feedback Jeremy

Author: matth-x

platformio.ini

@@ -43,7 +43,7 @@ lib_deps =
   [email protected]
   ESP32 [email protected]
   lorol/[email protected]
-  https://github.com/matth-x/ArduinoOcpp
+  matth-x/ArduinoOcpp@0.0.2
 lib_ignore = WebSockets ; ArduinoOcpp: don't compile built-in WS library
 extra_scripts = scripts/extra_script.py
 debug_flags =

src/MongooseOcppSocketClient.cpp

@@ -206,8 +206,8 @@ void MongooseOcppSocketClient::reconnect(const String &ws_url) {
 bool MongooseOcppSocketClient::sendTXT(String &out) {
     /*
      * Check if the EVSE is able to send the data at the moment. This fuzzy check can be useful to
-     * to diagnose connection problems at upper layers. It gives no guarantee that packages were
-     * actually sent successfully.
+     * to diagnose connection problems at upper layers. It gives no guarantee that packages will
+     * actually be sent successfully.
      */
     if (!nc || !connection_established || !net_is_connected())
         return false;

src/app_config.cpp

@@ -312,28 +312,6 @@ config_save_mqtt(bool enable, int protocol, String server, uint16_t port, String
   config.commit();
 }
 
-void
-config_save_ocpp(bool enable, String server, String ocpp_chargeBoxId, String ocpp_idTag, String tx_start_point, bool ocpp_suspend_evse, bool ocpp_energize_plug) {
-  uint32_t newflags = flags & ~(CONFIG_SERVICE_OCPP | CONFIG_OCPP_ACCESS_SUSPEND | CONFIG_OCPP_ACCESS_ENERGIZE);
-  if(enable) {
-    newflags |= CONFIG_SERVICE_OCPP;
-  }
-  if(ocpp_suspend_evse) {
-    newflags |= CONFIG_OCPP_ACCESS_SUSPEND;
-  }
-  if(ocpp_energize_plug) {
-    newflags |= CONFIG_OCPP_ACCESS_ENERGIZE;
-  }
-
-  config.set("ocpp_server", server);
-  config.set("ocpp_chargeBoxId", ocpp_chargeBoxId);
-  config.set("ocpp_idTag", ocpp_idTag);
-  config.set("tx_start_point", tx_start_point);
-  config.set("flags", newflags);
-  config.commit();
-}
-
-
 void
 config_save_admin(String user, String pass) {
   config.set("www_username", user);

src/app_config.h

@@ -145,11 +145,6 @@ extern void config_save_emoncms(bool enable, String server, String node, String
 // -------------------------------------------------------------------
 extern void config_save_mqtt(bool enable, int protocol, String server, uint16_t port, String topic, String user, String pass, String solar, String grid_ie, bool reject_unauthorized);
 
-// -------------------------------------------------------------------
-// Save the OCPP connection details
-// -------------------------------------------------------------------
-extern void config_save_ocpp(bool enable, String server, String ocpp_chargeBoxId, String ocpp_idTag, String tx_start_point, bool ocpp_suspend_evse, bool ocpp_energize_plug);
-
 // -------------------------------------------------------------------
 // Save the admin/web interface details
 // -------------------------------------------------------------------

src/main.cpp

@@ -219,8 +219,6 @@ loop() {
       emoncms_publish(data);
       emoncms_updated = false;
     }
-
-    ocpp.poll();
   } // end WiFi connected
 
   Profile_End(loop, 10);

src/ocpp.cpp

@@ -175,14 +175,20 @@ void ArduinoOcppTask::loadEvseBehavior() {
 
 unsigned long ArduinoOcppTask::loop(MicroTasks::WakeReason reason) {
 
-    if (!config_ocpp_enabled()) {
-        return 5000;
-    }
-
-    if (!arduinoOcppInitialized) {
-        initializeArduinoOcpp();
-        loadEvseBehavior();
+    if (arduinoOcppInitialized) {
+        if (config_ocpp_enabled()) {
+            OCPP_loop();
+        } else {
+            //The OCPP function has been activated and then deactivated again.
 
+            ArduinoOcpp::ocppEngine_loop(); //There could be remaining operations in the OCPP-queue. I will add the OCPP_unitialize() soon as a better solution to this
+            return 0;
+        }
+    } else {
+        if (config_ocpp_enabled()) {
+            initializeArduinoOcpp();
+            loadEvseBehavior();
+        }
         return 50;
     }
 
@@ -201,17 +207,7 @@ unsigned long ArduinoOcppTask::loop(MicroTasks::WakeReason reason) {
         onVehicleDisconnect();
     }
 
-    return 50;
-}
-
-void ArduinoOcppTask::poll() {
-    if (arduinoOcppInitialized) {
-        if (config_ocpp_enabled()) {
-            OCPP_loop();
-        } else {
-            ArduinoOcpp::ocppEngine_loop(); //better continue looping. Leftover pending messages could interfere with the networking stack 
-        }
-    }
+    return 0;
 }
 
 void ArduinoOcppTask::updateEvseClaim() {
@@ -281,14 +277,24 @@ void ArduinoOcppTask::updateEvseClaim() {
 }
 
 String ArduinoOcppTask::getCentralSystemUrl() {
-    ocpp_server.trim();
     String url = ocpp_server;
+    url.trim();
+    if (url.isEmpty()) {
+        return url; //return empty String
+    }
     if (!url.endsWith("/")) {
         url += '/';
     }
-    ocpp_chargeBoxId.trim();
-    url += ocpp_chargeBoxId;
-    return url;
+    String chargeBoxId = ocpp_chargeBoxId;
+    chargeBoxId.trim();
+    url += chargeBoxId;
+
+    if (MongooseOcppSocketClient::isValidUrl(url.c_str())) {
+        return url;
+    } else {
+        DBUGLN(F("[ArduinoOcppTask] OCPP server URL or chargeBoxId invalid"));
+        return String("");
+    }
 }
 
 void ArduinoOcppTask::notifyConfigChanged() {

src/ocpp.h

@@ -33,14 +33,6 @@ class ArduinoOcppTask: public MicroTasks::Task {
     std::function<void()> onVehicleConnect = [] () {};
     std::function<void()> onVehicleDisconnect = [] () {};
 
-    /*
-     * OpenEVSE connector claiming rules
-     */
-    std::function<void(EvseState&, EvseProperties&)> inferClaimTransactionActive = [] (EvseState&, EvseProperties&) {};        //Transaction engaged and accepted by the CS
-    std::function<void(EvseState&, EvseProperties&)> inferClaimTransactionActiveOffline = [] (EvseState&, EvseProperties&) {}; //Transaction request pending. EVSE may choose to start charging
-    std::function<void(EvseState&, EvseProperties&)> inferClaimTransactionInactive = [] (EvseState&, EvseProperties&) {};      //No transaction
-    std::function<void(EvseState&, EvseProperties&, float charging_limit)> inferClaimSmartCharging = [] (EvseState&, EvseProperties&, float) {};
-    
     void initializeArduinoOcpp();
     bool arduinoOcppInitialized = false;
     void loadEvseBehavior();
@@ -66,8 +58,6 @@ class ArduinoOcppTask: public MicroTasks::Task {
     ~ArduinoOcppTask();
 
     void begin(EvseManager &evse, LcdTask &lcd);
-
-    void poll();
 
     void updateEvseClaim();
 

src/web_server.cpp

@@ -361,47 +361,6 @@ handleSaveMqtt(MongooseHttpServerRequest *request) {
   mqtt_restart();
 }
 
-// -------------------------------------------------------------------
-// Save OCPP V1.6 Config
-// url: /saveocpp
-// -------------------------------------------------------------------
-void
-handleSaveOcpp(MongooseHttpServerRequest *request) {
-  MongooseHttpServerResponseStream *response;
-  if(false == requestPreProcess(request, response, CONTENT_TYPE_TEXT)) {
-    return;
-  }
-
-  String url = request->getParam("ocpp_server");
-
-  if (!MongooseOcppSocketClient::isValidUrl(url.c_str())) {
-    response->setCode(400);
-    response->print("invalid URL");
-    request->send(response);
-    return;
-  }
-
-  config_save_ocpp(isPositive(request->getParam("ocpp_enabled")),
-                   url, 
-                   request->getParam("ocpp_chargeBoxId"), 
-                   request->getParam("ocpp_idTag"), 
-                   request->getParam("tx_start_point"), 
-                   isPositive(request->getParam("ocpp_suspend_evse")),
-                   isPositive(request->getParam("ocpp_energize_plug")));
-
-  char tmpStr[200];
-  snprintf(tmpStr, sizeof(tmpStr), "Saved: %s %s %s %s %d %d %d",
-          ocpp_server.c_str(), ocpp_chargeBoxId.c_str(), ocpp_idTag.c_str(), tx_start_point.c_str(),
-          (int) config_ocpp_enabled(), (int) config_ocpp_access_can_energize, (int) config_ocpp_access_can_suspend());
-  DBUGLN(tmpStr);
-
-  response->setCode(200);
-  response->print(tmpStr);
-  request->send(response);
-
-  ArduinoOcppTask::notifyConfigChanged();
-}
-
 // -------------------------------------------------------------------
 // Change divert mode (solar PV divert mode) e.g 1:Normal (default), 2:Eco
 // url: /divertmode
@@ -1275,7 +1234,6 @@ web_server_setup() {
   server.on("/savenetwork$", handleSaveNetwork);
   server.on("/saveemoncms$", handleSaveEmoncms);
   server.on("/savemqtt$", handleSaveMqtt);
-  server.on("/saveocpp$", handleSaveOcpp);
   server.on("/saveadmin$", handleSaveAdmin);
   server.on("/teslaveh$", handleTeslaVeh);
   server.on("/saveadvanced$", handleSaveAdvanced);