Merge pull request #416 from KipK/fix#411

Fix#411
OpenEVSE · Aug 22, 2022 · 7e234b8 · 7e234b8
2 parents fb11345 + 9ec7d4b
commit 7e234b8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/src/input.cpp b/src/input.cpp
@@ -69,7 +69,6 @@ class InputTask : public MicroTasks::Task
         event["colour"] = evse.getStateColour();
         event["pilot"] = evse.getPilotState();
         event["manual_override"] = manual.isActive() ? 1 : 0; //TODO: remove this
-        event["override"] = getOverride(); 
         event["session_energy"] = evse.getSessionEnergy();
         event_send(event);
       }
@@ -133,27 +132,12 @@ 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; //TODO: remove this 
-  //replace "manual_override", should be either 0 or json override claim.
-  doc["override"] = getOverride();
+  doc["manual_override"] = manual.isActive() ? 1 : 0;
   doc["freeram"] = ESPAL.getFreeHeap();
   doc["divertmode"] = divertmode;
   doc["srssi"] = WiFi.RSSI();
 }
 
-String getOverride() {
-  String override = "";
-  const size_t capacity = JSON_OBJECT_SIZE(10) + 1024;
-  DynamicJsonDocument doc(capacity);
-  if(manual.isActive()) {
-    evse.serializeClaim(doc, EvseClient_OpenEVSE_Manual);   
-  } else {
-    doc["state"] = "null";
-  }
-  serializeJson(doc, override);
-  return override;
-}
-
 void
 handleRapiRead()
 {

diff --git a/src/input.h b/src/input.h
@@ -15,7 +15,6 @@ extern String url;
 extern String data;
 extern String ohm_hour;
 
-extern String getOverride();
 extern void handleRapiRead();
 extern void create_rapi_json(JsonDocument &data);
 

diff --git a/src/web_server.cpp b/src/web_server.cpp
@@ -816,6 +816,7 @@ void handleOverridePost(MongooseHttpServerRequest *request, MongooseHttpServerRe
     if(manual.claim(props)) {
       response->setCode(201);
       response->print("{\"msg\":\"Created\"}");
+      mqtt_publish_override();  // update override state to mqtt
     } else {
       response->setCode(500);
       response->print("{\"msg\":\"Failed to claim manual overide\"}");