merged with master

src/concurrency/Thread.cpp

@@ -1,4 +1,5 @@
 #include "Thread.h"
+#include "timing.h"
 
 namespace concurrency {
 

src/concurrency/Thread.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "freertosinc.h"
+#include "esp_task_wdt.h"
 
 namespace concurrency {
 
@@ -30,8 +31,26 @@ class Thread
      */
     virtual void doRun() = 0;
 
+    /**
+     * All thread run methods must periodically call serviceWatchdog, or the system will declare them hung and panic.
+     *
+     * this only applies after startWatchdog() has been called.  If you need to sleep for a long time call stopWatchdog()
+     */
+    void serviceWatchdog() { esp_task_wdt_reset(); }
+    void startWatchdog()
+    {
+        auto r = esp_task_wdt_add(taskHandle);
+        assert(r == ESP_OK);
+    }
+    void stopWatchdog()
+    {
+        auto r = esp_task_wdt_delete(taskHandle);
+        assert(r == ESP_OK);
+    }
+
   private:
     static void callRun(void *_this);
 };
 
+
 } // namespace concurrency

src/concurrency/WorkerThread.cpp

@@ -5,21 +5,28 @@ namespace concurrency {
 
 void WorkerThread::doRun()
 {
+    startWatchdog();
+
     while (!wantExit) {
+        stopWatchdog();
         block();
+        startWatchdog();
+
+        // no need - startWatchdog is guaranteed to give us one full watchdog interval
+        // serviceWatchdog(); // Let our loop worker have one full watchdog interval (at least) to run
 
 #ifdef DEBUG_STACK
         static uint32_t lastPrint = 0;
         if (timing::millis() - lastPrint > 10 * 1000L) {
             lastPrint = timing::millis();
-            uint32_t taskHandle = reinterpret_cast<uint32_t>(xTaskGetCurrentTaskHandle());
-            DEBUG_MSG("printThreadInfo(%s) task: %" PRIx32 " core id: %u min free stack: %u\n", "thread", taskHandle, xPortGetCoreID(),
-              uxTaskGetStackHighWaterMark(nullptr));
+            meshtastic::printThreadInfo("net");
         }
 #endif
 
         loop();
     }
+
+    stopWatchdog();
 }
 
 } // namespace concurrency