coroutine: kinda works now

src/concurrency/NotifiedWorkerThread.cpp

@@ -1,14 +1,43 @@
 #include "NotifiedWorkerThread.h"
+#include "configuration.h"
 #include <assert.h>
 
 namespace concurrency
 {
 
+static bool debugNotification;
+
 /**
  * Notify this thread so it can run
  */
-IRAM_ATTR void NotifiedWorkerThread::notify(uint32_t v, bool overwrite) {
-    
+bool NotifiedWorkerThread::notify(uint32_t v, bool overwrite)
+{
+    bool r = notifyCommon(v, overwrite);
+
+    if (r)
+        mainDelay.interrupt();
+
+    return r;
+}
+
+/**
+ * Notify this thread so it can run
+ */
+IRAM_ATTR bool NotifiedWorkerThread::notifyCommon(uint32_t v, bool overwrite)
+{
+    if (overwrite || notification == 0) {
+        enabled = true;
+        setInterval(0); // Run ASAP
+
+        notification = v;
+        if (debugNotification)
+            DEBUG_MSG("setting notification %d\n", v);
+        return true;
+    } else {
+        if (debugNotification)
+            DEBUG_MSG("dropping notification %d\n", v);
+        return false;
+    }
 }
 
 /**
@@ -16,20 +45,41 @@ IRAM_ATTR void NotifiedWorkerThread::notify(uint32_t v, bool overwrite) {
  *
  * This must be inline or IRAM_ATTR on ESP32
  */
-IRAM_ATTR void NotifiedWorkerThread::notifyFromISR(BaseType_t *highPriWoken, uint32_t v, bool overwrite)
+IRAM_ATTR bool NotifiedWorkerThread::notifyFromISR(BaseType_t *highPriWoken, uint32_t v, bool overwrite)
 {
-    notify(v, overwrite);
+    bool r = notifyCommon(v, overwrite);
+    if (r)
+        mainDelay.interruptFromISR(highPriWoken);
+
+    return r;
 }
 
 /**
  * Schedule a notification to fire in delay msecs
  */
-void NotifiedWorkerThread::notifyLater(uint32_t delay, uint32_t v, bool overwrite) {
+bool NotifiedWorkerThread::notifyLater(uint32_t delay, uint32_t v, bool overwrite)
+{
+    bool didIt = notify(v, overwrite);
 
+    if (didIt) {                   // If we didn't already have something queued, override the delay to be larger
+        setIntervalFromNow(delay); // a new version of setInterval relative to the current time
+        if (debugNotification)
+            DEBUG_MSG("delaying notification %u\n", delay);
+    }
+
+    return didIt;
 }
 
-uint32_t NotifiedWorkerThread::runOnce() {
+int32_t NotifiedWorkerThread::runOnce()
+{
+    auto n = notification;
+    enabled = false;  // Only run once per notification
+    notification = 0; // clear notification
+    if (n) {
+        onNotify(n);
+    }
 
+    return RUN_SAME;
 }
 
 } // namespace concurrency