fix: reversed sleep state

Author: filipton

src/buttons.rs

@@ -82,7 +82,8 @@ async fn wakeup_button(
     state: &GlobalState,
 ) -> Result<bool, ()> {
     if sleep_state() {
-        let _drop = state.state.lock().await;
+        state.state.signal();
+        return Ok(true);
     }
 
     Ok(false)

src/lcd.rs

@@ -128,7 +128,7 @@ pub async fn lcd_task(
         log::debug!("current_state: {:?}", current_state);
         last_update = Instant::now();
 
-        if !sleep_state() {
+        if sleep_state() {
             #[cfg(feature = "esp32c3")]
             {
                 _ = bl_pin.set_high();
@@ -139,7 +139,7 @@ pub async fn lcd_task(
             }
 
             unsafe {
-                crate::state::SLEEP_STATE = true;
+                crate::state::SLEEP_STATE = false;
             }
         }
 
@@ -164,7 +164,7 @@ pub async fn lcd_task(
                     lcd_driver.display_on_lcd(&mut lcd, &mut delay).unwrap();
                 }
 
-                if sleep_state() && (Instant::now() - last_update).as_secs() > 60 * 5 {
+                if !sleep_state() && (Instant::now() - last_update).as_secs() > 60 * 5 {
                     #[cfg(feature = "esp32c3")]
                     {
                         _ = bl_pin.set_low();
@@ -175,7 +175,7 @@ pub async fn lcd_task(
                     }
 
                     unsafe {
-                        crate::state::SLEEP_STATE = false;
+                        crate::state::SLEEP_STATE = true;
                     }
                 }
             }

src/main.rs

@@ -18,7 +18,7 @@ use esp_hal::{
     timer::timg::TimerGroup,
 };
 use esp_storage::FlashStorage;
-use state::{get_ota_state, GlobalStateInner, SavedGlobalState, Scene};
+use state::{ota_state, GlobalStateInner, SavedGlobalState, Scene};
 use structs::ConnSettings;
 use translations::init_translations;
 use utils::{logger::FkmLogger, set_brownout_detection};
@@ -319,7 +319,7 @@ async fn main(spawner: Spawner) {
             tmp_logs.push(msg);
         }
 
-        if get_ota_state() {
+        if ota_state() {
             continue;
         }
 

src/state.rs

@@ -21,7 +21,7 @@ pub fn sleep_state() -> bool {
 }
 
 #[inline(always)]
-pub fn get_ota_state() -> bool {
+pub fn ota_state() -> bool {
     unsafe { OTA_STATE }
 }
 

src/utils/buttons.rs

@@ -144,9 +144,13 @@ impl ButtonsHandler {
             .find(|(_, h)| h.button == button);
 
         if let Some(ref default_handler) = self.default_handler {
-            _ = default_handler
+            let res = default_handler
                 .execute(&ButtonTrigger::Down, 0, state)
                 .await;
+
+            if res == Ok(true) {
+                return;
+            }
         }
 
         if let Some((i, handler)) = &mut handler {
@@ -237,9 +241,14 @@ impl ButtonsHandler {
 
         let hold_time = (Instant::now() - self.press_time).as_millis();
         if let Some(ref default_handler) = self.default_handler {
-            _ = default_handler
+            let res = default_handler
                 .execute(&ButtonTrigger::Up, hold_time, state)
                 .await;
+
+            if res == Ok(true) {
+                self.current_handler_down = None;
+                return;
+            }
         }
 
         let handler = &self.handlers[self.current_handler_down.expect("Cant fail")];

src/utils/logger.rs

@@ -1,4 +1,4 @@
-use crate::state::get_ota_state;
+use crate::state::ota_state;
 use alloc::string::String;
 use embassy_sync::{blocking_mutex::raw::CriticalSectionRawMutex, channel::Channel};
 
@@ -52,7 +52,7 @@ impl log::Log for FkmLogger {
         esp_println::println!("{}{} - {}{}", color, record.level(), record.args(), reset);
 
         #[cfg(not(feature = "bat_dev_lcd"))]
-        if !get_ota_state() {
+        if !ota_state() {
             if LOGS_CHANNEL.is_full() {
                 _ = LOGS_CHANNEL.try_receive();
             }

src/ws.rs

@@ -249,7 +249,7 @@ async fn ws_rw(
                     }
                 },
                 WsFrame::Binary(data) => {
-                    if !crate::state::get_ota_state() {
+                    if !crate::state::ota_state() {
                         continue;
                     }