chore: refacto + fmt + remove unused code

Author: thomassimmer

crates/fingerprint2-rs/src/commands.rs

@@ -39,6 +39,8 @@ pub const PS_SET_WORK_MODE: u8 = 0xD2;
 pub const PS_SET_SLEEP_TIME: u8 = 0xD0;
 /// Control the RGB LED ring.
 pub const PS_CONTROL_BLN: u8 = 0x3C;
+/// Activate the sensor (required after cold boot on some firmware versions).
+pub const PS_ACTIVATE: u8 = 0xD4;
 
 // ---------------------------------------------------------------------------
 // LedMode

crates/fingerprint2-rs/src/driver.rs

@@ -498,13 +498,6 @@ where
         Ok(())
     }
 
-    /// Cancel any running auto enrollment or auto identification.
-    pub fn cancel_auto_flow(&mut self) -> Result<(), FingerprintError<E>> {
-        self.send_command(&[crate::commands::PS_CANCEL_AUTO_FLOW])?;
-        self.read_ack()?;
-        Ok(())
-    }
-
     /// Poll for an unsolicited incoming frame — **non-blocking**.
     ///
     /// - Returns `Ok(DriverEvent::Wakeup)` when the sensor's 12-byte autonomous

firmware/src/app.rs

@@ -61,7 +61,7 @@ fn check_boot_factory_reset<D, A, B, C>(
         fp.empty_template_library();
         log::info!("Factory reset: fingerprint templates cleared");
         {
-            let mut guard = nvs.lock().expect("NVS mutex poisoned");
+            let mut guard = config_store::lock_nvs(nvs);
             for slot in 0u32..10 {
                 let _ = guard.0.remove(&format!("slot_{slot}"));
                 let _ = guard.0.remove(&format!("label_{slot}"));
@@ -74,6 +74,59 @@ fn check_boot_factory_reset<D, A, B, C>(
     }
 }
 
+/// Wake the screen if it is off, resetting the inactivity counter.
+///
+/// Centralises the repeated "ensure screen is on" pattern used throughout the
+/// main event loop (button press, BLE event, fingerprint result, CLI request…).
+fn wake_screen_if_off<BL: OutputPin>(
+    screen_on: &mut bool,
+    inactivity_ticks: &mut u32,
+    backlight: &mut PinDriver<'_, BL, Output>,
+    fp: &mut fingerprint::FingerprintSensor<'_>,
+) {
+    *inactivity_ticks = 0;
+    if !*screen_on {
+        backlight.set_high().ok();
+        *screen_on = true;
+        fp.wake();
+    }
+}
+
+/// Restore the main idle screen after any action that temporarily takes over the display.
+///
+/// Shows the active-clients count, the pairing PIN, or the "Press B to pair" prompt
+/// depending on the current BLE state — the three branches are the same everywhere
+/// in the main loop so this helper eliminates 5× copies of the same code.
+fn restore_idle_screen<D>(
+    disp: &mut D,
+    sb: &display::StatusBar<'_>,
+    connected: u32,
+    pairing_open: bool,
+    passkey: u32,
+) where
+    D: embedded_graphics::draw_target::DrawTarget<Color = embedded_graphics::pixelcolor::Rgb565>,
+{
+    if connected > 0 {
+        display::show_status(disp, sb, &format!("ACTIVE CLIENTS: {}", connected));
+    } else if pairing_open {
+        display::show_pin(disp, sb, passkey, connected);
+    } else {
+        display::show_status(disp, sb, "Press B to pair");
+    }
+}
+
+/// Generate a fresh random passkey, open a 60-second pairing window, and
+/// set `pairing_open` + `pairing_auto_close_at` accordingly.
+///
+/// Returns the new passkey so the caller can pass it to `show_pin`.
+fn open_fresh_pairing_window(pairing_open: &mut bool, pairing_auto_close_at: &mut u64) -> u32 {
+    let passkey = unsafe { esp_idf_svc::sys::esp_random() } % 1_000_000;
+    ble_hid::open_pairing_window(passkey);
+    *pairing_open = true;
+    *pairing_auto_close_at = unsafe { esp_idf_svc::sys::time(std::ptr::null_mut()) } as u64 + 60;
+    passkey
+}
+
 #[allow(clippy::too_many_arguments)]
 pub fn run<D, A, B, C, P, BL, F>(
     ble: &ble_hid::BleHid,
@@ -173,12 +226,12 @@ where
                 if ble_hid::PAIRING_ALLOWED.load(Ordering::Relaxed) {
                     display::show_pin(disp, &sb, passkey, connected);
                 } else if connected > 0 {
-                    display::show_status_mini(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
+                    display::show_status(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
                 } else {
                     display::show_status(disp, &sb, "Press B to pair");
                 }
             } else if connected > 0 {
-                display::show_status_mini(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
+                display::show_status(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
             } else {
                 display::show_status(disp, &sb, "Press B to pair");
             }
@@ -194,35 +247,21 @@ where
                 if connected == 0 {
                     display::show_status(disp, &sb, "Press B to pair");
                 } else {
-                    display::show_status_mini(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
+                    display::show_status(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
                 }
             }
         }
 
         // CLI allow_pairing: generate a fresh passkey and open a 60-second window.
         if ble_hid::OPEN_PAIRING_REQUESTED.swap(false, Ordering::Relaxed) {
-            passkey = unsafe { esp_idf_svc::sys::esp_random() } % 1_000_000;
-            ble_hid::open_pairing_window(passkey);
-            pairing_open = true;
-            pairing_auto_close_at =
-                unsafe { esp_idf_svc::sys::time(std::ptr::null_mut()) } as u64 + 60;
-            inactivity_ticks = 0;
-            if !screen_on {
-                backlight.set_high().ok();
-                screen_on = true;
-                fp.wake();
-            }
+            passkey = open_fresh_pairing_window(&mut pairing_open, &mut pairing_auto_close_at);
+            wake_screen_if_off(&mut screen_on, &mut inactivity_ticks, &mut backlight, fp);
             display::show_pin(disp, &sb, passkey, connected);
         }
 
         let btn_event = buttons.poll();
         if btn_event.is_some() || (!screen_on && buttons.is_any_down()) {
-            inactivity_ticks = 0;
-            if !screen_on {
-                backlight.set_high().ok();
-                screen_on = true;
-                fp.wake();
-            }
+            wake_screen_if_off(&mut screen_on, &mut inactivity_ticks, &mut backlight, fp);
         }
         match btn_event {
             Some(ButtonEvent::ALongPress) => {
@@ -238,17 +277,7 @@ where
             Some(ButtonEvent::AShortPress) => {
                 if pending_bond_clear {
                     pending_bond_clear = false;
-                    if connected > 0 {
-                        display::show_status_mini(
-                            disp,
-                            &sb,
-                            &format!("ACTIVE CLIENTS: {}", connected),
-                        );
-                    } else if pairing_open {
-                        display::show_pin(disp, &sb, passkey, connected);
-                    } else {
-                        display::show_status(disp, &sb, "Press B to pair");
-                    }
+                    restore_idle_screen(disp, &sb, connected, pairing_open, passkey);
                 }
             }
             Some(ButtonEvent::BLongPress) => {
@@ -261,21 +290,10 @@ where
                     ble_hid::close_pairing_window();
                     pairing_open = false;
                     pairing_auto_close_at = 0;
-                    if connected > 0 {
-                        display::show_status_mini(
-                            disp,
-                            &sb,
-                            &format!("ACTIVE CLIENTS: {}", connected),
-                        );
-                    } else {
-                        display::show_status(disp, &sb, "Press B to pair");
-                    }
+                    restore_idle_screen(disp, &sb, connected, pairing_open, passkey);
                 } else {
-                    passkey = unsafe { esp_idf_svc::sys::esp_random() } % 1_000_000;
-                    ble_hid::open_pairing_window(passkey);
-                    pairing_open = true;
-                    pairing_auto_close_at =
-                        unsafe { esp_idf_svc::sys::time(std::ptr::null_mut()) } as u64 + 60;
+                    passkey =
+                        open_fresh_pairing_window(&mut pairing_open, &mut pairing_auto_close_at);
                     display::show_pin(disp, &sb, passkey, connected);
                 }
             }
@@ -312,12 +330,7 @@ where
 
         // CLI-driven enrollment: pick up a pending EnrollRequest from the CLI task.
         if let Ok(request) = enroll_rx.try_recv() {
-            inactivity_ticks = 0;
-            if !screen_on {
-                backlight.set_high().ok();
-                screen_on = true;
-                fp.wake();
-            }
+            wake_screen_if_off(&mut screen_on, &mut inactivity_ticks, &mut backlight, fp);
             const PASSES: u8 = 3;
             display::show_status_2line(disp, &sb, "CLI Enroll", "Place finger");
             if fp.begin_enroll(request.slot, PASSES) {
@@ -377,23 +390,12 @@ where
             }
             fp.reactivate();
             FreeRtos::delay_ms(2000);
-            if connected > 0 {
-                display::show_status_mini(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
-            } else if pairing_open {
-                display::show_pin(disp, &sb, passkey, connected);
-            } else {
-                display::show_status(disp, &sb, "Press B to pair");
-            }
+            restore_idle_screen(disp, &sb, connected, pairing_open, passkey);
         }
 
         // CLI-driven fingerprint verify: pick up a pending VerifyRequest from the CLI task.
         if let Ok(request) = verify_rx.try_recv() {
-            inactivity_ticks = 0;
-            if !screen_on {
-                backlight.set_high().ok();
-                screen_on = true;
-                fp.wake();
-            }
+            wake_screen_if_off(&mut screen_on, &mut inactivity_ticks, &mut backlight, fp);
             display::show_status_2line(disp, &sb, "CLI Auth", "Place finger");
             let deadline = std::time::Instant::now() + std::time::Duration::from_secs(30);
             let matched = loop {
@@ -413,30 +415,19 @@ where
                 display::show_status(disp, &sb, "Auth Failed");
             }
             FreeRtos::delay_ms(1500);
-            if connected > 0 {
-                display::show_status_mini(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
-            } else if pairing_open {
-                display::show_pin(disp, &sb, passkey, connected);
-            } else {
-                display::show_status(disp, &sb, "Press B to pair");
-            }
+            restore_idle_screen(disp, &sb, connected, pairing_open, passkey);
         }
 
         // Fingerprint — non-blocking poll; blocks ~20 ms only when a finger is detected.
         match fp.poll() {
             Some(fingerprint::IdentifyResult::Match(id)) => {
-                inactivity_ticks = 0;
-                if !screen_on {
-                    backlight.set_high().ok();
-                    screen_on = true;
-                    fp.wake();
-                }
+                wake_screen_if_off(&mut screen_on, &mut inactivity_ticks, &mut backlight, fp);
                 display::show_auth_ok(disp, &sb, id);
 
                 let key = format!("slot_{}", id);
                 let mut buf = [0u8; 65];
                 let totp_result = {
-                    let guard = nvs.lock().expect("NVS mutex poisoned");
+                    let guard = config_store::lock_nvs(&nvs);
                     match guard.0.get_str(&key, &mut buf) {
                         Ok(Some(secret)) => {
                             let now =
@@ -472,30 +463,13 @@ where
                 }
 
                 FreeRtos::delay_ms(2000);
-                if connected > 0 {
-                    display::show_status_mini(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
-                } else if pairing_open {
-                    display::show_pin(disp, &sb, passkey, connected);
-                } else {
-                    display::show_status(disp, &sb, "Press B to pair");
-                }
+                restore_idle_screen(disp, &sb, connected, pairing_open, passkey);
             }
             Some(fingerprint::IdentifyResult::NoMatch) => {
-                inactivity_ticks = 0;
-                if !screen_on {
-                    backlight.set_high().ok();
-                    screen_on = true;
-                    fp.wake();
-                }
+                wake_screen_if_off(&mut screen_on, &mut inactivity_ticks, &mut backlight, fp);
                 display::show_no_match(disp, &sb);
                 FreeRtos::delay_ms(2000);
-                if connected > 0 {
-                    display::show_status_mini(disp, &sb, &format!("ACTIVE CLIENTS: {}", connected));
-                } else if pairing_open {
-                    display::show_pin(disp, &sb, passkey, connected);
-                } else {
-                    display::show_status(disp, &sb, "Press B to pair");
-                }
+                restore_idle_screen(disp, &sb, connected, pairing_open, passkey);
             }
             None => {}
         }

firmware/src/ble_hid.rs

@@ -4,7 +4,7 @@
 //!   - `CONNECTED`   : AtomicBool  (true when CCCD subscribed, keystrokes can be sent)
 //!   - `CLEAR_BONDS` : AtomicBool  (set by UI to request bond wipe + reboot)
 //!   - `init(passkey)` → `BleHid`  (call once from main before the main loop)
-//!   - `BleHid::type_string(text)`  (send keystrokes)
+//!   - `BleHid::type_digits(text)`  (send numpad digit keystrokes)
 //!   - `clear_bonds_and_reboot()`   (wipe NVS bonds, then esp_restart)
 
 use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
@@ -16,8 +16,6 @@ use esp32_nimble::{
 };
 use esp_idf_svc::hal::delay::FreeRtos;
 
-use crate::hid::ascii_to_key;
-
 // ---------------------------------------------------------------------------
 // HID Report Descriptor (minimal boot keyboard — 45 bytes)
 // ---------------------------------------------------------------------------
@@ -70,35 +68,10 @@ pub struct BleHid {
 }
 
 impl BleHid {
-    /// Type every printable ASCII character in `text` as key-down / key-up pairs.
-    ///
-    /// No-op if the host has not yet subscribed to HID notifications.
-    pub fn type_string(&self, text: &str) {
-        if SUBSCRIBED.load(Ordering::Relaxed) == 0 {
-            log::warn!("[HID] no active subscriptions — dropping '{}'", text);
-            return;
-        }
-        for byte in text.bytes() {
-            let (modifier, keycode) = ascii_to_key(byte);
-            if keycode == 0 {
-                log::debug!("[HID] skipping unmapped char 0x{:02x}", byte);
-                continue;
-            }
-            self.input
-                .lock()
-                .set_value(&[modifier, 0x00, keycode, 0, 0, 0, 0, 0])
-                .notify();
-            FreeRtos::delay_ms(10); // hold key down
-            self.input.lock().set_value(&[0u8; 8]).notify(); // key up
-            FreeRtos::delay_ms(5);
-        }
-        log::info!("[HID] '{}' sent", text);
-    }
-
     /// Type a string of digits using numpad keycodes (layout-independent).
     ///
     /// Regular digit keycodes (0x1e–0x27) are physical-position-based and produce
-    /// wrong characters on non-QWERTY layouts (e.g. AZERTY gives "àéèç...").
+    /// wrong characters on non-QWERTY layouts (e.g. AZERTY gives "àéèç…").
     /// Numpad keycodes (0x59–0x62) are always interpreted as digits by the host OS.
     pub fn type_digits(&self, digits: &str) {
         if SUBSCRIBED.load(Ordering::Relaxed) == 0 {