Only re-evaluate if a claim has changed

Author: jeremypoulter

src/evse_man.cpp

@@ -109,11 +109,19 @@ EvseManager::Claim::Claim() :
 {
 }
 
-void EvseManager::Claim::claim(EvseClient client, int priority, EvseProperties &target)
+bool EvseManager::Claim::claim(EvseClient client, int priority, EvseProperties &target)
 {
-  _client = client;
-  _priority = priority;
-  _properties = target;
+  if(_client != client ||
+     _priority != priority ||
+     _properties != target)
+  {
+    _client = client;
+    _priority = priority;
+    _properties = target;
+    return true;
+  }
+
+  return false;
 }
 
 void EvseManager::Claim::release()
@@ -385,7 +393,7 @@ bool EvseManager::claim(EvseClient client, int priority, EvseProperties &target)
 {
   Claim *slot = NULL;
 
-  DBUGF("New claim from 0x%08x, priority %d, %s", client, priority, target.getState().toString());
+  DBUGF("Claim from 0x%08x, priority %d, %s", client, priority, target.getState().toString());
 
   for (size_t i = 0; i < EVSE_MANAGER_MAX_CLIENT_CLAIMS; i++)
   {
@@ -400,10 +408,13 @@ bool EvseManager::claim(EvseClient client, int priority, EvseProperties &target)
 
   if(slot)
   {
-    DBUGF("Found slot, waking task");
-    slot->claim(client, priority, target);
-    _evaluateClaims = true;
-    MicroTask.wakeTask(this);
+    DBUGF("Found slot");
+    if(slot->claim(client, priority, target))
+    {
+      DBUGF("Claim added/updated, waking task");
+      _evaluateClaims = true;
+      MicroTask.wakeTask(this);
+    }
     return true;
   }
 

src/evse_man.h

@@ -162,6 +162,34 @@ class EvseProperties : virtual public JsonSerialize<512>
       return *this;
     }
 
+    bool equals(EvseProperties &rhs) {
+      return this->_state == rhs._state &&
+             this->_charge_current == rhs._charge_current &&
+             this->_max_current == rhs._max_current &&
+             this->_energy_limit == rhs._energy_limit &&
+             this->_time_limit == rhs._time_limit &&
+             this->_auto_release == rhs._auto_release;
+
+    }
+    bool equals(EvseState &rhs) {
+      return this->_state == rhs;
+    }
+
+    bool operator == (EvseProperties &rhs) {
+      return this->equals(rhs);
+    }
+    bool operator == (EvseState &rhs) {
+      return this->equals(rhs);
+    }
+
+    bool operator != (EvseProperties &rhs) {
+      return !equals(rhs);
+    }
+    bool operator != (EvseState &rhs) {
+      return !equals(rhs);
+    }
+
+
     using JsonSerialize::deserialize;
     virtual bool deserialize(JsonObject &obj);
     using JsonSerialize::serialize;
@@ -181,7 +209,7 @@ class EvseManager : public MicroTasks::Task
       public:
         Claim();
 
-        void claim(EvseClient client, int priority, EvseProperties &target);
+        bool claim(EvseClient client, int priority, EvseProperties &target);
         void release();
 
         bool isValid() {