Add more info to more battery info page

Author: dalathegreat

Software/src/battery/RIVIAN-BATTERY.cpp

@@ -26,7 +26,7 @@ uint8_t RivianBattery::calculateCRC(CAN_frame rx_frame, uint8_t length, uint8_t
 
 void RivianBattery::update_values() {
 
-  datalayer.battery.status.real_soc = battery_SOC;
+  datalayer.battery.status.real_soc = battery_SOC_average;
 
   //datalayer.battery.status.soh_pptt; //TODO: Find usable SOH
 
@@ -70,27 +70,36 @@ void RivianBattery::update_values() {
   datalayer_extended.rivian.main_contactor_voltage = main_contactor_voltage;
   datalayer_extended.rivian.voltage_reference = voltage_reference;
   datalayer_extended.rivian.DCFC_contactor_voltage = DCFC_contactor_voltage;
+  datalayer_extended.rivian.slewrate_potential_violation = slewrate_potential_violation;
+  datalayer_extended.rivian.minimum_power_potential_violation = minimum_power_potential_violation;
+  datalayer_extended.rivian.operation_limit_violation_warning = operation_limit_violation_warning;
 }
 
 void RivianBattery::handle_incoming_can_frame(CAN_frame rx_frame) {
   switch (rx_frame.ID) {
+    case 0x00A:  //DCDC status [Platform CAN]+ 20ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
     case 0x0A0:  //Cellvoltage min/max (Not available on all packs)
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
       cell_min_voltage_mV = (((rx_frame.data.u8[5] & 0x0F) << 8) | rx_frame.data.u8[4]);
       cell_max_voltage_mV = ((rx_frame.data.u8[6] << 4) | (rx_frame.data.u8[5] >> 4));
       break;
-    case 0x06E:  //Status flags [Platform CAN]+
+    case 0x06E:  //Status flags [Platform CAN]+ 10ms
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
       error_flags_from_BMS = rx_frame.data.u8[5];
       error_relay_open = (rx_frame.data.u8[6] & 0x01);
       IsolationMeasurementOngoing = (rx_frame.data.u8[6] & 0x02) >> 1;
       contactor_state = (((rx_frame.data.u8[7] & 0x01) << 3) | (rx_frame.data.u8[6] >> 5));
       break;
-    case 0x100:  //Discharge/Charge speed
+    case 0x100:  //Discharge/Charge speed [Platform CAN]+ 10ms
       battery_charge_limit_amp =
           (((rx_frame.data.u8[3] & 0x0F) << 8) | (rx_frame.data.u8[2] << 4) | (rx_frame.data.u8[1] >> 4)) / 20;
       battery_discharge_limit_amp =
           (((rx_frame.data.u8[5] & 0x0F) << 8) | (rx_frame.data.u8[4] << 4) | (rx_frame.data.u8[3] >> 4)) / 20;
+      slewrate_potential_violation = (rx_frame.data.u8[5] & 0x10) >> 4;
+      minimum_power_potential_violation = (rx_frame.data.u8[5] & 0x20) >> 5;
+      operation_limit_violation_warning = (rx_frame.data.u8[5] & 0x40) >> 6;
       break;
     case 0x1E3:  //HMI [Platform CAN]+
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
@@ -164,9 +173,9 @@ void RivianBattery::handle_incoming_can_frame(CAN_frame rx_frame) {
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
       BMS_state = (rx_frame.data.u8[0] & 0x03);
       break;
-    case 0x55B:  //Temperatures
+    case 0x55B:  //SOC [Platform CAN]+
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
-      battery_SOC = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
+      battery_SOC_average = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
       break;
     default:
       break;

Software/src/battery/RIVIAN-BATTERY.h

@@ -28,7 +28,9 @@ class RivianBattery : public CanBattery {
   uint16_t main_contactor_voltage = 0;
   uint16_t voltage_reference = 0;
   uint16_t DCFC_contactor_voltage = 0;
-  uint16_t battery_SOC = 5000;
+  uint16_t battery_SOC_average = 5000;
+  uint16_t battery_SOC_max = 0;
+  uint16_t battery_SOC_min = 0;
   int32_t battery_current = 32000;
   uint16_t kWh_available_total = 135;
   uint16_t kWh_available_max = 135;
@@ -52,6 +54,9 @@ class RivianBattery : public CanBattery {
   bool liquid_fault = false;
   bool contactor_DCFC_welded = false;
   bool NACS_charger_detected = false;
+  bool slewrate_potential_violation = false;
+  bool minimum_power_potential_violation = false;
+  bool operation_limit_violation_warning = false;
   static const uint8_t SLEEP = 0;
   static const uint8_t STANDBY = 1;
   static const uint8_t READY = 2;

Software/src/battery/RIVIAN-HTML.h

@@ -16,6 +16,9 @@ class RivianHtmlRenderer : public BatteryHtmlRenderer {
     content += "<h4>Voltage, reference: " + String(datalayer_extended.rivian.voltage_reference) + " dV</h4>";
     content += "<h4>Voltage, DCFC contactors: " + String(datalayer_extended.rivian.DCFC_contactor_voltage) + " dV</h4>";
 
+    content += "<h4>SOC, max: " + String(datalayer_extended.rivian.battery_SOC_max) + " pptt</h4>";
+    content += "<h4>SOC, min: " + String(datalayer_extended.rivian.battery_SOC_min) + " pptt</h4>";
+
     if (datalayer_extended.rivian.NACS_charger_detected) {
       content += "<h4>NACS charger detected!</h4>";
     }
@@ -161,6 +164,16 @@ class RivianHtmlRenderer : public BatteryHtmlRenderer {
       content += "<h4>DCFC contactor welded</h4>";
     }
 
+    if (datalayer_extended.rivian.slewrate_potential_violation) {
+      content += "<h4>Slewrate potential violation</h4>";
+    }
+    if (datalayer_extended.rivian.minimum_power_potential_violation) {
+      content += "<h4>Min power potential violation</h4>";
+    }
+    if (datalayer_extended.rivian.operation_limit_violation_warning) {
+      content += "<h4>Operation limit violation warning</h4>";
+    }
+
     return content;
   }
 };

Software/src/datalayer/datalayer_extended.h

@@ -459,6 +459,8 @@ struct DATALAYER_INFO_RIVIAN {
   uint16_t main_contactor_voltage = 0;
   uint16_t voltage_reference = 0;
   uint16_t DCFC_contactor_voltage = 0;
+  uint16_t battery_SOC_max = 0;
+  uint16_t battery_SOC_min = 0;
   uint8_t BMS_state = 0;
   uint8_t HVIL = 0;
   uint8_t error_flags_from_BMS = 0;
@@ -473,6 +475,9 @@ struct DATALAYER_INFO_RIVIAN {
   bool liquid_fault = false;
   bool contactor_DCFC_welded = false;
   bool NACS_charger_detected = false;
+  bool slewrate_potential_violation = false;
+  bool minimum_power_potential_violation = false;
+  bool operation_limit_violation_warning = false;
 };
 
 struct DATALAYER_INFO_TESLA {