Merge branch 'master' of github.com:OpenEVSE/ESP32_WiFi_V3.x into jeremypoulter/issue147

Author: jeremypoulter

docs/wired-ethernet.md

@@ -13,6 +13,8 @@ Network connection can be made with a standard Ethernet cable. For new installat
 
 ## Hardware Connections 
 
+See [photos ](https://photos.google.com/share/AF1QipNvANgeR_NRmLrq0lhKnA0BR7ieD8DGRoaJFoilMIwQ8c7QpxR4X7hSfGj3XiTTUw) of hardware connectors for new OpenEVSE V5.5 controller.
+
 *Note: The these hardware connections apply to the current Rev.E & Rev.F ESP32-gateway hardware revisions. See section below for older units.*
 
 

platformio.ini

@@ -75,6 +75,7 @@ build_flags =
   -DMG_ENABLE_SNTP=1
   -DCS_PLATFORM=CS_P_ESP32
   -DAO_CUSTOM_WS ; ArduinoOcpp: don't use built-in WS library
+  -DRAPI_MAX_COMMANDS=20
 build_partitions = min_spiffs.csv
 monitor_flags = --filter=esp32_exception_decoder
 

src/divert.cpp

@@ -92,7 +92,7 @@ void divertmode_update(byte newmode)
         event["smoothed_available_current"] = smoothed_available_current = 0;
 
         EvseProperties props(EvseState::Disabled);
-        evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Divert, props);
+        evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Default, props);
       } break;
 
       default:
@@ -208,7 +208,7 @@ void divert_update_state()
         if(divert_active && divertmode_get_time() >= min_charge_end)
         {
           EvseProperties props(EvseState::Disabled);
-          evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Divert, props);
+          evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Default, props);
 
           if(previousState != evse.getState())
           {

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;
   }
 
@@ -525,6 +536,10 @@ uint32_t EvseManager::getTimeLimit(EvseClient client)
   return getClaimProperties(client).getTimeLimit();
 }
 
+bool EvseManager::isRapiCommandBlocked(String rapi)
+{
+  return rapi.startsWith("$ST");
+}
 
 bool EvseManager::serializeClaims(DynamicJsonDocument &doc)
 {

src/evse_man.h

@@ -164,6 +164,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;
@@ -183,7 +211,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() {
@@ -402,6 +430,8 @@ class EvseManager : public MicroTasks::Task
     void onSessionComplete(MicroTasks::EventListener *listner) {
       _monitor.onSessionComplete(listner);
     }
+
+    bool isRapiCommandBlocked(String rapi);
 };
 
 #endif // !_OPENEVSE_EVSE_MAN_H

src/mqtt.cpp

@@ -95,16 +95,19 @@ void mqttmsg_callback(MongooseString topic, MongooseString payload) {
         cmd += " "+payload_str;
       }
 
-      rapiSender.sendCmd(cmd, [](int ret)
+      if(!evse.isRapiCommandBlocked(cmd))
       {
-        if (RAPI_RESPONSE_OK == ret || RAPI_RESPONSE_NK == ret)
+        rapiSender.sendCmd(cmd, [](int ret)
         {
-          String rapiString = rapiSender.getResponse();
-          String mqtt_data = rapiString;
-          String mqtt_sub_topic = mqtt_topic + "/rapi/out";
-          mqttclient.publish(mqtt_sub_topic, mqtt_data);
-        }
-      });
+          if (RAPI_RESPONSE_OK == ret || RAPI_RESPONSE_NK == ret)
+          {
+            String rapiString = rapiSender.getResponse();
+            String mqtt_data = rapiString;
+            String mqtt_sub_topic = mqtt_topic + "/rapi/out";
+            mqttclient.publish(mqtt_sub_topic, mqtt_data);
+          }
+        });
+      }
     }
   }
 } //end call back

src/scheduler.cpp

@@ -204,7 +204,9 @@ unsigned long Scheduler::loop(MicroTasks::WakeReason reason)
       DBUGF("Starting %s claim",
         currentEvent.getState().toString());
       EvseProperties properties(currentEvent.getState());
-      _evse->claim(EvseClient_OpenEVSE_Schedule, EvseManager_Priority_Timer, properties);
+      _evse->claim(EvseClient_OpenEVSE_Schedule,
+        EvseState::Active == currentEvent.getState() ? EvseManager_Priority_Timer : EvseManager_Priority_Default,
+        properties);
     } else {
       // No scheduled events, release any claims
       DBUGLN("releasing claims");

src/web_server.cpp

@@ -58,6 +58,8 @@ const char _CONTENT_TYPE_JPEG[] PROGMEM = "image/jpeg";
 const char _CONTENT_TYPE_PNG[] PROGMEM = "image/png";
 const char _CONTENT_TYPE_SVG[] PROGMEM = "image/svg+xml";
 
+#define RAPI_RESPONSE_BLOCKED             -300
+
 void handleEvseClaims(MongooseHttpServerRequest *request);
 
 void dumpRequest(MongooseHttpServerRequest *request)
@@ -1101,12 +1103,18 @@ handleRapi(MongooseHttpServerRequest *request) {
   if (request->hasParam("rapi"))
   {
     String rapi = request->getParam("rapi");
+    int ret = RAPI_RESPONSE_NK;
 
-    // BUG: Really we should do this in the main loop not here...
-    RAPI_PORT.flush();
-    DBUGVAR(rapi);
-    int ret = rapiSender.sendCmdSync(rapi);
-    DBUGVAR(ret);
+    if(!evse.isRapiCommandBlocked(rapi))
+    {
+      // BUG: Really we should do this in the main loop not here...
+      RAPI_PORT.flush();
+      DBUGVAR(rapi);
+      ret = rapiSender.sendCmdSync(rapi);
+      DBUGVAR(ret);
+    } else {
+      ret = RAPI_RESPONSE_BLOCKED;
+    }
 
     if(RAPI_RESPONSE_OK == ret ||
        RAPI_RESPONSE_NK == ret)
@@ -1162,6 +1170,7 @@ handleRapi(MongooseHttpServerRequest *request) {
         RAPI_RESPONSE_BAD_CHECKSUM == ret ? F("RAPI_RESPONSE_BAD_CHECKSUM") :
         RAPI_RESPONSE_BAD_SEQUENCE_ID == ret ? F("RAPI_RESPONSE_BAD_SEQUENCE_ID") :
         RAPI_RESPONSE_ASYNC_EVENT == ret ? F("RAPI_RESPONSE_ASYNC_EVENT") :
+        RAPI_RESPONSE_BLOCKED == ret ? F("RAPI_RESPONSE_BLOCKED") :
         F("UNKNOWN");
 
       if (json) {
@@ -1172,7 +1181,7 @@ handleRapi(MongooseHttpServerRequest *request) {
         s += errorString;
       }
 
-      code = 500;
+      code = RAPI_RESPONSE_BLOCKED == ret ? 400 : 500;
     }
   }
   if (false == json) {