diff --git a/water-pod-common/src/lib.rs b/water-pod-common/src/lib.rs index abfc5ee..f4419e5 100644 --- a/water-pod-common/src/lib.rs +++ b/water-pod-common/src/lib.rs @@ -82,8 +82,8 @@ impl TimeSyncMs { pub fn new(origin: jiff::Timestamp) -> Self { Self { t0: origin.as_millisecond(), - t1: jiff::Timestamp::MIN.as_millisecond(), - t2: jiff::Timestamp::MIN.as_millisecond(), + t1: jiff::Timestamp::UNIX_EPOCH.as_millisecond(), + t2: jiff::Timestamp::UNIX_EPOCH.as_millisecond(), } } @@ -116,14 +116,16 @@ pub enum Command { SetTimer(PumpTimer), } -#[derive(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq)] +#[derive(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone, Copy)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] pub struct PumpActivation { pub duration: u8, pub pump: u8, } -#[derive(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, PartialOrd, Ord)] +#[derive( + Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, +)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] pub struct PumpTimer { pub duration: u8, @@ -132,7 +134,7 @@ pub struct PumpTimer { pub minute: i8, } -#[derive(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq)] +#[derive(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone, Copy)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] pub struct PodDevice { pub pumps: u8,