try out loop() on inbox

balvig · Sep 3, 2020 · 61a46ce · 61a46ce
1 parent cc048dc
commit 61a46ce
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 28 deletions.
diff --git a/examples/ble/src/main.cpp b/examples/ble/src/main.cpp
@@ -2,7 +2,6 @@
 #include <Bricks.Brick.h>
 #include <Bricks.Inbox.h>
 #include <Bricks.Outbox.h>
-#include <Bricks.OtaAction.h>
 using namespace Bricks;
 
 // Local
@@ -56,11 +55,10 @@ void setup() {
 
   // Enable receiving messages
   gInbox.init("BLE Scanner");
-  gInbox.actions[0] = new OtaAction();
-  gInbox.actions[1] = new Action("scan", &passiveScan);
-  gInbox.actions[2] = new Action("activeScan", &activeScan);
+  gInbox.actions[0] = new Action("scan", &passiveScan);
+  gInbox.actions[1] = new Action("activeScan", &activeScan);
 }
 
 void loop() {
-  ArduinoOTA.handle();
+  gInbox.loop();
 }
diff --git a/examples/button-sleep/src/main.cpp b/examples/button-sleep/src/main.cpp
@@ -2,7 +2,6 @@
 #include <Bricks.Brick.h>
 #include <Bricks.Constants.h>
 #include <Bricks.Inbox.h>
-#include <Bricks.OtaAction.h>
 using namespace Bricks;
 
 void setup() {
@@ -15,9 +14,8 @@ void setup() {
 
   // Configure inbox
   gInbox.init("Button");
-  gInbox.actions[0] = new OtaAction();
 }
 
 void loop() {
-  ArduinoOTA.handle();
+  gInbox.loop();
 }
diff --git a/examples/buzzer/src/main.cpp b/examples/buzzer/src/main.cpp
@@ -1,7 +1,6 @@
 // Bricks
 #include <Bricks.Brick.h>
 #include <Bricks.Inbox.h>
-#include <Bricks.OtaAction.h>
 using namespace Bricks;
 
 // Local
@@ -26,13 +25,12 @@ void setup() {
 
   // Configure inbox
   gInbox.init("Buzzer");
-  gInbox.actions[0] = new OtaAction();
-  gInbox.actions[1] = new Action("tone", &playTone);
+  gInbox.actions[0] = new Action("tone", &playTone);
 
   // Configure buzzer
   pinMode(BUZZER, OUTPUT);
 }
 
 void loop() {
-  ArduinoOTA.handle();
+  gInbox.loop();
 }
diff --git a/examples/ir/src/main.cpp b/examples/ir/src/main.cpp
@@ -1,7 +1,6 @@
 // Bricks
 #include <Bricks.Brick.h>
 #include <Bricks.Inbox.h>
-#include <Bricks.OtaAction.h>
 using namespace Bricks;
 
 // Local
@@ -38,8 +37,7 @@ void setup() {
   gBrick.init();
 
   gInbox.init("IR Controller");
-  gInbox.actions[0] = new OtaAction();
-  gInbox.actions[1] = new Action("sendCode", &sendCode);
+  gInbox.actions[0] = new Action("sendCode", &sendCode);
 
   // Start the IR receiver / sender
   irrecv.enableIRIn();
@@ -57,5 +55,5 @@ void loop() {
     Log.notice(resultToSourceCode(&results).c_str());
     irrecv.resume();
   }
-  ArduinoOTA.handle();
+  gInbox.loop();
 }
diff --git a/examples/led-matrix/src/main.cpp b/examples/led-matrix/src/main.cpp
@@ -1,7 +1,6 @@
 // Bricks
 #include <Bricks.Brick.h>
 #include <Bricks.Inbox.h>
-#include <Bricks.OtaAction.h>
 using namespace Bricks;
 
 // Local
@@ -30,10 +29,9 @@ void setup() {
 
   // Configure inbox
   gInbox.init("LED 8x8 Matrix");
-  gInbox.actions[0] = new OtaAction();
-  gInbox.actions[1] = new Action("setValue", &setValue);
+  gInbox.actions[0] = new Action("setValue", &setValue);
 }
 
 void loop() {
-  ArduinoOTA.handle();
+  gInbox.loop();
 }
diff --git a/examples/led/src/main.cpp b/examples/led/src/main.cpp
@@ -1,7 +1,6 @@
 // Bricks
 #include <Bricks.Brick.h>
 #include <Bricks.Inbox.h>
-#include <Bricks.OtaAction.h>
 using namespace Bricks;
 
 const int ledPin = LED_BUILTIN;
@@ -15,7 +14,7 @@ void setPattern(const uint8_t *macAddr, const Message message) {
   }
 }
 
-//Main
+// Main
 void setup() {
   // Logging
   Serial.begin(115200);
@@ -30,10 +29,9 @@ void setup() {
 
   // Enable receiving messages
   gInbox.init("LED");
-  gInbox.actions[0] = new OtaAction();
-  gInbox.actions[1] = new Action("setPattern", &setPattern);
+  gInbox.actions[0] = new Action("setPattern", &setPattern);
 }
 
 void loop() {
-  ArduinoOTA.handle();
+  gInbox.loop();
 }
diff --git a/examples/pir/src/main.cpp b/examples/pir/src/main.cpp
@@ -1,7 +1,6 @@
 // Bricks
 #include <Bricks.Brick.h>
 #include <Bricks.Inbox.h>
-#include <Bricks.OtaAction.h>
 using namespace Bricks;
 
 // Local
@@ -35,7 +34,6 @@ void setup() {
 
   // Configure inbox
   gInbox.init("PIR");
-  gInbox.actions[0] = new OtaAction();
 
   // Configure PIR
   pinMode(PIR, INPUT);
@@ -47,5 +45,5 @@ void loop() {
   if(timer.onRestart()) {
     notifyChanges();
   }
-  ArduinoOTA.handle();
+  gInbox.loop();
 }
diff --git a/src/Bricks.Action.cpp b/src/Bricks.Action.cpp
@@ -6,6 +6,10 @@ namespace Bricks {
     this->customCallback = customCallback;
   }
 
+  void Action::loop() {
+    // Do nothing
+  }
+
   void Action::callback(const uint8_t *macAddr, const Message message) {
     customCallback(macAddr, message);
   }

diff --git a/src/Bricks.Action.h b/src/Bricks.Action.h
@@ -12,6 +12,7 @@ namespace Bricks {
     public:
       Action(const char *key = "", std::function<void(const uint8_t *macAddr, const Message message)> customCallback = nullptr);
       bool respondsTo(const char* compareKey);
+      virtual void loop();
       virtual void callback(const uint8_t *macAddr, const Message message);
       const char *key;
     private:

diff --git a/src/Bricks.Inbox.cpp b/src/Bricks.Inbox.cpp
@@ -2,6 +2,7 @@
 
 namespace Bricks {
   void Inbox::init(const char *name) {
+    actions[3] = new OtaAction();
     actions[4] = new ListAction();
     actions[5] = new PongAction(name);
     actions[6] = new StoreGatewayAction();
@@ -26,6 +27,12 @@ namespace Bricks {
     gInbox.process(macAddr, message);
   }
 
+  void Inbox::loop() {
+    for(int i = 0; i < MAX_ACTIONS; i++) {
+      actions[i]->loop();
+    }
+  }
+
   void Inbox::process(const uint8_t *macAddr, const Message message) {
     for(int i = 0; i < MAX_ACTIONS; i++) {
       if(actions[i]->respondsTo(message.key)) {

diff --git a/src/Bricks.Inbox.h b/src/Bricks.Inbox.h
@@ -13,6 +13,7 @@
 #include <Bricks.AckAction.h>
 #include <Bricks.BatteryAction.h>
 #include <Bricks.ListAction.h>
+#include <Bricks.OtaAction.h>
 #include <Bricks.PongAction.h>
 #include <Bricks.SleepAction.h>
 #include <Bricks.StoreGatewayAction.h>
@@ -25,6 +26,7 @@ namespace Bricks {
       Inbox() {}
       void init(const char *name);
       void initBase();
+      void loop();
       void process(const uint8_t *macAddr, const Message message);
       String listActions(); // The (supposedly) EVIL STRING?
       Action *actions[MAX_ACTIONS] = { new Action(), new Action(), new Action(), new Action(), new Action(), new Action(), new Action(), new Action(), new Action(), new Action() }; // what the

diff --git a/src/Bricks.OtaAction.cpp b/src/Bricks.OtaAction.cpp
@@ -4,6 +4,10 @@ namespace Bricks {
   OtaAction::OtaAction() : Action("setOta") {
   }
 
+  void OtaAction::loop() {
+    ArduinoOTA.handle();
+  }
+
   void OtaAction::callback(const uint8_t *macAddr, const Message message) {
     initOta();
     gOutbox.send(macAddr, "ota", WiFi.softAPIP().toString().c_str());

diff --git a/src/Bricks.OtaAction.h b/src/Bricks.OtaAction.h
@@ -10,6 +10,7 @@ namespace Bricks {
   class OtaAction : public Action {
     public:
       OtaAction();
+      void loop();
       void callback(const uint8_t *macAddr, const Message message);
     private:
       void initOta();