ESP32 target

src/Utils/statUtils.cpp

@@ -6,6 +6,11 @@
 #include "Global.h"
 #include "ItemsList.h"
 
+#ifdef ESP32
+#include <rom/rtc.h>
+#endif
+
+String ESP_getResetReason(void);
 
 void initSt() {
     addNewDevice();
@@ -25,7 +30,7 @@ void initSt() {
 void decide() {
     if ((WiFi.status() == WL_CONNECTED)) {
         uint8_t cnt = getNextNumber("stat.txt");
-        SerialPrint("I","Stat","Total resets number: " + String(cnt));
+        SerialPrint("I", "Stat", "Total resets number: " + String(cnt));
         if (cnt <= 3) {
             //Serial.println("(get)");
             getPsn();
@@ -81,7 +86,7 @@ String addNewDevice() {
         }
         http.end();
     }
-    SerialPrint("I","Stat","New device registaration: " + ret);
+    SerialPrint("I", "Stat", "New device registaration: " + ret);
     return ret;
 }
 
@@ -95,7 +100,7 @@ String updateDevicePsn(String lat, String lon, String accur) {
         http.addHeader("Content-Type", "application/json");
         String mac = WiFi.macAddress().c_str();
         int httpCode = http.POST("?id=" + mac +
-                                 "&resetReason=" + ESP.getResetReason() +
+                                 "&resetReason=" + ESP_getResetReason() +
                                  "&lat=" + lat +
                                  "&lon=" + lon +
                                  "&accuracy=" + accur + "");
@@ -110,7 +115,7 @@ String updateDevicePsn(String lat, String lon, String accur) {
         }
         http.end();
     }
-    SerialPrint("I","Stat","Update device psn: " + ret);
+    SerialPrint("I", "Stat", "Update device psn: " + ret);
     return ret;
 }
 
@@ -124,10 +129,10 @@ String updateDeviceStatus() {
         http.addHeader("Content-Type", "application/json");
         String mac = WiFi.macAddress().c_str();
         int httpCode = http.POST("?id=" + mac +
-                                 "&resetReason=" + ESP.getResetReason() +
+                                 "&resetReason=" + ESP_getResetReason() +
                                  "&uptime=" + timeNow->getUptime() +
                                  "&uptimeTotal=" + getUptimeTotal() +
-                                 "&version=" + FIRMWARE_VERSION + 
+                                 "&version=" + FIRMWARE_VERSION +
                                  "&resetsTotal=" + String(getCurrentNumber("stat.txt")) + "");
         if (httpCode > 0) {
             ret = httpCode;
@@ -140,14 +145,14 @@ String updateDeviceStatus() {
         }
         http.end();
     }
-    SerialPrint("I","Stat","Update device data: " + ret);
+    SerialPrint("I", "Stat", "Update device data: " + ret);
     return ret;
 }
 
 String getUptimeTotal() {
     uint8_t hrs = getCurrentNumber("totalhrs.txt");
     String hrsStr = prettySeconds(hrs * 60 * 60);
-    SerialPrint("I","Stat","Total running time: " + hrsStr);
+    SerialPrint("I", "Stat", "Total running time: " + hrsStr);
     return hrsStr;
 }
 
@@ -164,7 +169,53 @@ uint8_t getCurrentNumber(String file) {
     return number;
 }
 
+#ifdef ESP8266
+String ESP_getResetReason(void) {
+    return ESP.getResetReason();
+}
+#else
+String ESP32GetResetReason(uint32_t cpu_no) {
+    // tools\sdk\include\esp32\rom\rtc.h
+    switch (rtc_get_reset_reason((RESET_REASON)cpu_no)) {
+        case POWERON_RESET:
+            return F("Vbat power on reset");  // 1
+        case SW_RESET:
+            return F("Software reset digital core");  // 3
+        case OWDT_RESET:
+            return F("Legacy watch dog reset digital core");  // 4
+        case DEEPSLEEP_RESET:
+            return F("Deep Sleep reset digital core");  // 5
+        case SDIO_RESET:
+            return F("Reset by SLC module, reset digital core");  // 6
+        case TG0WDT_SYS_RESET:
+            return F("Timer Group0 Watch dog reset digital core");  // 7
+        case TG1WDT_SYS_RESET:
+            return F("Timer Group1 Watch dog reset digital core");  // 8
+        case RTCWDT_SYS_RESET:
+            return F("RTC Watch dog Reset digital core");  // 9
+        case INTRUSION_RESET:
+            return F("Instrusion tested to reset CPU");  // 10
+        case TGWDT_CPU_RESET:
+            return F("Time Group reset CPU");  // 11
+        case SW_CPU_RESET:
+            return F("Software reset CPU");  // 12
+        case RTCWDT_CPU_RESET:
+            return F("RTC Watch dog Reset CPU");  // 13
+        case EXT_CPU_RESET:
+            return F("or APP CPU, reseted by PRO CPU");  // 14
+        case RTCWDT_BROWN_OUT_RESET:
+            return F("Reset when the vdd voltage is not stable");  // 15
+        case RTCWDT_RTC_RESET:
+            return F("RTC Watch dog reset digital core and rtc module");  // 16
+        default:
+            return F("NO_MEAN");  // 0
+    }
+}
 
+String ESP_getResetReason(void) {
+    return ESP32GetResetReason(0);  // CPU 0
+}
+#endif
 //String getUptimeTotal() {
 //    static int hrs;
 //    EEPROM.begin(512);