Merge branch 'main' into feature/mqtt_library_replacement

dalathegreat · Jan 19, 2025 · fc3f5b4 · fc3f5b4
2 parents 0444b4b + a84a1d6
commit fc3f5b4
Show file tree

Hide file tree

Showing 12 changed files with 1,611 additions and 236 deletions.
diff --git a/.github/workflows/compile-all-batteries.yml b/.github/workflows/compile-all-batteries.yml
@@ -51,6 +51,7 @@ jobs:
         battery:
           - BMW_I3_BATTERY
           - BMW_IX_BATTERY
+          - BMW_PHEV_BATTERY
           - BYD_ATTO_3_BATTERY
           - CELLPOWER_BMS
           - CHADEMO_BATTERY

diff --git a/.github/workflows/compile-all-combinations-part1-batteries-A-to-M.yml b/.github/workflows/compile-all-combinations-part1-batteries-A-to-M.yml
@@ -56,6 +56,7 @@ jobs:
         battery:
           - BMW_I3_BATTERY
           - BMW_IX_BATTERY
+          - BMW_PHEV_BATTERY
           - BYD_ATTO_3_BATTERY
           - CELLPOWER_BMS
           - CHADEMO_BATTERY

diff --git a/Software/Software.ino b/Software/Software.ino
@@ -54,7 +54,7 @@
 #endif  // WIFI
 
 // The current software version, shown on webserver
-const char* version_number = "8.2.dev";
+const char* version_number = "8.3.dev";
 
 // Interval settings
 uint16_t intervalUpdateValues = INTERVAL_1_S;  // Interval at which to update inverter values / Modbus registers

diff --git a/Software/USER_SETTINGS.h b/Software/USER_SETTINGS.h
@@ -11,6 +11,7 @@
 /* Select battery used */
 //#define BMW_I3_BATTERY
 //#define BMW_IX_BATTERY
+//#define BMW_PHEV_BATTERY
 //#define BOLT_AMPERA_BATTERY
 //#define BYD_ATTO_3_BATTERY
 //#define CELLPOWER_BMS

diff --git a/Software/src/battery/BATTERIES.h b/Software/src/battery/BATTERIES.h
@@ -17,6 +17,10 @@ void setup_can_shunt();
 #include "BMW-IX-BATTERY.h"
 #endif
 
+#ifdef BMW_PHEV_BATTERY
+#include "BMW-PHEV-BATTERY.h"
+#endif
+
 #ifdef BOLT_AMPERA_BATTERY
 #include "BOLT-AMPERA-BATTERY.h"
 #endif

diff --git a/Software/src/battery/BMW-IX-BATTERY.cpp b/Software/src/battery/BMW-IX-BATTERY.cpp
@@ -272,6 +272,12 @@ CAN_frame BMWiX_6F4_REQUEST_BALANCING_START = {
     .DLC = 6,
     .ID = 0x6F4,
     .data = {0xF4, 0x04, 0x71, 0x01, 0xAE, 0x77}};  // Request Balancing command?
+CAN_frame BMWiX_6F4_REQUEST_BALANCING_START2 = {
+    .FD = true,
+    .ext_ID = false,
+    .DLC = 6,
+    .ID = 0x6F4,
+    .data = {0xF4, 0x04, 0x31, 0x01, 0xAE, 0x77}};  // Request Balancing command?
 CAN_frame BMWiX_6F4_REQUEST_PACK_VOLTAGE_LIMITS = {
     .FD = true,
     .ext_ID = false,
@@ -330,15 +336,15 @@ int numUDSreqs = sizeof(UDS_REQUESTS100MS) / sizeof(UDS_REQUESTS100MS[0]);  // N
 static bool battery_info_available = false;
 static uint32_t battery_serial_number = 0;
 static int32_t battery_current = 0;
-static int16_t battery_voltage = 370;
+static int16_t battery_voltage = 370;  //Startup with valid values - needs fixing in future
 static int16_t terminal30_12v_voltage = 0;
 static int16_t battery_voltage_after_contactor = 0;
-static int16_t min_soc_state = 50;
-static int16_t avg_soc_state = 50;
-static int16_t max_soc_state = 50;
-static int16_t min_soh_state = 99;  // Uses E5 45, also available in 78 73
-static int16_t avg_soh_state = 99;  // Uses E5 45, also available in 78 73
-static int16_t max_soh_state = 99;  // Uses E5 45, also available in 78 73
+static int16_t min_soc_state = 5000;
+static int16_t avg_soc_state = 5000;
+static int16_t max_soc_state = 5000;
+static int16_t min_soh_state = 9900;  // Uses E5 45, also available in 78 73
+static int16_t avg_soh_state = 9900;  // Uses E5 45, also available in 78 73
+static int16_t max_soh_state = 9900;  // Uses E5 45, also available in 78 73
 static uint16_t max_design_voltage = 0;
 static uint16_t min_design_voltage = 0;
 static int32_t remaining_capacity = 0;
@@ -347,8 +353,8 @@ static int16_t min_battery_temperature = 0;
 static int16_t avg_battery_temperature = 0;
 static int16_t max_battery_temperature = 0;
 static int16_t main_contactor_temperature = 0;
-static int16_t min_cell_voltage = 0;
-static int16_t max_cell_voltage = 0;
+static int16_t min_cell_voltage = 3700;  //Startup with valid values - needs fixing in future
+static int16_t max_cell_voltage = 3700;  //Startup with valid values - needs fixing in future
 static unsigned long min_cell_voltage_lastchanged = 0;
 static unsigned long max_cell_voltage_lastchanged = 0;
 static unsigned min_cell_voltage_lastreceived = 0;
@@ -763,6 +769,8 @@ void transmit_can_battery() {
   // Send 10000ms CAN Message
   if (currentMillis - previousMillis10000 >= INTERVAL_10_S) {
     previousMillis10000 = currentMillis;
+    transmit_can_frame(&BMWiX_6F4_REQUEST_BALANCING_START2, can_config.battery);
+    transmit_can_frame(&BMWiX_6F4_REQUEST_BALANCING_START, can_config.battery);
   }
 }
 //We can always send CAN as the iX BMS will wake up on vehicle comms