From 9346632b952a5ca7d8ee356257a63bb306f46a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C3=96ster?= Date: Thu, 13 Jun 2024 23:36:52 +0300 Subject: [PATCH] Add clearing of overrun event --- Software/src/battery/BMW-I3-BATTERY.cpp | 2 ++ Software/src/battery/BYD-ATTO-3-BATTERY.cpp | 2 ++ Software/src/battery/CHADEMO-BATTERY.cpp | 2 ++ Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp | 2 ++ Software/src/battery/KIA-E-GMP-BATTERY.cpp | 2 ++ Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp | 2 ++ Software/src/battery/MG-5-BATTERY.cpp | 2 ++ Software/src/battery/NISSAN-LEAF-BATTERY.cpp | 2 ++ Software/src/battery/RENAULT-ZOE-BATTERY.cpp | 2 ++ Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp | 2 ++ Software/src/battery/TESLA-MODEL-3-BATTERY.cpp | 2 ++ Software/src/battery/VOLVO-SPA-BATTERY.cpp | 2 ++ 12 files changed, 24 insertions(+) diff --git a/Software/src/battery/BMW-I3-BATTERY.cpp b/Software/src/battery/BMW-I3-BATTERY.cpp index 646fafa9..526bfbd8 100644 --- a/Software/src/battery/BMW-I3-BATTERY.cpp +++ b/Software/src/battery/BMW-I3-BATTERY.cpp @@ -687,6 +687,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp index 4c80263c..2aeb702f 100644 --- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp +++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp @@ -264,6 +264,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/CHADEMO-BATTERY.cpp b/Software/src/battery/CHADEMO-BATTERY.cpp index cb9f7ce8..27df46f6 100644 --- a/Software/src/battery/CHADEMO-BATTERY.cpp +++ b/Software/src/battery/CHADEMO-BATTERY.cpp @@ -689,6 +689,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp index 11a86f40..a0f4ce5d 100644 --- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp +++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp @@ -188,6 +188,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/KIA-E-GMP-BATTERY.cpp b/Software/src/battery/KIA-E-GMP-BATTERY.cpp index 97f05fb1..713a1219 100644 --- a/Software/src/battery/KIA-E-GMP-BATTERY.cpp +++ b/Software/src/battery/KIA-E-GMP-BATTERY.cpp @@ -377,6 +377,8 @@ void send_can_battery() { // Check if sending of CAN messages has been delayed too much. if ((currentMillis - previousMillis500ms >= INTERVAL_500_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) { set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis500ms)); + } else { + clear_event(EVENT_CAN_OVERRUN); } previousMillis500ms = currentMillis; // Section added to close contractor diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp index a4aa647d..1105c077 100644 --- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp +++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp @@ -525,6 +525,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/MG-5-BATTERY.cpp b/Software/src/battery/MG-5-BATTERY.cpp index 766f0e0d..d8bfeb83 100644 --- a/Software/src/battery/MG-5-BATTERY.cpp +++ b/Software/src/battery/MG-5-BATTERY.cpp @@ -125,6 +125,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp index 0f1ef624..ea77a6d7 100644 --- a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp +++ b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp @@ -559,6 +559,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/RENAULT-ZOE-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-BATTERY.cpp index dff3f2cd..fb86a0a5 100644 --- a/Software/src/battery/RENAULT-ZOE-BATTERY.cpp +++ b/Software/src/battery/RENAULT-ZOE-BATTERY.cpp @@ -125,6 +125,8 @@ void send_can_battery() { // 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; //ESP32Can.CANWriteFrame(&ZOE_423); diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp index db3abadd..56371598 100644 --- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp +++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp @@ -123,6 +123,8 @@ void send_can_battery() { // 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; diff --git a/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp b/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp index 47490030..8378a774 100644 --- a/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp +++ b/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp @@ -568,6 +568,8 @@ the first, for a few cycles, then stop all messages which causes the contactor // Check if sending of CAN messages has been delayed too much. if ((currentMillis - previousMillis30 >= INTERVAL_30_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) { set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis30)); + } else { + clear_event(EVENT_CAN_OVERRUN); } previousMillis30 = currentMillis; diff --git a/Software/src/battery/VOLVO-SPA-BATTERY.cpp b/Software/src/battery/VOLVO-SPA-BATTERY.cpp index 94a14a3e..62b393ab 100644 --- a/Software/src/battery/VOLVO-SPA-BATTERY.cpp +++ b/Software/src/battery/VOLVO-SPA-BATTERY.cpp @@ -331,6 +331,8 @@ void send_can_battery() { // 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;