Arduino Bootstrapper (v1.15.1)

Author: sblantipodi

library.json

@@ -6,7 +6,7 @@
         "type": "git",
         "url": "https://github.com/sblantipodi/arduino_bootstrapper.git"
     },
-    "version": "1.14.2",
+    "version": "1.15.1",
     "examples": "examples/*.cpp", 
     "exclude": "tests",
     "frameworks": "arduino",

library.properties

@@ -1,5 +1,5 @@
 name=Bootstrapper
-version=1.14.2
+version=1.15.1
 author=Davide Perini <[email protected]>
 maintainer=Davide Perini <[email protected]>
 sentence=A client library for MQTT messaging.

src/BootstrapManager.cpp

@@ -51,6 +51,13 @@ void BootstrapManager::bootstrapSetup(void (*manageDisconnections)(), void (*man
     isConfigFileOk = false;
     launchWebServerForOTAConfig();
   }
+#if defined(ARDUINO_ARCH_ESP32)
+  esp_task_wdt_init(3000, true); //enable panic so ESP32 restarts
+  esp_task_wdt_add(NULL); //add current thread to WDT watch
+#endif
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+  Serial.setTxTimeoutMs(0);
+#endif
 }
 
 /********************************** BOOTSTRAP FUNCTIONS FOR SETUP() *****************************************/
@@ -74,13 +81,24 @@ void BootstrapManager::bootstrapSetup(void (*manageDisconnections)(), void (*man
     isConfigFileOk = false;
     launchWebServerCustom(waitImprov, listener);
   }
+#if defined(ARDUINO_ARCH_ESP32)
+  esp_task_wdt_init(3000, true); //enable panic so ESP32 restarts
+  esp_task_wdt_add(NULL); //add current thread to WDT watch
+#endif
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+  Serial.setTxTimeoutMs(0);
+#endif
 }
 
 /********************************** BOOTSTRAP FUNCTIONS FOR LOOP() *****************************************/
 bool rcpResponseSent = false;
-
-void BootstrapManager::bootstrapLoop(void (*manageDisconnections)(), void (*manageQueueSubscription)(),
-                                     void (*manageHardwareButton)()) {
+void BootstrapManager::bootstrapLoop(void (*manageDisconnections)(), void (*manageQueueSubscription)(), void (*manageHardwareButton)()) {
+#if defined(ARDUINO_ARCH_ESP32)
+  if (millis() - lastMillisForWdt >= 3000) {
+    lastMillisForWdt = millis();
+    esp_task_wdt_reset();
+  }
+#endif
 #if (IMPROV_ENABLED > 0)
   if (!rcpResponseSent && WifiManager::isConnected()) {
     rcpResponseSent = true;

src/BootstrapManager.h

@@ -30,29 +30,29 @@
 #include "Helpers.h"
 #include "WifiManager.h"
 #include "QueueManager.h"
-
+#if defined(ARDUINO_ARCH_ESP32)
+#include <esp_task_wdt.h>
+#endif
 
 class BootstrapManager {
 
 private:
     WifiManager wifiManager; // WifiManager classes for Wifi management
     QueueManager queueManager; // QueueManager classes for MQTT queue management
     Helpers helper;
+#if defined(ARDUINO_ARCH_ESP32)
+    unsigned long lastMillisForWdt = millis();
+#endif
 
 public:
     StaticJsonDocument<BUFFER_SIZE> jsonDoc;
     StaticJsonDocument<BUFFER_SIZE_MAX_SIZE> jsonDocBigSize;
-
     // using JsonDocument = StaticJsonDocument<BUFFER_SIZE>;
-    StaticJsonDocument<BUFFER_SIZE>
-    parseQueueMsg(char *topic, byte *payload, unsigned int length); // print the message arriving from the queue
-    StaticJsonDocument<BUFFER_SIZE>
-    parseHttpMsg(String payload, unsigned int length); // print the message arriving from HTTP
+    StaticJsonDocument<BUFFER_SIZE> parseQueueMsg(char* topic, byte* payload, unsigned int length); // print the message arriving from the queue
+    StaticJsonDocument<BUFFER_SIZE> parseHttpMsg(String payload, unsigned int length); // print the message arriving from HTTP
     void littleFsInit();
-
-    void bootstrapSetup(void (*manageDisconnectionFunction)(), void (*manageHardwareButton)(), void (*callback)(char *, byte *, unsigned int)); // bootstrap setup()
-    void bootstrapSetup(void (*manageDisconnectionFunction)(), void (*manageHardwareButton)(), void (*callback)(char *, byte *, unsigned int), bool waitImprov,
-                        void (*listener)()); // bootstrap setup()
+    void bootstrapSetup(void (*manageDisconnectionFunction)(), void (*manageHardwareButton)(), void (*callback)(char*, byte*, unsigned int)); // bootstrap setup()
+    void bootstrapSetup(void (*manageDisconnectionFunction)(), void (*manageHardwareButton)(), void (*callback)(char*, byte*, unsigned int), bool waitImprov, void (*listener)()); // bootstrap setup()
     void bootstrapLoop(void (*manageDisconnectionFunction)(), void (*manageQueueSubscription)(), void (*manageHardwareButton)()); // bootstrap loop()
     static void setMQTTWill(const char *topic, const char *payload, int qos, boolean retain, boolean cleanSession); // set the last will parameters for mqtt
     static void publish(const char *topic, const char *payload, boolean retained); // send a message on the queue
@@ -63,12 +63,12 @@ class BootstrapManager {
     JsonObject getJsonObject(); // return a new json object instance
     [[maybe_unused]] static void nonBlokingBlink(); // blink default LED when sending data to the queue
     [[maybe_unused]] static void getMicrocontrollerInfo(); // print or display microcontroller's info
-    [[maybe_unused]] void drawInfoPage(const String &softwareVersion, const String &author); // draw a page with all the microcontroller's info
-    [[maybe_unused]] void drawScreenSaver(const String &txt); // useful for OLED displays
-    [[maybe_unused]] static void sendState(const char *topic, JsonObject objectToSend, const String &version); // send microcontroller's info on the queue
-    [[maybe_unused]] static void writeToLittleFS(const DynamicJsonDocument &jDoc, const String &filenameToUse); // write json file to storage
-    [[maybe_unused]] static StaticJsonDocument<BUFFER_SIZE> readLittleFS(const String &filenameToUse); // read json file from storage
-    [[maybe_unused]] String readValueFromFile(const String &filenameToUse, const String &paramName); // read a param from a json file
+    [[maybe_unused]] void drawInfoPage(const String& softwareVersion, const String& author); // draw a page with all the microcontroller's info
+    [[maybe_unused]] void drawScreenSaver(const String& txt); // useful for OLED displays
+    [[maybe_unused]] static void sendState(const char *topic, JsonObject objectToSend, const String& version); // send microcontroller's info on the queue
+    [[maybe_unused]] static void writeToLittleFS(const DynamicJsonDocument& jDoc, const String& filenameToUse); // write json file to storage
+    [[maybe_unused]] static StaticJsonDocument<BUFFER_SIZE> readLittleFS(const String& filenameToUse); // read json file from storage
+    [[maybe_unused]] String readValueFromFile(const String& filenameToUse, const String& paramName); // read a param from a json file
     static bool isWifiConfigured(); // check if wifi is correctly configured
     void launchWebServerForOTAConfig(); // if no ssid available, launch web server to get config params via browser
     void launchWebServerCustom(bool waitImprov, void (*listener)()); // if no ssid available, launch web server to get config params via browser