From f49ffe9f7b218e4ad8f9af3128741c83e0ea25d7 Mon Sep 17 00:00:00 2001
From: Claas <claas@claas.dev>
Date: Sun, 20 Oct 2024 17:37:13 +0200
Subject: [PATCH] Move fan setting to where it belongs

to reduce code bloat in main
---
 fan-controller/src/fan.rs  | 27 ++++++++++++++++++++-----
 fan-controller/src/main.rs | 40 +++++++++++++-------------------------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/fan-controller/src/fan.rs b/fan-controller/src/fan.rs
index 10821ea..23f5d56 100644
--- a/fan-controller/src/fan.rs
+++ b/fan-controller/src/fan.rs
@@ -25,6 +25,27 @@ pub(crate) fn get_configuration() -> uart::Config {
 
 pub(crate) const MAX_SET_POINT: u16 = 64_000;
 
+#[derive(Debug)]
+pub(crate) struct FanSetting(u16);
+
+#[derive(Debug)]
+pub(crate) struct SetPointOutOfBoundsError;
+
+impl FanSetting {
+    const ZERO: Self = Self(0);
+    pub(crate) const fn new(set_point: u16) -> Result<Self, SetPointOutOfBoundsError> {
+        if set_point > MAX_SET_POINT {
+            return Err(SetPointOutOfBoundsError);
+        }
+
+        Ok(Self(set_point))
+    }
+
+    const fn get(&self) -> u16 {
+        self.0
+    }
+}
+
 #[derive(Default, Format, Debug)]
 pub(crate) enum State {
     #[default]
@@ -67,11 +88,7 @@ impl<'a, UART: uart::Instance, PIN: Pin> FanClient<'a, UART, PIN> {
         }
     }
 
-    pub(crate) async fn set_set_point(&mut self, set_point: u16) {
-        if set_point > MAX_SET_POINT {
-            return;
-        }
-
+    pub(crate) async fn set_set_point(&mut self, FanSetting(set_point): FanSetting) {
         // Send update through UART to MAX845 to modbus fans
         // Form message to fan 1
         let mut message: [u8; 8] = [
diff --git a/fan-controller/src/main.rs b/fan-controller/src/main.rs
index e1aff14..3140efc 100644
--- a/fan-controller/src/main.rs
+++ b/fan-controller/src/main.rs
@@ -56,7 +56,7 @@ use crate::mqtt::subscribe_acknowledgement::SubscribeAcknowledgement;
 use crate::mqtt::task::{send, Encode};
 use crate::mqtt::QualityOfService;
 use crate::mqtt::{connect, publish, subscribe};
-use fan::FanClient;
+use fan::{FanClient, FanSetting};
 
 mod async_callback;
 mod configuration;
@@ -376,7 +376,13 @@ async fn mqtt_task(
                     return;
                 };
 
-                let fans = FANS.lock().await;
+                let mut fans = FANS.lock().await;
+                let Some(fan) = fans.deref_mut() else {
+                    warn!("No fan available to set speed");
+                    return;
+                };
+
+                fan.set_set_point(setting).await;
             }
 
             other => info!(
@@ -555,7 +561,7 @@ async fn mqtt_task(
     }
 
     //TODO cancel all tasks when client loses connection
-    // join3(listen, talk, set_up).await;
+    join3(listen, talk, set_up).await;
 }
 
 enum PublishReceiveError {
@@ -850,26 +856,6 @@ async fn send_discovery_and_keep_alive(
         //TODO read ping response or disconnect after "a reasonable amount of time"
     }
 }
-#[derive(Debug)]
-struct FanSetting(u16);
-#[derive(Debug)]
-
-struct SetPointOutOfBoundsError;
-
-impl FanSetting {
-    const ZERO: Self = Self(0);
-    const fn new(set_point: u16) -> Result<Self, SetPointOutOfBoundsError> {
-        if set_point > fan::MAX_SET_POINT {
-            return Err(SetPointOutOfBoundsError);
-        }
-
-        Ok(Self(set_point))
-    }
-
-    const fn get(&self) -> u16 {
-        self.0
-    }
-}
 
 /// This task handles inputs from physical buttons to change the fan speed
 #[embassy_executor::task]
@@ -918,7 +904,7 @@ async fn input_task(pin_18: PIN_18) {
             continue;
         };
 
-        fan.set_set_point(set_point).await;
+        fan.set_set_point(setting).await;
     }
 }
 
@@ -956,9 +942,9 @@ async fn main(spawner: Spawner) {
     unwrap!(spawner.spawn(input_task(pin_18)));
     // The MQTT task waits for publishes from MQTT and sends them to the modbus task.
     // It also sends updates from the modbus task that happen through button inputs to MQTT
-    // unwrap!(spawner.spawn(mqtt_task(
-    //     spawner, pin_23, pin_25, pio0, dma_ch0, pin_24, pin_29
-    // )));
+    unwrap!(spawner.spawn(mqtt_task(
+        spawner, pin_23, pin_25, pio0, dma_ch0, pin_24, pin_29
+    )));
 }
 
 #[cfg(test)]
-- 
2.51.2