Address crashing on resets (lbussy#19)

src/main.cpp

@@ -39,7 +39,7 @@ void setup() {
     _delay(200); // Let pins settle, else detect is inconsistent
 
     if (digitalRead(RESETWIFI) == LOW) {
-        Log.notice(F("%s low, presenting portal." CR), RESETWIFI);
+        Log.notice(F("%s low, presenting portal." CR), stringify(RESETWIFI));
         doWiFi(true);
     } else if (rst == true) {
         Log.notice(F("DRD: Triggered, presenting portal." CR));

src/pushhelper.cpp

@@ -156,6 +156,10 @@ void setDoBrewfTarget() {
     doBrewfTarget = true; // Semaphore required for Ticker + radio event
 }
 
+void setDoReset() {
+    doReset = true; // Semaphore required for reset in callback
+}
+
 void tickerLoop() {
     Target *target = Target::getInstance();
     BFTarget *bfTarget = BFTarget::getInstance();
@@ -194,4 +198,11 @@ void tickerLoop() {
         doBrewfTarget = false;
         brewfTarget->push();
     }
+
+    // Check for Reset Pending
+    // Necessary because we cannot delay in a callback
+    if (doReset) {
+        doReset = false;
+        resetController();
+    }
 }

src/pushhelper.h

@@ -37,11 +37,13 @@ void updateLoop();
 void setDoURLTarget();
 void setDoBFTarget();
 void setDoBrewfTarget();
+void setDoReset();
 extern volatile bool doBubble;
 extern struct Bubbles bubbles;
 
 static bool __attribute__((unused)) doURLTarget = false;    // Semaphore for Target timer
 static bool __attribute__((unused)) doBFTarget = false;     // Semaphore for BF timer
-static bool __attribute__((unused)) doBrewfTarget = false;    // Semaphore for BRF timer
+static bool __attribute__((unused)) doBrewfTarget = false;  // Semaphore for BRF timer
+static bool __attribute__((unused)) doReset = false;        // Semahore for reset
 
 #endif // _PUSHHELPER_H

src/tools.cpp

@@ -23,18 +23,22 @@ SOFTWARE. */
 #include "tools.h"
 
 void _delay(unsigned long ulDelay) {
-    // Safe blocking delay() replacement with yield()
+    // Safe semi-blocking delay
+#ifdef ESP32
+    vTaskDelay(ulDelay); // Builtin to ESP32
+#elif defined ESP8266
     unsigned long ulNow = millis();
     unsigned long ulThen = ulNow + ulDelay;
     while (ulThen > millis()) {
-        yield();
+        yield(); // ESP8266 needs to yield()
     }
+#endif
 }
 
-void reboot() {
+void resetController() {
     Log.notice(F("Reboot request - rebooting system." CR));
+    _delay(5000);
     saveBpm();
-    _delay(1000);
     ESP.restart();
 }
 

src/tools.h

@@ -33,7 +33,7 @@ SOFTWARE. */
 #define EEPROM_ADDRESS 0x00
 
 void _delay(unsigned long);
-void reboot();
+void resetController();
 void loadBpm();
 void saveBpm();
 

src/webserver.cpp

@@ -80,8 +80,7 @@ void setActionPageHandlers()
         Log.verbose(F("Processing /reset/." CR));
         // Redirect to Reset page
         request->send(SPIFFS, "/reset.htm");
-        _delay(5000);
-        reboot();
+        setDoReset();
     });
 
     server.on("/otastart/", HTTP_GET, [](AsyncWebServerRequest *request) {

src/webserver.h

@@ -30,6 +30,7 @@ SOFTWARE. */
 #include "version.h"
 #include "config.h"
 #include "thatVersion.h"
+#include "pushhelper.h"
 #include <ArduinoLog.h>
 #include <ArduinoJson.h>
 #include <AsyncJson.h>

src/wifi.cpp

@@ -80,7 +80,7 @@ void doWiFi(bool ignore = false) { // Handle WiFi and optionally ignore current
             _delay(3000);
             digitalWrite(LED, HIGH);
             Log.notice(F("Hit timeout for on-demand portal, exiting." CR));
-            reboot();
+            setDoReset();
         }
     } else { // Normal WiFi connection attempt
         blinker.attach_ms(STABLINK, wifiBlinker);

src/wifi.h

@@ -28,6 +28,7 @@ SOFTWARE. */
 #include "config.h"
 #include "jsonconfig.h"
 #include "tools.h"
+#include "pushhelper.h"
 #include <ESP8266WiFi.h>
 #include <Ticker.h>
 #include <ArduinoLog.h>