Move blocking to LEAF side to avoid OVERRUN events

dalathegreat · Jan 23, 2025 · 39113a9 · 39113a9
1 parent cc97642
commit 39113a9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
@@ -1064,9 +1064,19 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
   }
 }
 void transmit_can_battery() {
-  if (battery_can_alive) {
 
-    unsigned long currentMillis = millis();
+  unsigned long currentMillis = millis();
+
+  if (datalayer.system.status.BMS_reset_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;
+    return;
+  }
+
+  if (battery_can_alive) {
 
     //Send 10ms message
     if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {

diff --git a/Software/src/communication/can/comm_can.cpp b/Software/src/communication/can/comm_can.cpp
@@ -108,10 +108,7 @@ void transmit_can() {
     return;  //Global block of CAN messages
   }
 
-  if (!datalayer.system.status.BMS_reset_in_progress) {
-    //Transmitting towards battery is halted while BMS is being reset
-    transmit_can_battery();
-  }
+  transmit_can_battery();
 
 #ifdef CAN_INVERTER_SELECTED
   transmit_can_inverter();