Some Manual override change

Author: KipK

gui-v2

@@ -215,14 +215,6 @@ bool EvseManager::evaluateClaims(EvseProperties &properties)
         maxCurrentPriority = claim.getPriority();
         _max_current_client = claim.getClient();
       }
-
-      if(claim.getClient() == EvseClient_OpenEVSE_Manual) {
-        const size_t capacity = JSON_OBJECT_SIZE(40) + 1024;
-        // update manual_override event to socket & mqtt
-        DynamicJsonDocument event(capacity);
-        event["manual_override"] = 1;
-        event_send(event);
-      }
     }
   }
 
@@ -446,13 +438,6 @@ bool EvseManager::release(EvseClient client)
 
   if(findClaim(client, &claim))
   {
-    // if claim is manual override, publish data to socket & mqtt
-    if (claim->getClient() == EvseClient_OpenEVSE_Manual) {
-      const size_t capacity = JSON_OBJECT_SIZE(40) + 1024;
-      DynamicJsonDocument event(capacity);
-      event["manual_override"] = 0;
-      event_send(event);
-    }
     claim->release();
     _evaluateClaims = true;
     MicroTask.wakeTask(this);

src/evse_man.cpp

@@ -74,7 +74,6 @@ class InputTask : public MicroTasks::Task
         event["colour"] = evse.getStateColour();
         event["pilot"] = evse.getChargeCurrent();
         event["max_current"] = evse.getMaxCurrent();
-        event["manual_override"] = manual.isActive() ? 1 : 0; //TODO: remove this
         event["status"] = evse.getState().toString();
         event["elapsed"] = evse.getSessionElapsed();
         event["amp"] = evse.getAmps() * AMPS_SCALE_FACTOR;
@@ -144,7 +143,6 @@ void create_rapi_json(JsonDocument &doc)
   doc["flags"] = evse.getFlags();
   doc["vehicle"] = evse.isVehicleConnected() ? 1 : 0;
   doc["colour"] = evse.getStateColour();
-  doc["manual_override"] = manual.isActive() ? 1 : 0;
   doc["freeram"] = ESPAL.getFreeHeap();
   doc["divertmode"] = (uint8_t)divert.getMode();
   doc["srssi"] = WiFi.RSSI();

src/input.cpp

@@ -299,7 +299,8 @@ unsigned long LcdTask::displayNextMessage()
 
 LcdTask::LcdInfoLine LcdTask::getNextInfoLine(LcdInfoLine info)
 {
-  if(_manual->isActive()) {
+  // only dispklay Manual Override if there a state prop
+  if(_manual->isActive() && _evse->getClaimProperties(EvseClient_OpenEVSE_Manual).getState() != EvseState::None ) {
     return LcdInfoLine::ManualOverride;
   }
 

src/lcd.cpp

@@ -13,7 +13,17 @@ ManualOverride::~ManualOverride()
 
 bool ManualOverride::claim()
 {
-  EvseProperties props(EvseState::Active == _evse->getState() ?  EvseState::Disabled : EvseState::Active);
+  // Keep previous properties
+  EvseProperties props = _evse->getClaimProperties(EvseClient_OpenEVSE_Manual);
+  // toggle state
+  props.setState(EvseState::Active == _evse->getState() ?  EvseState::Disabled : EvseState::Active);
+  // set charge_current to prevent other service controlling it
+  if (props.getChargeCurrent() != UINT32_MAX) {
+    props.setChargeCurrent(props.getChargeCurrent());
+  }
+  else {
+    props.setChargeCurrent(_evse->getMaxConfiguredCurrent());
+  }
   return claim(props);
 }
 
@@ -30,12 +40,12 @@ bool ManualOverride::release()
 
 bool ManualOverride::toggle()
 {
-  if(!isActive())
-  {
+  if (!isActive()) {
     return claim();
   }
-
-  return release();
+  else {
+    return release();
+  }
 }
 
 bool ManualOverride::getProperties(EvseProperties &props)
@@ -55,5 +65,4 @@ uint8_t ManualOverride::getVersion() {
 uint8_t ManualOverride::setVersion(uint8_t version) {
   _version = version;
   return _version;
-}
- 
+}

src/manual.cpp

@@ -468,7 +468,7 @@ mqtt_publish_override() {
   DynamicJsonDocument override_data(capacity);
   EvseProperties props;
   //check if there an override claim
-  if (evse.clientHasClaim(EvseClient_OpenEVSE_Manual) || manual.isActive()) {
+  if (manual.isActive()) {
     props = evse.getClaimProperties(EvseClient_OpenEVSE_Manual);
     //check if there's state property in override
     props.serialize(override_data);