Merge pull request #474 from KipK/master

add "claims_version" event sent at each claims change.

Author: jeremypoulter

src/evse_man.cpp

@@ -478,7 +478,15 @@ bool EvseManager::claim(EvseClient client, int priority, EvseProperties &target)
     DBUGF("Found slot");
     if(slot->claim(client, priority, target))
     {
-      DBUGF("Claim added/updated, waking task");
+      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);
+      }
+
       _evaluateClaims = true;
       MicroTask.wakeTask(this);
     }
@@ -491,7 +499,7 @@ bool EvseManager::claim(EvseClient client, int priority, EvseProperties &target)
 bool EvseManager::release(EvseClient client)
 {
   Claim *claim;
-  
+
   if(findClaim(client, &claim))
   {
     // if claim is manual override, publish data to socket & mqtt
@@ -506,9 +514,13 @@ bool EvseManager::release(EvseClient client)
       mqtt_publish_json(event, "/override");
     }
 
+    StaticJsonDocument<128> event;
+    event["claims_version"] = ++_version;
+    event_send(event);
+
     claim->release();
     _evaluateClaims = true;
-    MicroTask.wakeTask(this); 
+    MicroTask.wakeTask(this);
     return true;
   }
 
@@ -532,6 +544,11 @@ bool EvseManager::clientHasClaim(EvseClient client) {
   return findClaim(client);
 }
 
+uint8_t EvseManager::getClaimsVersion() {
+  return _version;
+}
+
+
 EvseProperties &EvseManager::getClaimProperties(EvseClient client)
 {
   if(EvseClient_NULL == client) {

src/evse_man.h

@@ -253,6 +253,7 @@ class EvseManager : public MicroTasks::Task
 
     EvseProperties _targetProperties;
     bool _hasClaims;
+    uint8_t _version;
 
     EvseClient _state_client;
     EvseClient _charge_current_client;
@@ -297,6 +298,7 @@ class EvseManager : public MicroTasks::Task
     bool claim(EvseClient client, int priority, EvseProperties &target);
     bool release(EvseClient client);
     bool clientHasClaim(EvseClient client);
+    uint8_t getClaimsVersion();
 
     EvseProperties &getClaimProperties(EvseClient client);
     EvseState getState(EvseClient client = EvseClient_NULL);

src/web_server.cpp

@@ -39,6 +39,7 @@ typedef const __FlashStringHelper *fstr_t;
 #include "scheduler.h"
 #include "rfid.h"
 #include "current_shaper.h"
+#include "evse_man.h"
 
 MongooseHttpServer server;          // Create class for Web server
 
@@ -252,6 +253,7 @@ void buildStatus(DynamicJsonDocument &doc) {
   doc["offset"] = String(offset);
 
   doc["config_version"] = config_version;
+  doc["claims_version"] = evse.getClaimsVersion();
   doc["schedule_version"] = scheduler.getVersion();
   doc["schedule_plan_version"] = scheduler.getPlanVersion();