From 4fbca4b0292addf8ddcc980de48ef16def5c029b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Mon, 14 Apr 2025 00:04:02 +0300
Subject: [PATCH 01/15] Add Crash reset to More Battery Info page

---
 Software/src/battery/BYD-ATTO-3-BATTERY.cpp   | 54 +++++++++++++++++--
 Software/src/datalayer/datalayer_extended.h   |  3 ++
 .../webserver/advanced_battery_html.cpp       | 13 +++++
 Software/src/devboard/webserver/webserver.cpp |  9 ++++
 4 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
index 43583781..dc70e352 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
@@ -7,15 +7,17 @@
 
 /* Notes
   - SOC% by default is now ESTIMATED.
-  - If you have a non-crashed pack, enable using real SOC. See Wiki for info.
-  - TODO: In the future, we might be able to unlock crashed batteries and get SOC going always
+  - If you have a crash-locked pack, run the "Unlock crashed BMS" from the "More Battery Info" page
+  - After battery is unlocked, you can remove the "USE_ESTIMATED_SOC" from the BYD-ATTO-3-BATTERY.h file
 */
 
 /* Do not change code below unless you are sure what you are doing */
 #define NOT_DETERMINED_YET 0
 #define STANDARD_RANGE 1
 #define EXTENDED_RANGE 2
+#define NOT_RUNNING 0xFF
 static uint8_t battery_type = NOT_DETERMINED_YET;
+static uint8_t stateMachineClearCrash = NOT_RUNNING;
 static unsigned long previousMillis50 = 0;   // will store last time a 50ms CAN Message was send
 static unsigned long previousMillis100 = 0;  // will store last time a 100ms CAN Message was send
 static unsigned long previousMillis500 = 0;  // will store last time a 500ms CAN Message was send
@@ -89,6 +91,16 @@ CAN_frame ATTO_3_7E7_POLL = {.FD = false,
                              .DLC = 8,
                              .ID = 0x7E7,  //Poll PID 03 22 00 05 (POLL_FOR_BATTERY_SOC)
                              .data = {0x03, 0x22, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00}};
+CAN_frame ATTO_3_7E7_ACK = {.FD = false,
+                            .ext_ID = false,
+                            .DLC = 8,
+                            .ID = 0x7E7,  //ACK frame for long PIDs
+                            .data = {0x30, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00}};
+CAN_frame ATTO_3_7E7_CLEAR_CRASH = {.FD = false,
+                                    .ext_ID = false,
+                                    .DLC = 8,
+                                    .ID = 0x7E7,
+                                    .data = {0x02, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00}};
 
 // Define the data points for %SOC depending on pack voltage
 const uint8_t numPoints = 14;
@@ -252,6 +264,12 @@ void update_values_battery() {  //This function maps all the values fetched via
   datalayer_extended.bydAtto3.battery_temperatures[7] = battery_daughterboard_temperatures[7];
   datalayer_extended.bydAtto3.battery_temperatures[8] = battery_daughterboard_temperatures[8];
   datalayer_extended.bydAtto3.battery_temperatures[9] = battery_daughterboard_temperatures[9];
+
+  // Update requests from webserver datalayer
+  if (datalayer_extended.bydAtto3.UserRequestCrashReset) {
+    stateMachineClearCrash = 0;  //Start the statemachine
+    datalayer_extended.bydAtto3.UserRequestCrashReset = false;
+  }
 }
 
 void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
@@ -356,6 +374,10 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
       break;
     case 0x7EF:  //OBD2 PID reply from battery
+      if (rx_frame.data.u8[0] == 0x10) {
+        transmit_can_frame(&ATTO_3_7E7_ACK, can_config.battery);  //Send next line request
+      }
+
       switch (rx_frame.data.u8[3]) {
         case POLL_FOR_BATTERY_SOC:
           BMS_SOC = rx_frame.data.u8[4];
@@ -444,7 +466,6 @@ void transmit_can_battery() {
     }
 
     if (counter_100ms > 3) {
-
       ATTO_3_441.data.u8[4] = 0x9D;
       ATTO_3_441.data.u8[5] = 0x01;
       ATTO_3_441.data.u8[6] = 0xFF;
@@ -455,6 +476,27 @@ void transmit_can_battery() {
 #ifdef DOUBLE_BATTERY
     transmit_can_frame(&ATTO_3_441, can_config.battery_double);
 #endif  //DOUBLE_BATTERY
+    switch (stateMachineClearCrash) {
+      case 0:
+        ATTO_3_7E7_CLEAR_CRASH.data = {0x02, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00};
+        transmit_can_frame(&ATTO_3_7E7_CLEAR_CRASH, can_config.battery);
+        stateMachineClearCrash = 1;
+        break;
+      case 1:
+        ATTO_3_7E7_CLEAR_CRASH.data = {0x04, 0x14, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00};
+        transmit_can_frame(&ATTO_3_7E7_CLEAR_CRASH, can_config.battery);
+        stateMachineClearCrash = 2;
+        break;
+      case 2:
+        ATTO_3_7E7_CLEAR_CRASH.data = {0x03, 0x19, 0x02, 0x09, 0x00, 0x00, 0x00, 0x00};
+        transmit_can_frame(&ATTO_3_7E7_CLEAR_CRASH, can_config.battery);
+        stateMachineClearCrash = NOT_RUNNING;
+        break;
+      case NOT_RUNNING:
+        break;
+      default:
+        break;
+    }
   }
   // Send 500ms CAN Message
   if (currentMillis - previousMillis500 >= INTERVAL_500_MS) {
@@ -498,10 +540,12 @@ void transmit_can_battery() {
         break;
     }
 
-    transmit_can_frame(&ATTO_3_7E7_POLL, can_config.battery);
+    if (stateMachineClearCrash == NOT_RUNNING) {  //Don't poll battery for data if clear crash running
+      transmit_can_frame(&ATTO_3_7E7_POLL, can_config.battery);
 #ifdef DOUBLE_BATTERY
-    transmit_can_frame(&ATTO_3_7E7_POLL, can_config.battery_double);
+      transmit_can_frame(&ATTO_3_7E7_POLL, can_config.battery_double);
 #endif  //DOUBLE_BATTERY
+    }
   }
 }
 
diff --git a/Software/src/datalayer/datalayer_extended.h b/Software/src/datalayer/datalayer_extended.h
index f3f4849f..5f0141b9 100644
--- a/Software/src/datalayer/datalayer_extended.h
+++ b/Software/src/datalayer/datalayer_extended.h
@@ -163,6 +163,9 @@ typedef struct {
 } DATALAYER_INFO_BMWI3;
 
 typedef struct {
+  /** bool */
+  /** User requesting crash reset via WebUI*/
+  bool UserRequestCrashReset = false;
   /** bool */
   /** Which SOC method currently used. 0 = Estimated, 1 = Measured */
   bool SOC_method = 0;
diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp
index b7439f37..a2b25e6c 100644
--- a/Software/src/devboard/webserver/advanced_battery_html.cpp
+++ b/Software/src/devboard/webserver/advanced_battery_html.cpp
@@ -487,6 +487,7 @@ String advanced_battery_processor(const String& var) {
 
 #ifdef BYD_ATTO_3_BATTERY
     static const char* SOCmethod[2] = {"Estimated from voltage", "Measured by BMS"};
+    content += "<button onclick='askResetCrash()'>Unlock crashed BMS</button>";
     content += "<h4>SOC method used: " + String(SOCmethod[datalayer_extended.bydAtto3.SOC_method]) + "</h4>";
     content += "<h4>SOC estimated: " + String(datalayer_extended.bydAtto3.SOC_estimated) + "</h4>";
     content += "<h4>SOC highprec: " + String(datalayer_extended.bydAtto3.SOC_highprec) + "</h4>";
@@ -1501,6 +1502,18 @@ String advanced_battery_processor(const String& var) {
     content += "function goToMainPage() { window.location.href = '/'; }";
     content += "</script>";
     content += "<script>";
+    content +=
+        "function askResetCrash() { if (window.confirm('Are you sure you want to reset crash data? "
+        "Note this will unlock your BMS and enable contactor closing and SOC calculation.')) { "
+        "resetCrash(); } }";
+    content += "function resetCrash() {";
+    content += "  var xhr = new XMLHttpRequest();";
+    content += "  xhr.open('GET', '/resetCrash', true);";
+    content += "  xhr.send();";
+    content += "}";
+    content += "function goToMainPage() { window.location.href = '/'; }";
+    content += "</script>";
+    content += "<script>";
     content +=
         "function askResetSOH() { if (window.confirm('Are you sure you want to reset degradation data? "
         "Note this should only be used on 2011-2017 24/30kWh batteries!')) { "
diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp
index b0306ff9..10f2bbd3 100644
--- a/Software/src/devboard/webserver/webserver.cpp
+++ b/Software/src/devboard/webserver/webserver.cpp
@@ -597,6 +597,15 @@ void init_webserver() {
     request->send(200, "text/plain", "Updated successfully");
   });
 
+  // Route for resetting Crash data on BYD Atto3 batteries
+  server.on("/resetCrash", HTTP_GET, [](AsyncWebServerRequest* request) {
+    if (WEBSERVER_AUTH_REQUIRED && !request->authenticate(http_username, http_password)) {
+      return request->requestAuthentication();
+    }
+    datalayer_extended.bydAtto3.UserRequestCrashReset = true;
+    request->send(200, "text/plain", "Updated successfully");
+  });
+
   // Route for erasing DTC on Volvo/Polestar batteries
   server.on("/volvoEraseDTC", HTTP_GET, [](AsyncWebServerRequest* request) {
     if (WEBSERVER_AUTH_REQUIRED && !request->authenticate(http_username, http_password)) {

From c8de1684350876e44340a88a77907ac540266b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Sat, 26 Apr 2025 23:43:51 +0300
Subject: [PATCH 02/15] Simplify can sending routine and perf check

---
 Software/Software.ino                         | 16 +++++++---
 Software/src/battery/BATTERIES.h              |  4 +--
 Software/src/battery/BMW-I3-BATTERY.cpp       |  9 +-----
 Software/src/battery/BMW-IX-BATTERY.cpp       | 25 +--------------
 Software/src/battery/BMW-PHEV-BATTERY.cpp     |  3 +-
 Software/src/battery/BMW-SBOX.cpp             | 21 ++++++-------
 Software/src/battery/BOLT-AMPERA-BATTERY.cpp  |  9 +-----
 Software/src/battery/BYD-ATTO-3-BATTERY.cpp   |  9 +-----
 Software/src/battery/CELLPOWER-BMS.cpp        |  5 ++-
 Software/src/battery/CHADEMO-BATTERY.cpp      | 10 +-----
 Software/src/battery/CMFA-EV-BATTERY.cpp      |  7 +----
 Software/src/battery/ECMP-BATTERY.cpp         |  3 +-
 Software/src/battery/FOXESS-BATTERY.cpp       |  4 +--
 .../src/battery/IMIEV-CZERO-ION-BATTERY.cpp   | 10 ++----
 Software/src/battery/JAGUAR-IPACE-BATTERY.cpp | 31 +------------------
 Software/src/battery/KIA-E-GMP-BATTERY.cpp    | 10 +-----
 .../src/battery/KIA-HYUNDAI-64-BATTERY.cpp    |  9 +-----
 .../battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp    |  3 +-
 Software/src/battery/MEB-BATTERY.cpp          | 14 ++-------
 Software/src/battery/MG-5-BATTERY.cpp         |  9 +-----
 Software/src/battery/NISSAN-LEAF-BATTERY.cpp  | 11 +------
 Software/src/battery/ORION-BMS.cpp            |  3 +-
 Software/src/battery/PYLON-BATTERY.cpp        |  4 +--
 .../src/battery/RANGE-ROVER-PHEV-BATTERY.cpp  |  4 +--
 .../src/battery/RENAULT-KANGOO-BATTERY.cpp    |  3 +-
 Software/src/battery/RENAULT-TWIZY.cpp        |  2 +-
 .../src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp  |  7 +----
 .../src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp  |  7 +----
 Software/src/battery/RJXZS-BMS.cpp            |  4 +--
 .../src/battery/SANTA-FE-PHEV-BATTERY.cpp     | 10 +-----
 Software/src/battery/SIMPBMS-BATTERY.cpp      |  4 ++-
 Software/src/battery/SONO-BATTERY.cpp         |  4 +--
 Software/src/battery/TESLA-BATTERY.cpp        | 10 +-----
 Software/src/battery/TEST-FAKE-BATTERY.cpp    |  3 +-
 Software/src/battery/VOLVO-SPA-BATTERY.cpp    |  9 +-----
 .../src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp  |  9 +-----
 Software/src/charger/CHARGERS.h               |  2 +-
 Software/src/charger/CHEVY-VOLT-CHARGER.cpp   |  3 +-
 Software/src/charger/NISSAN-LEAF-CHARGER.cpp  |  3 +-
 Software/src/communication/can/comm_can.cpp   | 17 +++++-----
 Software/src/communication/can/comm_can.h     |  3 +-
 .../comm_contactorcontrol.cpp                 |  2 +-
 Software/src/devboard/utils/events.cpp        |  6 ++--
 Software/src/devboard/utils/events.h          |  2 +-
 Software/src/devboard/utils/types.h           |  6 ----
 Software/src/inverter/AFORE-CAN.cpp           |  2 +-
 Software/src/inverter/BYD-CAN.cpp             |  3 +-
 Software/src/inverter/FERROAMP-CAN.cpp        |  2 +-
 Software/src/inverter/FOXESS-CAN.cpp          |  6 +---
 Software/src/inverter/GROWATT-HV-CAN.cpp      |  4 +--
 Software/src/inverter/GROWATT-LV-CAN.cpp      |  2 +-
 Software/src/inverter/INVERTERS.h             |  2 +-
 Software/src/inverter/PYLON-CAN.cpp           |  2 +-
 Software/src/inverter/PYLON-LV-CAN.cpp        |  3 +-
 Software/src/inverter/SCHNEIDER-CAN.cpp       |  3 +-
 Software/src/inverter/SMA-BYD-H-CAN.cpp       |  3 +-
 Software/src/inverter/SMA-BYD-HVS-CAN.cpp     |  3 +-
 Software/src/inverter/SMA-LV-CAN.cpp          |  3 +-
 Software/src/inverter/SMA-TRIPOWER-CAN.cpp    |  3 +-
 Software/src/inverter/SOFAR-CAN.cpp           |  3 +-
 Software/src/inverter/SOLAX-CAN.cpp           |  2 +-
 Software/src/inverter/SUNGROW-CAN.cpp         |  4 +--
 62 files changed, 98 insertions(+), 301 deletions(-)

diff --git a/Software/Software.ino b/Software/Software.ino
index c8f4186d..6ba38176 100644
--- a/Software/Software.ino
+++ b/Software/Software.ino
@@ -52,6 +52,7 @@ volatile unsigned long long bmsResetTimeOffset = 0;
 const char* version_number = "8.12.dev";
 
 // Interval timers
+volatile unsigned long currentMillis = 0;
 unsigned long previousMillis10ms = 0;
 unsigned long previousMillisUpdateVal = 0;
 unsigned long lastMillisOverflowCheck = 0;
@@ -208,6 +209,7 @@ void core_loop(void*) {
   led_init();
 
   while (true) {
+
     START_TIME_MEASUREMENT(all);
     START_TIME_MEASUREMENT(comm);
 #ifdef EQUIPMENT_STOP_BUTTON
@@ -227,8 +229,12 @@ void core_loop(void*) {
 #endif  // WEBSERVER
 
     // Process
-    if (millis() - previousMillis10ms >= INTERVAL_10_MS) {
-      previousMillis10ms = millis();
+    currentMillis = millis();
+    if (currentMillis - previousMillis10ms >= INTERVAL_10_MS) {
+      if ((currentMillis - previousMillis10ms >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
+        set_event(EVENT_TASK_OVERRUN, (currentMillis - previousMillis10ms));
+      }
+      previousMillis10ms = currentMillis;
 #ifdef FUNCTION_TIME_MEASUREMENT
       START_TIME_MEASUREMENT(time_10ms);
 #endif
@@ -242,8 +248,8 @@ void core_loop(void*) {
 #endif
     }
 
-    if (millis() - previousMillisUpdateVal >= INTERVAL_1_S) {
-      previousMillisUpdateVal = millis();  // Order matters on the update_loop!
+    if (currentMillis - previousMillisUpdateVal >= INTERVAL_1_S) {
+      previousMillisUpdateVal = currentMillis;  // Order matters on the update_loop!
 #ifdef FUNCTION_TIME_MEASUREMENT
       START_TIME_MEASUREMENT(time_values);
 #endif
@@ -264,7 +270,7 @@ void core_loop(void*) {
     START_TIME_MEASUREMENT(cantx);
 #endif
     // Output
-    transmit_can();  // Send CAN messages to all components
+    transmit_can(currentMillis);  // Send CAN messages to all components
 
 #ifdef RS485_BATTERY_SELECTED
     transmit_rs485();
diff --git a/Software/src/battery/BATTERIES.h b/Software/src/battery/BATTERIES.h
index 1bf91d0f..80afe51f 100644
--- a/Software/src/battery/BATTERIES.h
+++ b/Software/src/battery/BATTERIES.h
@@ -5,7 +5,7 @@
 #ifdef BMW_SBOX
 #include "BMW-SBOX.h"
 void handle_incoming_can_frame_shunt(CAN_frame rx_frame);
-void transmit_can_shunt();
+void transmit_can_shunt(unsigned long currentMillis);
 void setup_can_shunt();
 #endif
 
@@ -155,7 +155,7 @@ void transmit_rs485();
 void receive_RS485();
 #else
 void handle_incoming_can_frame_battery(CAN_frame rx_frame);
-void transmit_can_battery();
+void transmit_can_battery(unsigned long currentMillis);
 #endif
 
 #ifdef DOUBLE_BATTERY
diff --git a/Software/src/battery/BMW-I3-BATTERY.cpp b/Software/src/battery/BMW-I3-BATTERY.cpp
index 45473c25..d628d584 100644
--- a/Software/src/battery/BMW-I3-BATTERY.cpp
+++ b/Software/src/battery/BMW-I3-BATTERY.cpp
@@ -877,18 +877,11 @@ void handle_incoming_can_frame_battery2(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   if (battery_awake) {
     //Send 20ms message
     if (currentMillis - previousMillis20 >= INTERVAL_20_MS) {
-      // Check if sending of CAN messages has been delayed too much.
-      if ((currentMillis - previousMillis20 >= INTERVAL_20_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-        set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis20));
-      } else {
-        clear_event(EVENT_CAN_OVERRUN);
-      }
       previousMillis20 = currentMillis;
 
       if (startup_counter_contactor < 160) {
diff --git a/Software/src/battery/BMW-IX-BATTERY.cpp b/Software/src/battery/BMW-IX-BATTERY.cpp
index 11872e22..71e1c959 100644
--- a/Software/src/battery/BMW-IX-BATTERY.cpp
+++ b/Software/src/battery/BMW-IX-BATTERY.cpp
@@ -11,8 +11,6 @@ static unsigned long previousMillis100 = 0;    // will store last time a 100ms C
 static unsigned long previousMillis200 = 0;    // will store last time a 200ms CAN Message was send
 static unsigned long previousMillis500 = 0;    // will store last time a 500ms CAN Message was send
 static unsigned long previousMillis640 = 0;    // will store last time a 600ms CAN Message was send
-static unsigned long previousMillis1000 = 0;   // will store last time a 1000ms CAN Message was send
-static unsigned long previousMillis5000 = 0;   // will store last time a 5000ms CAN Message was send
 static unsigned long previousMillis10000 = 0;  // will store last time a 10000ms CAN Message was send
 
 #define ALIVE_MAX_VALUE 14  // BMW CAN messages contain alive counter, goes from 0...14
@@ -839,8 +837,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   //if (battery_awake) { //We can always send CAN as the iX BMS will wake up on vehicle comms
   // Send 100ms CAN Message
@@ -862,14 +859,6 @@ void transmit_can_battery() {
     BMWiX_C0.data.u8[0] = increment_C0_counter(BMWiX_C0.data.u8[0]);  //Keep Alive 1
     transmit_can_frame(&BMWiX_C0, can_config.battery);
   }
-  // Send 1000ms CAN Message
-  if (currentMillis - previousMillis1000 >= INTERVAL_1_S) {
-    previousMillis1000 = currentMillis;
-  }
-  // Send 5000ms CAN Message
-  if (currentMillis - previousMillis5000 >= INTERVAL_5_S) {
-    previousMillis5000 = currentMillis;
-  }
   // Send 10000ms CAN Message
   if (currentMillis - previousMillis10000 >= INTERVAL_10_S) {
     previousMillis10000 = currentMillis;
@@ -877,18 +866,6 @@ void transmit_can_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
-// else {
-//   previousMillis20 = currentMillis;
-//   previousMillis100 = currentMillis;
-//   previousMillis200 = currentMillis;
-//   previousMillis500 = currentMillis;
-//   previousMillis640 = currentMillis;
-//   previousMillis1000 = currentMillis;
-//   previousMillis5000 = currentMillis;
-//   previousMillis10000 = currentMillis;
-// }
-//} //We can always send CAN as the iX BMS will wake up on vehicle comms
 
 void setup_battery(void) {  // Performs one time setup at startup
   strncpy(datalayer.system.info.battery_protocol, "BMW iX and i4-7 platform", 63);
diff --git a/Software/src/battery/BMW-PHEV-BATTERY.cpp b/Software/src/battery/BMW-PHEV-BATTERY.cpp
index 53b87eb9..ad62b3aa 100644
--- a/Software/src/battery/BMW-PHEV-BATTERY.cpp
+++ b/Software/src/battery/BMW-PHEV-BATTERY.cpp
@@ -1005,8 +1005,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   //if (battery_awake) { //We can always send CAN as the PHEV BMS will wake up on vehicle comms
 
diff --git a/Software/src/battery/BMW-SBOX.cpp b/Software/src/battery/BMW-SBOX.cpp
index ff0139b4..dcd9807d 100644
--- a/Software/src/battery/BMW-SBOX.cpp
+++ b/Software/src/battery/BMW-SBOX.cpp
@@ -100,18 +100,17 @@ void handle_incoming_can_frame_shunt(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_shunt() {
-  unsigned long currentTime = millis();
+void transmit_can_shunt(unsigned long currentMillis) {
 
   /** Shunt can frames seen? **/
-  if (ShuntLastSeen + 1000 < currentTime) {
+  if (ShuntLastSeen + 1000 < currentMillis) {
     datalayer.shunt.available = false;
   } else {
     datalayer.shunt.available = true;
   }
   // Send 20ms CAN Message
-  if (currentTime - LastMsgTime >= INTERVAL_20_MS) {
-    LastMsgTime = currentTime;
+  if (currentMillis - LastMsgTime >= INTERVAL_20_MS) {
+    LastMsgTime = currentMillis;
     // First check if we have any active errors, incase we do, turn off the battery
     if (datalayer.battery.status.bms_status == FAULT) {
       timeSpentInFaultedMode++;
@@ -154,16 +153,16 @@ void transmit_can_shunt() {
     switch (contactorStatus) {
       case PRECHARGE:
         SBOX_100.data.u8[0] = 0x86;  // Precharge relay only
-        prechargeStartTime = currentTime;
+        prechargeStartTime = currentMillis;
         contactorStatus = NEGATIVE;
 #ifdef DEBUG_VIA_USB
         Serial.println("S-BOX Precharge relay engaged");
 #endif
         break;
       case NEGATIVE:
-        if (currentTime - prechargeStartTime >= CONTACTOR_CONTROL_T1) {
+        if (currentMillis - prechargeStartTime >= CONTACTOR_CONTROL_T1) {
           SBOX_100.data.u8[0] = 0xA6;  // Precharge + Negative
-          negativeStartTime = currentTime;
+          negativeStartTime = currentMillis;
           contactorStatus = POSITIVE;
           datalayer.shunt.precharging = true;
 #ifdef DEBUG_VIA_USB
@@ -172,11 +171,11 @@ void transmit_can_shunt() {
         }
         break;
       case POSITIVE:
-        if (currentTime - negativeStartTime >= CONTACTOR_CONTROL_T2 &&
+        if (currentMillis - negativeStartTime >= CONTACTOR_CONTROL_T2 &&
             (datalayer.shunt.measured_voltage_mV * MAX_PRECHARGE_RESISTOR_VOLTAGE_PERCENT <
              datalayer.shunt.measured_outvoltage_mV)) {
           SBOX_100.data.u8[0] = 0xAA;  // Precharge + Negative + Positive
-          positiveStartTime = currentTime;
+          positiveStartTime = currentMillis;
           contactorStatus = PRECHARGE_OFF;
           datalayer.shunt.precharging = false;
 #ifdef DEBUG_VIA_USB
@@ -185,7 +184,7 @@ void transmit_can_shunt() {
         }
         break;
       case PRECHARGE_OFF:
-        if (currentTime - positiveStartTime >= CONTACTOR_CONTROL_T3) {
+        if (currentMillis - positiveStartTime >= CONTACTOR_CONTROL_T3) {
           SBOX_100.data.u8[0] = 0x6A;  // Negative + Positive
           contactorStatus = COMPLETED;
 #ifdef DEBUG_VIA_USB
diff --git a/Software/src/battery/BOLT-AMPERA-BATTERY.cpp b/Software/src/battery/BOLT-AMPERA-BATTERY.cpp
index 26169f06..43f8b412 100644
--- a/Software/src/battery/BOLT-AMPERA-BATTERY.cpp
+++ b/Software/src/battery/BOLT-AMPERA-BATTERY.cpp
@@ -769,17 +769,10 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   //Send 20ms message
   if (currentMillis - previousMillis20ms >= INTERVAL_20_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis20ms >= INTERVAL_20_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis20ms));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis20ms = currentMillis;
     transmit_can_frame(&BOLT_778, can_config.battery);
   }
diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
index 43583781..e72217fd 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
@@ -389,16 +389,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   //Send 50ms message
   if (currentMillis - previousMillis50 >= INTERVAL_50_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis50 >= INTERVAL_50_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis50));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis50 = currentMillis;
 
     // Set close contactors to allowed (Useful for crashed packs, started via contactor control thru GPIO)
diff --git a/Software/src/battery/CELLPOWER-BMS.cpp b/Software/src/battery/CELLPOWER-BMS.cpp
index 9a73ed40..e0a480c8 100644
--- a/Software/src/battery/CELLPOWER-BMS.cpp
+++ b/Software/src/battery/CELLPOWER-BMS.cpp
@@ -316,11 +316,10 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
+
   // Send 1s CAN Message
   if (currentMillis - previousMillis1s >= INTERVAL_1_S) {
-
     previousMillis1s = currentMillis;
 
     /*
diff --git a/Software/src/battery/CHADEMO-BATTERY.cpp b/Software/src/battery/CHADEMO-BATTERY.cpp
index e864b285..e2ba0095 100644
--- a/Software/src/battery/CHADEMO-BATTERY.cpp
+++ b/Software/src/battery/CHADEMO-BATTERY.cpp
@@ -655,9 +655,7 @@ void update_evse_discharge_capabilities(CAN_frame& f) {
   CHADEMO_208.data.u8[7] = highByte(x208_evse_dischg_cap.lower_threshold_voltage);
 }
 
-void transmit_can_battery() {
-
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   handlerBeforeMillis = currentMillis;
   handle_chademo_sequence();
@@ -665,12 +663,6 @@ void transmit_can_battery() {
 
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis100 >= INTERVAL_100_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis100));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis100 = currentMillis;
 
     /* no EVSE messages should be sent until the vehicle has
diff --git a/Software/src/battery/CMFA-EV-BATTERY.cpp b/Software/src/battery/CMFA-EV-BATTERY.cpp
index 2e6282ae..322fa140 100644
--- a/Software/src/battery/CMFA-EV-BATTERY.cpp
+++ b/Software/src/battery/CMFA-EV-BATTERY.cpp
@@ -513,14 +513,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 10ms CAN Message
   if (currentMillis - previousMillis10ms >= INTERVAL_10_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis10ms >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10ms));
-    }
     previousMillis10ms = currentMillis;
     transmit_can_frame(&CMFA_1EA, can_config.battery);
     transmit_can_frame(&CMFA_135, can_config.battery);
diff --git a/Software/src/battery/ECMP-BATTERY.cpp b/Software/src/battery/ECMP-BATTERY.cpp
index 9bea886a..ce349179 100644
--- a/Software/src/battery/ECMP-BATTERY.cpp
+++ b/Software/src/battery/ECMP-BATTERY.cpp
@@ -288,8 +288,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 1s CAN Message
   if (currentMillis - previousMillis1000 >= INTERVAL_1_S) {
     previousMillis1000 = currentMillis;
diff --git a/Software/src/battery/FOXESS-BATTERY.cpp b/Software/src/battery/FOXESS-BATTERY.cpp
index 465ad8ec..cb256d9e 100644
--- a/Software/src/battery/FOXESS-BATTERY.cpp
+++ b/Software/src/battery/FOXESS-BATTERY.cpp
@@ -474,9 +474,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
-
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 500ms CAN Message
   if (currentMillis - previousMillis500 >= INTERVAL_500_MS) {
     previousMillis500 = currentMillis;
diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
index ddc63814..b9767694 100644
--- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
+++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
@@ -207,16 +207,10 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
+
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis100 >= INTERVAL_100_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis100));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis100 = currentMillis;
 
     // Send CAN goes here...
diff --git a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
index 618b32c8..434bbc24 100644
--- a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
+++ b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
@@ -120,14 +120,6 @@ void update_values_battery() {
 }
 
 void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
-
-  // Do not log noisy startup messages - there are many !
-  if (rx_frame.ID == 0 && rx_frame.DLC == 8 && rx_frame.data.u8[0] == 0 && rx_frame.data.u8[1] == 0 &&
-      rx_frame.data.u8[2] == 0 && rx_frame.data.u8[3] == 0 && rx_frame.data.u8[4] == 0 && rx_frame.data.u8[5] == 0 &&
-      rx_frame.data.u8[6] == 0x80 && rx_frame.data.u8[7] == 0) {
-    return;
-  }
-
   switch (rx_frame.ID) {  // These messages are periodically transmitted by the battery
     case 0x080:
       datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
@@ -222,34 +214,13 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
     default:
       break;
   }
-
-  // Discard non-interesting can messages so they do not get logged via serial
-  if (rx_frame.ID < 0x500) {
-    return;
-  }
-
-  // All CAN messages recieved will be logged via serial
-  logging.print(millis());  // Example printout, time, ID, length, data: 7553  1DB  8  FF C0 B9 EA 0 0 2 5D
-  logging.print("  ");
-  logging.print(rx_frame.ID, HEX);
-  logging.print("  ");
-  logging.print(rx_frame.DLC);
-  logging.print("  ");
-  for (int i = 0; i < rx_frame.DLC; ++i) {
-    logging.print(rx_frame.data.u8[i], HEX);
-    logging.print(" ");
-  }
-  logging.println("");
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
-
+void transmit_can_battery(unsigned long currentMillis) {
   /* Send keep-alive every 200ms */
   if (currentMillis - previousMillisKeepAlive >= INTERVAL_200_MS) {
     previousMillisKeepAlive = currentMillis;
     transmit_can_frame(&ipace_keep_alive, can_config.battery);
-    return;
   }
 }
 
diff --git a/Software/src/battery/KIA-E-GMP-BATTERY.cpp b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
index ce70cd2c..9bac65bc 100644
--- a/Software/src/battery/KIA-E-GMP-BATTERY.cpp
+++ b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
@@ -1082,8 +1082,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   if (startedUp) {
     //Send Contactor closing message loop
     // Check if we still have messages to send
@@ -1108,13 +1107,6 @@ void transmit_can_battery() {
     //Send 200ms CANFD message
     if (currentMillis - previousMillis200ms >= INTERVAL_200_MS) {
       previousMillis200ms = currentMillis;
-      // Check if sending of CAN messages has been delayed too much.
-      if ((currentMillis - previousMillis200ms >= INTERVAL_200_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-        set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis200ms));
-      } else {
-        clear_event(EVENT_CAN_OVERRUN);
-      }
-      previousMillis200ms = currentMillis;
 
       EGMP_7E4.data.u8[3] = KIA_7E4_COUNTER;
 
diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
index a8d85114..53d52329 100644
--- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
+++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
@@ -924,8 +924,7 @@ void handle_incoming_can_frame_battery2(CAN_frame rx_frame) {
 }
 #endif  //DOUBLE_BATTERY
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   if (!startedUp) {
     return;  // Don't send any CAN messages towards battery until it has started up
@@ -948,12 +947,6 @@ void transmit_can_battery() {
   }
   // Send 10ms CAN Message
   if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis10 >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis10 = currentMillis;
 
     switch (counter_200) {
diff --git a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
index 71c4c88f..37d36b08 100644
--- a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
+++ b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
@@ -230,8 +230,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   // Send 1000ms CAN Message
   if (currentMillis - previousMillis1000 >= INTERVAL_1_S) {
diff --git a/Software/src/battery/MEB-BATTERY.cpp b/Software/src/battery/MEB-BATTERY.cpp
index 8c9f84ad..8d9e4f8c 100644
--- a/Software/src/battery/MEB-BATTERY.cpp
+++ b/Software/src/battery/MEB-BATTERY.cpp
@@ -1627,9 +1627,8 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
-  // Send 10ms CAN Message
+void transmit_can_battery(unsigned long currentMillis) {
+
   if (currentMillis > last_can_msg_timestamp + 500) {
 #ifdef DEBUG_LOG
     if (first_can_msg)
@@ -1642,15 +1641,8 @@ void transmit_can_battery() {
       datalayer.system.status.battery_allows_contactor_closing = false;
     }
   }
-
+  // Send 10ms CAN Message
   if (currentMillis - previousMillis10ms >= INTERVAL_10_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis10ms >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME) &&
-        previousMillis10ms > 0) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10ms));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis10ms = currentMillis;
 
     MEB_0FC.data.u8[1] = ((MEB_0FC.data.u8[1] & 0xF0) | counter_10ms);
diff --git a/Software/src/battery/MG-5-BATTERY.cpp b/Software/src/battery/MG-5-BATTERY.cpp
index 07c54a7d..ab12c6e8 100644
--- a/Software/src/battery/MG-5-BATTERY.cpp
+++ b/Software/src/battery/MG-5-BATTERY.cpp
@@ -108,16 +108,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   //Send 10ms message
   if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis10 >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis10 = currentMillis;
 
     transmit_can_frame(&MG_5_100, can_config.battery);
diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
index bea67ddd..8e45919f 100644
--- a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
+++ b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
@@ -1071,13 +1071,10 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
 
   if (datalayer.system.status.BMS_reset_in_progress || datalayer.system.status.BMS_startup_in_progress) {
     // Transmitting towards battery is halted while BMS is being reset
-    // Reset sending counters to avoid overrun messages when reset is over
     previousMillis10 = currentMillis;
     previousMillis100 = currentMillis;
     previousMillis10s = currentMillis;
@@ -1088,12 +1085,6 @@ void transmit_can_battery() {
 
     //Send 10ms message
     if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
-      // Check if sending of CAN messages has been delayed too much.
-      if ((currentMillis - previousMillis10 >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-        set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10));
-      } else {
-        clear_event(EVENT_CAN_OVERRUN);
-      }
       previousMillis10 = currentMillis;
 
       switch (mprun10) {
diff --git a/Software/src/battery/ORION-BMS.cpp b/Software/src/battery/ORION-BMS.cpp
index f0ba33a8..54ad5f25 100644
--- a/Software/src/battery/ORION-BMS.cpp
+++ b/Software/src/battery/ORION-BMS.cpp
@@ -132,8 +132,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // No transmission needed for this integration
 }
 
diff --git a/Software/src/battery/PYLON-BATTERY.cpp b/Software/src/battery/PYLON-BATTERY.cpp
index e41eb48c..847c935d 100644
--- a/Software/src/battery/PYLON-BATTERY.cpp
+++ b/Software/src/battery/PYLON-BATTERY.cpp
@@ -158,11 +158,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 1s CAN Message
   if (currentMillis - previousMillis1000 >= INTERVAL_1_S) {
-
     previousMillis1000 = currentMillis;
 
     transmit_can_frame(&PYLON_3010, can_config.battery);  // Heartbeat
diff --git a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp
index 3ff1325e..b87bd709 100644
--- a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp
+++ b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp
@@ -301,11 +301,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 50ms CAN Message
   if (currentMillis - previousMillis50ms >= INTERVAL_50_MS) {
-
     previousMillis50ms = currentMillis;
 
     transmit_can_frame(&RANGE_ROVER_18B, can_config.battery);
diff --git a/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp b/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
index 4fa4a6e4..e8a8ccaa 100644
--- a/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
@@ -210,8 +210,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 100ms CAN Message (for 2.4s, then pause 10s)
   if ((currentMillis - previousMillis100) >= (INTERVAL_100_MS + GVL_pause)) {
     previousMillis100 = currentMillis;
diff --git a/Software/src/battery/RENAULT-TWIZY.cpp b/Software/src/battery/RENAULT-TWIZY.cpp
index b6c746f2..6965d514 100644
--- a/Software/src/battery/RENAULT-TWIZY.cpp
+++ b/Software/src/battery/RENAULT-TWIZY.cpp
@@ -127,7 +127,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
+void transmit_can_battery(unsigned long currentMillis) {
   // we do not need to send anything to the battery for now
 }
 
diff --git a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
index 6d9e9b6f..ae1100a5 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
@@ -490,14 +490,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis100 >= INTERVAL_100_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis100));
-    }
     previousMillis100 = currentMillis;
     transmit_can_frame(&ZOE_423, can_config.battery);
 
diff --git a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
index a34203ae..ebc3453b 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
@@ -371,8 +371,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
     previousMillis100 = currentMillis;
@@ -391,10 +390,6 @@ void transmit_can_battery() {
 
   // Send 200ms CAN Message
   if (currentMillis - previousMillis200 >= INTERVAL_200_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis200 >= INTERVAL_200_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis200));
-    }
     previousMillis200 = currentMillis;
 
     // Update current poll from the array
diff --git a/Software/src/battery/RJXZS-BMS.cpp b/Software/src/battery/RJXZS-BMS.cpp
index f08e9659..dd0c59eb 100644
--- a/Software/src/battery/RJXZS-BMS.cpp
+++ b/Software/src/battery/RJXZS-BMS.cpp
@@ -571,11 +571,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 10s CAN Message
   if (currentMillis - previousMillis10s >= INTERVAL_10_S) {
-
     previousMillis10s = currentMillis;
 
     if (datalayer.battery.status.bms_status == FAULT) {
diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
index db1e4377..a48bf1d8 100644
--- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
+++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
@@ -333,17 +333,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
-
+void transmit_can_battery(unsigned long currentMillis) {
   //Send 10ms message
   if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis10 >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis10 = currentMillis;
 
     SANTAFE_200.data.u8[6] = (counter_200 << 1);
diff --git a/Software/src/battery/SIMPBMS-BATTERY.cpp b/Software/src/battery/SIMPBMS-BATTERY.cpp
index 5feedb3d..c13e32a9 100644
--- a/Software/src/battery/SIMPBMS-BATTERY.cpp
+++ b/Software/src/battery/SIMPBMS-BATTERY.cpp
@@ -115,7 +115,9 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_battery() {}
+void transmit_can_battery(unsigned long currentMillis) {
+  // No periodic transmitting for this battery type
+}
 
 void setup_battery(void) {  // Performs one time setup at startup
   strncpy(datalayer.system.info.battery_protocol, "SIMPBMS battery", 63);
diff --git a/Software/src/battery/SONO-BATTERY.cpp b/Software/src/battery/SONO-BATTERY.cpp
index d9de102f..24592e0b 100644
--- a/Software/src/battery/SONO-BATTERY.cpp
+++ b/Software/src/battery/SONO-BATTERY.cpp
@@ -137,9 +137,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
       break;
   }
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
-
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
     previousMillis100 = currentMillis;
diff --git a/Software/src/battery/TESLA-BATTERY.cpp b/Software/src/battery/TESLA-BATTERY.cpp
index d0cc62e1..e88f5fea 100644
--- a/Software/src/battery/TESLA-BATTERY.cpp
+++ b/Software/src/battery/TESLA-BATTERY.cpp
@@ -1864,14 +1864,12 @@ int index_1CF = 0;
 int index_118 = 0;
 #endif  //defined(TESLA_MODEL_SX_BATTERY) || defined(EXP_TESLA_BMS_DIGITAL_HVIL)
 
-void transmit_can_battery() {
+void transmit_can_battery(unsigned long currentMillis) {
   /*From bielec: My fist 221 message, to close the contactors is 0x41, 0x11, 0x01, 0x00, 0x00, 0x00, 0x20, 0x96 and then, 
 to cause "hv_up_for_drive" I send an additional 221 message 0x61, 0x15, 0x01, 0x00, 0x00, 0x00, 0x20, 0xBA  so 
 two 221 messages are being continuously transmitted.   When I want to shut down, I stop the second message and only send 
 the first, for a few cycles, then stop all  messages which causes the contactor to open. */
 
-  unsigned long currentMillis = millis();
-
   if (!cellvoltagesRead) {
     return;  //All cellvoltages not read yet, do not proceed with contactor closing
   }
@@ -1906,12 +1904,6 @@ the first, for a few cycles, then stop all  messages which causes the contactor
 
   //Send 50ms message
   if (currentMillis - previousMillis50 >= INTERVAL_50_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis50 >= INTERVAL_50_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis50));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis50 = currentMillis;
 
     if ((datalayer.system.status.inverter_allows_contactor_closing == true) &&
diff --git a/Software/src/battery/TEST-FAKE-BATTERY.cpp b/Software/src/battery/TEST-FAKE-BATTERY.cpp
index fb1cf729..6c701200 100644
--- a/Software/src/battery/TEST-FAKE-BATTERY.cpp
+++ b/Software/src/battery/TEST-FAKE-BATTERY.cpp
@@ -130,8 +130,7 @@ void handle_incoming_can_frame_battery2(CAN_frame rx_frame) {
 void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
 }
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
     previousMillis100 = currentMillis;
diff --git a/Software/src/battery/VOLVO-SPA-BATTERY.cpp b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
index aaf33b63..97b3891b 100644
--- a/Software/src/battery/VOLVO-SPA-BATTERY.cpp
+++ b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
@@ -435,16 +435,9 @@ void readCellVoltages() {
   transmit_can_frame(&VOLVO_CELL_U_Req, can_config.battery);  //Send cell voltage read request for first module
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis100 >= INTERVAL_100_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis100));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis100 = currentMillis;
 
     transmit_can_frame(&VOLVO_536, can_config.battery);  //Send 0x536 Network managing frame to keep BMS alive
diff --git a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp
index c0d1ead7..556fdf84 100644
--- a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp
+++ b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp
@@ -610,16 +610,9 @@ void readCellVoltages() {
   transmit_can_frame(&VOLVO_CELL_U_Req, can_config.battery);  //Send cell voltage read request for first module
 }
 
-void transmit_can_battery() {
-  unsigned long currentMillis = millis();
+void transmit_can_battery(unsigned long currentMillis) {
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
-    // Check if sending of CAN messages has been delayed too much.
-    if ((currentMillis - previousMillis100 >= INTERVAL_100_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
-      set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis100));
-    } else {
-      clear_event(EVENT_CAN_OVERRUN);
-    }
     previousMillis100 = currentMillis;
 
     transmit_can_frame(&VOLVO_536, can_config.battery);  //Send 0x536 Network managing frame to keep BMS alive
diff --git a/Software/src/charger/CHARGERS.h b/Software/src/charger/CHARGERS.h
index a41b5bc9..e09cd633 100644
--- a/Software/src/charger/CHARGERS.h
+++ b/Software/src/charger/CHARGERS.h
@@ -11,6 +11,6 @@
 #endif
 
 void map_can_frame_to_variable_charger(CAN_frame rx_frame);
-void transmit_can_charger();
+void transmit_can_charger(unsigned long currentMillis);
 
 #endif
diff --git a/Software/src/charger/CHEVY-VOLT-CHARGER.cpp b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
index 80377676..fe85d446 100644
--- a/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
+++ b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
@@ -98,8 +98,7 @@ void map_can_frame_to_variable_charger(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_charger() {
-  unsigned long currentMillis = millis();
+void transmit_can_charger(unsigned long currentMillis) {
   uint16_t Vol_temp = 0;
 
   uint16_t setpoint_HV_VDC = floor(datalayer.charger.charger_setpoint_HV_VDC);
diff --git a/Software/src/charger/NISSAN-LEAF-CHARGER.cpp b/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
index 194fad95..52e4b5cd 100644
--- a/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
+++ b/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
@@ -156,8 +156,7 @@ void map_can_frame_to_variable_charger(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_charger() {
-  unsigned long currentMillis = millis();
+void transmit_can_charger(unsigned long currentMillis) {
 
   /* Send keepalive with mode every 10ms */
   if (currentMillis - previousMillis10ms >= INTERVAL_10_MS) {
diff --git a/Software/src/communication/can/comm_can.cpp b/Software/src/communication/can/comm_can.cpp
index 61d00970..71b11db6 100644
--- a/Software/src/communication/can/comm_can.cpp
+++ b/Software/src/communication/can/comm_can.cpp
@@ -3,12 +3,12 @@
 #include "src/devboard/sdcard/sdcard.h"
 
 // Parameters
-
-CAN_device_t CAN_cfg;          // CAN Config
-const int rx_queue_size = 10;  // Receive Queue size
+CAN_device_t CAN_cfg;              // CAN Config
+const uint8_t rx_queue_size = 10;  // Receive Queue size
 volatile bool send_ok_native = 0;
 volatile bool send_ok_2515 = 0;
 volatile bool send_ok_2518 = 0;
+static unsigned long previousMillis10 = 0;
 
 #ifdef CAN_ADDON
 static const uint32_t QUARTZ_FREQUENCY = CRYSTAL_FREQUENCY_MHZ * 1000000UL;  //MHZ configured in USER_SETTINGS.h
@@ -105,25 +105,26 @@ void init_CAN() {
 }
 
 // Transmit functions
-void transmit_can() {
+void transmit_can(unsigned long currentMillis) {
+
   if (!allowed_to_send_CAN) {
     return;  //Global block of CAN messages
   }
 
 #ifndef RS485_BATTERY_SELECTED
-  transmit_can_battery();
+  transmit_can_battery(currentMillis);
 #endif
 
 #ifdef CAN_INVERTER_SELECTED
-  transmit_can_inverter();
+  transmit_can_inverter(currentMillis);
 #endif  // CAN_INVERTER_SELECTED
 
 #ifdef CHARGER_SELECTED
-  transmit_can_charger();
+  transmit_can_charger(currentMillis);
 #endif  // CHARGER_SELECTED
 
 #ifdef CAN_SHUNT_SELECTED
-  transmit_can_shunt();
+  transmit_can_shunt(currentMillis);
 #endif  // CAN_SHUNT_SELECTED
 }
 
diff --git a/Software/src/communication/can/comm_can.h b/Software/src/communication/can/comm_can.h
index ea047878..e961c66a 100644
--- a/Software/src/communication/can/comm_can.h
+++ b/Software/src/communication/can/comm_can.h
@@ -40,10 +40,11 @@ void transmit_can_frame();
  * @brief Send CAN messages to all components 
  *
  * @param[in] void
+ * @param[in] unsigned long currentMillis
  *
  * @return void
  */
-void transmit_can();
+void transmit_can(unsigned long currentMillis);
 
 /**
  * @brief Receive CAN messages from all interfaces 
diff --git a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
index 815abe22..0e5d4d58 100644
--- a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
+++ b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
@@ -94,7 +94,7 @@ void init_contactors() {
 #ifdef BMS_2_POWER  //Hardware supports 2x BMS
   pinMode(BMS_2_POWER, OUTPUT);
   digitalWrite(BMS_2_POWER, HIGH);
-#endif BMS_2_POWER
+#endif                                                        //BMS_2_POWER
 #endif                                                        // HW with dedicated BMS pins
 #if defined(PERIODIC_BMS_RESET) || defined(REMOTE_BMS_RESET)  // User has enabled BMS reset, turn on output on start
   pinMode(BMS_POWER, OUTPUT);
diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp
index 7849e997..4ce88992 100644
--- a/Software/src/devboard/utils/events.cpp
+++ b/Software/src/devboard/utils/events.cpp
@@ -39,7 +39,7 @@ void init_events(void) {
   events.entries[EVENT_CANMCP2515_INIT_FAILURE].level = EVENT_LEVEL_WARNING;
   events.entries[EVENT_CANFD_BUFFER_FULL].level = EVENT_LEVEL_WARNING;
   events.entries[EVENT_CAN_BUFFER_FULL].level = EVENT_LEVEL_WARNING;
-  events.entries[EVENT_CAN_OVERRUN].level = EVENT_LEVEL_INFO;
+  events.entries[EVENT_TASK_OVERRUN].level = EVENT_LEVEL_INFO;
   events.entries[EVENT_CAN_CORRUPTED_WARNING].level = EVENT_LEVEL_WARNING;
   events.entries[EVENT_CAN_NATIVE_TX_FAILURE].level = EVENT_LEVEL_WARNING;
   events.entries[EVENT_CAN_BATTERY_MISSING].level = EVENT_LEVEL_ERROR;
@@ -176,8 +176,8 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
       return "MCP2518FD message failed to send. Buffer full or no one on the bus to ACK the message!";
     case EVENT_CAN_BUFFER_FULL:
       return "MCP2515 message failed to send. Buffer full or no one on the bus to ACK the message!";
-    case EVENT_CAN_OVERRUN:
-      return "CAN message failed to send within defined time. Contact developers, CPU load might be too high.";
+    case EVENT_TASK_OVERRUN:
+      return "Task took too long to complete. CPU load might be too high. Info message, no action required.";
     case EVENT_CAN_CORRUPTED_WARNING:
       return "High amount of corrupted CAN messages detected. Check CAN wire shielding!";
     case EVENT_CAN_NATIVE_TX_FAILURE:
diff --git a/Software/src/devboard/utils/events.h b/Software/src/devboard/utils/events.h
index c651d80b..e3101926 100644
--- a/Software/src/devboard/utils/events.h
+++ b/Software/src/devboard/utils/events.h
@@ -12,7 +12,6 @@
   XX(EVENT_CANMCP2515_INIT_FAILURE)            \
   XX(EVENT_CANFD_BUFFER_FULL)                  \
   XX(EVENT_CAN_BUFFER_FULL)                    \
-  XX(EVENT_CAN_OVERRUN)                        \
   XX(EVENT_CAN_CORRUPTED_WARNING)              \
   XX(EVENT_CAN_BATTERY_MISSING)                \
   XX(EVENT_CAN_BATTERY2_MISSING)               \
@@ -73,6 +72,7 @@
   XX(EVENT_SERIAL_RX_FAILURE)                  \
   XX(EVENT_SERIAL_TX_FAILURE)                  \
   XX(EVENT_SERIAL_TRANSMITTER_FAILURE)         \
+  XX(EVENT_TASK_OVERRUN)                       \
   XX(EVENT_RESET_UNKNOWN)                      \
   XX(EVENT_RESET_POWERON)                      \
   XX(EVENT_RESET_EXT)                          \
diff --git a/Software/src/devboard/utils/types.h b/Software/src/devboard/utils/types.h
index 0d1195a2..28941f8f 100644
--- a/Software/src/devboard/utils/types.h
+++ b/Software/src/devboard/utils/types.h
@@ -37,12 +37,6 @@ enum PrechargeState {
 #define INTERVAL_60_S 60000
 
 #define INTERVAL_10_MS_DELAYED 15
-#define INTERVAL_20_MS_DELAYED 30
-#define INTERVAL_30_MS_DELAYED 40
-#define INTERVAL_50_MS_DELAYED 65
-#define INTERVAL_100_MS_DELAYED 120
-#define INTERVAL_200_MS_DELAYED 240
-#define INTERVAL_500_MS_DELAYED 550
 
 #define CAN_STILL_ALIVE 60
 // Set by battery each time we get a CAN message. Decrements every second. When reaching 0, sets event
diff --git a/Software/src/inverter/AFORE-CAN.cpp b/Software/src/inverter/AFORE-CAN.cpp
index d9037d2c..4f367321 100644
--- a/Software/src/inverter/AFORE-CAN.cpp
+++ b/Software/src/inverter/AFORE-CAN.cpp
@@ -217,7 +217,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
+void transmit_can_inverter(unsigned long currentMillis) {
   if (time_to_send_info) {  // Set every 1s if we get message from inverter
     transmit_can_frame(&AFORE_350, can_config.inverter);
     transmit_can_frame(&AFORE_351, can_config.inverter);
diff --git a/Software/src/inverter/BYD-CAN.cpp b/Software/src/inverter/BYD-CAN.cpp
index 66cc7678..2d874b8b 100644
--- a/Software/src/inverter/BYD-CAN.cpp
+++ b/Software/src/inverter/BYD-CAN.cpp
@@ -204,8 +204,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
 
   if (!inverterStartedUp) {
     //Avoid sending messages towards inverter, unless it has woken up and sent something to us first
diff --git a/Software/src/inverter/FERROAMP-CAN.cpp b/Software/src/inverter/FERROAMP-CAN.cpp
index eb41f1ac..d0928f8e 100644
--- a/Software/src/inverter/FERROAMP-CAN.cpp
+++ b/Software/src/inverter/FERROAMP-CAN.cpp
@@ -453,7 +453,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
+void transmit_can_inverter(unsigned long currentMillis) {
   // No periodic sending, we only react on received can messages
 }
 
diff --git a/Software/src/inverter/FOXESS-CAN.cpp b/Software/src/inverter/FOXESS-CAN.cpp
index 0534335b..5a998889 100644
--- a/Software/src/inverter/FOXESS-CAN.cpp
+++ b/Software/src/inverter/FOXESS-CAN.cpp
@@ -595,10 +595,9 @@ void update_values_can_inverter() {  //This function maps all the CAN values fet
   // So do we really need to map the same two values over and over to 32 places?
 }
 
-void transmit_can_inverter() {  // This function loops as fast as possible
+void transmit_can_inverter(unsigned long currentMillis) {
 
   if (send_bms_info) {
-    currentMillis = millis();  // Get the current time
 
     // Check if enough time has passed since the last batch
     if (currentMillis - previousMillisBMSinfo >= delay_between_batches_ms) {
@@ -634,7 +633,6 @@ void transmit_can_inverter() {  // This function loops as fast as possible
   }
 
   if (send_individual_pack_status) {
-    currentMillis = millis();  // Get the current time
 
     // Check if enough time has passed since the last batch
     if (currentMillis - previousMillisIndividualPacks >= delay_between_batches_ms) {
@@ -670,7 +668,6 @@ void transmit_can_inverter() {  // This function loops as fast as possible
   }
 
   if (send_serial_numbers) {
-    currentMillis = millis();  // Get the current time
 
     // Check if enough time has passed since the last batch
     if (currentMillis - previousMillisSerialNumber >= delay_between_batches_ms) {
@@ -781,7 +778,6 @@ void transmit_can_inverter() {  // This function loops as fast as possible
   }
 
   if (send_cellvoltages) {
-    currentMillis = millis();  // Get the current time
 
     // Check if enough time has passed since the last batch
     if (currentMillis - previousMillisCellvoltage >= delay_between_batches_ms) {
diff --git a/Software/src/inverter/GROWATT-HV-CAN.cpp b/Software/src/inverter/GROWATT-HV-CAN.cpp
index be4a9cb5..f561c2c7 100644
--- a/Software/src/inverter/GROWATT-HV-CAN.cpp
+++ b/Software/src/inverter/GROWATT-HV-CAN.cpp
@@ -523,14 +523,12 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
+void transmit_can_inverter(unsigned long currentMillis) {
 
   if (!inverter_alive) {
     return;  //Dont send messages towards inverter until it has started
   }
 
-  unsigned long currentMillis = millis();
-
   //Check if 1 second has passed, then we start sending!
   if (currentMillis - previousMillis1s >= INTERVAL_1_S) {
     previousMillis1s = currentMillis;
diff --git a/Software/src/inverter/GROWATT-LV-CAN.cpp b/Software/src/inverter/GROWATT-LV-CAN.cpp
index 3245f246..671fce6c 100644
--- a/Software/src/inverter/GROWATT-LV-CAN.cpp
+++ b/Software/src/inverter/GROWATT-LV-CAN.cpp
@@ -267,7 +267,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
+void transmit_can_inverter(unsigned long currentMillis) {
   // No periodic sending for this battery type. Data is sent when inverter requests it
 }
 
diff --git a/Software/src/inverter/INVERTERS.h b/Software/src/inverter/INVERTERS.h
index 903a9b8e..5cd3bc50 100644
--- a/Software/src/inverter/INVERTERS.h
+++ b/Software/src/inverter/INVERTERS.h
@@ -82,7 +82,7 @@
 #ifdef CAN_INVERTER_SELECTED
 void update_values_can_inverter();
 void map_can_frame_to_variable_inverter(CAN_frame rx_frame);
-void transmit_can_inverter();
+void transmit_can_inverter(unsigned long currentMillis);
 #endif
 
 #ifdef MODBUS_INVERTER_SELECTED
diff --git a/Software/src/inverter/PYLON-CAN.cpp b/Software/src/inverter/PYLON-CAN.cpp
index 463ee8a9..a0ed5b65 100644
--- a/Software/src/inverter/PYLON-CAN.cpp
+++ b/Software/src/inverter/PYLON-CAN.cpp
@@ -438,7 +438,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
+void transmit_can_inverter(unsigned long currentMillis) {
   // No periodic sending, we only react on received can messages
 }
 
diff --git a/Software/src/inverter/PYLON-LV-CAN.cpp b/Software/src/inverter/PYLON-LV-CAN.cpp
index 725c6451..94fee589 100644
--- a/Software/src/inverter/PYLON-LV-CAN.cpp
+++ b/Software/src/inverter/PYLON-LV-CAN.cpp
@@ -158,8 +158,7 @@ void dump_frame(CAN_frame* frame) {
 }
 #endif
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
 
   if (currentMillis - previousMillis1000ms >= 1000) {
     previousMillis1000ms = currentMillis;
diff --git a/Software/src/inverter/SCHNEIDER-CAN.cpp b/Software/src/inverter/SCHNEIDER-CAN.cpp
index 38cf1ed9..d9fc5e94 100644
--- a/Software/src/inverter/SCHNEIDER-CAN.cpp
+++ b/Software/src/inverter/SCHNEIDER-CAN.cpp
@@ -265,8 +265,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
 
   // Send 500ms CAN Message
   if (currentMillis - previousMillis500ms >= INTERVAL_500_MS) {
diff --git a/Software/src/inverter/SMA-BYD-H-CAN.cpp b/Software/src/inverter/SMA-BYD-H-CAN.cpp
index 5bd68f8d..5653b79a 100644
--- a/Software/src/inverter/SMA-BYD-H-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-H-CAN.cpp
@@ -236,8 +236,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
 
   // Send CAN Message every 100ms if inverter allows contactor closing
   if (datalayer.system.status.inverter_allows_contactor_closing) {
diff --git a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
index a5df8bee..ec84ce9e 100644
--- a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
@@ -240,8 +240,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
 
   // Send CAN Message every 100ms if inverter allows contactor closing
   if (datalayer.system.status.inverter_allows_contactor_closing) {
diff --git a/Software/src/inverter/SMA-LV-CAN.cpp b/Software/src/inverter/SMA-LV-CAN.cpp
index eff1598c..1adf53c0 100644
--- a/Software/src/inverter/SMA-LV-CAN.cpp
+++ b/Software/src/inverter/SMA-LV-CAN.cpp
@@ -136,8 +136,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
 
   if (currentMillis - previousMillis100ms >= INTERVAL_100_MS) {
     previousMillis100ms = currentMillis;
diff --git a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
index 9828dd7c..27def188 100644
--- a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
+++ b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
@@ -190,8 +190,7 @@ void pushFrame(CAN_frame* frame, void (*callback)() = NULL) {
   listLength++;
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
 
   // Send CAN Message only if we're enabled by inverter
   if (!datalayer.system.status.inverter_allows_contactor_closing) {
diff --git a/Software/src/inverter/SOFAR-CAN.cpp b/Software/src/inverter/SOFAR-CAN.cpp
index bd6916dd..1cc434a7 100644
--- a/Software/src/inverter/SOFAR-CAN.cpp
+++ b/Software/src/inverter/SOFAR-CAN.cpp
@@ -247,8 +247,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
+void transmit_can_inverter(unsigned long currentMillis) {
   // Send 100ms CAN Message
   if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
     previousMillis100 = currentMillis;
diff --git a/Software/src/inverter/SOLAX-CAN.cpp b/Software/src/inverter/SOLAX-CAN.cpp
index dec2b961..5f69b612 100644
--- a/Software/src/inverter/SOLAX-CAN.cpp
+++ b/Software/src/inverter/SOLAX-CAN.cpp
@@ -206,7 +206,7 @@ void update_values_can_inverter() {  //This function maps all the values fetched
   SOLAX_187E.data.u8[5] = (uint8_t)(datalayer.battery.status.reported_soc / 100);
 }
 
-void transmit_can_inverter() {
+void transmit_can_inverter(unsigned long currentMillis) {
   // No periodic sending used on this protocol, we react only on incoming CAN messages!
 }
 
diff --git a/Software/src/inverter/SUNGROW-CAN.cpp b/Software/src/inverter/SUNGROW-CAN.cpp
index 6cac5cc0..a52bfa10 100644
--- a/Software/src/inverter/SUNGROW-CAN.cpp
+++ b/Software/src/inverter/SUNGROW-CAN.cpp
@@ -557,9 +557,7 @@ void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {
   }
 }
 
-void transmit_can_inverter() {
-  unsigned long currentMillis = millis();
-
+void transmit_can_inverter(unsigned long currentMillis) {
   // Send 1s CAN Message
   if (currentMillis - previousMillis500ms >= INTERVAL_500_MS) {
     previousMillis500ms = currentMillis;

From 94c813f3adebbaf6dd302b32fe975a907fc12b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Sun, 27 Apr 2025 13:14:04 +0300
Subject: [PATCH 03/15] Add enumerations for statemachine

---
 Software/src/battery/BYD-ATTO-3-BATTERY.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
index dc70e352..d0ecace0 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
@@ -16,6 +16,9 @@
 #define STANDARD_RANGE 1
 #define EXTENDED_RANGE 2
 #define NOT_RUNNING 0xFF
+#define STARTED 0
+#define RUNNING_STEP_1 1
+#define RUNNING_STEP_2 2
 static uint8_t battery_type = NOT_DETERMINED_YET;
 static uint8_t stateMachineClearCrash = NOT_RUNNING;
 static unsigned long previousMillis50 = 0;   // will store last time a 50ms CAN Message was send
@@ -267,7 +270,7 @@ void update_values_battery() {  //This function maps all the values fetched via
 
   // Update requests from webserver datalayer
   if (datalayer_extended.bydAtto3.UserRequestCrashReset) {
-    stateMachineClearCrash = 0;  //Start the statemachine
+    stateMachineClearCrash = STARTED;
     datalayer_extended.bydAtto3.UserRequestCrashReset = false;
   }
 }
@@ -477,17 +480,17 @@ void transmit_can_battery() {
     transmit_can_frame(&ATTO_3_441, can_config.battery_double);
 #endif  //DOUBLE_BATTERY
     switch (stateMachineClearCrash) {
-      case 0:
+      case STARTED:
         ATTO_3_7E7_CLEAR_CRASH.data = {0x02, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00};
         transmit_can_frame(&ATTO_3_7E7_CLEAR_CRASH, can_config.battery);
-        stateMachineClearCrash = 1;
+        stateMachineClearCrash = RUNNING_STEP_1;
         break;
-      case 1:
+      case RUNNING_STEP_1:
         ATTO_3_7E7_CLEAR_CRASH.data = {0x04, 0x14, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00};
         transmit_can_frame(&ATTO_3_7E7_CLEAR_CRASH, can_config.battery);
-        stateMachineClearCrash = 2;
+        stateMachineClearCrash = RUNNING_STEP_2;
         break;
-      case 2:
+      case RUNNING_STEP_2:
         ATTO_3_7E7_CLEAR_CRASH.data = {0x03, 0x19, 0x02, 0x09, 0x00, 0x00, 0x00, 0x00};
         transmit_can_frame(&ATTO_3_7E7_CLEAR_CRASH, can_config.battery);
         stateMachineClearCrash = NOT_RUNNING;

From 363804710d705542042a96daa8ffc1681a52e8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Mon, 28 Apr 2025 18:12:29 +0300
Subject: [PATCH 04/15] Add Event for missing enable line for SMA

---
 .../contactorcontrol/comm_contactorcontrol.cpp       | 12 ++++++++++++
 Software/src/devboard/utils/events.cpp               |  3 +++
 Software/src/devboard/utils/events.h                 |  1 +
 3 files changed, 16 insertions(+)

diff --git a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
index 815abe22..31d642fa 100644
--- a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
+++ b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
@@ -39,6 +39,7 @@ unsigned long negativeStartTime = 0;
 unsigned long prechargeCompletedTime = 0;
 unsigned long timeSpentInFaultedMode = 0;
 #endif
+static uint timeSpentWithoutEnableTurnedOn = 0;
 unsigned long currentTime = 0;
 unsigned long lastPowerRemovalTime = 0;
 unsigned long bmsPowerOnTime = 0;
@@ -119,6 +120,17 @@ static void dbg_contactors(const char* state) {
 void handle_contactors() {
 #if defined(SMA_BYD_H_CAN) || defined(SMA_BYD_HVS_CAN) || defined(SMA_TRIPOWER_CAN)
   datalayer.system.status.inverter_allows_contactor_closing = digitalRead(INVERTER_CONTACTOR_ENABLE_PIN);
+
+  if (!datalayer.system.status.inverter_allows_contactor_closing) {
+    timeSpentWithoutEnableTurnedOn++;
+
+    if (timeSpentWithoutEnableTurnedOn >
+        180000) {  //Increments once every 10ms. 100/second*60seconds*30minutes = 180000
+      set_event(EVENT_NO_ENABLE_DETECTED, 0);
+    }
+  } else {
+    timeSpentWithoutEnableTurnedOn = 0;
+  }
 #endif
 
   handle_BMSpower();  // Some batteries need to be periodically power cycled
diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp
index 7849e997..336e1c0f 100644
--- a/Software/src/devboard/utils/events.cpp
+++ b/Software/src/devboard/utils/events.cpp
@@ -81,6 +81,7 @@ void init_events(void) {
   events.entries[EVENT_INVERTER_OPEN_CONTACTOR].level = EVENT_LEVEL_INFO;
   events.entries[EVENT_INTERFACE_MISSING].level = EVENT_LEVEL_INFO;
   events.entries[EVENT_MODBUS_INVERTER_MISSING].level = EVENT_LEVEL_INFO;
+  events.entries[EVENT_NO_ENABLE_DETECTED].level = EVENT_LEVEL_INFO;
   events.entries[EVENT_ERROR_OPEN_CONTACTOR].level = EVENT_LEVEL_INFO;
   events.entries[EVENT_CELL_CRITICAL_UNDER_VOLTAGE].level = EVENT_LEVEL_ERROR;
   events.entries[EVENT_CELL_CRITICAL_OVER_VOLTAGE].level = EVENT_LEVEL_ERROR;
@@ -269,6 +270,8 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
              "Check other error code for reason!";
     case EVENT_MODBUS_INVERTER_MISSING:
       return "Modbus inverter has not sent any data. Inspect communication wiring!";
+    case EVENT_NO_ENABLE_DETECTED:
+      return "Inverter has not toggled Enable signal for a long time. Check Wiring!";
     case EVENT_CELL_CRITICAL_UNDER_VOLTAGE:
       return "CELL VOLTAGE CRITICALLY LOW! Not possible to continue. Inspect battery!";
     case EVENT_CELL_UNDER_VOLTAGE:
diff --git a/Software/src/devboard/utils/events.h b/Software/src/devboard/utils/events.h
index c651d80b..581cea59 100644
--- a/Software/src/devboard/utils/events.h
+++ b/Software/src/devboard/utils/events.h
@@ -55,6 +55,7 @@
   XX(EVENT_INVERTER_OPEN_CONTACTOR)            \
   XX(EVENT_INTERFACE_MISSING)                  \
   XX(EVENT_MODBUS_INVERTER_MISSING)            \
+  XX(EVENT_NO_ENABLE_DETECTED)                 \
   XX(EVENT_ERROR_OPEN_CONTACTOR)               \
   XX(EVENT_CELL_CRITICAL_UNDER_VOLTAGE)        \
   XX(EVENT_CELL_CRITICAL_OVER_VOLTAGE)         \

From 1bc007d0f355a160084d9219077f5287cf248e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Mon, 28 Apr 2025 18:15:42 +0300
Subject: [PATCH 05/15] Change datatype

---
 .../communication/contactorcontrol/comm_contactorcontrol.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
index 31d642fa..de726ef8 100644
--- a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
+++ b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
@@ -39,7 +39,7 @@ unsigned long negativeStartTime = 0;
 unsigned long prechargeCompletedTime = 0;
 unsigned long timeSpentInFaultedMode = 0;
 #endif
-static uint timeSpentWithoutEnableTurnedOn = 0;
+static uint32_t timeSpentWithoutEnableTurnedOn = 0;
 unsigned long currentTime = 0;
 unsigned long lastPowerRemovalTime = 0;
 unsigned long bmsPowerOnTime = 0;

From d6903c166f80b782eec20479b3cab16ac00c5d52 Mon Sep 17 00:00:00 2001
From: Jaakko Haakana <jaakko@haakana.net>
Date: Thu, 1 May 2025 08:25:25 +0300
Subject: [PATCH 06/15] Use base class for Jaguar Ipace battery

---
 Software/src/battery/BATTERIES.cpp              | 15 +++++++++------
 Software/src/battery/BATTERIES.h                | 13 -------------
 Software/src/battery/CanBattery.h               | 17 +++++++++++++++++
 Software/src/battery/JAGUAR-IPACE-BATTERY.cpp   |  9 +++++----
 Software/src/battery/JAGUAR-IPACE-BATTERY.h     | 14 +++++++++++---
 Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h |  7 +++----
 Software/src/communication/can/comm_can.h       |  1 +
 7 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 Software/src/battery/CanBattery.h

diff --git a/Software/src/battery/BATTERIES.cpp b/Software/src/battery/BATTERIES.cpp
index 2d88dd6a..36a8e5af 100644
--- a/Software/src/battery/BATTERIES.cpp
+++ b/Software/src/battery/BATTERIES.cpp
@@ -1,16 +1,19 @@
-#include "../include.h"
+#include "BATTERIES.h"
 
 // These functions adapt the old C-style global functions battery-API to the
 // object-oriented battery API.
 
-#ifdef OO_BATTERY_SELECTED
+// The instantiated class is defined by the pre-compiler define
+// to support battery class selection at compile-time
+#ifdef SELECTED_BATTERY_CLASS
 
-static CanBattery* battery;
+static CanBattery* battery = nullptr;
 
 void setup_battery() {
-  // Currently only one battery is implemented as a class.
-  // TODO: Extend based on build-time or run-time selected battery.
-  battery = new RenaultZoeGen1Battery();
+  // Instantiate the battery only once just in case this function gets called multiple times.
+  if (battery == nullptr) {
+    battery = new SELECTED_BATTERY_CLASS();
+  }
   battery->setup();
 }
 
diff --git a/Software/src/battery/BATTERIES.h b/Software/src/battery/BATTERIES.h
index 5c92696d..1bf91d0f 100644
--- a/Software/src/battery/BATTERIES.h
+++ b/Software/src/battery/BATTERIES.h
@@ -2,19 +2,6 @@
 #define BATTERIES_H
 #include "../../USER_SETTINGS.h"
 
-#include "src/devboard/utils/types.h"
-
-// Abstract base class for next-generation battery implementations.
-// Defines the interface to call battery specific functionality.
-// No support for double battery yet.
-class CanBattery {
- public:
-  virtual void setup(void) = 0;
-  virtual void handle_incoming_can_frame(CAN_frame rx_frame) = 0;
-  virtual void update_values() = 0;
-  virtual void transmit_can() = 0;
-};
-
 #ifdef BMW_SBOX
 #include "BMW-SBOX.h"
 void handle_incoming_can_frame_shunt(CAN_frame rx_frame);
diff --git a/Software/src/battery/CanBattery.h b/Software/src/battery/CanBattery.h
new file mode 100644
index 00000000..4d2795cc
--- /dev/null
+++ b/Software/src/battery/CanBattery.h
@@ -0,0 +1,17 @@
+#ifndef CAN_BATTERY_H
+#define CAN_BATTERY_H
+
+#include "src/devboard/utils/types.h"
+
+// Abstract base class for next-generation battery implementations.
+// Defines the interface to call battery specific functionality.
+// No support for double battery yet.
+class CanBattery {
+ public:
+  virtual void setup(void) = 0;
+  virtual void handle_incoming_can_frame(CAN_frame rx_frame) = 0;
+  virtual void update_values() = 0;
+  virtual void transmit_can() = 0;
+};
+
+#endif
diff --git a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
index 618b32c8..049cab0c 100644
--- a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
+++ b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
@@ -1,5 +1,6 @@
 #include "../include.h"
 #ifdef JAGUAR_IPACE_BATTERY
+#include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
 #include "JAGUAR-IPACE-BATTERY.h"
@@ -62,7 +63,7 @@ void print_units(char* header, int value, char* units) {
   logging.print(units);
 }
 
-void update_values_battery() {
+void JaguarIpaceBattery::update_values() {
 
   datalayer.battery.status.real_soc = HVBattAvgSOC * 100;  //Add two decimals
 
@@ -119,7 +120,7 @@ void update_values_battery() {
 #endif
 }
 
-void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
+void JaguarIpaceBattery::handle_incoming_can_frame(CAN_frame rx_frame) {
 
   // Do not log noisy startup messages - there are many !
   if (rx_frame.ID == 0 && rx_frame.DLC == 8 && rx_frame.data.u8[0] == 0 && rx_frame.data.u8[1] == 0 &&
@@ -242,7 +243,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   logging.println("");
 }
 
-void transmit_can_battery() {
+void JaguarIpaceBattery::transmit_can() {
   unsigned long currentMillis = millis();
 
   /* Send keep-alive every 200ms */
@@ -253,7 +254,7 @@ void transmit_can_battery() {
   }
 }
 
-void setup_battery(void) {  // Performs one time setup at startup
+void JaguarIpaceBattery::setup(void) {  // Performs one time setup at startup
   strncpy(datalayer.system.info.battery_protocol, "Jaguar I-PACE", 63);
   datalayer.system.info.battery_protocol[63] = '\0';
   datalayer.battery.info.number_of_cells = 108;
diff --git a/Software/src/battery/JAGUAR-IPACE-BATTERY.h b/Software/src/battery/JAGUAR-IPACE-BATTERY.h
index d89e4770..c6c3effd 100644
--- a/Software/src/battery/JAGUAR-IPACE-BATTERY.h
+++ b/Software/src/battery/JAGUAR-IPACE-BATTERY.h
@@ -1,15 +1,23 @@
 #ifndef JAGUAR_IPACE_BATTERY_H
 #define JAGUAR_IPACE_BATTERY_H
-#include "../include.h"
+
+#include "CanBattery.h"
 
 #define BATTERY_SELECTED
+#define SELECTED_BATTERY_CLASS JaguarIpaceBattery
+
 #define MAX_PACK_VOLTAGE_DV 4546  //5000 = 500.0V
 #define MIN_PACK_VOLTAGE_DV 3370
 #define MAX_CELL_DEVIATION_MV 250
 #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);
+class JaguarIpaceBattery : public CanBattery {
+ public:
+  virtual void setup(void);
+  virtual void handle_incoming_can_frame(CAN_frame rx_frame);
+  virtual void update_values();
+  virtual void transmit_can();
+};
 
 #endif
diff --git a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h
index c5f6b48f..03128362 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h
+++ b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.h
@@ -1,11 +1,10 @@
 #ifndef RENAULT_ZOE_GEN1_BATTERY_H
 #define RENAULT_ZOE_GEN1_BATTERY_H
-#include "../include.h"
+
+#include "CanBattery.h"
 
 #define BATTERY_SELECTED
-
-// Indicates that the object-oriented battery interface is to be activated.
-#define OO_BATTERY_SELECTED
+#define SELECTED_BATTERY_CLASS RenaultZoeGen1Battery
 
 #define MAX_PACK_VOLTAGE_DV 4200  //5000 = 500.0V
 #define MIN_PACK_VOLTAGE_DV 3000
diff --git a/Software/src/communication/can/comm_can.h b/Software/src/communication/can/comm_can.h
index ea047878..67d09bfa 100644
--- a/Software/src/communication/can/comm_can.h
+++ b/Software/src/communication/can/comm_can.h
@@ -16,6 +16,7 @@
 #endif  //CANFD_ADDON
 
 void dump_can_frame(CAN_frame& frame, frameDirection msgDir);
+void transmit_can_frame(CAN_frame* tx_frame, int interface);
 
 /**
  * @brief Initialization function for CAN.

From 792eac2858e950013704e70710b05ce925cf7598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Thu, 1 May 2025 12:04:36 +0300
Subject: [PATCH 07/15] Improve wording on enable event

---
 Software/src/devboard/utils/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp
index 336e1c0f..bc351f03 100644
--- a/Software/src/devboard/utils/events.cpp
+++ b/Software/src/devboard/utils/events.cpp
@@ -271,7 +271,7 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
     case EVENT_MODBUS_INVERTER_MISSING:
       return "Modbus inverter has not sent any data. Inspect communication wiring!";
     case EVENT_NO_ENABLE_DETECTED:
-      return "Inverter has not toggled Enable signal for a long time. Check Wiring!";
+      return "Inverter Enable line has not been active for a long time. Check Wiring!";
     case EVENT_CELL_CRITICAL_UNDER_VOLTAGE:
       return "CELL VOLTAGE CRITICALLY LOW! Not possible to continue. Inspect battery!";
     case EVENT_CELL_UNDER_VOLTAGE:

From 84a5fdf580d561a7d9492a756978a3c9501dc0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Thu, 1 May 2025 12:14:38 +0300
Subject: [PATCH 08/15] Move check to slower control loop

---
 .../contactorcontrol/comm_contactorcontrol.cpp     | 11 -----------
 Software/src/inverter/SMA-BYD-H-CAN.cpp            | 14 ++++++++++++++
 Software/src/inverter/SMA-BYD-HVS-CAN.cpp          | 14 ++++++++++++++
 Software/src/inverter/SMA-TRIPOWER-CAN.cpp         | 14 ++++++++++++++
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
index de726ef8..b961378b 100644
--- a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
+++ b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
@@ -120,17 +120,6 @@ static void dbg_contactors(const char* state) {
 void handle_contactors() {
 #if defined(SMA_BYD_H_CAN) || defined(SMA_BYD_HVS_CAN) || defined(SMA_TRIPOWER_CAN)
   datalayer.system.status.inverter_allows_contactor_closing = digitalRead(INVERTER_CONTACTOR_ENABLE_PIN);
-
-  if (!datalayer.system.status.inverter_allows_contactor_closing) {
-    timeSpentWithoutEnableTurnedOn++;
-
-    if (timeSpentWithoutEnableTurnedOn >
-        180000) {  //Increments once every 10ms. 100/second*60seconds*30minutes = 180000
-      set_event(EVENT_NO_ENABLE_DETECTED, 0);
-    }
-  } else {
-    timeSpentWithoutEnableTurnedOn = 0;
-  }
 #endif
 
   handle_BMSpower();  // Some batteries need to be periodically power cycled
diff --git a/Software/src/inverter/SMA-BYD-H-CAN.cpp b/Software/src/inverter/SMA-BYD-H-CAN.cpp
index 5bd68f8d..398159fa 100644
--- a/Software/src/inverter/SMA-BYD-H-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-H-CAN.cpp
@@ -1,6 +1,7 @@
 #include "../include.h"
 #ifdef SMA_BYD_H_CAN
 #include "../datalayer/datalayer.h"
+#include "../devboard/utils/events.h"
 #include "SMA-BYD-H-CAN.h"
 
 /* TODO: Map error bits in 0x158 */
@@ -11,6 +12,8 @@ static unsigned long previousMillis100ms = 0;
 static uint32_t inverter_time = 0;
 static uint16_t inverter_voltage = 0;
 static int16_t inverter_current = 0;
+static uint16_t secondsWithoutEnableSignal = 0;
+#define THIRTY_MINUTES 1200
 
 //Actual content messages
 CAN_frame SMA_158 = {.FD = false,
@@ -145,6 +148,17 @@ void update_values_can_inverter() {  //This function maps all the values fetched
 #endif                  // INVERTER_CONTACTOR_ENABLE_LED_PIN
   }
 
+  // Check if Enable line is working. If we go too long without any input, raise an event
+  if (!datalayer.system.status.inverter_allows_contactor_closing) {
+    secondsWithoutEnableSignal++;
+
+    if (secondsWithoutEnableSignal > THIRTY_MINUTES) {
+      set_event(EVENT_NO_ENABLE_DETECTED, 0);
+    }
+  } else {
+    secondsWithoutEnableSignal = 0;
+  }
+
   /*
   //SMA_158.data.u8[0] = //bit12 Fault high temperature, bit34Battery cellundervoltage, bit56 Battery cell overvoltage, bit78 batterysystemdefect
   //TODO: add all error bits. Sending message with all 0xAA until that.
diff --git a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
index a5df8bee..eaa03d0a 100644
--- a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
@@ -1,6 +1,7 @@
 #include "../include.h"
 #ifdef SMA_BYD_HVS_CAN
 #include "../datalayer/datalayer.h"
+#include "../devboard/utils/events.h"
 #include "SMA-BYD-HVS-CAN.h"
 
 /* TODO: Map error bits in 0x158 */
@@ -11,6 +12,8 @@ static unsigned long previousMillis100ms = 0;
 static uint32_t inverter_time = 0;
 static uint16_t inverter_voltage = 0;
 static int16_t inverter_current = 0;
+static uint16_t secondsWithoutEnableSignal = 0;
+#define THIRTY_MINUTES 1200
 
 //Actual content messages
 CAN_frame SMA_158 = {.FD = false,
@@ -149,6 +152,17 @@ void update_values_can_inverter() {  //This function maps all the values fetched
 #endif                  // INVERTER_CONTACTOR_ENABLE_LED_PIN
   }
 
+  // Check if Enable line is working. If we go too long without any input, raise an event
+  if (!datalayer.system.status.inverter_allows_contactor_closing) {
+    secondsWithoutEnableSignal++;
+
+    if (secondsWithoutEnableSignal > THIRTY_MINUTES) {
+      set_event(EVENT_NO_ENABLE_DETECTED, 0);
+    }
+  } else {
+    secondsWithoutEnableSignal = 0;
+  }
+
   /*
   //SMA_158.data.u8[0] = //bit12 Fault high temperature, bit34Battery cellundervoltage, bit56 Battery cell overvoltage, bit78 batterysystemdefect
   //TODO: add all error bits. Sending message with all 0xAA until that.
diff --git a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
index 9828dd7c..72642062 100644
--- a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
+++ b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
@@ -1,6 +1,7 @@
 #include "../include.h"
 #ifdef SMA_TRIPOWER_CAN
 #include "../datalayer/datalayer.h"
+#include "../devboard/utils/events.h"
 #include "SMA-TRIPOWER-CAN.h"
 
 /* TODO:
@@ -32,6 +33,8 @@ static int16_t inverter_current = 0;
 static bool pairing_completed = false;
 static int16_t temperature_average = 0;
 static uint16_t ampere_hours_remaining = 0;
+static uint16_t secondsWithoutEnableSignal = 0;
+#define THIRTY_MINUTES 1200
 
 //Actual content messages
 CAN_frame SMA_358 = {.FD = false,
@@ -146,6 +149,17 @@ void update_values_can_inverter() {  //This function maps all the values fetched
   } else {
     SMA_4D8.data.u8[6] = READY_STATE;
   }
+
+  // Check if Enable line is working. If we go too long without any input, raise an event
+  if (!datalayer.system.status.inverter_allows_contactor_closing) {
+    secondsWithoutEnableSignal++;
+
+    if (secondsWithoutEnableSignal > THIRTY_MINUTES) {
+      set_event(EVENT_NO_ENABLE_DETECTED, 0);
+    }
+  } else {
+    secondsWithoutEnableSignal = 0;
+  }
 }
 
 void map_can_frame_to_variable_inverter(CAN_frame rx_frame) {

From f3e65acbdb76ddee9bbc6375a0ea9109a158904c Mon Sep 17 00:00:00 2001
From: Jaakko Haakana <jaakko@haakana.net>
Date: Thu, 1 May 2025 18:27:29 +0300
Subject: [PATCH 09/15] Use include.h after all

---
 Software/src/battery/BATTERIES.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Software/src/battery/BATTERIES.cpp b/Software/src/battery/BATTERIES.cpp
index 36a8e5af..cd56ae38 100644
--- a/Software/src/battery/BATTERIES.cpp
+++ b/Software/src/battery/BATTERIES.cpp
@@ -1,4 +1,4 @@
-#include "BATTERIES.h"
+#include "../include.h"
 
 // These functions adapt the old C-style global functions battery-API to the
 // object-oriented battery API.

From 576e8af921b4968b1f2acba5cb0cec204e561a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Sat, 3 May 2025 00:42:50 +0300
Subject: [PATCH 10/15] Rename variable

---
 .../contactorcontrol/comm_contactorcontrol.cpp            | 1 -
 Software/src/inverter/SMA-BYD-H-CAN.cpp                   | 8 ++++----
 Software/src/inverter/SMA-BYD-HVS-CAN.cpp                 | 8 ++++----
 Software/src/inverter/SMA-TRIPOWER-CAN.cpp                | 8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
index b961378b..815abe22 100644
--- a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
+++ b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
@@ -39,7 +39,6 @@ unsigned long negativeStartTime = 0;
 unsigned long prechargeCompletedTime = 0;
 unsigned long timeSpentInFaultedMode = 0;
 #endif
-static uint32_t timeSpentWithoutEnableTurnedOn = 0;
 unsigned long currentTime = 0;
 unsigned long lastPowerRemovalTime = 0;
 unsigned long bmsPowerOnTime = 0;
diff --git a/Software/src/inverter/SMA-BYD-H-CAN.cpp b/Software/src/inverter/SMA-BYD-H-CAN.cpp
index 398159fa..c12cd717 100644
--- a/Software/src/inverter/SMA-BYD-H-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-H-CAN.cpp
@@ -12,7 +12,7 @@ static unsigned long previousMillis100ms = 0;
 static uint32_t inverter_time = 0;
 static uint16_t inverter_voltage = 0;
 static int16_t inverter_current = 0;
-static uint16_t secondsWithoutEnableSignal = 0;
+static uint16_t timeWithoutInverterAllowsContactorClosing = 0;
 #define THIRTY_MINUTES 1200
 
 //Actual content messages
@@ -150,13 +150,13 @@ void update_values_can_inverter() {  //This function maps all the values fetched
 
   // Check if Enable line is working. If we go too long without any input, raise an event
   if (!datalayer.system.status.inverter_allows_contactor_closing) {
-    secondsWithoutEnableSignal++;
+    timeWithoutInverterAllowsContactorClosing++;
 
-    if (secondsWithoutEnableSignal > THIRTY_MINUTES) {
+    if (timeWithoutInverterAllowsContactorClosing > THIRTY_MINUTES) {
       set_event(EVENT_NO_ENABLE_DETECTED, 0);
     }
   } else {
-    secondsWithoutEnableSignal = 0;
+    timeWithoutInverterAllowsContactorClosing = 0;
   }
 
   /*
diff --git a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
index eaa03d0a..71ccc7ca 100644
--- a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
@@ -12,7 +12,7 @@ static unsigned long previousMillis100ms = 0;
 static uint32_t inverter_time = 0;
 static uint16_t inverter_voltage = 0;
 static int16_t inverter_current = 0;
-static uint16_t secondsWithoutEnableSignal = 0;
+static uint16_t timeWithoutInverterAllowsContactorClosing = 0;
 #define THIRTY_MINUTES 1200
 
 //Actual content messages
@@ -154,13 +154,13 @@ void update_values_can_inverter() {  //This function maps all the values fetched
 
   // Check if Enable line is working. If we go too long without any input, raise an event
   if (!datalayer.system.status.inverter_allows_contactor_closing) {
-    secondsWithoutEnableSignal++;
+    timeWithoutInverterAllowsContactorClosing++;
 
-    if (secondsWithoutEnableSignal > THIRTY_MINUTES) {
+    if (timeWithoutInverterAllowsContactorClosing > THIRTY_MINUTES) {
       set_event(EVENT_NO_ENABLE_DETECTED, 0);
     }
   } else {
-    secondsWithoutEnableSignal = 0;
+    timeWithoutInverterAllowsContactorClosing = 0;
   }
 
   /*
diff --git a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
index 72642062..f9f2e389 100644
--- a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
+++ b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
@@ -33,7 +33,7 @@ static int16_t inverter_current = 0;
 static bool pairing_completed = false;
 static int16_t temperature_average = 0;
 static uint16_t ampere_hours_remaining = 0;
-static uint16_t secondsWithoutEnableSignal = 0;
+static uint16_t timeWithoutInverterAllowsContactorClosing = 0;
 #define THIRTY_MINUTES 1200
 
 //Actual content messages
@@ -152,13 +152,13 @@ void update_values_can_inverter() {  //This function maps all the values fetched
 
   // Check if Enable line is working. If we go too long without any input, raise an event
   if (!datalayer.system.status.inverter_allows_contactor_closing) {
-    secondsWithoutEnableSignal++;
+    timeWithoutInverterAllowsContactorClosing++;
 
-    if (secondsWithoutEnableSignal > THIRTY_MINUTES) {
+    if (timeWithoutInverterAllowsContactorClosing > THIRTY_MINUTES) {
       set_event(EVENT_NO_ENABLE_DETECTED, 0);
     }
   } else {
-    secondsWithoutEnableSignal = 0;
+    timeWithoutInverterAllowsContactorClosing = 0;
   }
 }
 

From e4cf649f3c31057a2013361f46b16ff16c85fd5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Sat, 3 May 2025 11:55:40 +0300
Subject: [PATCH 11/15] Add high temperature fault event

---
 Software/src/devboard/safety/safety.cpp | 14 +++++++++++---
 Software/src/devboard/utils/events.cpp  |  7 +++++--
 Software/src/devboard/utils/events.h    |  3 ++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Software/src/devboard/safety/safety.cpp b/Software/src/devboard/safety/safety.cpp
index dc135c6a..7cac486a 100644
--- a/Software/src/devboard/safety/safety.cpp
+++ b/Software/src/devboard/safety/safety.cpp
@@ -19,11 +19,19 @@ battery_pause_status emulator_pause_status = NORMAL;
 //battery pause status end
 
 void update_machineryprotection() {
-  // Check if the CPU is too hot
+  /* Check if the ESP32 CPU running the Battery-Emulator is too hot. 
+  We start with a warning, you can start to see Wifi issues if ut becomes too hot 
+  If the chip starts to approach the design limit, we perform a graceful shutdown */
   if (datalayer.system.info.CPU_temperature > 80.0f) {
-    set_event(EVENT_CPU_OVERHEAT, 0);
+    set_event(EVENT_CPU_OVERHEATING, 0);
   } else {
-    clear_event(EVENT_CPU_OVERHEAT);
+    clear_event(EVENT_CPU_OVERHEATING);
+  }
+  if (datalayer.system.info.CPU_temperature > 110.0f) {
+    set_event(EVENT_CPU_OVERHEATED, 0);
+  }
+  if (datalayer.system.info.CPU_temperature < 105.0f) {
+    clear_event(EVENT_CPU_OVERHEATED);  //Hysteresis on the clearing
   }
 
   // Check health status of CAN interfaces
diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp
index bc351f03..60fc0804 100644
--- a/Software/src/devboard/utils/events.cpp
+++ b/Software/src/devboard/utils/events.cpp
@@ -47,7 +47,8 @@ void init_events(void) {
   events.entries[EVENT_CAN_CHARGER_MISSING].level = EVENT_LEVEL_INFO;
   events.entries[EVENT_CAN_INVERTER_MISSING].level = EVENT_LEVEL_WARNING;
   events.entries[EVENT_CONTACTOR_WELDED].level = EVENT_LEVEL_WARNING;
-  events.entries[EVENT_CPU_OVERHEAT].level = EVENT_LEVEL_WARNING;
+  events.entries[EVENT_CPU_OVERHEATING].level = EVENT_LEVEL_WARNING;
+  events.entries[EVENT_CPU_OVERHEATED].level = EVENT_LEVEL_ERROR;
   events.entries[EVENT_WATER_INGRESS].level = EVENT_LEVEL_ERROR;
   events.entries[EVENT_CHARGE_LIMIT_EXCEEDED].level = EVENT_LEVEL_INFO;
   events.entries[EVENT_DISCHARGE_LIMIT_EXCEEDED].level = EVENT_LEVEL_INFO;
@@ -193,8 +194,10 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
       return "Inverter not sending messages via CAN for the last 60 seconds. Check wiring!";
     case EVENT_CONTACTOR_WELDED:
       return "Contactors sticking/welded. Inspect battery with caution!";
-    case EVENT_CPU_OVERHEAT:
+    case EVENT_CPU_OVERHEATING:
       return "Battery-Emulator CPU overheating! Increase airflow/cooling to increase hardware lifespan!";
+    case EVENT_CPU_OVERHEATED:
+      return "Battery-Emulator CPU melting! Performing controlled shutdown until temperature drops!";
     case EVENT_CHARGE_LIMIT_EXCEEDED:
       return "Inverter is charging faster than battery is allowing.";
     case EVENT_DISCHARGE_LIMIT_EXCEEDED:
diff --git a/Software/src/devboard/utils/events.h b/Software/src/devboard/utils/events.h
index 581cea59..6992f956 100644
--- a/Software/src/devboard/utils/events.h
+++ b/Software/src/devboard/utils/events.h
@@ -21,7 +21,8 @@
   XX(EVENT_CAN_NATIVE_TX_FAILURE)              \
   XX(EVENT_CHARGE_LIMIT_EXCEEDED)              \
   XX(EVENT_CONTACTOR_WELDED)                   \
-  XX(EVENT_CPU_OVERHEAT)                       \
+  XX(EVENT_CPU_OVERHEATING)                    \
+  XX(EVENT_CPU_OVERHEATED)                     \
   XX(EVENT_DISCHARGE_LIMIT_EXCEEDED)           \
   XX(EVENT_WATER_INGRESS)                      \
   XX(EVENT_12V_LOW)                            \

From 6cdccbe8cce57a6982cbc505eede921d21ec7530 Mon Sep 17 00:00:00 2001
From: Marijn van Galen <marijnvangalen@gmail.com>
Date: Sat, 3 May 2025 18:49:51 +0200
Subject: [PATCH 12/15] Fix typo in comment.

---
 Software/src/devboard/safety/safety.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Software/src/devboard/safety/safety.cpp b/Software/src/devboard/safety/safety.cpp
index 7cac486a..7ec7a2d7 100644
--- a/Software/src/devboard/safety/safety.cpp
+++ b/Software/src/devboard/safety/safety.cpp
@@ -20,7 +20,7 @@ battery_pause_status emulator_pause_status = NORMAL;
 
 void update_machineryprotection() {
   /* Check if the ESP32 CPU running the Battery-Emulator is too hot. 
-  We start with a warning, you can start to see Wifi issues if ut becomes too hot 
+  We start with a warning, you can start to see Wifi issues if it becomes too hot 
   If the chip starts to approach the design limit, we perform a graceful shutdown */
   if (datalayer.system.info.CPU_temperature > 80.0f) {
     set_event(EVENT_CPU_OVERHEATING, 0);

From 1e3fe0e3e52b799682efc52975083907cffe22ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Sat, 3 May 2025 22:00:12 +0300
Subject: [PATCH 13/15] Fix compilation error

---
 Software/src/battery/CanBattery.h           | 2 +-
 Software/src/battery/JAGUAR-IPACE-BATTERY.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Software/src/battery/CanBattery.h b/Software/src/battery/CanBattery.h
index 4d2795cc..efb55cbe 100644
--- a/Software/src/battery/CanBattery.h
+++ b/Software/src/battery/CanBattery.h
@@ -11,7 +11,7 @@ class CanBattery {
   virtual void setup(void) = 0;
   virtual void handle_incoming_can_frame(CAN_frame rx_frame) = 0;
   virtual void update_values() = 0;
-  virtual void transmit_can() = 0;
+  virtual void transmit_can(unsigned long currentMillis) = 0;
 };
 
 #endif
diff --git a/Software/src/battery/JAGUAR-IPACE-BATTERY.h b/Software/src/battery/JAGUAR-IPACE-BATTERY.h
index c6c3effd..f91444a0 100644
--- a/Software/src/battery/JAGUAR-IPACE-BATTERY.h
+++ b/Software/src/battery/JAGUAR-IPACE-BATTERY.h
@@ -17,7 +17,7 @@ class JaguarIpaceBattery : public CanBattery {
   virtual void setup(void);
   virtual void handle_incoming_can_frame(CAN_frame rx_frame);
   virtual void update_values();
-  virtual void transmit_can();
+  virtual void transmit_can(unsigned long currentMillis);
 };
 
 #endif

From 3841af790bcd9902f6548cb50a5252668f9d502e Mon Sep 17 00:00:00 2001
From: Marijn van Galen <marijnvangalen@gmail.com>
Date: Sun, 4 May 2025 14:16:01 +0200
Subject: [PATCH 14/15] Prevent user start signal interfering with running
 statemachine

---
 Software/src/battery/BYD-ATTO-3-BATTERY.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
index d0ecace0..05409d05 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
@@ -269,7 +269,7 @@ void update_values_battery() {  //This function maps all the values fetched via
   datalayer_extended.bydAtto3.battery_temperatures[9] = battery_daughterboard_temperatures[9];
 
   // Update requests from webserver datalayer
-  if (datalayer_extended.bydAtto3.UserRequestCrashReset) {
+  if (datalayer_extended.bydAtto3.UserRequestCrashReset && stateMachineClearCrash == NOT_RUNNING) {
     stateMachineClearCrash = STARTED;
     datalayer_extended.bydAtto3.UserRequestCrashReset = false;
   }

From 39daa3494f6de46475aae458068bd142003d150f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96ster?= <dalathegreat@gmail.com>
Date: Sun, 4 May 2025 23:11:23 +0300
Subject: [PATCH 15/15] Fix startup crash when using Modbus inverter

---
 Software/Software.ino | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Software/Software.ino b/Software/Software.ino
index 6ba38176..06c3a5ae 100644
--- a/Software/Software.ino
+++ b/Software/Software.ino
@@ -101,12 +101,13 @@ void setup() {
   init_precharge_control();
 #endif  // PRECHARGE_CONTROL
 
-  init_rs485();
-
 #if defined(CAN_INVERTER_SELECTED) || defined(MODBUS_INVERTER_SELECTED) || defined(RS485_INVERTER_SELECTED)
   setup_inverter();
 #endif
   setup_battery();
+
+  init_rs485();
+
 #ifdef EQUIPMENT_STOP_BUTTON
   init_equipment_stop_button();
 #endif