Refactor threshold usage to use monitor_config values

Removed hardcoded temperature and SOC threshold macros from lvgl_main_screen.h and updated lvgl_updates.cpp to use threshold values from monitor_config.h. Also adjusted bmsLowCellVoltageThresholds in monitor_config.h to new warnHigh and critHigh values. This centralizes threshold configuration and improves maintainability.

Author: zjwhitehead

inc/sp140/lvgl/lvgl_main_screen.h

@@ -21,18 +21,6 @@ enum ScreenPage {
 #define LVGL_PURPLE lv_color_make(128, 0, 128)
 #define LVGL_GRAY lv_color_make(128, 128, 128)
 
-// Temperature thresholds
-#define BATT_TEMP_WARNING 45.0f
-#define BATT_TEMP_CRITICAL 55.0f
-#define ESC_TEMP_WARNING 90.0f
-#define ESC_TEMP_CRITICAL 100.0f
-#define MOTOR_TEMP_WARNING 90.0f
-#define MOTOR_TEMP_CRITICAL 110.0f
-
-#define BATT_CRITICAL_SOC_THRESHOLD 5.0f
-#define BATT_WARNING_SOC_THRESHOLD 20.0f
-#define CELL_VOLTAGE_WARNING 3.2f
-#define CELL_VOLTAGE_CRITICAL 2.95f
 
 // LVGL styles for temperature warnings and critical states
 extern lv_style_t style_warning;

inc/sp140/monitor_config.h

@@ -15,7 +15,7 @@ static const Thresholds motorTempThresholds = {.warnLow = -20, .warnHigh = 90, .
 static const Thresholds bmsTempThresholds = {.warnLow = -10, .warnHigh = 50, .critLow = -15, .critHigh = 60};
 static const Thresholds bmsCellTempThresholds = {.warnLow = -10, .warnHigh = 50, .critLow = -15, .critHigh = 56};
 static const Thresholds bmsHighCellVoltageThresholds = {.warnLow = 0.0, .warnHigh = 4.1, .critLow = 0.0, .critHigh = 4.2};
-static const Thresholds bmsLowCellVoltageThresholds = {.warnLow = 3.2, .warnHigh = 5.0, .critLow = 3.0, .critHigh = 5.0};
+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};

src/sp140/lvgl/lvgl_updates.cpp

@@ -1,5 +1,6 @@
 #include "../../../inc/sp140/lvgl/lvgl_updates.h"
 #include "../../../inc/sp140/esp32s3-config.h"
+#include "../../../inc/sp140/monitor_config.h"  // For direct threshold access
 #include "../../../inc/sp140/globals.h"
 #include "../../../inc/sp140/vibration_pwm.h"
 #include "../../../inc/sp140/shared-config.h"
@@ -352,9 +353,9 @@ void updateLvglMainScreen(
 
     // Set color based on percentage
     lv_color_t batteryColor = LVGL_RED;
-    if (batteryPercent >= BATT_WARNING_SOC_THRESHOLD) {
+    if (batteryPercent >= bmsSOCThresholds.warnLow) {
       batteryColor = LVGL_GREEN;
-    } else if (batteryPercent >= BATT_CRITICAL_SOC_THRESHOLD) {
+    } else if (batteryPercent >= bmsSOCThresholds.critLow) {
       batteryColor = LVGL_YELLOW;
     }
 
@@ -654,10 +655,10 @@ void updateLvglMainScreen(
     if (bmsTelemetry.bmsState == TelemetryState::CONNECTED) {
       lv_label_set_text_fmt(batt_temp_label, "%d", static_cast<int>(batteryTemp));
 
-      if (batteryTemp >= BATT_TEMP_CRITICAL) {
+      if (batteryTemp >= bmsTempThresholds.critHigh) {
         lv_obj_add_style(batt_temp_bg, &style_critical, 0);
         lv_obj_clear_flag(batt_temp_bg, LV_OBJ_FLAG_HIDDEN);
-      } else if (batteryTemp >= BATT_TEMP_WARNING) {
+      } else if (batteryTemp >= bmsTempThresholds.warnHigh) {
         lv_obj_add_style(batt_temp_bg, &style_warning, 0);
         lv_obj_clear_flag(batt_temp_bg, LV_OBJ_FLAG_HIDDEN);
       } else {
@@ -677,10 +678,10 @@ void updateLvglMainScreen(
     if (escTelemetry.escState == TelemetryState::CONNECTED) {
       lv_label_set_text_fmt(esc_temp_label, "%d", static_cast<int>(escTemp));
 
-      if (escTemp >= ESC_TEMP_CRITICAL) {
+      if (escTemp >= escMosTempThresholds.critHigh) {
         lv_obj_add_style(esc_temp_bg, &style_critical, 0);
         lv_obj_clear_flag(esc_temp_bg, LV_OBJ_FLAG_HIDDEN);
-      } else if (escTemp >= ESC_TEMP_WARNING) {
+      } else if (escTemp >= escMosTempThresholds.warnHigh) {
         lv_obj_add_style(esc_temp_bg, &style_warning, 0);
         lv_obj_clear_flag(esc_temp_bg, LV_OBJ_FLAG_HIDDEN);
       } else {
@@ -700,10 +701,10 @@ void updateLvglMainScreen(
     if (escTelemetry.escState == TelemetryState::CONNECTED && motorTemp > -20.0f) {
       lv_label_set_text_fmt(motor_temp_label, "%d", static_cast<int>(motorTemp));
 
-      if (motorTemp >= MOTOR_TEMP_CRITICAL) {
+      if (motorTemp >= motorTempThresholds.critHigh) {
         lv_obj_add_style(motor_temp_bg, &style_critical, 0);
         lv_obj_clear_flag(motor_temp_bg, LV_OBJ_FLAG_HIDDEN);
-      } else if (motorTemp >= MOTOR_TEMP_WARNING) {
+      } else if (motorTemp >= motorTempThresholds.warnHigh) {
         lv_obj_add_style(motor_temp_bg, &style_warning, 0);
         lv_obj_clear_flag(motor_temp_bg, LV_OBJ_FLAG_HIDDEN);
       } else {