Merge pull request #996 from OpenEVSE/max_hardware_current_set

Changes to allow setting of the max hardware current

Author: jeremypoulter

gui-v2

@@ -34,7 +34,7 @@ lib_deps =
   jeremypoulter/[email protected]
   jeremypoulter/Micro [email protected]
   jeremypoulter/[email protected]
-  jeremypoulter/[email protected].14
+  jeremypoulter/[email protected].15
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
@@ -52,7 +52,7 @@ debug_flags =
   #-D ENABLE_DEBUG_WEB_REQUEST
   #-D ENABLE_DEBUG_SCHEDULER
   #-D ENABLE_DEBUG_TIME
-  #-D ENABLE_DEBUG_EVSE_MAN
+  -D ENABLE_DEBUG_EVSE_MAN
   #-D ENABLE_DEBUG_EVSE_MONITOR
   #-D ENABLE_DEBUG_DIVERT
   #-D ENABLE_DEBUG_LED

platformio.ini

@@ -503,6 +503,17 @@ bool config_deserialize(DynamicJsonDocument &doc)
     }
   }
 
+  if(doc.containsKey("max_current_hard"))
+  {
+    // This value can only be written once so we need to check if the value has changed after setting
+    long current = doc["max_current_hard"];
+    if(current != evse.getMaxHardwareCurrent()) {
+      evse.setMaxHardwareCurrent(current);
+      config_modified = true;
+      DBUGLN("max_current_hard changed");
+    }
+  }
+
   if(doc.containsKey("scale") && doc.containsKey("offset"))
   {
     long scale = doc["scale"];

src/app_config.cpp

@@ -122,6 +122,7 @@ EvseManager::EvseManager(Stream &port, EventLog &eventLog) :
   _evseStateListener(this),
   _evseBootListener(this),
   _sessionCompleteListener(this),
+  _settingsChangedListener(this),
   _targetProperties(EvseState::Active),
   _hasClaims(false),
   _sleepForDisable(true),
@@ -234,6 +235,7 @@ void EvseManager::setup()
   _monitor.onBootReady(&_evseBootListener);
   _monitor.onStateChange(&_evseStateListener);
   _monitor.onSessionComplete(&_sessionCompleteListener);
+  _monitor.onSettingsChanged(&_settingsChangedListener);
 }
 
 bool EvseManager::setTargetState(EvseProperties &target)
@@ -370,6 +372,18 @@ unsigned long EvseManager::loop(MicroTasks::WakeReason reason)
     _monitor.clearEnergyMeterSession();
   }
 
+  DBUGVAR(_settingsChangedListener.IsTriggered());
+  if(_settingsChangedListener.IsTriggered())
+  {
+    // Settings have changed, re-evaluate claims
+    _evaluateClaims = true;
+
+    DBUGVAR(_monitor.getPilot());
+    DBUGVAR(_monitor.getMinCurrent());
+    DBUGVAR(_monitor.getMaxConfiguredCurrent());
+    DBUGVAR(_monitor.getMaxHardwareCurrent());
+  }
+
   DBUGVAR(_evaluateClaims);
   if(_evaluateClaims)
   {
@@ -594,11 +608,13 @@ void EvseManager::setVehicleEta(int vehicleEta)
 void EvseManager::setMaxConfiguredCurrent(long amps)
 {
   _monitor.setMaxConfiguredCurrent(amps);
-  DBUGF("Max configured current set to %ld", _monitor.getMaxConfiguredCurrent());
-  // Setting the Max Current will update the pilot as well, but in any case we may
-  // need to change the level so re-evaluate the claims
-  _evaluateClaims = true;
-  MicroTask.wakeTask(this);
+  DBUGF("Max configured current set to %ld (%ld)", _monitor.getMaxConfiguredCurrent(), amps);
+}
+
+void EvseManager::setMaxHardwareCurrent(long amps)
+{
+  _monitor.setMaxHardwareCurrent(amps);
+  DBUGF("Max hardware current set to actual: %ld, requested: %ld", _monitor.getMaxHardwareCurrent(), amps);
 }
 
 bool EvseManager::isRapiCommandBlocked(String rapi)

src/evse_man.cpp

@@ -221,6 +221,7 @@ class EvseManager : public MicroTasks::Task
     MicroTasks::EventListener _evseStateListener;
     MicroTasks::EventListener _evseBootListener;
     MicroTasks::EventListener _sessionCompleteListener;
+    MicroTasks::EventListener _settingsChangedListener;
 
     EvseProperties _targetProperties;
     bool _hasClaims;
@@ -418,6 +419,7 @@ class EvseManager : public MicroTasks::Task
     long getMaxConfiguredCurrent() {
       return _monitor.getMaxConfiguredCurrent();
     }
+    void setMaxHardwareCurrent(long amps);
     long getMaxHardwareCurrent() {
       return _monitor.getMaxHardwareCurrent();
     }

src/evse_man.h

@@ -699,6 +699,35 @@ void EvseMonitor::setMaxConfiguredCurrent(long amps)
   });
 }
 
+// This method will attempt to set the hardware current limit. This
+// can only be set once. If called subsequent times it will be ignored.
+// We will need to read back the hardware limit to know what it is.
+void EvseMonitor::setMaxHardwareCurrent(long amps)
+{
+  // limit `amps` to the hardware limit
+  if(amps > _max_hardware_current) {
+    amps = _max_hardware_current;
+  }
+  if(amps < _min_current && _min_current != 0) {
+    amps = _min_current;
+  }
+
+  _openevse.setCurrentCapacityFactoryLimit(amps, [this, amps](int ret, long pilot)
+  {
+    if(RAPI_RESPONSE_OK == ret)
+    {
+      _max_hardware_current = amps;
+      DBUGVAR(_max_hardware_current);
+
+      if(_max_configured_current > _max_hardware_current) {
+        setMaxConfiguredCurrent(_max_hardware_current);
+      }
+
+      _settings_changed.Trigger();
+    }
+  });
+}
+
 void EvseMonitor::getStatusFromEvse(bool allowStart)
 {
   DBUGLN("Get EVSE status");
@@ -813,4 +842,4 @@ void EvseMonitor::getAmmeterSettings()
       _current_sensor_offset = offset;
     }
   });
-}
+}

src/evse_monitor.cpp

@@ -197,6 +197,7 @@ class EvseMonitor : public MicroTasks::Task
     void disable();
     void restart();
     void setMaxConfiguredCurrent(long amps);
+    void setMaxHardwareCurrent(long amps);
 
     void setPilot(long amps, bool force=false, std::function<void(int ret)> callback = NULL);
     void setVoltage(double volts, std::function<void(int ret)> callback = NULL);