fix mqtt /override topic publishing too much props

fix override topic not publishing props if there's no state prop
removed useless if condition

Author: KipK

src/evse_man.cpp

@@ -10,6 +10,7 @@
 #include "event_log.h"
 #include "divert.h"
 #include "current_shaper.h"
+#include "manual.h"
 
 static EvseProperties nullProperties;
 
@@ -267,7 +268,6 @@ bool EvseManager::evaluateClaims(EvseProperties &properties)
         DynamicJsonDocument event(capacity);
         event["manual_override"] = 1;
         event_send(event);
-        // update /override topic to mqtt
         event.clear();
         mqtt_publish_json(event, "/override");
       }
@@ -439,6 +439,12 @@ unsigned long EvseManager::loop(MicroTasks::WakeReason reason)
   {
     _evaluateTargetState = false;
     setTargetState(_targetProperties);
+
+    if ( manual.isActive() ) {
+      // update /override topic to mqtt
+      mqtt_publish_override();
+    }
+
   }
   return MicroTask.Infinate;
 }

src/mqtt.cpp

@@ -404,22 +404,18 @@ mqtt_publish_claim() {
 
 void
 mqtt_publish_override() {
+  DBUGLN("MQTT publish_override()");
   if(!config_mqtt_enabled() || !mqttclient.connected()) {
     return;
   }
   const size_t capacity = JSON_OBJECT_SIZE(40) + 1024;
   DynamicJsonDocument override_data(capacity);
   EvseProperties props;
   //check if there an override claim
-  if (evse.clientHasClaim(EvseClient_OpenEVSE_Manual)) {
+  if (evse.clientHasClaim(EvseClient_OpenEVSE_Manual) || manual.isActive()) {
     props = evse.getClaimProperties(EvseClient_OpenEVSE_Manual);
     //check if there's state property in override
-    if(props.getState() != 0) {
-      props.serialize(override_data); 
-    }
-    else {
-      override_data["state"] = "null";
-    }
+    props.serialize(override_data); 
   }
   else override_data["state"] = "null";
   mqtt_publish_json(override_data, "/override");