Merge pull request #327 from amarofarinha/main

Max Charge / Discharge Limit Failures - Fix Charge / Discharge Limit exceeded early events
dalathegreat · May 29, 2024 · ccec28a · ccec28a
2 parents 81c0c30 + e1c2b7a
commit ccec28a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Software/src/devboard/safety/safety.cpp b/Software/src/devboard/safety/safety.cpp
@@ -2,6 +2,7 @@
 #include "../utils/events.h"
 
 static uint16_t cell_deviation_mV = 0;
+static uint8_t charge_discharge_limit_failures = 0;
 
 void update_machineryprotection() {
   // Start checking that the battery is within reason. Incase we see any funny business, raise an event!
@@ -82,18 +83,28 @@ void update_machineryprotection() {
   // Inverter is charging with more power than battery wants!
   if (datalayer.battery.status.active_power_W > 0) {  // Charging
     if (datalayer.battery.status.active_power_W > (datalayer.battery.status.max_charge_power_W + 2000)) {
-      set_event(EVENT_CHARGE_LIMIT_EXCEEDED, 0);  // Alert when 2kW over requested max
+      if (charge_discharge_limit_failures > MAX_CHARGE_DISCHARGE_LIMIT_FAILURES) {
+        set_event(EVENT_CHARGE_LIMIT_EXCEEDED, 0);  // Alert when 2kW over requested max
+      } else {
+        charge_discharge_limit_failures++;
+      }
     } else {
       clear_event(EVENT_CHARGE_LIMIT_EXCEEDED);
+      charge_discharge_limit_failures = 0;
     }
   }
 
   // Inverter is pulling too much power from battery!
   if (datalayer.battery.status.active_power_W < 0) {  // Discharging
     if (-datalayer.battery.status.active_power_W > (datalayer.battery.status.max_discharge_power_W + 2000)) {
-      set_event(EVENT_DISCHARGE_LIMIT_EXCEEDED, 0);  // Alert when 2kW over requested max
+      if (charge_discharge_limit_failures > MAX_CHARGE_DISCHARGE_LIMIT_FAILURES) {
+        set_event(EVENT_DISCHARGE_LIMIT_EXCEEDED, 0);  // Alert when 2kW over requested max
+      } else {
+        charge_discharge_limit_failures++;
+      }
     } else {
       clear_event(EVENT_DISCHARGE_LIMIT_EXCEEDED);
+      charge_discharge_limit_failures = 0;
     }
   }
 

diff --git a/Software/src/devboard/safety/safety.h b/Software/src/devboard/safety/safety.h
@@ -4,6 +4,8 @@
 
 #define MAX_CAN_FAILURES 50
 
+#define MAX_CHARGE_DISCHARGE_LIMIT_FAILURES 1
+
 void update_machineryprotection();
 
 #endif