fix: update wifimanager to fix "sticky" ble

Author: filipton

Cargo.lock

@@ -19,7 +19,7 @@ embedded-storage = "0.3.1"
 static_cell = { version = "2.1.1", features = ["nightly"] }
 heapless = { version = "0.9.1", default-features = false }
 esp-alloc = "0.9.0"
-esp-hal-wifimanager = { version = "0.2.0", default-features = false, features = ["ap", "ble", "esp32c3"] }
+esp-hal-wifimanager = { version = "0.2.1", default-features = false, features = ["ap", "ble", "esp32c3"] }
 serde = { version = "1.0.228", features = ["alloc", "derive"], default-features = false }
 serde_json = { version = "1.0.145", default-features = false, features = ["alloc"] }
 adv-shift-registers = "0.2.5"

Cargo.toml

@@ -1,3 +1,4 @@
+use crate::state::GlobalState;
 use core::cell::RefCell;
 use embassy_futures::join::join;
 use embassy_time::{Duration, Timer};
@@ -8,6 +9,7 @@ use trouble_host::prelude::*;
 pub async fn bluetooth_timer_task(
     init: &'static RadioController<'static>,
     bt: esp_hal::peripherals::BT<'static>,
+    state: GlobalState,
 ) {
     let Ok(connector) = BleConnector::new(init, bt, esp_radio::ble::Config::default()) else {
         log::error!("Cannot init ble connector");
@@ -29,6 +31,7 @@ pub async fn bluetooth_timer_task(
 
     let printer = Printer {
         seen: RefCell::new(heapless::Deque::new()),
+        state: &state,
     };
     let mut scanner = Scanner::new(central);
     let _ = join(runner.run_with_handler(&printer), async {
@@ -45,11 +48,12 @@ pub async fn bluetooth_timer_task(
 }
 
 #[allow(dead_code)]
-struct Printer {
+struct Printer<'a> {
     seen: RefCell<heapless::Deque<BdAddr, 128>>,
+    state: &'a GlobalState,
 }
 
-impl EventHandler for Printer {
+impl<'a> EventHandler for Printer<'a> {
     fn on_adv_reports(&self, mut it: LeAdvReportsIter<'_>) {
         let mut seen = self.seen.borrow_mut();
         while let Some(Ok(report)) = it.next() {

src/bluetooth.rs

@@ -309,12 +309,11 @@ async fn main(spawner: Spawner) {
         spawner.must_spawn(logger_task(global_state.clone()));
 
         // BUG: this fails after wifi setup (its good if wifi is saved and ble isnt spawned)
-        /*
         spawner.must_spawn(bluetooth::bluetooth_timer_task(
             wifi_res.wifi_init,
             board.bt,
+            global_state.clone(),
         ));
-        */
 
         set_brownout_detection(true);
         global_state.state.lock().await.scene = Scene::WaitingForCompetitor;