chore: make ble signalling cleaner

Author: filipton

src/bluetooth.rs

@@ -1,4 +1,7 @@
-use crate::{state::GlobalState, structs::BleDisplayDevice};
+use crate::{
+    state::{BleAction, GlobalState, MenuScene},
+    structs::BleDisplayDevice,
+};
 use alloc::string::ToString;
 use core::cell::RefCell;
 use embassy_futures::select::{Either, select, select3, select4};
@@ -18,6 +21,26 @@ pub async fn bluetooth_timer_task(
     state: GlobalState,
 ) {
     loop {
+        let (mut has_bond_info, bond_info) =
+            if let Some(bond_info) = load_bonding_info(&state.nvs).await {
+                log::info!("Bond stored.");
+                (true, Some(bond_info))
+            } else {
+                log::info!("No bond stored.");
+
+                let current_menu_scene = state.state.lock().await.menu_scene.clone();
+                if current_menu_scene != Some(MenuScene::BtDisplay) {
+                    loop {
+                        let sig = state.ble_sig.wait().await;
+                        if let BleAction::StartScan = sig {
+                            break;
+                        }
+                    }
+                }
+
+                (false, None)
+            };
+
         let Ok(connector) = BleConnector::new(
             init,
             unsafe { bt.clone_unchecked() },
@@ -42,16 +65,6 @@ pub async fn bluetooth_timer_task(
             ..
         } = stack.build();
 
-        let (mut has_bond_info, bond_info) =
-            if let Some(bond_info) = load_bonding_info(&state.nvs).await {
-                log::info!("Bond stored. Adding to stack.");
-                stack.add_bond_information(bond_info.clone()).unwrap();
-                (true, Some(bond_info))
-            } else {
-                log::info!("No bond stored.");
-                (false, None)
-            };
-
         let mut central = if !has_bond_info {
             let discovery_channel: Channel<NoopRawMutex, BleDisplayDevice, 10> =
                 embassy_sync::channel::Channel::new();
@@ -98,7 +111,7 @@ pub async fn bluetooth_timer_task(
                 async {
                     loop {
                         Timer::after_millis(200).await;
-                        if state.ble_connect_sig.signaled() {
+                        if state.ble_sig.signaled() {
                             break;
                         }
                     }
@@ -108,12 +121,21 @@ pub async fn bluetooth_timer_task(
 
             scanner.into_inner()
         } else {
+            stack
+                .add_bond_information(bond_info.clone().unwrap())
+                .unwrap();
+
             central
         };
 
         let display_addr = match bond_info {
             Some(ref bond_info) => bond_info.identity.bd_addr.into_inner(),
-            None => state.ble_connect_sig.wait().await.addr,
+            None => loop {
+                let sig = state.ble_sig.wait().await;
+                if let BleAction::Connect(d) = sig {
+                    break d.addr;
+                }
+            },
         };
         let target: Address = Address::random(display_addr);
 
@@ -129,7 +151,12 @@ pub async fn bluetooth_timer_task(
         let _ = select3(
             runner.run(),
             async {
-                state.ble_unpair_sig.wait().await;
+                loop {
+                    let sig = state.ble_sig.wait().await;
+                    if let BleAction::Unpair = sig {
+                        break;
+                    }
+                }
             },
             async {
                 'outer: loop {

src/buttons.rs

@@ -1,6 +1,8 @@
 use crate::{
     stackmat::CURRENT_TIME,
-    state::{GlobalState, MenuScene, Scene, current_epoch, deeper_sleep_state, sleep_state},
+    state::{
+        BleAction, GlobalState, MenuScene, Scene, current_epoch, deeper_sleep_state, sleep_state,
+    },
     structs::DelegateResponsePacket,
     utils::buttons::{Button, ButtonTrigger, ButtonsHandler},
 };
@@ -183,16 +185,19 @@ async fn submit_up(
                 );
 
                 _ = state.nvs.invalidate_key(b"BONDING_KEY").await;
-                state.ble_connect_sig.signal(
-                    state_val.discovered_bluetooth_devices[state_val.selected_bluetooth_item]
-                        .clone(),
+                state.ble_sig.signal(
+                    BleAction::Connect(
+                        state_val.discovered_bluetooth_devices[state_val.selected_bluetooth_item]
+                            .clone(),
+                    )
+                    .clone(),
                 );
             } else if state_val.selected_bluetooth_item
                 == state_val.discovered_bluetooth_devices.len()
             {
                 log::debug!("[BtD] Unpair current device");
                 _ = state.nvs.invalidate_key(b"BONDING_KEY").await;
-                state.ble_unpair_sig.signal(());
+                state.ble_sig.signal(BleAction::Unpair);
             } else if state_val.selected_bluetooth_item
                 == state_val.discovered_bluetooth_devices.len() + 1
             {
@@ -223,6 +228,7 @@ async fn submit_up(
             }
             1 => {
                 state_val.menu_scene = Some(MenuScene::BtDisplay);
+                state.ble_sig.signal(BleAction::StartScan);
             }
             2 => {
                 state_val.menu_scene = Some(MenuScene::Signing);

src/state.rs

@@ -135,6 +135,13 @@ impl End2End {
     }
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum BleAction {
+    Connect(BleDisplayDevice),
+    StartScan,
+    Unpair,
+}
+
 pub type GlobalState = Rc<GlobalStateInner>;
 pub struct GlobalStateInner {
     pub state: SignaledMutex<CriticalSectionRawMutex, SignaledGlobalStateInner>,
@@ -143,8 +150,7 @@ pub struct GlobalStateInner {
     pub show_battery: Signal<CriticalSectionRawMutex, u8>,
     pub update_progress: Signal<CriticalSectionRawMutex, u8>,
     pub sign_unsign_progress: Signal<CriticalSectionRawMutex, bool>,
-    pub ble_connect_sig: Signal<CriticalSectionRawMutex, BleDisplayDevice>,
-    pub ble_unpair_sig: Signal<CriticalSectionRawMutex, ()>,
+    pub ble_sig: Signal<CriticalSectionRawMutex, BleAction>,
 
     pub nvs: Nvs,
     pub aes: Mutex<NoopRawMutex, Aes<'static>>,
@@ -162,8 +168,7 @@ impl GlobalStateInner {
             show_battery: Signal::new(),
             update_progress: Signal::new(),
             sign_unsign_progress: Signal::new(),
-            ble_connect_sig: Signal::new(),
-            ble_unpair_sig: Signal::new(),
+            ble_sig: Signal::new(),
 
             nvs: nvs.clone(),
             aes: Mutex::new(Aes::new(aes)),