Merge pull request #764 from cyberman54/master

sync dev to master

README.md

@@ -301,7 +301,8 @@ Hereafter described is the default *plain* format, which uses MSB bit numbering.
 	byte 3-10:	Uptime [seconds]
 	byte 11: 	CPU temperature [°C]
 	bytes 12-15:	Free RAM [bytes]
-	bytes 16-17:	Last CPU reset reason [core 0, core 1]
+	byte 16:	Last CPU core 0 reset reason
+	bytes 17-20:	Number of restarts since last power cycle
 
 **Port #3:** Device configuration query result
 

include/configmanager.h

@@ -2,6 +2,7 @@
 #define _CONFIGMANAGER_H
 
 #include "globals.h"
+#include "reset.h"
 #include <Preferences.h>
 
 void saveConfig(bool erase = false);

include/payload.h

@@ -49,7 +49,7 @@ public:
   void addCount(uint16_t value, uint8_t sniffytpe);
   void addConfig(configData_t value);
   void addStatus(uint16_t voltage, uint64_t uptime, float cputemp, uint32_t mem,
-                 uint8_t reset1, uint8_t reset2);
+                 uint8_t reset0, uint32_t restarts);
   void addAlarm(int8_t rssi, uint8_t message);
   void addVoltage(uint16_t value);
   void addGPS(gpsStatus_t value);

include/reset.h

@@ -9,6 +9,7 @@
 #include "display.h"
 #include "power.h"
 
+void reset_rtc_vars(void);
 void do_reset(bool warmstart);
 void do_after_reset(void);
 void enter_deepsleep(const uint64_t wakeup_sec = 60,
@@ -16,5 +17,6 @@ void enter_deepsleep(const uint64_t wakeup_sec = 60,
 unsigned long long uptime(void);
 
 extern RTC_NOINIT_ATTR runmode_t RTC_runmode;
+extern RTC_NOINIT_ATTR uint32_t RTC_restarts;
 
 #endif // _RESET_H

src/Node-RED/MQTT.json

@@ -328,7 +328,7 @@
         "z": "c26229c6.2d1ae8",
         "name": "device status",
         "property": "payload",
-        "pattern": "l16 => voltage,\nl64 => uptime,\nb8 => temperature,\nl32 => ram,\nb8 => reset0,\nb8 => reset1",
+        "pattern": "l16 => voltage,\nl64 => uptime,\nb8 => temperature,\nl32 => ram,\nb8 => reset0,\nl32 => restarts",
         "x": 650,
         "y": 200,
         "wires": [

src/TTN/packed_decoder.js

@@ -38,8 +38,8 @@ function Decoder(bytes, port) {
 
     if (port === 2) {
         // device status data
-        if (bytes.length === 17) {
+        if (bytes.length === 20) {
-            return decode(bytes, [uint16, uptime, uint8, uint32, uint8, uint8], ['voltage', 'uptime', 'cputemp', 'memory', 'reset0', 'reset1']);
+            return decode(bytes, [uint16, uptime, uint8, uint32, uint8, uint32], ['voltage', 'uptime', 'cputemp', 'memory', 'reset0', 'restarts']);
         }
     }
 

src/TTN/plain_decoder.js

@@ -32,7 +32,7 @@ function Decoder(bytes, port) {
     decoded.temp = bytes[i++];
     decoded.memory = ((bytes[i++] << 24) | (bytes[i++] << 16) | (bytes[i++] << 8) | bytes[i++]);
     decoded.reset0 = bytes[i++];
-    decoded.reset1 = bytes[i++];
+    decoded.restarts = ((bytes[i++] << 24) | (bytes[i++] << 16) | (bytes[i++] << 8) | bytes[i++]);
   }
 
   if (port === 4) {

src/TTNv3/packed_decodeUplink.js

@@ -46,8 +46,8 @@ function decodeUplink(input) {
 
     if (input.fPort === 2) {
         // device status data
-        if (input.bytes.length === 17) {
+        if (input.bytes.length === 20) {
-            data = decode(input.bytes, [uint16, uptime, uint8, uint32, uint8, uint8], ['voltage', 'uptime', 'cputemp', 'memory', 'reset0', 'reset1']);
+            data = decode(input.bytes, [uint16, uptime, uint8, uint32, uint8, uint32], ['voltage', 'uptime', 'cputemp', 'memory', 'reset0', 'restarts']);
         }
     }
 

src/TTNv3/plain_decodeUplink.js

@@ -39,7 +39,7 @@ function decodeUplink(input) {
         data.cputemp = input.bytes[i++];
         data.memory = ((input.bytes[i++] << 24) | (input.bytes[i++] << 16) | (input.bytes[i++] << 8) | input.bytes[i++]);
         data.reset0 = input.bytes[i++];
-        data.reset1 = input.bytes[i++];
+        data.restarts = ((input.bytes[i++] << 24) | (input.bytes[i++] << 16) | (input.bytes[i++] << 8) | input.bytes[i++]);
     }
 
     if (input.fPort === 4) {

src/boot.cpp

@@ -95,8 +95,8 @@ void start_boot_menu(void) {
   // (because esp_restart() from ISR would trigger the ESP32 task watchdog)
   xTaskCreate(
       [](void *p) {
-        vTaskSuspend(NULL);
+        vTaskSuspend(NULL); // wait for task resume call by watchdog
-        ESP.restart();
+        esp_restart();
       },
       "Restart", configMINIMAL_STACK_SIZE, NULL, (3 | portPRIVILEGE_BIT),
       &RestartHandle);
@@ -148,7 +148,6 @@ void start_boot_menu(void) {
       []() {
         server.sendHeader("Connection", "close");
         server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
-        WiFi.disconnect(true);
         esp_restart();
       },
 

src/configmanager.cpp

@@ -48,7 +48,7 @@ static void defaultConfig(configData_t *myconfig) {
   myconfig->blescantime =
       BLESCANINTERVAL /
       10; // BT channel scan cycle [seconds/100], default 1 (= 10ms)
-  myconfig->blescan = BLECOUNTER;    // 0=disabled, 1=enabled
+  myconfig->blescan = BLECOUNTER;   // 0=disabled, 1=enabled
   myconfig->wifiscan = WIFICOUNTER; // 0=disabled, 1=enabled
   myconfig->wifiant = 0;            // 0=internal, 1=external (for LoPy/LoPy4)
   myconfig->macfilter = MACFILTER;  // 0=disabled, 1=enabled
@@ -159,4 +159,7 @@ int version_compare(const String v1, const String v2) {
     return 1;
 }
 
-void eraseConfig(void) { saveConfig(true); }
+void eraseConfig(void) {
+  reset_rtc_vars();
+  saveConfig(true);
+}

src/main.cpp

@@ -140,6 +140,7 @@ void setup() {
   esp_log_level_set("*", ESP_LOG_NONE);
 #endif
 
+  // load device configuration from NVRAM and set runmode
   do_after_reset();
 
   // print chip information on startup if in verbose mode after coldstart
@@ -206,9 +207,6 @@ void setup() {
   strcat_P(features, " PMU");
 #endif
 
-  // read (and initialize on first run) runtime settings from NVRAM
-  _ASSERT(loadConfig()); // includes initialize if necessary
-
   // now that we are powered, we scan i2c bus for devices
   if (RTC_runmode == RUNMODE_POWERCYCLE)
     i2c_scan();
@@ -291,16 +289,15 @@ void setup() {
 #endif
 
 #if (BOOTMENU)
-  // start local webserver after device powers up or on rcommand request
+  // start local webserver after each coldstart
-  if ((RTC_runmode == RUNMODE_POWERCYCLE) ||
+  if (RTC_runmode == RUNMODE_POWERCYCLE)
-      (RTC_runmode == RUNMODE_MAINTENANCE))
-    start_boot_menu();
-#else
-  // start local webserver on rcommand request only
-  if (RTC_runmode == RUNMODE_MAINTENANCE)
     start_boot_menu();
 #endif
 
+  // start local webserver on rcommand request
+  if (RTC_runmode == RUNMODE_MAINTENANCE)
+    start_boot_menu();
+
   // start mac processing task
   ESP_LOGI(TAG, "Starting MAC processor...");
   macQueueInit();

src/payload.cpp

@@ -58,7 +58,7 @@ void PayloadConvert::addConfig(configData_t value) {
 }
 
 void PayloadConvert::addStatus(uint16_t voltage, uint64_t uptime, float cputemp,
-                               uint32_t mem, uint8_t reset1, uint8_t reset2) {
+                               uint32_t mem, uint8_t reset0, uint32_t restarts) {
 
   buffer[cursor++] = highByte(voltage);
   buffer[cursor++] = lowByte(voltage);
@@ -75,8 +75,11 @@ void PayloadConvert::addStatus(uint16_t voltage, uint64_t uptime, float cputemp,
   buffer[cursor++] = (byte)((mem & 0x00FF0000) >> 16);
   buffer[cursor++] = (byte)((mem & 0x0000FF00) >> 8);
   buffer[cursor++] = (byte)((mem & 0x000000FF));
-  buffer[cursor++] = (byte)(reset1);
+  buffer[cursor++] = (byte)(reset0);
-  buffer[cursor++] = (byte)(reset2);
+  buffer[cursor++] = (byte)((restarts & 0xFF000000) >> 24);
+  buffer[cursor++] = (byte)((restarts & 0x00FF0000) >> 16);
+  buffer[cursor++] = (byte)((restarts & 0x0000FF00) >> 8);
+  buffer[cursor++] = (byte)((restarts & 0x000000FF));
 }
 
 void PayloadConvert::addGPS(gpsStatus_t value) {
@@ -185,13 +188,13 @@ void PayloadConvert::addConfig(configData_t value) {
 }
 
 void PayloadConvert::addStatus(uint16_t voltage, uint64_t uptime, float cputemp,
-                               uint32_t mem, uint8_t reset1, uint8_t reset2) {
+                               uint32_t mem, uint8_t reset0, uint32_t restarts) {
   writeUint16(voltage);
   writeUptime(uptime);
   writeUint8((byte)cputemp);
   writeUint32(mem);
-  writeUint8(reset1);
+  writeUint8(reset0);
-  writeUint8(reset2);
+  writeUint32(restarts);
 }
 
 void PayloadConvert::addGPS(gpsStatus_t value) {
@@ -397,7 +400,7 @@ void PayloadConvert::addConfig(configData_t value) {
 }
 
 void PayloadConvert::addStatus(uint16_t voltage, uint64_t uptime, float celsius,
-                               uint32_t mem, uint8_t reset1, uint8_t reset2) {
+                               uint32_t mem, uint8_t reset0, uint32_t restarts) {
   uint16_t temp = celsius * 10;
   uint16_t volt = voltage / 10;
 #if (defined BAT_MEASURE_ADC || defined HAS_PMU)

src/rcommand.cpp

@@ -306,7 +306,7 @@ void get_status(uint8_t val[]) {
   payload.reset();
   payload.addStatus(read_voltage(), (uint64_t)(uptime() / 1000ULL),
                     temperatureRead(), getFreeRAM(), rtc_get_reset_reason(0),
-                    rtc_get_reset_reason(1));
+                    RTC_restarts);
   SendPayload(STATUSPORT);
 };
 

src/reset.cpp

@@ -10,6 +10,7 @@ static const char TAG[] = __FILE__;
 
 // RTC_NOINIT_ATTR -> keep value after a software restart or system crash
 RTC_NOINIT_ATTR runmode_t RTC_runmode;
+RTC_NOINIT_ATTR uint32_t RTC_restarts;
 
 // RTC_DATA_ATTR -> keep values after a wakeup from sleep
 RTC_DATA_ATTR struct timeval RTC_sleep_start_time;
@@ -17,8 +18,10 @@ RTC_DATA_ATTR unsigned long long RTC_millis = 0;
 
 timeval sleep_stop_time;
 
-const char *runmode[6] = {"powercycle", "normal", "wakeup",
+void reset_rtc_vars(void) {
-                          "update",     "sleep",  "maintenance"};
+  RTC_runmode = RUNMODE_POWERCYCLE;
+  RTC_restarts = 0;
+}
 
 void do_reset(bool warmstart) {
   if (warmstart) {
@@ -40,19 +43,19 @@ void do_after_reset(void) {
   struct timeval sleep_stop_time;
   uint64_t sleep_time_ms;
 
+  // read (and initialize on first run) runtime settings from NVRAM
+  loadConfig();
+
   switch (rtc_get_reset_reason(0)) {
 
   case POWERON_RESET:          // 0x01 Vbat power on reset
   case RTCWDT_BROWN_OUT_RESET: // 0x0f Reset when the vdd voltage is not
                                // stable
-    RTC_runmode = RUNMODE_POWERCYCLE;
+    reset_rtc_vars();
     break;
 
   case SW_CPU_RESET: // 0x0c Software reset CPU
-    // keep previous runmode, if RTC_runmode has valid value
+    // keep previous set runmode (update / normal / maintenance)
-    // sets runmode, if RTC_runmode is invalid (i.e. not initialized)
-    if ((RTC_runmode != RUNMODE_UPDATE) && (RTC_runmode != RUNMODE_NORMAL))
-      RTC_runmode = RUNMODE_POWERCYCLE;
     break;
 
   case DEEPSLEEP_RESET: // 0x05 Deep Sleep reset digital core
@@ -84,8 +87,9 @@ void do_after_reset(void) {
     break;
   }
 
-  ESP_LOGI(TAG, "Starting Software v%s, runmode %s", PROGVERSION,
+  RTC_restarts++;
-           runmode[RTC_runmode]);
+  ESP_LOGI(TAG, "Starting Software v%s (runmode=%d / restarts=%d)", PROGVERSION,
+           RTC_runmode, RTC_restarts);
 }
 
 void enter_deepsleep(const uint64_t wakeup_sec, gpio_num_t wakeup_gpio) {