From c86f96996de3800b5fd75d19d48c534f24b5dcc3 Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Thu, 19 Jul 2018 17:30:05 +0200 Subject: [PATCH] cleanup mesh example --- src/examples/mesh/{MeshApp.h => MeshApp.cpp} | 5 +++-- src/examples/mesh/{mesh.cpp => main.cpp} | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename src/examples/mesh/{MeshApp.h => MeshApp.cpp} (91%) rename src/examples/mesh/{mesh.cpp => main.cpp} (93%) diff --git a/src/examples/mesh/MeshApp.h b/src/examples/mesh/MeshApp.cpp similarity index 91% rename from src/examples/mesh/MeshApp.h rename to src/examples/mesh/MeshApp.cpp index 5c7b0cc..b41f39f 100644 --- a/src/examples/mesh/MeshApp.h +++ b/src/examples/mesh/MeshApp.cpp @@ -1,4 +1,4 @@ - #ifndef __MESH_APP__ +#ifndef __MESH_APP__ #define __MESH_APP__ #include @@ -15,12 +15,13 @@ class MeshApp : public Sprocket { MeshApp(SprocketConfig cfg) : Sprocket(cfg) {} Sprocket* activate(Scheduler* scheduler, Network* network) { net = static_cast(network); - //net->onReceive(bind(&MeshApp::onReceive,this, _1, _2)); + net->onReceive(bind(&MeshApp::dispatch,this, _1, _2)); // add a task that sends stuff to the mesh someTask.set(TASK_SECOND * 5, TASK_FOREVER, bind(&MeshApp::heartbeat, this, net)); scheduler->addTask(someTask); someTask.enable(); + return this; } using Sprocket::activate; void heartbeat(MeshNet* network){ diff --git a/src/examples/mesh/mesh.cpp b/src/examples/mesh/main.cpp similarity index 93% rename from src/examples/mesh/mesh.cpp rename to src/examples/mesh/main.cpp index 655fbbd..bd04b7c 100644 --- a/src/examples/mesh/mesh.cpp +++ b/src/examples/mesh/main.cpp @@ -1,6 +1,6 @@ #include "config.h" #include "MeshNet.h" -#include "MeshApp.h" +#include "MeshApp.cpp" MeshNet net({ STATION_MODE, WIFI_CHANNEL,