more precise variable naming

matth-x · matth-x · commit 178c2a2fe9e8 · 2021-06-03T00:06:22.000+02:00
diff --git a/src/MongooseOcppSocketClient.cpp b/src/MongooseOcppSocketClient.cpp
@@ -42,15 +42,6 @@ const char *ocpp_ca = "-----BEGIN CERTIFICATE-----\r\n"
 #define MG_WEBSOCKET_PING_INTERVAL_MS (MG_WEBSOCKET_PING_INTERVAL_SECONDS * 1000)
 
 bool ocppIsConnected = false;
-bool ocppConnected() {
-    return ocppIsConnected;
-}
-
-int checkUrl(const char *url) {
-    unsigned int port_i = 0;
-    struct mg_str scheme, query, fragment;
-    return mg_parse_uri(mg_mk_str(url), &scheme, NULL, NULL, &port_i, NULL, &query, &fragment); //returns 0 on success, false otherwise
-}
 
 MongooseOcppSocketClient::MongooseOcppSocketClient(String &ws_url) {
     this->ws_url = String(ws_url);
@@ -253,6 +244,15 @@ bool MongooseOcppSocketClient::receiveTXT(const char* msg, size_t len) {
     return receiveTXTcallback(msg, len);
 }
 
+bool MongooseOcppSocketClient::ocppConnected() {
+    return ocppIsConnected;
+}
+
+bool MongooseOcppSocketClient::isValidUrl(const char *url) {
+    unsigned int port_i = 0;
+    struct mg_str scheme, query, fragment;
+    return mg_parse_uri(mg_mk_str(url), &scheme, NULL, NULL, &port_i, NULL, &query, &fragment) == 0; //mg_parse_uri returns 0 on success, false otherwise
+}
 
 void MongooseOcppSocketClient::printUrl() {
     Serial.print(ws_url);
diff --git a/src/MongooseOcppSocketClient.h b/src/MongooseOcppSocketClient.h
@@ -18,9 +18,6 @@
 
 #define WS_UNRESPONSIVE_THRESHOLD_MS 4000
 
-extern boolean ocppConnected(); //for dashboard
-int checkUrl(const char *url);
-
 class MongooseOcppSocketClient : public ArduinoOcpp::OcppSocket {
 private:
     ArduinoOcpp::ReceiveTXTcallback receiveTXTcallback = [] (const char *, size_t) {return false;};
@@ -61,6 +58,10 @@ class MongooseOcppSocketClient : public ArduinoOcpp::OcppSocket {
     static void mg_event_callback(struct mg_connection *nc, int ev, void *ev_data, void *user_data);
 
     void reconnect(String &ws_url);
+
+    static boolean ocppConnected(); //for dashboard
+
+    static bool isValidUrl(const char *url);
 };
 
 #endif
diff --git a/src/app_config.cpp b/src/app_config.cpp
@@ -207,11 +207,11 @@ void config_changed(String name)
     if(emoncms_connected != config_emoncms_enabled()) {
       emoncms_updated = true;
     }
-    ArduinoOcppTask::notifyReconfigured();
+    ArduinoOcppTask::notifyConfigChanged();
   } else if(name.startsWith("mqtt_")) {
     mqtt_restart();
   } else if(name.startsWith("ocpp_") || name.startsWith("tx_start_point")) {
-    ArduinoOcppTask::notifyReconfigured();
+    ArduinoOcppTask::notifyConfigChanged();
   } else if(name.startsWith("emoncms_")) {
     emoncms_updated = true;
   } else if(name == "divert_enabled" || name == "charge_mode") {
diff --git a/src/main.cpp b/src/main.cpp
@@ -220,7 +220,7 @@ loop() {
       emoncms_updated = false;
     }
 
-    ocpp.OcppLibrary_loop();
+    ocpp.poll();
   } // end WiFi connected
 
   Profile_End(loop, 10);
diff --git a/src/ocpp.cpp b/src/ocpp.cpp
@@ -5,14 +5,12 @@
 
 #include "ocpp.h"
 
-#include "debug.h"
 #include "app_config.h"
 
 #include <ArduinoOcpp.h> // Facade for ArduinoOcpp
 #include <ArduinoOcpp/SimpleOcppOperationFactory.h> // define behavior for incoming req messages
 
-#include <ArduinoOcpp/Core/OcppEngine.h> //only for outputting debug messages to SteVe
-#include <ArduinoOcpp/MessagesV16/DataTransfer.h> //only for outputting debug messages to SteVe
+#include <ArduinoOcpp/Core/OcppEngine.h>
 
 #include "emonesp.h" //for DEFAULT_VOLTAGE
 
@@ -31,21 +29,20 @@ ArduinoOcppTask::~ArduinoOcppTask() {
 }
 
 void ArduinoOcppTask::begin(EvseManager &evse, LcdTask &lcd) {
-    Serial.println("[ArduinoOcppTask] begin!");
     
     this->evse = &evse;
     this->lcd = &lcd;
 
-    loadOcppLibrary();
+    initializeArduinoOcpp();
     loadEvseBehavior();
 
     instance = this; //cannot be in constructer because object is invalid before .begin()
     MicroTask.startTask(this);
 }
 
-void ArduinoOcppTask::loadOcppLibrary() {
+void ArduinoOcppTask::initializeArduinoOcpp() {
 
-    if (config_ocpp_enabled() && !ocppLibraryLoaded) {
+    if (config_ocpp_enabled() && !arduinoOcppInitialized) {
 
         String url = getCentralSystemUrl();
 
@@ -67,7 +64,7 @@ void ArduinoOcppTask::loadOcppLibrary() {
             LCD_DISPLAY("OCPP connected!");
         });
 
-        ocppLibraryLoaded = true;
+        arduinoOcppInitialized = true;
     }
 }
 
@@ -77,7 +74,7 @@ void ArduinoOcppTask::setup() {
 
 void ArduinoOcppTask::loadEvseBehavior() {
 
-    if (!ocppLibraryLoaded) {
+    if (!arduinoOcppInitialized) {
         return;
     }
 
@@ -110,18 +107,6 @@ void ArduinoOcppTask::loadEvseBehavior() {
      * CP behavior definition: How will plugging and unplugging the EV start or stop OCPP transactions
      */
 
-    if (!config_ocpp_enabled()) {
-        //ocpp off
-        onVehicleConnect = [] () {};
-        onVehicleDisconnect = [] () {};
-        inferClaimTransactionActive = [] (EvseState& evseState, EvseProperties& evseProperties) {};
-        inferClaimTransactionActiveOffline = [] (EvseState& evseState, EvseProperties& evseProperties) {};
-        inferClaimTransactionInactive = [] (EvseState& evseState, EvseProperties& evseProperties) {};
-        inferClaimSmartCharging = [evse = evse] (EvseState& evseState, EvseProperties& evseProperties, float charging_limit) {};
-        updateEvseClaim();
-        return;
-    }
-
     onVehicleConnect = [this] () {
         if (getTransactionId() < 0) {
             if (!ocpp_idTag.isEmpty()) {
@@ -157,7 +142,7 @@ void ArduinoOcppTask::loadEvseBehavior() {
 
     setOnRemoteStartTransactionSendConf([this, onVehicleConnect = onVehicleConnect] (JsonObject payload) {
         if (!operationIsAccepted(payload)){
-            if (DEBUG_OUT) Serial.print(F("RemoteStartTransaction rejected! Do nothing\n"));
+            //RemoteStartTransaction rejected! Do nothing
             return;
         }
 
@@ -177,7 +162,7 @@ void ArduinoOcppTask::loadEvseBehavior() {
 
     setOnRemoteStopTransactionSendConf([this](JsonObject payload) {
         if (!operationIsAccepted(payload)){
-            if (DEBUG_OUT) Serial.print(F("RemoteStopTransaction rejected! There is no transaction with given ID. Do nothing\n"));
+            //RemoteStopTransaction rejected! There is no transaction with given ID. Do nothing
             return;
         }
 
@@ -194,8 +179,8 @@ unsigned long ArduinoOcppTask::loop(MicroTasks::WakeReason reason) {
         return 5000;
     }
 
-    if (!ocppLibraryLoaded) {
-        loadOcppLibrary();
+    if (!arduinoOcppInitialized) {
+        initializeArduinoOcpp();
         loadEvseBehavior();
 
         return 50;
@@ -219,8 +204,8 @@ unsigned long ArduinoOcppTask::loop(MicroTasks::WakeReason reason) {
     return 50;
 }
 
-void ArduinoOcppTask::OcppLibrary_loop() {
-    if (ocppLibraryLoaded) {
+void ArduinoOcppTask::poll() {
+    if (arduinoOcppInitialized) {
         if (config_ocpp_enabled()) {
             OCPP_loop();
         } else {
@@ -306,14 +291,14 @@ String ArduinoOcppTask::getCentralSystemUrl() {
     return url;
 }
 
-void ArduinoOcppTask::notifyReconfigured() {
+void ArduinoOcppTask::notifyConfigChanged() {
     if (instance) {
         instance->reconfigure();
     }
 }
 
 void ArduinoOcppTask::reconfigure() {
-    if (ocppLibraryLoaded) {
+    if (arduinoOcppInitialized) {
         if (config_ocpp_enabled()) {
             String mUrl = getCentralSystemUrl();
             ocppSocket->reconnect(mUrl);
@@ -322,7 +307,7 @@ void ArduinoOcppTask::reconfigure() {
             ocppSocket->reconnect(emptyUrl);
         }
     } else {
-        loadOcppLibrary();
+        initializeArduinoOcpp();
     }
     loadEvseBehavior();
 }
diff --git a/src/ocpp.h b/src/ocpp.h
@@ -41,8 +41,8 @@ class ArduinoOcppTask: public MicroTasks::Task {
     std::function<void(EvseState&, EvseProperties&)> inferClaimTransactionInactive = [] (EvseState&, EvseProperties&) {};      //No transaction
     std::function<void(EvseState&, EvseProperties&, float charging_limit)> inferClaimSmartCharging = [] (EvseState&, EvseProperties&, float) {};
     
-    void loadOcppLibrary();
-    bool ocppLibraryLoaded = false;
+    void initializeArduinoOcpp();
+    bool arduinoOcppInitialized = false;
     void loadEvseBehavior();
 
     String getCentralSystemUrl();
@@ -55,10 +55,10 @@ class ArduinoOcppTask: public MicroTasks::Task {
     static bool idTagIsRejected(JsonObject payload);
 protected:
 
-    //hook method of Task
+    //hook method of MicroTask::Task
     void setup();
 
-    //hook method of Task
+    //hook method of MicroTask::Task
     unsigned long loop(MicroTasks::WakeReason reason);
 
 public:
@@ -67,11 +67,11 @@ class ArduinoOcppTask: public MicroTasks::Task {
 
     void begin(EvseManager &evse, LcdTask &lcd);
 
-    void OcppLibrary_loop();
+    void poll();
     
     void updateEvseClaim();
 
-    static void notifyReconfigured();
+    static void notifyConfigChanged();
     void reconfigure();
 
 };
diff --git a/src/web_server.cpp b/src/web_server.cpp
@@ -374,20 +374,13 @@ handleSaveOcpp(MongooseHttpServerRequest *request) {
 
   String url = request->getParam("ocpp_server");
 
-  if (checkUrl(url.c_str())) {
+  if (!MongooseOcppSocketClient::isValidUrl(url.c_str())) {
     response->setCode(400);
     response->print("invalid URL");
     request->send(response);
     return;
   }
 
-//  String enabledStr = request->getParam("ocpp_enabled");
-//  enabledStr.trim();
-//  enabledStr.toLowerCase();
-//  bool ocppEnabled = false;
-//  ocppEnabled |= !strcmp(enabledStr.c_str(), "true");
-//  ocppEnabled |= enabledStr.charAt(0) > '0' && enabledStr.charAt(0) <= '9';
-
   config_save_ocpp(isPositive(request->getParam("ocpp_enabled")),
                    url, 
                    request->getParam("ocpp_chargeBoxId"), 
@@ -397,15 +390,16 @@ handleSaveOcpp(MongooseHttpServerRequest *request) {
                    isPositive(request->getParam("ocpp_energize_plug")));
 
   char tmpStr[200];
-  snprintf(tmpStr, sizeof(tmpStr), "Saved: %s %s %s",
-          ocpp_server.c_str(), ocpp_chargeBoxId.c_str(), ocpp_idTag.c_str());
+  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(),
+          config_ocpp_enabled(), config_ocpp_access_can_energize, config_ocpp_access_can_suspend());
   DBUGLN(tmpStr);
 
   response->setCode(200);
   response->print(tmpStr);
   request->send(response);
 
-  ArduinoOcppTask::notifyReconfigured();
+  ArduinoOcppTask::notifyConfigChanged();
 }
 
 // -------------------------------------------------------------------
@@ -621,7 +615,7 @@ handleStatus(MongooseHttpServerRequest *request) {
 
   doc["mqtt_connected"] = (int)mqtt_connected();
 
-  doc["ocpp_connected"] = (int)ocppConnected();
+  doc["ocpp_connected"] = (int)MongooseOcppSocketClient::ocppConnected();
 
   doc["ohm_hour"] = ohm_hour;
 

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ loop() {`
`220`	`220`	`emoncms_updated = false;`
`221`	`221`	`}`
`222`	`222`
`223`		`- ocpp.OcppLibrary_loop();`
	`223`	`+ ocpp.poll();`
`224`	`224`	`} // end WiFi connected`
`225`	`225`
`226`	`226`	`Profile_End(loop, 10);`