From 8afc667f39084e339928f4e59a636bd37bf8d8a0 Mon Sep 17 00:00:00 2001
From: Sachymetsu <sachymetsu@tutamail.com>
Date: Sat, 15 Aug 2026 10:08:51 +0000
Subject: [PATCH] More separating of timers/actions

---
 src/requests.rs | 9 ++++++---
 water-pod-common/src/lib.rs | 9 +++++----
 2 file(s) changed, 11 insertion(s)(+), 7 deletion(s)(-)

diff --git a/src/requests.rs b/src/requests.rs
--- a/src/requests.rs
+++ b/src/requests.rs
@@ -45,20 +45,23 @@
 
             Encrypted::new(Response::TimeSync(sync)).to_bytes(send_state)
         }
-        Request::FetchCommands { hash } => {
+        Request::FetchTimers { hash } => {
             let mocked = Timestamp::now().to_zoned(TimeZone::UTC);
             let pump = PumpTimer {
                 hour: mocked.hour(),
                 minute: mocked.minute() + 2,
                 duration: 5,
+                freq: 1,
                 pump: 0,
             };
-            Encrypted::new(Response::FetchCommands {
+            Encrypted::new(Response::FetchTimers {
                 timers: Some(Box::from([pump])),
-                actions: None,
                 hash: hash - 2,
             })
             .to_bytes(send_state)
+        }
+        Request::FetchCommands => {
+            Encrypted::new(Response::FetchCommands(None)).to_bytes(send_state)
         }
         Request::Update(_device) => Encrypted::new(Response::Ack).to_bytes(send_state),
         _ => Encrypted::new(Response::Error).to_bytes(send_state),
diff --git a/water-pod-common/src/lib.rs b/water-pod-common/src/lib.rs
--- a/water-pod-common/src/lib.rs
+++ b/water-pod-common/src/lib.rs
@@ -24,10 +24,11 @@
 pub enum Request {
     TimeSync(TimeSyncMs),
     Update(PodDevice),
-    FetchCommands {
+    FetchTimers {
         #[serde(with = "postcard::fixint::le")]
         hash: u64,
     },
+    FetchCommands,
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
@@ -35,12 +36,11 @@
 #[non_exhaustive]
 pub enum Response {
     TimeSync(TimeSyncMs),
-    FetchCommands {
+    FetchTimers {
         timers: Option<Box<[PumpTimer]>>,
-        actions: Option<Box<[PumpActivation]>>,
-        #[serde(with = "postcard::fixint::le")]
         hash: u64,
     },
+    FetchCommands(Option<Box<[PumpActivation]>>),
     Ack,
     Error,
 }
@@ -133,6 +133,7 @@
     pub pump: u8,
     pub hour: i8,
     pub minute: i8,
+    pub freq: i8,
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone, Copy)]

--
tangled.sh