sync with 1.9 changes

.gitignore

@@ -21,22 +21,13 @@ src/websrc/gzipped
 src/websrc/temp
 *.gz.h
 
-# Logs
+# NPM directories
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# Dependency directories
 node_modules/
 jspm_packages/
-
-# Optional npm cache directory
 .npm
+package-lock.json
+tools/webfilesbuilder/package-lock.json
+tools/wsemulator/package-lock.json
 
 # Output of 'npm pack'
 *.tgz

platformio.ini-example

@@ -8,11 +8,9 @@ default_envs = debug
 
 [common]
 ; -DMYESP_TIMESTAMP -DTESTS -DCRASH -DFORCE_SERIAL -DNO_GLOBAL_EEPROM -DLOGICANALYZER
-;general_flags = -Wl,-Teagle.flash.4m2m.ld
 general_flags =
 
 [env]
-;board = esp12e
 board = d1_mini
 framework = arduino
 platform = espressif8266
@@ -67,10 +65,11 @@ extra_scripts = pre:scripts/clean_fw.py
 
 [env:release]
 build_flags = ${common.general_flags}
-extra_scripts = pre:scripts/rename_fw.py
+extra_scripts =
+  pre:scripts/rename_fw.py
+  pre:scripts/buildweb.py
 
 [env:checkcode]
 build_type = debug
 build_flags = ${common.general_flags} -Wall
 extra_scripts = scripts/checkcode.py
-

src/MyESP.cpp

@@ -2658,7 +2658,7 @@ void MyESP::_addMQTTLog(const char * topic, const char * payload) {
     // myDebug("Publish [#%d] %s (%d) %s (%d)", logCount, topic, strlen(topic), payload, strlen(payload)); // for debugging
 
     // find the topic
-    while ((_hasValue(MQTT_log[logPointer].topic) && logPointer < MYESP_MQTTLOG_MAX)) {
+    while ((logPointer < MYESP_MQTTLOG_MAX) && (_hasValue(MQTT_log[logPointer].topic))) {
         if (strcmp(MQTT_log[logPointer].topic, topic) == 0) {
             found = true;
             break;

src/TelnetSpy.cpp

@@ -573,8 +573,7 @@ void TelnetSpy::handle() {
         return;
     }
     if (!listening) {
-        
+                if ((WiFi.status() == WL_DISCONNECTED) && (WiFi.getMode() & WIFI_AP)) {
-        if ((WiFi.status() == WL_DISCONNECTED) && (WiFi.getMode() & WIFI_AP)) {
             if (usedSer) {
                 usedSer->println("[TELNET] in AP mode"); // added by Proddy
             }

src/TimeLib.cpp

@@ -105,28 +105,28 @@ void refreshCache(time_t t) {
 }
 
 int day(time_t t) { // the day for the given time (0-6)
-  refreshCache(t);
+    refreshCache(t);
-  return tm.Day;
+    return tm.Day;
 }
 
-int month(time_t t) {  // the month for the given time
+int month(time_t t) { // the month for the given time
-  refreshCache(t);
+    refreshCache(t);
-  return tm.Month;
+    return tm.Month;
 }
 
-int second(time_t t) {  // the second for the given time
+int second(time_t t) { // the second for the given time
-  refreshCache(t);
+    refreshCache(t);
-  return tm.Second;
+    return tm.Second;
 }
 
 int minute(time_t t) { // the minute for the given time
-  refreshCache(t);
+    refreshCache(t);
-  return tm.Minute;  
+    return tm.Minute;
 }
 
 int hour(time_t t) { // the hour for the given time
-  refreshCache(t);
+    refreshCache(t);
-  return tm.Hour;  
+    return tm.Hour;
 }
 
 int year(time_t t) { // the year for the given time
@@ -140,4 +140,3 @@ void setTime(time_t t) {
     Status       = timeSet;
     prevMillis   = millis(); // restart counting from now (thanks to Korman for this fix)
 }
-

tools/wsemulator/package-lock.json

@@ -1,27 +0,0 @@
-{
-  "name": "wsemulator",
-  "version": "0.0.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "ws": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
-      "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
-      "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0"
-      }
-    }
-  }
-}