more UI elements added into DASH, such as HV state and voltage from lvpdb

Author: gabedebugs

BMS/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

DART/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

DASH/Core/User/Inc/FEB_CAN_BMS.h

@@ -33,6 +33,7 @@ typedef enum
 
 void FEB_CAN_BMS_Init(void);
 BMS_State_t FEB_CAN_BMS_GetLastState(void);
+bool FEB_CAN_BMS_GetLastHVState(void);
 int16_t FEB_CAN_BMS_GetLastCellMaxTemperature(void);
 uint16_t FEB_CAN_BMS_GetLastAccumulatorTotalVoltage(void);
 bool FEB_CAN_BMS_IsDataFresh(uint32_t timeout_ms);

DASH/Core/User/Src/FEB_CAN_BMS.c

@@ -121,6 +121,13 @@ void FEB_CAN_BMS_Init(void)
   FEB_CAN_RX_Register(&rx_params_bms_voltage);
 }
 
+bool FEB_CAN_BMS_GetLastHVState()
+{
+  return ((bms_data.state == BMS_STATE_DRIVE) || (bms_data.state == BMS_STATE_ENERGIZED) ||
+          (bms_data.state == BMS_STATE_PRECHARGE) || (bms_data.state == BMS_STATE_CHARGER_PRECHARGE) ||
+          (bms_data.state == BMS_STATE_CHARGING) || (bms_data.state == BMS_STATE_BALANCE));
+}
+
 BMS_State_t FEB_CAN_BMS_GetLastState(void)
 {
   return bms_data.state;

DASH/Core/User/Src/UI_Elements/FEB_UI_BMS_State.c

@@ -1,5 +1,6 @@
 #include "FEB_CAN_BMS.h"
 #include "FEB_CAN_PCU.h"
+#include "FEB_CAN_LVPDB.h"
 #include "lvgl.h"
 #include "src/core/lv_obj.h"
 #include "src/core/lv_obj_style.h"
@@ -13,23 +14,31 @@
 static lv_obj_t *ui_BMS_State_String;
 static lv_obj_t *ui_BMS_Cell_Max_Temperature;
 static lv_obj_t *ui_BMS_Accumulator_Total_Voltage;
+static lv_obj_t *ui_BMS_HV_State_String;
+static lv_obj_t *ui_LVPDB_low_voltage;
 
 int16_t cell_max_temperature = 67;
 uint16_t accumulator_total_voltage = 67;
+uint16_t low_voltage = 67;
 
 char buf[16];
 
 void FEB_UI_Update_BMS_State()
 {
   BMS_State_t state = FEB_CAN_BMS_GetLastState();
   lv_label_set_text(ui_BMS_State_String, to_BMS_state_string(state));
+  lv_label_set_text(ui_BMS_HV_State_String, (FEB_CAN_BMS_GetLastHVState() ? "HV_ON" : "HV_OFF"));
 
   cell_max_temperature = FEB_CAN_BMS_GetLastCellMaxTemperature();
   accumulator_total_voltage = FEB_CAN_BMS_GetLastAccumulatorTotalVoltage();
+  low_voltage = FEB_CAN_LVPDB_GetLast24VVoltage();
 
   snprintf(buf, sizeof(buf), "%d.%d °C", cell_max_temperature / 10, cell_max_temperature % 10);
   lv_label_set_text(ui_BMS_Cell_Max_Temperature, buf);
 
+  snprintf(buf, sizeof(buf), "%d.%d V", low_voltage / 10, low_voltage % 10);
+  lv_label_set_text(ui_LVPDB_low_voltage, buf);
+
   snprintf(buf, sizeof(buf), "%d.%d V", accumulator_total_voltage / 10, accumulator_total_voltage % 10);
   lv_label_set_text(ui_BMS_Accumulator_Total_Voltage, buf);
 }
@@ -42,6 +51,12 @@ void FEB_UI_Init_BMS_State(lv_obj_t *ui_Screen)
   lv_obj_set_style_text_font(ui_BMS_State_String, &lv_font_montserrat_40, 0);
   lv_obj_set_style_text_color(ui_BMS_State_String, lv_color_hex(0xFFFFFF), 0);
 
+  ui_BMS_HV_State_String = lv_label_create(ui_Screen);
+  lv_obj_align(ui_BMS_HV_State_String, LV_ALIGN_BOTTOM_RIGHT, -15, -35);
+  lv_label_set_text(ui_BMS_HV_State_String, "---");
+  lv_obj_set_style_text_font(ui_BMS_HV_State_String, &lv_font_montserrat_40, 0);
+  lv_obj_set_style_text_color(ui_BMS_HV_State_String, lv_color_hex(0xFFFFFF), 0);
+
   ui_BMS_Cell_Max_Temperature = lv_label_create(ui_Screen);
   lv_obj_align(ui_BMS_Cell_Max_Temperature, LV_ALIGN_TOP_LEFT, 15, 60);
   lv_label_set_text(ui_BMS_Cell_Max_Temperature, "--.- °C");
@@ -53,13 +68,21 @@ void FEB_UI_Init_BMS_State(lv_obj_t *ui_Screen)
   lv_label_set_text(ui_BMS_Accumulator_Total_Voltage, "---.- V");
   lv_obj_set_style_text_font(ui_BMS_Accumulator_Total_Voltage, &lv_font_montserrat_40, 0);
   lv_obj_set_style_text_color(ui_BMS_Accumulator_Total_Voltage, lv_color_hex(0xFFFFFF), 0);
+
+  ui_LVPDB_low_voltage = lv_label_create(ui_Screen);
+  lv_obj_align(ui_LVPDB_low_voltage, LV_ALIGN_TOP_RIGHT, -15, 40);
+  lv_label_set_text(ui_LVPDB_low_voltage, "--.- V");
+  lv_obj_set_style_text_font(ui_LVPDB_low_voltage, &lv_font_montserrat_40, 0);
+  lv_obj_set_style_text_color(ui_LVPDB_low_voltage, lv_color_hex(0xFFFFFF), 0);
 }
 
 void FEB_UI_Destroy_BMS_State(void)
 {
   ui_BMS_State_String = NULL;
+  ui_BMS_HV_State_String = NULL;
   ui_BMS_Cell_Max_Temperature = NULL;
   ui_BMS_Accumulator_Total_Voltage = NULL;
+  ui_LVPDB_low_voltage = NULL;
 }
 
 char *to_BMS_state_string(BMS_State_t state)

DASH/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

DCU/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

LVPDB/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

PCU/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

Sensor_Nodes/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2