Merge branch 'master' into devel

data/reset.htm

@@ -92,8 +92,7 @@ <h4 class="card-title">Controller Reset</h4>
                 <div class="card-body" id="message">
                     <p class="card-text">
                         Your Brew Bubbles' controller is being reset and will return momentarily. You will be redirected
-                        to the home page when
-                        that is complete.
+                        to the home page when that is complete.
                     </p>
                 </div>
             </div> <!-- Controller Reset Information -->

firmware/version.json

@@ -1 +1 @@
-{"version": "2.2.0"}
+{"version": "2.2.1"}

platformio.ini

@@ -16,6 +16,7 @@ platform = espressif8266
 build_unflags = 
 build_flags =
     !python tools\git_rev.py
+    -D PIO_SRC_TAG=2.2.1
     -D BAUD=${common_env_data.monitor_speed}
     ; -DDEBUG_ESP_PORT=Serial
     ; -DDEBUG_ESP_WIFI

src/resetreasons.h

@@ -23,6 +23,7 @@ SOFTWARE. */
 #ifndef _RESETREASONS_H
 #define _RESETREASONS_H
 
+#if defined ESP8266
 const char *resetReason[7] = {
     "REASON_DEFAULT_RST",      // = 0, /* normal startup by power on */
     "REASON_WDT_RST",          // = 1, /* hardware watch dog reset */
@@ -42,4 +43,50 @@ const char *resetDescription[7] = {
     "Wake up from deep-sleep",
     "External system reset"};
 
+#elif ESP32
+
+const char *resetReason[10] = {
+    "ESP_RST_UNKNOWN",    //!< Reset reason can not be determined
+    "ESP_RST_POWERON",    //!< Reset due to power-on event
+    "ESP_RST_EXT",        //!< Reset by external pin (not applicable for ESP32)
+    "ESP_RST_SW",         //!< Software reset via esp_restart
+    "ESP_RST_PANIC",      //!< Software reset due to exception/panic
+    "ESP_RST_INT_WDT",    //!< Reset (software or hardware) due to interrupt watchdog
+    "ESP_RST_TASK_WDT",   //!< Reset due to task watchdog
+    "ESP_RST_WDT",        //!< Reset due to other watchdogs
+    "ESP_RST_DEEPSLEEP",  //!< Reset after exiting deep sleep mode
+    "ESP_RST_BROWNOUT",   //!< Brownout reset (software or hardware)
+    "ESP_RST_SDIO"        //!< Reset over SDIO
+};
+
+const char *resetDescription[10] = {
+    "Reset reason can not be determined",
+    "Reset due to power-on event",
+    "Reset by external pin (not applicable for ESP32)",
+    "Software reset via esp_restart",
+    "Software reset due to exception/panic",
+    "Reset (software or hardware) due to interrupt watchdog",
+    "Reset due to task watchdog",
+    "Reset due to other watchdogs",
+    "Reset after exiting deep sleep mode",
+    "Brownout reset (software or hardware)",
+    "Reset over SDIO"
+};
+
+typedef enum {
+    ESP_RST_UNKNOWN,    //!< Reset reason can not be determined
+    ESP_RST_POWERON,    //!< Reset due to power-on event
+    ESP_RST_EXT,        //!< Reset by external pin (not applicable for ESP32)
+    ESP_RST_SW,         //!< Software reset via esp_restart
+    ESP_RST_PANIC,      //!< Software reset due to exception/panic
+    ESP_RST_INT_WDT,    //!< Reset (software or hardware) due to interrupt watchdog
+    ESP_RST_TASK_WDT,   //!< Reset due to task watchdog
+    ESP_RST_WDT,        //!< Reset due to other watchdogs
+    ESP_RST_DEEPSLEEP,  //!< Reset after exiting deep sleep mode
+    ESP_RST_BROWNOUT,   //!< Brownout reset (software or hardware)
+    ESP_RST_SDIO,       //!< Reset over SDIO
+} esp_reset_reason_t;
+
+#endif
+
 #endif // _RESETREASONS_H

tools/git_rev.py

@@ -44,6 +44,6 @@
 
 # Make all available for use in the macros
 print("-DPIO_SRC_NAM={0}".format(project))
-print("-DPIO_SRC_TAG={0}".format(version))
+# print("-DPIO_SRC_TAG={0}".format(version))
 print("-DPIO_SRC_REV={0}".format(commit))
 print("-DPIO_SRC_BRH={0}".format(branch))