Merge origin/master into ble-rewrite

Author: zjwhitehead

.github/workflows/config.yml

@@ -1,103 +1,103 @@
-name: Continuous Integration
-on:
-  push:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  cpplint:
-    name: CPP Lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          token: ${{ github.token }}
-          show-progress: false
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: 3.x
-      - run: pip install cpplint
-      - run: cpplint --linelength 140 --filter=-legal/copyright,-runtime/int,-build/include_subdir,-readability/casting,-readability/todo,-build/include_order,-build/include_what_you_use --recursive ./inc/ ./lib/ ./src/
-
-  pio-test:
-    name: PlatformIO Tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-          persist-credentials: true
-          show-progress: false
-      - name: Setup Git Credentials
-        run: |
-          git config --global credential.helper store
-          echo "https://oauth2:${{ secrets.GH_TOKEN }}@github.com" > ~/.git-credentials
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: 3.x
-      - name: Cache PlatformIO
-        uses: actions/cache@v4
-        with:
-          path: ~/.platformio
-          key: pio-${{ hashFiles('platformio.ini') }}
-          restore-keys: pio-
-      - name: Install PlatformIO
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio
-      - name: Run Unit Tests
-        run: platformio test -e native-test
-
-  pio-build:
-    name: PlatformIO Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-          persist-credentials: true
-          show-progress: false
-      - name: Setup Git Credentials
-        run: |
-          git config --global credential.helper store
-          echo "https://oauth2:${{ secrets.GH_TOKEN }}@github.com" > ~/.git-credentials
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: 3.x
-      - name: Cache PlatformIO
-        uses: actions/cache@v4
-        with:
-          path: ~/.platformio
-          key: pio-${{ hashFiles('platformio.ini') }}
-          restore-keys: pio-
-      - name: Install PlatformIO
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio
-      - name: Build ESP32S3
-        run: platformio run -e OpenPPG-CESP32S3-CAN-SP140
-      - name: Install esptool
-        run: pip install esptool
-      - name: Merge Binaries
-        run: |
-          esptool.py --chip esp32s3 merge_bin \
-            -o .pio/build/OpenPPG-CESP32S3-CAN-SP140/full-controller-firmware.bin \
-            --flash_mode dio \
-            --flash_freq 80m \
-            --flash_size 8MB \
-            0x0 .pio/build/OpenPPG-CESP32S3-CAN-SP140/bootloader.bin \
-            0x8000 .pio/build/OpenPPG-CESP32S3-CAN-SP140/partitions.bin \
-            0xe000 /home/runner/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin \
-            0x10000 .pio/build/OpenPPG-CESP32S3-CAN-SP140/firmware.bin
-      - name: Archive ESP32S3 Firmware
-        uses: actions/upload-artifact@v5
-        with:
-          name: OpenPPG-CESP32S3-CAN-SP140-firmware
-          path: .pio/build/OpenPPG-CESP32S3-CAN-SP140/full-controller-firmware.bin
+name: Continuous Integration
+on:
+  push:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  cpplint:
+    name: CPP Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          token: ${{ github.token }}
+          show-progress: false
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+      - run: pip install cpplint
+      - run: cpplint --linelength 140 --filter=-legal/copyright,-runtime/int,-build/include_subdir,-readability/casting,-readability/todo,-build/include_order,-build/include_what_you_use --recursive ./inc/ ./lib/ ./src/
+
+  pio-test:
+    name: PlatformIO Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          persist-credentials: true
+          show-progress: false
+      - name: Setup Git Credentials
+        run: |
+          git config --global credential.helper store
+          echo "https://oauth2:${{ secrets.GH_TOKEN }}@github.com" > ~/.git-credentials
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+      - name: Cache PlatformIO
+        uses: actions/cache@v5
+        with:
+          path: ~/.platformio
+          key: pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: pio-
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio
+      - name: Run Unit Tests
+        run: platformio test -e native-test
+
+  pio-build:
+    name: PlatformIO Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          persist-credentials: true
+          show-progress: false
+      - name: Setup Git Credentials
+        run: |
+          git config --global credential.helper store
+          echo "https://oauth2:${{ secrets.GH_TOKEN }}@github.com" > ~/.git-credentials
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+      - name: Cache PlatformIO
+        uses: actions/cache@v5
+        with:
+          path: ~/.platformio
+          key: pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: pio-
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio
+      - name: Build ESP32S3
+        run: platformio run -e OpenPPG-CESP32S3-CAN-SP140
+      - name: Install esptool
+        run: pip install esptool
+      - name: Merge Binaries
+        run: |
+          esptool.py --chip esp32s3 merge_bin \
+            -o .pio/build/OpenPPG-CESP32S3-CAN-SP140/full-controller-firmware.bin \
+            --flash_mode dio \
+            --flash_freq 80m \
+            --flash_size 8MB \
+            0x0 .pio/build/OpenPPG-CESP32S3-CAN-SP140/bootloader.bin \
+            0x8000 .pio/build/OpenPPG-CESP32S3-CAN-SP140/partitions.bin \
+            0xe000 /home/runner/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin \
+            0x10000 .pio/build/OpenPPG-CESP32S3-CAN-SP140/firmware.bin
+      - name: Archive ESP32S3 Firmware
+        uses: actions/upload-artifact@v6
+        with:
+          name: OpenPPG-CESP32S3-CAN-SP140-firmware
+          path: .pio/build/OpenPPG-CESP32S3-CAN-SP140/full-controller-firmware.bin

inc/sp140/alert_display.h

@@ -32,11 +32,15 @@ struct AlertUIUpdate {
   // Counter data
   AlertCounts counts;
 
-  // Display message data
-  SensorID displayId;       // Valid sensor when showDisplay == true
-  AlertLevel displayLevel;  // Alert level for dynamic abbreviations
-  bool displayCritical;     // true = critical colouring
-  bool showDisplay;         // false = hide label
+  // Warning display (bottom row)
+  SensorID warningId;         // Valid sensor when showWarning == true
+  AlertLevel warningLevel;    // Alert level for dynamic abbreviations
+  bool showWarning;           // false = hide warning label
+
+  // Critical display (top row, in altitude area)
+  SensorID criticalId;        // Valid sensor when showCritical == true
+  AlertLevel criticalLevel;   // Alert level for dynamic abbreviations
+  bool showCritical;          // false = hide critical label
 
   // Critical alert state (for border/vibration control)
   bool criticalAlertsActive;  // true = show red border + vibration

inc/sp140/esc.h

@@ -14,8 +14,8 @@
 #define ESC_MCU_CRIT 95
 #define ESC_CAP_WARN 85
 #define ESC_CAP_CRIT 100
-#define MOTOR_WARN 90
-#define MOTOR_CRIT 110
+#define MOTOR_WARN 105
+#define MOTOR_CRIT 150
 
 void initESC();
 void setESCThrottle(int throttlePWM);

inc/sp140/lvgl/lvgl_alerts.h

@@ -13,7 +13,8 @@ extern lv_obj_t* critical_counter_circle;
 extern lv_obj_t* critical_counter_label;
 
 // Alert text carousel objects
-extern lv_obj_t* alert_text_label;
+extern lv_obj_t* alert_text_label;       // For warning text
+extern lv_obj_t* critical_text_label;    // For critical text (separate so both can show)
 extern lv_timer_t* alert_cycle_timer;
 
 // Snapshot state shared between timer and external updater
@@ -29,5 +30,7 @@ void loadAlertSnapshot(const AlertSnapshot& snap);
 void lv_showAlertText(SensorID id, bool critical);
 void lv_showAlertTextWithLevel(SensorID id, AlertLevel level, bool critical);
 void lv_hideAlertText();
+void lv_hideWarningText();
+void lv_hideCriticalText();
 
 #endif  // INC_SP140_LVGL_LVGL_ALERTS_H_

inc/sp140/monitor_config.h

@@ -6,24 +6,24 @@
 // This file serves as the single source of truth for all sensor monitoring thresholds.
 
 // -- ESC Thresholds --
-static const Thresholds escMosTempThresholds = {.warnLow = -10, .warnHigh = 90, .critLow = -20, .critHigh = 110, .hysteresis = 2.0f};
-static const Thresholds escMcuTempThresholds = {.warnLow = -10, .warnHigh = 80, .critLow = -20, .critHigh = 95, .hysteresis = 2.0f};
-static const Thresholds escCapTempThresholds = {.warnLow = -10, .warnHigh = 85, .critLow = -20, .critHigh = 100, .hysteresis = 2.0f};
-static const Thresholds motorTempThresholds = {.warnLow = -20, .warnHigh = 105, .critLow = -25, .critHigh = 115, .hysteresis = 2.0f};
+static const Thresholds escMosTempThresholds = {.warnLow = -10, .warnHigh = 90, .critLow = -20, .critHigh = 110, .hysteresis = 1.0f};
+static const Thresholds escMcuTempThresholds = {.warnLow = -10, .warnHigh = 80, .critLow = -20, .critHigh = 95, .hysteresis = 1.0f};
+static const Thresholds escCapTempThresholds = {.warnLow = -10, .warnHigh = 85, .critLow = -20, .critHigh = 100, .hysteresis = 1.0f};
+static const Thresholds motorTempThresholds = {.warnLow = -20, .warnHigh = 105, .critLow = -25, .critHigh = 115, .hysteresis = 1.0f};
 
 // -- BMS Thresholds --
-static const Thresholds bmsTempThresholds = {.warnLow = -10, .warnHigh = 50, .critLow = -15, .critHigh = 60, .hysteresis = 2.0f};
-static const Thresholds bmsCellTempThresholds = {.warnLow = -10, .warnHigh = 50, .critLow = -15, .critHigh = 56, .hysteresis = 2.0f};
+static const Thresholds bmsTempThresholds = {.warnLow = -10, .warnHigh = 50, .critLow = -15, .critHigh = 60, .hysteresis = 1.0f};
+static const Thresholds bmsCellTempThresholds = {.warnLow = -10, .warnHigh = 50, .critLow = -15, .critHigh = 56, .hysteresis = 1.0f};
 static const Thresholds bmsHighCellVoltageThresholds = {.warnLow = 0.0, .warnHigh = 4.19, .critLow = 0.0, .critHigh = 4.20};
 static const Thresholds bmsLowCellVoltageThresholds = {.warnLow = 3.2, .warnHigh = 4.5, .critLow = 3.0, .critHigh = 4.8};
 static const Thresholds bmsSOCThresholds = {.warnLow = 15.0, .warnHigh = 101.0, .critLow = 5.0, .critHigh = 110.0};
 static const Thresholds bmsTotalVoltageThresholds = {.warnLow = 79.2, .warnHigh = 100.4, .critLow = 69.6, .critHigh = 100.8};
 static const Thresholds bmsVoltageDifferentialThresholds = {.warnLow = -1.0, .warnHigh = 0.2, .critLow = -2.0, .critHigh = 0.4};
 
 // -- Altimeter Thresholds --
-static const Thresholds baroTempThresholds = {.warnLow = 0, .warnHigh = 50, .critLow = -10, .critHigh = 80, .hysteresis = 2.0f};
+static const Thresholds baroTempThresholds = {.warnLow = 0, .warnHigh = 50, .critLow = -10, .critHigh = 80, .hysteresis = 1.0f};
 
 // -- Internal Thresholds --
-static const Thresholds cpuTempThresholds = {.warnLow = 0, .warnHigh = 60, .critLow = -10, .critHigh = 80, .hysteresis = 2.0f};
+static const Thresholds cpuTempThresholds = {.warnLow = 0, .warnHigh = 60, .critLow = -10, .critHigh = 80, .hysteresis = 1.0f};
 
 #endif  // INC_SP140_MONITOR_CONFIG_H_

inc/sp140/simple_monitor.h

@@ -195,16 +195,16 @@ struct HysteresisSensorMonitor : public SensorMonitor {
         break;
 
       case AlertLevel::WARN_LOW:
-        // From WARN_LOW, need to go below warnLow - hysteresis to clear
-        // Or escalate to critical if still below critLow + hysteresis
-        if (v <= thr.critLow + thr.hysteresis) now = AlertLevel::CRIT_LOW;
+        // From WARN_LOW, escalate to critical at exact threshold (no hysteresis)
+        // Use hysteresis only when clearing (de-escalating to OK)
+        if (v <= thr.critLow) now = AlertLevel::CRIT_LOW;
         else if (v > thr.warnLow + thr.hysteresis) now = AlertLevel::OK;
         break;
 
       case AlertLevel::WARN_HIGH:
-        // From WARN_HIGH, need to go below warnHigh - hysteresis to clear
-        // Or escalate to critical if still above critHigh - hysteresis
-        if (v >= thr.critHigh - thr.hysteresis) now = AlertLevel::CRIT_HIGH;
+        // From WARN_HIGH, escalate to critical at exact threshold (no hysteresis)
+        // Use hysteresis only when clearing (de-escalating to OK)
+        if (v >= thr.critHigh) now = AlertLevel::CRIT_HIGH;
         else if (v < thr.warnHigh - thr.hysteresis) now = AlertLevel::OK;
         break;