Decouple BLE UI updates; expose pairing state

Remove direct UI calls from BLE core and move BLE pairing icon management into the LVGL UI task. Added isBLEPairingModeActive() to ble_core.h/.cpp so the UI can query pairing state, removed updateBLEStatusIcon() and its calls from ble_core.cpp to decouple BLE logic from display code, and updated lvgl_updates.cpp to include BLE headers and keep the pairing icon in sync (managing the flash timer and visibility). This reduces cross-module coupling and ensures missed callback updates are recovered by the UI task.

Author: zjwhitehead

inc/sp140/ble/ble_core.h

@@ -17,5 +17,6 @@ void requestNormalConnParams();
 // Temporarily disable whitelist filtering so a new device can bond.
 // Advertising reopens for ~60 seconds then whitelisting is restored.
 void enterBLEPairingMode();
+bool isBLEPairingModeActive();
 
 #endif  // INC_SP140_BLE_BLE_CORE_H_

src/sp140/ble/ble_core.cpp

@@ -8,7 +8,6 @@
 #include <freertos/timers.h>
 
 #include "sp140/ble.h"
-#include "sp140/lvgl/lvgl_updates.h"
 #include "sp140/ble/ble_ids.h"
 #include "sp140/ble/config_service.h"
 #include "sp140/ble/fastlink_service.h"
@@ -38,7 +37,6 @@ uint16_t activeConnHandle = 0;
 
 bool shouldAdvertiseWhilePowered();
 bool startAdvertising(NimBLEServer *server);
-void updateBLEStatusIcon();
 
 // Builds gAdvertisingName from the BT MAC and returns the full MAC address
 // as an uppercase string for use as a unique device ID. Must be called before
@@ -153,22 +151,8 @@ bool shouldAdvertiseWhilePowered() {
          (pairingModeActive || reconnectWindowActive);
 }
 
-void updateBLEStatusIcon() {
-  if (deviceConnected) {
-    showBLEStatusIcon();
-    return;
-  }
-
-  if (pairingModeActive) {
-    startBLEPairingIconFlash();
-  } else {
-    hideBLEStatusIcon();
-  }
-}
-
 bool startAdvertising(NimBLEServer *server) {
   if (server == nullptr || pairingModeTransitionActive) {
-    updateBLEStatusIcon();
     return false;
   }
 
@@ -185,14 +169,12 @@ bool startAdvertising(NimBLEServer *server) {
   if (!allowOpenAdvertising && bondCount == 0) {
     USBSerial.println(
         "[BLE] No bonds present and pairing mode inactive; advertising stopped");
-    updateBLEStatusIcon();
     return false;
   }
 
   if (!allowOpenAdvertising && bondCount > 0 && !reconnectWindowActive) {
     USBSerial.println(
         "[BLE] Reconnect window inactive; whitelist advertising not started");
-    updateBLEStatusIcon();
     return false;
   }
 
@@ -230,7 +212,6 @@ bool startAdvertising(NimBLEServer *server) {
       configured, started,
       allowOpenAdvertising ? "OPEN" : "BONDED",
       static_cast<unsigned>(bondCount), static_cast<unsigned>(whiteListCount));
-  updateBLEStatusIcon();
   return started;
 #else
   // Configure payload once — NimBLE accumulates addServiceUUID calls
@@ -260,7 +241,6 @@ bool startAdvertising(NimBLEServer *server) {
                    allowOpenAdvertising ? "OPEN" : "BONDED",
                    static_cast<unsigned>(bondCount),
                    static_cast<unsigned>(whiteListCount));
-  updateBLEStatusIcon();
   return started;
 #endif
 }
@@ -304,7 +284,6 @@ class BleServerConnectionCallbacks : public NimBLEServerCallbacks {
         connectedHandle, connInfo.getAddress().toString().c_str(),
         connInfo.isBonded() ? 1 : 0, connInfo.isEncrypted() ? 1 : 0,
         pairingModeActive ? 1 : 0);
-    updateBLEStatusIcon();
 
     // During pairing mode, proactively request fresh security negotiation.
     // This helps recover from stale iOS bonds where iOS tries to restore
@@ -342,7 +321,6 @@ class BleServerConnectionCallbacks : public NimBLEServerCallbacks {
       }
       startAdvertising(server);
     }
-    updateBLEStatusIcon();
   }
 
   void onAuthenticationComplete(NimBLEConnInfo &connInfo) override {
@@ -380,7 +358,6 @@ class BleServerConnectionCallbacks : public NimBLEServerCallbacks {
         }
       }
     }
-    updateBLEStatusIcon();
   }
 
   void onIdentity(NimBLEConnInfo &connInfo) override {
@@ -447,8 +424,6 @@ void setupBLE() {
   initReconnectWindowFromBoot();
   if (shouldAdvertiseWhilePowered()) {
     restartBLEAdvertising();
-  } else {
-    updateBLEStatusIcon();
   }
 }
 
@@ -470,7 +445,6 @@ void requestNormalConnParams() {
 
 void restartBLEAdvertising() {
   if (pServer == nullptr) {
-    updateBLEStatusIcon();
     return;
   }
 
@@ -531,3 +505,5 @@ void enterBLEPairingMode() {
   USBSerial.println("[BLE] Pairing mode active for 60s");
   restartBLEAdvertising();
 }
+
+bool isBLEPairingModeActive() { return pairingModeActive; }

src/sp140/lvgl/lvgl_updates.cpp

@@ -4,6 +4,8 @@
 #include "../../../inc/sp140/globals.h"
 #include "../../../inc/sp140/vibration_pwm.h"
 #include "../../../inc/sp140/shared-config.h"
+#include "../../../inc/sp140/ble.h"
+#include "../../../inc/sp140/ble/ble_core.h"
 #include <math.h>
 
 // Flash timer globals - definitions
@@ -851,6 +853,36 @@ void updateLvglMainScreen(
     lv_obj_set_style_image_recolor(arm_fail_warning_icon_img, original_arm_fail_icon_color, LV_PART_MAIN);
   }
 
+  // Keep the BLE icon synced from the UI task so missed callback updates recover.
+  if (ble_pairing_icon != NULL) {
+    if (deviceConnected) {
+      if (ble_pairing_flash_timer != NULL) {
+        lv_timer_del(ble_pairing_flash_timer);
+        ble_pairing_flash_timer = NULL;
+      }
+      lv_obj_remove_flag(ble_pairing_icon, LV_OBJ_FLAG_HIDDEN);
+      isFlashingBLEPairingIcon = false;
+    } else if (isBLEPairingModeActive()) {
+      if (!isFlashingBLEPairingIcon) {
+        isFlashingBLEPairingIcon = true;
+        lv_obj_remove_flag(ble_pairing_icon, LV_OBJ_FLAG_HIDDEN);
+        ble_pairing_flash_timer = lv_timer_create(ble_pairing_flash_timer_cb, 500, NULL);
+        if (ble_pairing_flash_timer == NULL) {
+          isFlashingBLEPairingIcon = false;
+          lv_obj_add_flag(ble_pairing_icon, LV_OBJ_FLAG_HIDDEN);
+          USBSerial.println("Error: Failed to create BLE pairing flash timer!");
+        }
+      }
+    } else {
+      if (ble_pairing_flash_timer != NULL) {
+        lv_timer_del(ble_pairing_flash_timer);
+        ble_pairing_flash_timer = NULL;
+      }
+      lv_obj_add_flag(ble_pairing_icon, LV_OBJ_FLAG_HIDDEN);
+      isFlashingBLEPairingIcon = false;
+    }
+  }
+
   // Update climb rate indicator
   static float lastAltitude = 0.0f;
   static uint32_t lastAltitudeTime = 0;