Merge branch 'master' of github.com:OpenEVSE/ESP32_WiFi_V3.x into issue71/Vehicle_config_ui

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

@@ -81,6 +81,7 @@ build_flags =
   -DAO_CUSTOM_WS ; ArduinoOcpp: don't use built-in WS library
   #-DENABLE_DEBUG
   #-DENABLE_DEBUG_MONGOOSE_HTTP_CLIENT
+  -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()
@@ -128,10 +136,10 @@ EvseManager::EvseManager(Stream &port) :
   _clients(),
   _evseStateListener(this),
   _sessionCompleteListener(this),
-  _targetProperties(),
+  _targetProperties(EvseState::Active),
   _hasClaims(false),
   _sleepForDisable(true),
-  _evaluateClaims(false),
+  _evaluateClaims(true),
   _evaluateTargetState(false),
   _waitingForEvent(0),
   _vehicleValid(0),
@@ -391,7 +399,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++)
   {
@@ -406,10 +414,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;
   }
 
@@ -557,3 +568,41 @@ void EvseManager::setVehicleEta(int vehicleEta)
   _vehicleLastUpdated = millis();
   MicroTask.wakeTask(this);
 }
+
+bool EvseManager::isRapiCommandBlocked(String rapi)
+{
+  return rapi.startsWith("$ST");
+}
+
+bool EvseManager::serializeClaims(DynamicJsonDocument &doc)
+{
+  doc.to<JsonArray>();
+
+  for(size_t i = 0; i < EVSE_MANAGER_MAX_CLIENT_CLAIMS; i++)
+  {
+    Claim &claim = _clients[i];
+    if(claim.isValid())
+    {
+      JsonObject obj = doc.createNestedObject();
+      obj["client"] = claim.getClient();
+      obj["priority"] = claim.getPriority();
+      claim.getProperties().serialize(obj);
+    }
+  }
+
+  return true;
+}
+
+bool EvseManager::serializeClaim(DynamicJsonDocument &doc, EvseClient client)
+{
+  Claim *claim;
+
+  if(findClaim(client, &claim))
+  {
+    doc["priority"] = claim->getPriority();
+    claim->getProperties().serialize(doc);
+    return true;
+  }
+
+  return false;
+}

src/evse_man.h

@@ -39,6 +39,7 @@ typedef uint32_t EvseClient;
 #define EvseManager_Priority_Divert     50
 #define EvseManager_Priority_Timer     100
 #define EvseManager_Priority_Boost     200
+#define EvseManager_Priority_API       500
 #define EvseManager_Priority_Ohm       500
 #define EvseManager_Priority_Manual   1000
 #define EvseManager_Priority_Ocpp     1050
@@ -167,6 +168,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;
@@ -186,7 +215,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() {
@@ -290,6 +319,9 @@ class EvseManager : public MicroTasks::Task
     uint32_t getEnergyLimit(EvseClient client = EvseClient_NULL);
     uint32_t getTimeLimit(EvseClient client = EvseClient_NULL);
 
+    bool serializeClaims(DynamicJsonDocument &doc);
+    bool serializeClaim(DynamicJsonDocument &doc, EvseClient client);
+
     // Evse Status
     bool isConnected() {
       return OpenEVSE.isConnected();
@@ -438,6 +470,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

@@ -132,16 +132,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,10 @@ 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)
 {
 #ifdef ENABLE_DEBUG_WEB_REQUEST
@@ -119,7 +123,7 @@ void dumpRequest(MongooseHttpServerRequest *request)
 // -------------------------------------------------------------------
 // Helper function to perform the standard operations on a request
 // -------------------------------------------------------------------
-bool requestPreProcess(MongooseHttpServerRequest *request, MongooseHttpServerResponseStream *&response, fstr_t contentType = CONTENT_TYPE_JSON)
+bool requestPreProcess(MongooseHttpServerRequest *request, MongooseHttpServerResponseStream *&response, fstr_t contentType)
 {
   dumpRequest(request);
 
@@ -587,6 +591,8 @@ handleStatus(MongooseHttpServerRequest *request) {
 
   create_rapi_json(doc);
 
+  doc["status"] = evse.getState().toString();
+
   doc["elapsed"] = evse.getSessionElapsed();
   doc["wattsec"] = evse.getSessionEnergy() * SESSION_ENERGY_SCALE_FACTOR;
   doc["watthour"] = evse.getTotalEnergy() * TOTAL_ENERGY_SCALE_FACTOR;
@@ -1106,12 +1112,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)
@@ -1167,6 +1179,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) {
@@ -1177,7 +1190,7 @@ handleRapi(MongooseHttpServerRequest *request) {
         s += errorString;
       }
 
-      code = 500;
+      code = RAPI_RESPONSE_BLOCKED == ret ? 400 : 500;
     }
   }
   if (false == json) {
@@ -1261,6 +1274,8 @@ web_server_setup() {
   server.on("/schedule/plan$", handleSchedulePlan);
   server.on("/schedule", handleSchedule);
 
+  server.on("/claims", handleEvseClaims);
+
   server.on("/override$", handleOverride);
 
   // Simple Firmware Update Form

src/web_server.h

@@ -36,6 +36,9 @@ extern void web_server_loop();
 
 extern void web_server_event(JsonDocument &event);
 
+typedef const __FlashStringHelper *fstr_t;
+
+bool requestPreProcess(MongooseHttpServerRequest *request, MongooseHttpServerResponseStream *&response, fstr_t contentType = CONTENT_TYPE_JSON);
 void dumpRequest(MongooseHttpServerRequest *request);
 
 #endif // _EMONESP_WEB_SERVER_H