From 57a71727c34682ec48c2ab910541291ffe0b3eb6 Mon Sep 17 00:00:00 2001
From: Claas <claas@claas.dev>
Date: Sat, 26 Oct 2024 19:08:46 +0200
Subject: [PATCH] Set speed to 0 when turned off and recover last setting when
 turned on

---
 fan-controller/src/fan.rs  |  4 ++--
 fan-controller/src/main.rs | 46 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/fan-controller/src/fan.rs b/fan-controller/src/fan.rs
index 4735db9..3fc52bb 100644
--- a/fan-controller/src/fan.rs
+++ b/fan-controller/src/fan.rs
@@ -36,14 +36,14 @@ impl SettingStringBuffer {
     }
 }
 
-#[derive(Debug, Format)]
+#[derive(Debug, Format, Clone, Copy)]
 pub(crate) struct Setting(u16);
 
 #[derive(Debug, Format)]
 pub(crate) struct SetPointOutOfBoundsError;
 
 impl Setting {
-    const ZERO: Self = Self(0);
+    pub(crate) 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);
diff --git a/fan-controller/src/main.rs b/fan-controller/src/main.rs
index 50b8587..caa15c2 100644
--- a/fan-controller/src/main.rs
+++ b/fan-controller/src/main.rs
@@ -8,6 +8,7 @@ use core::future::{poll_fn, Future};
 use core::num::NonZeroU16;
 use core::ops::{Deref, DerefMut, Sub};
 use core::pin::pin;
+use core::sync::atomic::AtomicBool;
 use core::task::Poll;
 use crc::{Crc, CRC_16_MODBUS};
 use cyw43::{Control, NetDriver};
@@ -525,6 +526,11 @@ async fn mqtt_task(
                     OUTGOING.send(PACKET).await;
                 }
 
+                // Set last set point to the new set point
+                let mut lock = LAST_FAN_SETTING.lock().await;
+                let current_setting = lock.deref_mut();
+                *current_setting = setting;
+
                 // Update the fan state after successful update
 
                 info!("Fan speed set. Updating homeassistant");
@@ -541,8 +547,41 @@ async fn mqtt_task(
                     "Turning fan {} based on command",
                     if is_on { "on" } else { "off" }
                 );
+
+                let mut fans = FANS.lock().await;
+                let Some(fan) = fans.deref_mut() else {
+                    warn!("No fan available to turn on or off");
+                    return;
+                };
+
+                if is_on {
+                    let last_setting = LAST_FAN_SETTING.lock().await;
+                    let result = fan.set_set_point(&last_setting).await;
+                    if let Err(TimeoutError) = result {
+                        error!("Setting fan speed from 'turn on' publish message timed out");
+                        return;
+                    }
+                    info!(
+                        "Fan set to last remembered setting for on command. Updating homeassistant"
+                    );
+                    // Update home assistant state
+                    let packet =
+                        Message::PredefinedPublish(PredefinedPublish::PublishPercentageState {
+                            setting: last_setting.clone(),
+                        });
+                    OUTGOING.send(packet).await;
+                } else {
+                    let result = fan.set_set_point(&fan::Setting::ZERO).await;
+                    if let Err(TimeoutError) = result {
+                        error!("Setting fan speed from 'turn off' publish message timed out");
+                        return;
+                    }
+                }
+
+                // Update home assistant state
                 let packet =
                     Message::PredefinedPublish(PredefinedPublish::PublishOnState { is_on });
+
                 OUTGOING.send(packet).await;
             }
             other => warn!(
@@ -1004,6 +1043,12 @@ async fn input_task(pin_18: PIN_18) {
 type Fans = Mutex<CriticalSectionRawMutex, Option<fan::Client<'static, UART0, PIN_4>>>;
 /// Use this to make calls to the fans through modbus
 static FANS: Fans = Mutex::new(None);
+/// Last set setting to emulate off/on in homeassistant. This is used to reset to last setting after turning on.
+/// Should probably persist this to flash
+static LAST_FAN_SETTING: Mutex<CriticalSectionRawMutex, fan::Setting> =
+    Mutex::new(fan::Setting::ZERO);
+static FAN_IS_ON: AtomicBool = AtomicBool::new(false);
+
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
     let Peripherals {
@@ -1026,6 +1071,7 @@ async fn main(spawner: Spawner) {
     // UART
 
     let client = fan::Client::new(uart0, pin_12, pin_13, Irqs, dma_ch1, dma_ch2, pin_4);
+    //TODO load fan setting from fan
     // Inner scope to drop the guard after assigning
     {
         *(FANS.lock().await) = Some(client);
-- 
2.51.2