feat: wakeup from "sleep" after button press

Author: filipton

src/buttons.rs

@@ -1,5 +1,5 @@
 use crate::{
-    state::{current_epoch, GlobalState, Scene},
+    state::{current_epoch, sleep_state, GlobalState, Scene},
     structs::DelegateResponsePacket,
     utils::buttons::{Button, ButtonTrigger, ButtonsHandler},
 };
@@ -19,7 +19,7 @@ pub async fn buttons_task(
 
     #[cfg(feature = "esp32")] buttons: [Input<'static>; 4],
 ) {
-    let mut handler = ButtonsHandler::new();
+    let mut handler = ButtonsHandler::new(Some(wakeup_button()));
     handler.add_handler(Button::Third, ButtonTrigger::Up, submit_up());
     handler.add_handler(
         Button::Third,
@@ -75,6 +75,19 @@ async fn button_test(
     Ok(false)
 }
 
+#[macros::button_handler]
+async fn wakeup_button(
+    _triggered: &ButtonTrigger,
+    _hold_time: u64,
+    state: &GlobalState,
+) -> Result<bool, ()> {
+    if sleep_state() {
+        let _drop = state.state.lock().await;
+    }
+
+    Ok(false)
+}
+
 #[macros::button_handler]
 async fn submit_up(
     _triggered: &ButtonTrigger,

src/utils/buttons.rs

@@ -41,15 +41,19 @@ pub struct ButtonHandler {
 }
 
 pub struct ButtonsHandler {
+    default_handler: Option<HandlersDerive>,
+
     handlers: Vec<ButtonHandler>,
     press_time: Instant,
     last_hold_execute: Instant,
     current_handler_down: Option<usize>,
 }
 
 impl ButtonsHandler {
-    pub fn new() -> Self {
+    pub fn new(default_handler: Option<HandlersDerive>) -> Self {
         Self {
+            default_handler,
+
             handlers: Vec::new(),
             press_time: Instant::now(),
             last_hold_execute: Instant::now(),
@@ -139,6 +143,12 @@ impl ButtonsHandler {
             .enumerate()
             .find(|(_, h)| h.button == button);
 
+        if let Some(ref default_handler) = self.default_handler {
+            _ = default_handler
+                .execute(&ButtonTrigger::Down, 0, state)
+                .await;
+        }
+
         if let Some((i, handler)) = &mut handler {
             self.current_handler_down = Some(*i);
 
@@ -225,10 +235,16 @@ impl ButtonsHandler {
             return;
         }
 
+        let hold_time = (Instant::now() - self.press_time).as_millis();
+        if let Some(ref default_handler) = self.default_handler {
+            _ = default_handler
+                .execute(&ButtonTrigger::Up, hold_time, state)
+                .await;
+        }
+
         let handler = &self.handlers[self.current_handler_down.expect("Cant fail")];
         let handlers = handler.handlers.iter().filter(|h| h.0 == ButtonTrigger::Up);
         for handler in handlers {
-            let hold_time = (Instant::now() - self.press_time).as_millis();
             let res = handler.2.execute(&handler.0, hold_time, state).await;
             if let Err(e) = res {
                 log::error!("buttons_handler:up_err: {e:?}");