Merge pull request #486 from KipK:master

override version +  fixes

Author: jeremypoulter

src/current_shaper.cpp

@@ -52,6 +52,12 @@ unsigned long CurrentShaperTask::loop(MicroTasks::WakeReason reason) {
 				event_send(event);
 			}
 	}
+	else {
+		//remove shaper claim
+		if (_evse->clientHasClaim(EvseClient_OpenEVSE_Shaper)) {
+			_evse->release(EvseClient_OpenEVSE_Shaper);
+		}
+	}
 
 
 	return EVSE_SHAPER_LOOP_TIME;

src/evse_man.cpp

@@ -268,8 +268,6 @@ bool EvseManager::evaluateClaims(EvseProperties &properties)
         DynamicJsonDocument event(capacity);
         event["manual_override"] = 1;
         event_send(event);
-        event.clear();
-        mqtt_publish_json(event, "/override");
       }
     }
   }
@@ -439,12 +437,6 @@ 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;
 }
@@ -477,18 +469,13 @@ bool EvseManager::claim(EvseClient client, int priority, EvseProperties &target)
   {
     DBUGF("Found slot");
     if(slot->claim(client, priority, target))
-    {
-      if (target.getState() != EvseState::None)
-          // ignore incrementing claims_version if there's no state in the claim
-      {
-        DBUGF("Claim added/updated, waking task");
-        StaticJsonDocument<128> event;
-        event["claims_version"] = ++_version;
-        event_send(event);
-      }
-
+    { 
+      DBUGF("Claim added/updated, waking task");
       _evaluateClaims = true;
       MicroTask.wakeTask(this);
+      StaticJsonDocument<128> event;
+      event["claims_version"] = ++_version;
+      event_send(event);
     }
     return true;
   }
@@ -508,19 +495,13 @@ bool EvseManager::release(EvseClient client)
       DynamicJsonDocument event(capacity);
       event["manual_override"] = 0;
       event_send(event);
-      event.clear();
-      // update /override topic to mqtt
-      event["state"] = "null";
-      mqtt_publish_json(event, "/override");
     }
-
-    StaticJsonDocument<128> event;
-    event["claims_version"] = ++_version;
-    event_send(event);
-
     claim->release();
     _evaluateClaims = true;
     MicroTask.wakeTask(this);
+    StaticJsonDocument<128> event;
+    event["claims_version"] = ++_version;
+    event_send(event);
     return true;
   }
 

src/manual.cpp

@@ -1,8 +1,10 @@
 #include "manual.h"
+#include "event.h"
 
 ManualOverride::ManualOverride(EvseManager &evse) :
   _evse((&evse))
 {
+  _version = 0;
 }
 
 ManualOverride::~ManualOverride()
@@ -18,6 +20,9 @@ bool ManualOverride::claim()
 bool ManualOverride::claim(EvseProperties &props)
 {
   if (!props.hasAutoRelease()) props.setAutoRelease(true);
+  StaticJsonDocument<128> event;
+  event["override_version"] = ++_version;
+  event_send(event);
   return _evse->claim(EvseClient_OpenEVSE_Manual, EvseManager_Priority_Manual, props);
 }
 
@@ -45,3 +50,8 @@ bool ManualOverride::getProperties(EvseProperties &props)
 
   return false;
 }
+
+uint8_t ManualOverride::getVersion() {
+   return _version;
+}
+ 

src/manual.h

@@ -8,6 +8,7 @@ class ManualOverride
 {
   private:
     EvseManager *_evse;
+    uint8_t _version;
   public:
     ManualOverride(EvseManager &evse);
     ~ManualOverride();
@@ -21,6 +22,7 @@ class ManualOverride
       return _evse->clientHasClaim(EvseClient_OpenEVSE_Manual);
     }
     bool getProperties(EvseProperties &props);
+    uint8_t getVersion();
 };
 
 extern ManualOverride manual;

src/mqtt.cpp

@@ -31,6 +31,8 @@ static long nextMqttReconnectAttempt = 0;
 static unsigned long mqttRestartTime = 0;
 static bool connecting = false;
 static bool mqttRetained = false;
+uint8_t claimsVersion = 0;
+uint8_t overrideVersion = 0;
 
 String lastWill = "";
 
@@ -70,7 +72,7 @@ void mqttmsg_callback(MongooseString topic, MongooseString payload) {
   else if (topic_string == mqtt_live_pwr)
   {
       shaper.setLivePwr(payload_str.toInt());
-      DBUGF("shaper: available power:%dW", shaper.getAvlPwr());
+      DBUGF("shaper: available amps:%dA", shaper.getChgCur());
   }
   else if (topic_string == mqtt_vrms)
   {
@@ -496,6 +498,18 @@ mqtt_loop() {
     }
   }
 
+  if (claimsVersion != evse.getClaimsVersion() || !claimsVersion) {
+    mqtt_publish_claim();
+    DBUGF("Claims has changed, publishing to MQTT");
+    claimsVersion = evse.getClaimsVersion();
+  }
+
+  if (overrideVersion != manual.getVersion() || !overrideVersion ) {
+    mqtt_publish_override;
+    DBUGF("Claims has changed, publishing to MQTT");
+    overrideVersion = manual.getVersion();
+  }
+
   Profile_End(mqtt_loop, 5);
 }
 

src/web_server.cpp

@@ -254,6 +254,7 @@ void buildStatus(DynamicJsonDocument &doc) {
 
   doc["config_version"] = config_version;
   doc["claims_version"] = evse.getClaimsVersion();
+  doc["override_version"] = manual.getVersion();
   doc["schedule_version"] = scheduler.getVersion();
   doc["schedule_plan_version"] = scheduler.getPlanVersion();