adapt mesh app to use mesh plugin

src/MeshNet.cpp

@@ -40,8 +40,8 @@ void MeshNet::sendTo(uint32_t target, String msg){
     mesh.sendSingle(target, msg);
 }
 
-void MeshNet::broadcast(String msg){
+void MeshNet::broadcast(String msg, bool self){
-    mesh.sendBroadcast(msg);
+    mesh.sendBroadcast(msg, self);
     
 }
 void MeshNet::update(){

src/MeshNet.h

@@ -29,7 +29,7 @@ class MeshNet : public Network {
         void newConnectionCallback(uint32_t nodeId);
         void changedConnectionCallback();
         void nodeTimeAdjustedCallback(int32_t offset);
-        void broadcast(String msg);
+        void broadcast(String msg, bool self = false);
         void sendTo(uint32_t target, String msg);
         void onReceive(std::function<void(uint32_t from, String &msg)>);
         int isConnected(){

src/Network.h

@@ -16,7 +16,7 @@ class Network {
         virtual int connectStation() { return 0; };
         virtual int isConnected(){ return 0; };
         virtual void update() {};
-        virtual void broadcast(String msg){};
+        virtual void broadcast(String msg, bool self = false){};
         virtual void sendTo(uint32_t target, String msg) {};
         virtual void onReceive(std::function<void(uint32_t from, String &msg)>) {};
         Network* setScheduler(Scheduler* s) {

src/Plugin.h

@@ -1,6 +1,10 @@
 #ifndef __SPROCKET_PLUGIN__
 #define __SPROCKET_PLUGIN__
 
+#define _TASK_SLEEP_ON_IDLE_RUN
+#define _TASK_STD_FUNCTION
+#define _TASK_PRIORITY
+
 #include <TaskSchedulerDeclarations.h>
 #include <Network.h>
 #include <base/SprocketMessage.h>

src/Sprocket.h

@@ -3,6 +3,7 @@
 
 #define _TASK_SLEEP_ON_IDLE_RUN
 #define _TASK_STD_FUNCTION 
+#define _TASK_PRIORITY
 
 #include <TaskSchedulerDeclarations.h>
 //#include <TaskScheduler.h>
@@ -45,7 +46,6 @@ class Sprocket : public Mediator {
 
         void addPlugin(Plugin* p);
         void activatePlugins(Scheduler* scheduler);
-        void dispatchMessageToPlugins(SprocketMessage msg);
 };
 
 #endif

src/base/MeshSprocket.h

@@ -43,7 +43,7 @@ class MeshSprocket : public Sprocket {
 
         void loop() {
             //net->update();
-            scheduler.execute();
+            scheduler->execute();
         }
 };
 

src/examples/mesh/MeshApp.h

@@ -1,14 +1,12 @@
 #ifndef __MESH_APP__
 #define __MESH_APP__
 
-#include <painlessMesh.h>
+#include <Sprocket.h>
-#include <base/MeshSprocket.h>
 #include <MeshNet.h>
+#include <plugins/MeshNetworkPlugin.cpp>
 #include <plugins/WebServerConfig.h>
-//#include <plugins/OtaTcpPlugin.cpp>
 #include <plugins/WebServerPlugin.cpp>
 #include <plugins/WebConfigPlugin.cpp>
-//#include <plugins/MeshManPlugin.cpp>
 #include "Mediator.h"
 
 using namespace std;
@@ -16,48 +14,41 @@ using namespace std::placeholders;
 
 AsyncWebServer WEBSERVER(80);
 
-class MeshApp : public MeshSprocket {
+class MeshApp : public Sprocket {
     public:
         Task heartbeatTask;
 
-        MeshApp(SprocketConfig cfg, /* OtaConfig otaCfg, */ WebServerConfig webCfg) : MeshSprocket(cfg) {
+        MeshApp(SprocketConfig cfg, MeshConfig meshCfg, WebServerConfig webCfg) : Sprocket(cfg) {
-            //addPlugin(new OtaTcpPlugin(otaCfg));
+            addPlugin(new MeshNetworkPlugin(meshCfg));
             addPlugin(new WebServerPlugin(webCfg, &WEBSERVER));
             addPlugin(new WebConfigPlugin(&WEBSERVER));
-            //addPlugin(new MeshManPlugin(&WEBSERVER));
+            subscribe("device/heartbeat", bind(&MeshApp::messageHandler, this, _1));
-            subscribe("mesh/heartbeat", bind(&MeshApp::messageHandler, this, _1));
         }
 
         Sprocket* activate(Scheduler* scheduler) {
-            // call parent method that enables dispatching and plugins
+            Serial.println("activate MeshApp");
-            MeshSprocket::activate(scheduler);
+            Sprocket::activate(scheduler);
-            
             // add a task that sends stuff to the mesh
-            heartbeatTask.set(TASK_SECOND * 5, TASK_FOREVER, bind(&MeshApp::heartbeat, this, net));
+            heartbeatTask.set(TASK_SECOND * 5, TASK_FOREVER, bind(&MeshApp::heartbeat, this));
             addTask(heartbeatTask);
             
             return this;
-        } using MeshSprocket::activate;
+        } using Sprocket::activate;
 
         void messageHandler(String msg){
             Serial.println(String("MeshApp: ") + msg);
         }
 
-        void heartbeat(MeshNet* network){
+        void heartbeat(){
-            SprocketMessage msg; // = { "wirelos", "broadcast", "local", "alive", 0, };
+            SprocketMessage msg;
             msg.domain = "wirelos";
             msg.to = "broadcast";
             msg.payload = "alive";
-            msg.topic = "mesh/heartbeat";
+            msg.topic = "device/heartbeat";
             msg.type = SprocketMessage::APP;
             String msgStr = msg.toJsonString();
-            //network->mesh.sendBroadcast(msgStr, true);
+            publish("mesh/broadcast", msgStr);
-            //String mMsg =  String("hoi");
-            //publish("mediatorMsg", "hi mediator");
         }
-        //void onMessage( uint32_t from, String &msg ) {
-        //    Serial.printf("MeshApp onMessage: received from %u msg=%s\n", from, msg.c_str());
-        //}
 };
 
 #endif

src/examples/mesh/config.h

@@ -4,6 +4,7 @@
 // Scheduler config
 #define _TASK_SLEEP_ON_IDLE_RUN
 #define _TASK_STD_FUNCTION
+#define _TASK_PRIORITY
 
 // Chip config
 #define SERIAL_BAUD_RATE    115200

src/examples/mesh/main.cpp

@@ -1,24 +1,22 @@
 #include "config.h"
-#include "MeshNet.h"
 #include "MeshApp.h"
 
-MeshNet net({
-    SPROCKET_MODE, WIFI_CHANNEL,
-    MESH_PORT, MESH_PREFIX, MESH_PASSWORD,
-    STATION_SSID, STATION_PASSWORD, HOSTNAME,
-    MESH_DEBUG_TYPES
-});
 MeshApp sprocket(
-    { STARTUP_DELAY, SERIAL_BAUD_RATE },
+    {STARTUP_DELAY, SERIAL_BAUD_RATE},
-    /* { OTA_PORT, OTA_PASSWORD }, */
+    {SPROCKET_MODE, WIFI_CHANNEL,
-    { WEB_CONTEXT_PATH, WEB_DOC_ROOT, WEB_DEFAULT_FILE }
+     MESH_PORT, MESH_PREFIX, MESH_PASSWORD,
-);
+     STATION_SSID, STATION_PASSWORD, HOSTNAME,
+     MESH_DEBUG_TYPES},
+    {WEB_CONTEXT_PATH, WEB_DOC_ROOT, WEB_DEFAULT_FILE});
 
-void setup() {
+void setup()
-    //sprocket.join(net);
+{
+    delay(3000);
+    sprocket.activate();
 }
 
-void loop() {
+void loop()
+{
     sprocket.loop();
     yield();
 }

src/plugins/MeshNetworkPlugin.cpp

@@ -1,10 +1,8 @@
 #ifndef __MESH_NETWORK_PLUGIN__
 #define __MESH_NETWORK_PLUGIN__
 
-#define _TASK_PRIORITY
-
-#include "TaskSchedulerDeclarations.h"
 #include "Plugin.h"
+#include "TaskSchedulerDeclarations.h"
 #include <Network.h>
 #include <MeshNet.h>
 #include "plugins/NetworkPlugin.cpp"
@@ -22,6 +20,7 @@ class MeshNetworkPlugin : public NetworkPlugin
     MeshNetworkPlugin(MeshConfig cfg)
     {
         network = new MeshNet(cfg);
+        meshScheduler = new Scheduler();
     }
 
     void activate(Scheduler *userScheduler)
@@ -29,8 +28,13 @@ class MeshNetworkPlugin : public NetworkPlugin
         userScheduler->setHighPriorityScheduler(meshScheduler);
         network->onReceive(bind(&MeshNetworkPlugin::dispatch, this, _1, _2));
         // TODO base subscribers
+        subscribe("mesh/broadcast", bind(&MeshNetworkPlugin::broadcast, this, _1));
         NetworkPlugin::activate(meshScheduler);
     }
+    void broadcast(String msg)
+    {
+        network->broadcast(msg, true);
+    }
     void dispatch(uint32_t from, String &msg)
     {
         SprocketMessage sMsg;