coroutine: kinda works now

src/main.cpp

@@ -36,8 +36,10 @@
 #include "variant.h"
 #endif
 
+using namespace concurrency;
+
 // We always create a screen object, but we only init it if we find the hardware
-graphics::Screen screen(SSD1306_ADDRESS);
+graphics::Screen *screen;
 
 // Global power status
 meshtastic::PowerStatus *powerStatus = new meshtastic::PowerStatus();
@@ -51,8 +53,8 @@ meshtastic::NodeStatus *nodeStatus = new meshtastic::NodeStatus();
 bool ssd1306_found;
 bool axp192_found;
 
-DSRRouter realRouter;
-Router &router = realRouter; // Users of router don't care what sort of subclass implements that API
+
+Router *router = NULL; // Users of router don't care what sort of subclass implements that API
 
 // -----------------------------------------------------------------------------
 // Application
@@ -102,7 +104,7 @@ const char *getDeviceName()
     return name;
 }
 
-static uint32_t ledBlinker()
+static int32_t ledBlinker()
 {
     static bool ledOn;
     ledOn ^= 1;
@@ -110,10 +112,10 @@ static uint32_t ledBlinker()
     setLed(ledOn);
 
     // have a very sparse duty cycle of LED being on, unless charging, then blink 0.5Hz square wave rate to indicate that
-    return powerStatus->getIsCharging() ? 1000 : (ledOn ? 2 : 1000);
+    return powerStatus->getIsCharging() ? 1000 : (ledOn ? 1 : 1000);
 }
 
-concurrency::Periodic ledPeriodic("Blink", ledBlinker);
+static Periodic *ledPeriodic;
 
 // Prepare for button presses
 #ifdef BUTTON_PIN
@@ -128,7 +130,22 @@ void userButtonPressed()
 }
 void userButtonPressedLong()
 {
-    screen.adjustBrightness();
+    screen->adjustBrightness();
+}
+
+/**
+ * Watch a GPIO and if we get an IRQ, wake the main thread.
+ * Use to add wake on button press
+ */
+void wakeOnIrq(int irq, int mode)
+{
+    attachInterrupt(
+        irq,
+        [] {
+            BaseType_t higherWake = 0;
+            mainDelay.interruptFromISR(&higherWake);
+        },
+        FALLING);
 }
 
 RadioInterface *rIf = NULL;
@@ -156,7 +173,11 @@ void setup()
     digitalWrite(RESET_OLED, 1);
 #endif
 
-    concurrency::OSThread::setup();
+    OSThread::setup();
+
+    ledPeriodic = new Periodic("Blink", ledBlinker);
+
+    router = new DSRRouter();
 
 #ifdef I2C_SDA
     Wire.begin(I2C_SDA, I2C_SCL);
@@ -173,11 +194,13 @@ void setup()
     userButton = OneButton(BUTTON_PIN, true, true);
     userButton.attachClick(userButtonPressed);
     userButton.attachDuringLongPress(userButtonPressedLong);
+    wakeOnIrq(BUTTON_PIN, FALLING);
 #endif
 #ifdef BUTTON_PIN_ALT
     userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
     userButtonAlt.attachClick(userButtonPressed);
     userButton.attachDuringLongPress(userButtonPressedLong);
+    wakeOnIrq(BUTTON_PIN_ALT, FALLING);
 #endif
 #ifdef LED_PIN
     pinMode(LED_PIN, OUTPUT);
@@ -216,14 +239,15 @@ void setup()
 #endif
 
     // Initialize the screen first so we can show the logo while we start up everything else.
+    screen = new graphics::Screen(SSD1306_ADDRESS);
 #if defined(ST7735_CS) || defined(HAS_EINK)
-    screen.setup();
+    screen->setup();
 #else
     if (ssd1306_found)
-        screen.setup();
+        screen->setup();
 #endif
 
-    screen.print("Started...\n");
+    screen->print("Started...\n");
 
     readFromRTC(); // read the main CPU RTC at first (in case we can't get GPS time)
 
@@ -321,7 +345,7 @@ void setup()
     if (!rIf)
         recordCriticalError(ErrNoRadio);
     else
-        router.addInterface(rIf);
+        router->addInterface(rIf);
 
     // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
     PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS
@@ -347,16 +371,12 @@ uint32_t axpDebugRead()
   return 30 * 1000;
 }
 
-concurrency::Periodic axpDebugOutput(axpDebugRead);
+Periodic axpDebugOutput(axpDebugRead);
 axpDebugOutput.setup();
 #endif
 
 void loop()
 {
-    uint32_t msecstosleep = 1000 * 30; // How long can we sleep before we again need to service the main loop?
-
-    if (gps)
-        gps->loop(); // FIXME, remove from main, instead block on read
     powerFSM.run_machine();
 
     // axpDebugOutput.loop();
@@ -378,20 +398,9 @@ void loop()
     userButtonAlt.tick();
 #endif
 
-    concurrency::mainController.run();
-
-    loopWifi();
-
     // For debugging
     // if (rIf) ((RadioLibInterface *)rIf)->isActivelyReceiving();
 
-    // Show boot screen for first 3 seconds, then switch to normal operation.
-    static bool showingBootScreen = true;
-    if (showingBootScreen && (millis() > 3000)) {
-        screen.stopBootScreen();
-        showingBootScreen = false;
-    }
-
 #ifdef DEBUG_STACK
     static uint32_t lastPrint = 0;
     if (millis() - lastPrint > 10 * 1000L) {
@@ -400,19 +409,16 @@ void loop()
     }
 #endif
 
-    // Update the screen last, after we've figured out what to show.
-    screen.debug_info()->setChannelNameStatus(getChannelName());
-
-    // No GPS lock yet, let the OS put the main CPU in low power mode for 100ms (or until another interrupt comes in)
-    // i.e. don't just keep spinning in loop as fast as we can.
-    // DEBUG_MSG("msecs %d\n", msecstosleep);
-
-    // FIXME - until button press handling is done by interrupt (see polling above) we can't sleep very long at all or buttons
-    // feel slow
-    msecstosleep = 10; // FIXME, stop early if something happens and sleep much longer
-
     // TODO: This should go into a thread handled by FreeRTOS.
     handleWebResponse();
 
-    delay(msecstosleep);
+    service.loop();
+
+    long delayMsec = mainController.runOrDelay();
+
+    if(mainController.nextThread && delayMsec) 
+        DEBUG_MSG("Next %s in %ld\n", mainController.nextThread->ThreadName.c_str(), mainController.nextThread->tillRun(millis()));
+
+    // We want to sleep as long as possible here - because it saves power
+    mainDelay.delay(delayMsec);
 }