Add more CAN mappings and events

Software/src/battery/JAGUAR-IPACE-BATTERY.cpp

@@ -1,6 +1,7 @@
 #include "../include.h"
 #ifdef JAGUAR_IPACE_BATTERY
 #include "../datalayer/datalayer.h"
+#include "../devboard/utils/events.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 #include "JAGUAR-IPACE-BATTERY.h"
 
@@ -15,6 +16,8 @@ static uint8_t HVBattTempColdCellID = 0;
 static uint8_t HVBatTempHotCellID = 0;
 static uint8_t HVBattVoltMaxCellID = 0;
 static uint8_t HVBattVoltMinCellID = 0;
+static uint8_t HVBattPwerGPCS = 0;
+static uint8_t HVBattPwrGpCounter = 0;
 static int8_t HVBattCurrentTR = 0;
 static uint16_t HVBattCellVoltageMaxMv = 3700;
 static uint16_t HVBattCellVoltageMinMv = 3700;
@@ -24,11 +27,20 @@ static uint16_t HVBattTotalCapacityWhenNew = 0;
 static uint16_t HVBattDischargeContiniousPowerLimit = 0;
 static uint16_t HVBattDischargePowerLimitExt = 0;
 static uint16_t HVBattDischargeVoltageLimit = 0;
+static uint16_t HVBattVoltageExt = 0;
+static uint16_t HVBatteryVoltageOC = 0;
+static uint16_t HVBatteryChgCurrentLimit = 0;
+static uint16_t HVBattChargeContiniousPowerLimit = 0;
 static int16_t HVBattAverageTemperature = 0;
 static int16_t HVBattCellTempAverage = 0;
 static int16_t HVBattCellTempColdest = 0;
 static int16_t HVBattCellTempHottest = 0;
 static int16_t HVBattInletCoolantTemp = 0;
+static bool HVBatteryContactorStatus = false;
+static bool HVBatteryContactorStatusT = false;
+static bool HVBattHVILError = false;
+static bool HVILBattIsolationError = false;
+static bool HVIsolationTestStatus = false;
 
 /* TODO: Actually use a proper keepalive message */
 CAN_frame_t ipace_keep_alive = {.FIR = {.B =
@@ -59,7 +71,7 @@ void update_values_battery() {
 
   datalayer.battery.status.soh_pptt = 9900;  //TODO: Map
 
-  datalayer.battery.status.voltage_dV = 3700;  //TODO: Map
+  datalayer.battery.status.voltage_dV = HVBattVoltageExt * 10;  //TODO: This value OK?
 
   datalayer.battery.status.current_dA = HVBattCurrentTR * 10;  //TODO: This value OK?
 
@@ -72,18 +84,30 @@ void update_values_battery() {
 
   datalayer.battery.status.cell_min_voltage_mV = HVBattCellVoltageMinMv;
 
-  datalayer.battery.status.active_power_W = 0;  //TODO: Map
+  //Power in watts, Negative = charging batt
+  datalayer.battery.status.active_power_W =
+      ((datalayer.battery.status.voltage_dV * datalayer.battery.status.current_dA) / 100);
 
   datalayer.battery.status.temperature_min_dC = HVBattCellTempColdest * 10;  // C to dC
 
   datalayer.battery.status.temperature_max_dC = HVBattCellTempHottest * 10;  // C to dC
 
-  datalayer.battery.status.max_discharge_power_W = HVBattDischargeContiniousPowerLimit * 10;  // kWh+2 to W
+  datalayer.battery.status.max_discharge_power_W =
+      HVBattDischargeContiniousPowerLimit * 10;  // kWh+2 to W (TODO: Check that scaling is right way)
 
-  datalayer.battery.status.max_charge_power_W = 5000;  //TODO: Map
+  datalayer.battery.status.max_charge_power_W =
+      HVBattChargeContiniousPowerLimit * 10;  // kWh+2 to W (TODO: Check that scaling is right way)
 
-  for (int i = 0; i < 107; ++i) {
+  if (HVBattHVILError) {  // Alert user incase the high voltage interlock is not OK
-    datalayer.battery.status.cell_voltages_mV[i] = 3500 + i;
+    set_event(EVENT_HVIL_FAILURE, 0);
+  } else {
+    clear_event(EVENT_HVIL_FAILURE);
+  }
+
+  if (HVILBattIsolationError) {  // Alert user incase battery reports isolation error
+    set_event(EVENT_BATTERY_ISOLATION, 0);
+  } else {
+    clear_event(EVENT_BATTERY_ISOLATION);
   }
 
 /*Finally print out values to serial if configured to do so*/
@@ -114,6 +138,9 @@ void receive_can_battery(CAN_frame_t rx_frame) {
   switch (rx_frame.MsgID) {  // These messages are periodically transmitted by the battery
     case 0x080:
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      HVBatteryContactorStatus = ((rx_frame.data.u8[0] & 0x80) >> 7);
+      HVBattHVILError = ((rx_frame.data.u8[0] & 0x40) >> 6);
+      HVILBattIsolationError = ((rx_frame.data.u8[0] & 0x20) >> 5);
       break;
     case 0x100:
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
@@ -125,12 +152,22 @@ void receive_can_battery(CAN_frame_t rx_frame) {
       break;
     case 0x102:
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      HVBattPwrGpCounter = ((rx_frame.data.u8[1] & 0x3C) >> 2);  // Loops 0-F-0
+      HVBattPwerGPCS = rx_frame.data.u8[0];                      // SAE J1850 CRC8 Checksum.
+      //TODO: Add function that checks if CRC is correct. We can use this to detect corrupted CAN messages
+      //HVBattCurrentExt = //Used only on 2018+
+      HVBattVoltageExt = (((rx_frame.data.u8[1] & 0x03) << 8) | rx_frame.data.u8[2]);
       break;
     case 0x104:
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      HVBatteryContactorStatusT = ((rx_frame.data.u8[2] & 0x80) >> 7);
+      HVIsolationTestStatus = ((rx_frame.data.u8[2] & 0x10) >> 4);
+      HVBatteryVoltageOC = (((rx_frame.data.u8[2] & 0x03) << 8) | rx_frame.data.u8[3]);
+      HVBatteryChgCurrentLimit = (((rx_frame.data.u8[6] & 0x03) << 8) | rx_frame.data.u8[7]);
       break;
     case 0x10A:
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      HVBattChargeContiniousPowerLimit = ((rx_frame.data.u8[0] << 8) | rx_frame.data.u8[1]);
       break;
     case 0x198:
       break;

Software/src/devboard/utils/events.cpp

@@ -154,6 +154,7 @@ void init_events(void) {
   events.entries[EVENT_BATTERY_OVERHEAT].level = EVENT_LEVEL_ERROR;
   events.entries[EVENT_BATTERY_OVERVOLTAGE].level = EVENT_LEVEL_WARNING;
   events.entries[EVENT_BATTERY_UNDERVOLTAGE].level = EVENT_LEVEL_WARNING;
+  events.entries[EVENT_BATTERY_ISOLATION].level = EVENT_LEVEL_WARNING;
   events.entries[EVENT_LOW_SOH].level = EVENT_LEVEL_ERROR;
   events.entries[EVENT_HVIL_FAILURE].level = EVENT_LEVEL_ERROR;
   events.entries[EVENT_PRECHARGE_FAILURE].level = EVENT_LEVEL_INFO;
@@ -267,6 +268,8 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
       return "Warning: Battery exceeding maximum design voltage. Discharge battery to prevent damage!";
     case EVENT_BATTERY_UNDERVOLTAGE:
       return "Warning: Battery under minimum design voltage. Charge battery to prevent damage!";
+    case EVENT_BATTERY_ISOLATION:
+      return "Warning: Battery reports isolation error. High voltage might be leaking to ground. Check battery!";
     case EVENT_LOW_SOH:
       return "ERROR: State of health critically low. Battery internal resistance too high to continue. Recycle "
              "battery.";

Software/src/devboard/utils/events.h

@@ -6,7 +6,7 @@
 
 // #define INCLUDE_EVENTS_TEST  // Enable to run an event test loop, see events_test_on_target.cpp
 
-#define EE_MAGIC_HEADER_VALUE 0x0007  // 0x0000 to 0xFFFF
+#define EE_MAGIC_HEADER_VALUE 0x0008  // 0x0000 to 0xFFFF
 
 #define GENERATE_ENUM(ENUM) ENUM,
 #define GENERATE_STRING(STRING) #STRING,
@@ -48,6 +48,7 @@
   XX(EVENT_BATTERY_OVERHEAT)            \
   XX(EVENT_BATTERY_OVERVOLTAGE)         \
   XX(EVENT_BATTERY_UNDERVOLTAGE)        \
+  XX(EVENT_BATTERY_ISOLATION)           \
   XX(EVENT_BATTERY_REQUESTS_HEAT)       \
   XX(EVENT_BATTERY_WARMED_UP)           \
   XX(EVENT_LOW_SOH)                     \