Accumulate ESC runtime; tidy BLE UUIDs

Unwrap and accumulate the ESC 16-bit time_10ms counter into a 32-bit runtime (ms) to handle the ~10.9min rollover and avoid stale updates. Adds sEscLastTime10ms, sEscAccumulatedRuntimeMs and sEscFirstUpdate, applies stale-data guard, updates escTelemetryData.lastUpdateMs/esc_runtime_ms to use the accumulator, and resets the accumulator on disconnect. Also removes several obsolete packed-telemetry and controller BLE UUID defines from ble_ids.h and normalizes spacing for FAST_LINK UUID defines.

Author: PaulDWhite

inc/sp140/ble/ble_ids.h

@@ -24,44 +24,17 @@
 #define MANUFACTURER_NAME_UUID "2A29"
 #define DEVICE_UNIQUE_ID_UUID "B1571560-345F-4974-A14D-66E98740232F"
 
-// BMS service
-#define BMS_TELEMETRY_SERVICE_UUID "9E0F2FA3-3F2B-49C0-A6A3-3D8923062133"
-
-// ESC service
-#define ESC_TELEMETRY_SERVICE_UUID "C154DAE9-1984-40EA-B20F-5B23F9CBA0A9"
-
 // Log sync service (historical backfill)
 #define LOG_SYNC_SERVICE_UUID "F21F9A40-7A3D-4E08-9A8E-2014C5207A10"
 #define LOG_SYNC_CONTROL_UUID "F21F9A41-7A3D-4E08-9A8E-2014C5207A10"
 #define LOG_SYNC_DATA_UUID "F21F9A42-7A3D-4E08-9A8E-2014C5207A10"
 #define LOG_SYNC_META_UUID "F21F9A43-7A3D-4E08-9A8E-2014C5207A10"
 #define LOG_SYNC_STATUS_UUID "F21F9A44-7A3D-4E08-9A8E-2014C5207A10"
 
-// ============================================================================
-// Binary Packed Telemetry Characteristics (V1)
-// High-efficiency binary telemetry for reduced BLE overhead
-// ============================================================================
-
-// Packed BMS telemetry characteristic (single binary packet per BMS)
-// For multi-BMS, multiple notifications sent with different bms_id values
-#define BMS_PACKED_TELEMETRY_UUID "ABAB6342-D068-45A7-9D45-FBCE8E4D4DF1"
-
-// Extended BMS data (cell voltages + temps array) - separate packet for
-// detailed data
-#define BMS_EXTENDED_TELEMETRY_UUID "93431570-64A3-448D-AC97-4655B2D1458F"
-
-// Packed ESC telemetry characteristic
-#define ESC_PACKED_TELEMETRY_UUID "D3C2B470-007F-494E-95C5-8E275A181A3A"
-
-// Controller telemetry service and characteristic (ESP32 sensors: altitude,
-// baro, vario, temps)
-#define CONTROLLER_SERVICE_UUID "01C63B60-0891-4655-BBCA-8E745C48A175"
-#define CONTROLLER_TELEMETRY_UUID "01C63B61-0891-4655-BBCA-8E745C48A176"
-
 // Fast-Link Unified Telemetry (V1)
 #define FAST_LINK_TELEMETRY_SERVICE_UUID "45A17001-B73B-49E1-8B39-5E9ED5E1B930"
-#define FAST_LINK_TELEMETRY_UUID         "45A17002-B73B-49E1-8B39-5E9ED5E1B930"
+#define FAST_LINK_TELEMETRY_UUID "45A17002-B73B-49E1-8B39-5E9ED5E1B930"
 // App writes 0x01 here to trigger a GetHwInfo request to the ESC
-#define FAST_LINK_COMMAND_UUID           "45A17003-B73B-49E1-8B39-5E9ED5E1B930"
+#define FAST_LINK_COMMAND_UUID "45A17003-B73B-49E1-8B39-5E9ED5E1B930"
 
 #endif // INC_SP140_BLE_BLE_IDS_H_

src/sp140/esc.cpp

@@ -19,6 +19,12 @@ static unsigned long lastSuccessfulCommTimeMs = 0;  // Store millis() time of la
 // consumed safely inside readESCTelemetry() on the throttle task.
 static volatile bool s_hwInfoRequested = false;
 
+// ESC runtime accumulation — unwraps the uint16 time_10ms counter (~10.9 min period)
+// Unsigned subtraction naturally handles wrap: (uint16_t)(current - last) is correct even across rollover.
+static uint16_t sEscLastTime10ms = 0;
+static uint32_t sEscAccumulatedRuntimeMs = 0;
+static bool sEscFirstUpdate = true;
+
 
 STR_ESC_TELEMETRY_140 escTelemetryData = {
   .escState = TelemetryState::NOT_CONNECTED,
@@ -77,21 +83,27 @@ void readESCTelemetry() {
   // Only proceed if TWAI is initialized
   if (!escTwaiInitialized) { return; }  // NOLINT(whitespace/newline)
 
-  // Store the last known ESC timestamp before checking for new data
-  unsigned long previousEscReportedTimeMs = escTelemetryData.lastUpdateMs;
-
   const SineEscModel &model = esc.getModel();
 
   if (model.hasSetThrottleSettings2Response) {
     const sine_esc_SetThrottleSettings2Response *res = &model.setThrottleSettings2Response;
 
-    unsigned long newEscReportedTimeMs = res->time_10ms * 10;
+    uint16_t rawTime10ms = res->time_10ms;
+
+    // Check if the timestamp from the ESC has actually changed (stale-data guard)
+    if (sEscFirstUpdate || rawTime10ms != sEscLastTime10ms) {
+      // Unwrap the uint16 counter using unsigned subtraction — naturally correct across rollover.
+      // e.g. last=65000, current=100: (uint16_t)(100-65000) = 636 ticks = 6360ms elapsed.
+      if (!sEscFirstUpdate) {
+        uint16_t deltaTicks = rawTime10ms - sEscLastTime10ms;
+        sEscAccumulatedRuntimeMs += (uint32_t)deltaTicks * 10UL;
+      }
+      sEscFirstUpdate = false;
+      sEscLastTime10ms = rawTime10ms;
 
-    // Check if the timestamp from the ESC has actually changed
-    if (newEscReportedTimeMs != previousEscReportedTimeMs) {
       // Timestamp is new, process the telemetry data
-      escTelemetryData.lastUpdateMs = newEscReportedTimeMs;
-      escTelemetryData.esc_runtime_ms = newEscReportedTimeMs;
+      escTelemetryData.lastUpdateMs = sEscAccumulatedRuntimeMs;
+      escTelemetryData.esc_runtime_ms = sEscAccumulatedRuntimeMs;
 
       // Update telemetry data
       escTelemetryData.volts = res->voltage / 10.0f;
@@ -135,7 +147,10 @@ void readESCTelemetry() {
       // Log state change only if it actually changed
       USBSerial.printf("ESC State: %d -> NOT_CONNECTED (Timeout)\n", escTelemetryData.escState);
       escTelemetryData.escState = TelemetryState::NOT_CONNECTED;
-      // Optional: Consider resetting telemetry values here if needed when disconnected
+      // Reset runtime accumulator so it restarts from zero on reconnect
+      sEscAccumulatedRuntimeMs = 0;
+      sEscLastTime10ms = 0;
+      sEscFirstUpdate = true;
     }
   } else {
     if (escTelemetryData.escState != TelemetryState::CONNECTED) {