feat: ble display sleep

Author: filipton

src/bluetooth.rs

@@ -2,12 +2,13 @@ use crate::{
     state::{BleAction, GlobalState, MenuScene},
     structs::BleDisplayDevice,
 };
-use alloc::string::ToString;
+use alloc::{rc::Rc, string::ToString};
 use core::cell::RefCell;
 use embassy_futures::select::{Either, select, select3, select4};
 use embassy_sync::{
-    blocking_mutex::raw::NoopRawMutex,
+    blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex},
     channel::{Channel, Sender},
+    signal::Signal,
 };
 use embassy_time::{Duration, Timer, with_timeout};
 use esp_radio::{Controller as RadioController, ble::controller::BleConnector};
@@ -19,6 +20,35 @@ pub async fn bluetooth_timer_task(
     init: &'static RadioController<'static>,
     bt: esp_hal::peripherals::BT<'static>,
     state: GlobalState,
+    sleep_sig: Rc<Signal<CriticalSectionRawMutex, bool>>,
+) {
+    loop {
+        let mut sleep = false;
+        embassy_futures::select::select(bluetooth_loop(init, &bt, &state), async {
+            loop {
+                if sleep_sig.wait().await {
+                    sleep = true;
+                    break;
+                }
+            }
+        })
+        .await;
+
+        Timer::after_millis(1000).await;
+        if sleep {
+            loop {
+                if !sleep_sig.wait().await {
+                    break;
+                }
+            }
+        }
+    }
+}
+
+async fn bluetooth_loop(
+    init: &'static RadioController<'static>,
+    bt: &esp_hal::peripherals::BT<'static>,
+    state: &GlobalState,
 ) {
     loop {
         let mut bond_info = if let Some(bond_info) = load_bonding_info(&state.nvs).await {

src/main.rs

@@ -309,10 +309,12 @@ async fn main(spawner: Spawner) {
         ));
         spawner.must_spawn(logger_task(global_state.clone()));
 
+        let ble_sleep_sig = Rc::new(Signal::new());
         spawner.must_spawn(bluetooth::bluetooth_timer_task(
             wifi_res.wifi_init,
             board.bt,
             global_state.clone(),
+            ble_sleep_sig.clone(),
         ));
 
         set_brownout_detection(true);
@@ -331,6 +333,7 @@ async fn main(spawner: Spawner) {
             if sleep_state() != last_sleep {
                 last_sleep = sleep_state();
                 ws_sleep_sig.signal(last_sleep);
+                ble_sleep_sig.signal(last_sleep);
 
                 match last_sleep {
                     true => {