Add all CAN IDs transmitted by the battery on H-CAN

Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp

@@ -0,0 +1,136 @@
+#include "../include.h"
+#ifdef GEELY_GEOMETRY_C_BATTERY
+#include "../datalayer/datalayer.h"
+#include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
+#include "../devboard/utils/events.h"
+#include "GEELY-GEOMETRY-C-BATTERY.h"
+
+/* TODO
+- CAN log needed from complete H-CAN of Geely Geometry C vehicle. We are not sure what needs to be sent towards the battery yet to get contactor closing working
+/*
+
+/* Do not change code below unless you are sure what you are doing */
+
+CAN_frame GEELY_CAN_XXX = {.FD = false,
+                           .ext_ID = false,
+                           .DLC = 8,
+                           .ID = 0x373,
+                           .data = {0xC1, 0x80, 0x5D, 0x5D, 0x00, 0x00, 0xff, 0xcb}};
+
+static unsigned long previousMillis100 = 0;  // will store last time a 100ms CAN Message was sent
+
+void update_values_battery() {  //This function maps all the values fetched via CAN to the correct parameters used for modbus
+  datalayer.battery.status.soh_pptt;
+
+  datalayer.battery.status.real_soc;
+
+  datalayer.battery.status.voltage_dV;
+
+  datalayer.battery.status.current_dA;
+
+  //Calculate the remaining Wh amount from SOC% and max Wh value.
+  datalayer.battery.status.remaining_capacity_Wh = static_cast<uint32_t>(
+      (static_cast<double>(datalayer.battery.status.real_soc) / 10000) * datalayer.battery.info.total_capacity_Wh);
+
+  datalayer.battery.status.max_discharge_power_W;
+
+  datalayer.battery.status.max_charge_power_W;
+
+  datalayer.battery.status.temperature_min_dC;
+
+  datalayer.battery.status.temperature_max_dC;
+
+  datalayer.battery.status.cell_min_voltage_mV;
+
+  datalayer.battery.status.cell_max_voltage_mV;
+}
+
+void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
+  switch (rx_frame.ID) {
+    case 0x0B0:  //10ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      //frame7, CRC
+      //frame6, low byte counter 0-F
+      break;
+    case 0x178:  //10ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x179:  //20ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x17A:  //100ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x17B:  //20ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x210:  //100ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x211:  //100ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x212:  //500ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x351:  //100ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x352:  //500ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x353:  //500ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x354:  //500ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x355:  //500ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x356:  //1s
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x357:  //20ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x358:  //1s
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x359:  //1s
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x35B:  //200ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    case 0x424:  //500ms
+      datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
+      break;
+    default:
+      break;
+  }
+}
+
+void transmit_can_battery() {
+  unsigned long currentMillis = millis();
+  // Send 100ms CAN Message
+  if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
+    previousMillis100 = currentMillis;
+
+    //transmit_can_frame(&GEELY_CAN_XXX, can_config.battery);
+  }
+}
+
+void setup_battery(void) {  // Performs one time setup at startup
+  strncpy(datalayer.system.info.battery_protocol, "Renault Zoe Gen2 50kWh", 63);
+  datalayer.system.info.battery_protocol[63] = '\0';
+  datalayer.system.status.battery_allows_contactor_closing = true;
+  datalayer.battery.info.number_of_cells = 96;
+  datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_DV;
+  datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_DV;
+  datalayer.battery.info.max_cell_voltage_mV = MAX_CELL_VOLTAGE_MV;
+  datalayer.battery.info.min_cell_voltage_mV = MIN_CELL_VOLTAGE_MV;
+  datalayer.battery.info.max_cell_voltage_deviation_mV = MAX_CELL_DEVIATION_MV;
+}
+
+#endif

Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h

@@ -0,0 +1,15 @@
+#ifndef GEELY_GEOMETRY_C_BATTERY_H
+#define GEELY_GEOMETRY_C_BATTERY_H
+#include "../include.h"
+
+#define BATTERY_SELECTED
+#define MAX_PACK_VOLTAGE_DV 4100  //5000 = 500.0V
+#define MIN_PACK_VOLTAGE_DV 3000
+#define MAX_CELL_DEVIATION_MV 150
+#define MAX_CELL_VOLTAGE_MV 4250  //Battery is put into emergency stop if one cell goes over this value
+#define MIN_CELL_VOLTAGE_MV 2700  //Battery is put into emergency stop if one cell goes below this value
+
+void setup_battery(void);
+void transmit_can_frame(CAN_frame* tx_frame, int interface);
+
+#endif