Merge branch 'master' into jeremypoulter/issue806

platformio.ini

@@ -38,9 +38,9 @@ lib_deps =
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
-  matth-x/[email protected].0
-  matth-x/ArduinoOcppMongoose@0.1.0
-lib_ignore = WebSockets ; ArduinoOcpp: don't compile built-in WS library
+  matth-x/[email protected].0
+  matth-x/MicroOcppMongoose@1.1.0
+lib_ignore = WebSockets ; MicroOcpp: don't compile built-in WS library
 extra_scripts =
   pre:scripts/auto_fw_version.py
   scripts/extra_script.py
@@ -87,11 +87,11 @@ build_flags =
   -D MG_ENABLE_SNTP=1
   #-D ENABLE_DEBUG_MICROTASKS
   -D CS_PLATFORM=CS_P_ESP32
-  -D AO_CUSTOM_WS ; ArduinoOcpp: don't use built-in WS library
-  -D AO_CUSTOM_CONSOLE ; ArduinoOcpp: use custom debug out
-  -D AO_DBG_LEVEL=AO_DL_INFO
-  -D AO_MG_VERSION_614 ; use MG v6.14
-  -D AO_CA_CERT_LOCAL ; manage certificate locally
+  -D MO_CUSTOM_WS ; MicroOcpp: don't use built-in WS library
+  -D MO_CUSTOM_CONSOLE ; MicroOcpp: use custom debug out
+  -D MO_DBG_LEVEL=MO_DL_INFO
+  -D MO_TRAFFIC_OUT
+  -D MO_MG_VERSION_614 ; use MG v6.14
   #-D ENABLE_DEBUG
   #-D ENABLE_DEBUG_MONGOOSE_HTTP_CLIENT
   -D RAPI_MAX_COMMANDS=20

scripts/extra_script.py

@@ -126,6 +126,7 @@ def make_static(env, target, source, prefix, files_dir):
     for out_file in out_files:
         filetype = None
         compress = out_file.endswith(".gz")
+        out_file = out_file.replace("\\","/") # Windows: out_file generated with \ as directory separator
         if out_file.endswith(".css") or out_file.endswith(".css.gz"):
             filetype = "CSS"
         elif out_file.endswith(".js") or out_file.endswith(".js.gz"):

src/app_config.cpp

@@ -357,12 +357,12 @@ void config_changed(String name)
       emoncms_updated = true;
     }
     timeManager.setSntpEnabled(config_sntp_enabled());
-    ArduinoOcppTask::notifyConfigChanged();
+    OcppTask::notifyConfigChanged();
     evse.setSleepForDisable(!config_pause_uses_disabled());
   } else if(name.startsWith("mqtt_")) {
     mqtt_restart();
   } else if(name.startsWith("ocpp_")) {
-    ArduinoOcppTask::notifyConfigChanged();
+    OcppTask::notifyConfigChanged();
   } else if(name.startsWith("emoncms_")) {
     emoncms_updated = true;
   } else if(name.startsWith("scheduler_")) {

src/main.cpp

@@ -89,7 +89,7 @@ String currentfirmware = ESCAPEQUOTE(BUILD_TAG);
 String buildenv = ESCAPEQUOTE(BUILD_ENV_NAME);
 String serial;
 
-ArduinoOcppTask ocpp = ArduinoOcppTask();
+OcppTask ocpp = OcppTask();
 
 
 static void hardware_setup();