fix #452 . Check if Pilot from Evse and Pilot from evseMonitor are th…

…e same, if not reset. Temporary fix EmonEvse firmware and other compiled with PP_AUTO_AMPACITY where starting at full charge instead of configured one.
OpenEVSE · Feb 2, 2023 · 5e69c85 · 5e69c85
1 parent 751d837
commit 5e69c85
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/openevse-gui-v2 b/openevse-gui-v2
diff --git a/src/evse_monitor.cpp b/src/evse_monitor.cpp
@@ -163,6 +163,7 @@ EvseMonitor::EvseMonitor(OpenEVSEClass &openevse) :
   _stuck_count(0),
   _min_current(0),
   _pilot(0),
+  _pilot_is_wrong(false),
   _max_configured_current(0),
   _max_hardware_current(80),
   _data_ready(EVSE_MONITOR_DATA_READY),
@@ -308,9 +309,28 @@ void EvseMonitor::updateEvseState(uint8_t evse_state, uint8_t pilot_state, uint3
       }
       _session_complete.update(getFlags());
     });
+  verifyPilot();
   }
 }
 
+void EvseMonitor::verifyPilot() {
+    // After some state changes the OpenEVSE module compiled with PP_AUTO_AMPACITY will reset to the maximum pilot level, so reset to what we expect
+    _openevse.getCurrentCapacity([this](int ret, long min_current, long max_hardware_current, long pilot, long max_configured_current)
+    {
+      DBUGLN("Check pilot is ok");
+      DBUGVAR(pilot);
+      DBUGVAR(getPilot());
+
+      if(RAPI_RESPONSE_OK == ret && pilot != getPilot())
+      {
+        DBUGLN("####  Pilot is wrong set again");
+        _pilot_is_wrong = true;
+        setPilot(getPilot());
+        _pilot_is_wrong = false;
+      }
+    });
+}
+
 void EvseMonitor::updateCurrentSettings(long min_current, long max_hardware_current, long pilot, long max_configured_current)
 {
   DBUGF("min_current = %ld, pilot = %ld, max_configured_current = %ld, max_hardware_current = %ld", min_current, pilot, max_configured_current, max_hardware_current);
@@ -320,7 +340,6 @@ void EvseMonitor::updateCurrentSettings(long min_current, long max_hardware_curr
   _max_configured_current = max_configured_current;
 }
 
-
 unsigned long EvseMonitor::loop(MicroTasks::WakeReason reason)
 {
   DBUG("EVSE monitor woke: ");
@@ -359,6 +378,10 @@ unsigned long EvseMonitor::loop(MicroTasks::WakeReason reason)
     getEnergyFromEvse();
   }
 
+  // Check if pilot is wrong ( solve OpenEvse fw compiled with -D PP_AUTO_AMPACITY)
+  if (isCharging())
+    verifyPilot();
+
   _count ++;
 
   return EVSE_MONITOR_POLL_TIME;
@@ -464,7 +487,7 @@ void EvseMonitor::setPilot(long amps, std::function<void(int ret)> callback)
     amps = _min_current;
   }
 
-  if(amps == _pilot)
+  if(amps == _pilot && !_pilot_is_wrong)
   {
     if(callback) {
       callback(RAPI_RESPONSE_OK);

diff --git a/src/evse_monitor.h b/src/evse_monitor.h
@@ -155,6 +155,8 @@ class EvseMonitor : public MicroTasks::Task
     char _firmware_version[32];
     char _serial[16];
 
+    bool _pilot_is_wrong;
+
 #ifdef ENABLE_MCP9808
     Adafruit_MCP9808 _mcp9808;
 #endif
@@ -209,6 +211,7 @@ class EvseMonitor : public MicroTasks::Task
     void enableStuckRelayCheck(bool enabled, std::function<void(int ret)> callback = NULL);
     void enableVentRequired(bool enabled, std::function<void(int ret)> callback = NULL);
     void enableTemperatureCheck(bool enabled, std::function<void(int ret)> callback = NULL);
+    void verifyPilot();
 
     uint8_t getEvseState() {
       return _state.getEvseState();