From 4ec14819026a162fd99f0e26c2480c151269f55e Mon Sep 17 00:00:00 2001
From: Patrick Balsiger <frupii@gmail.com>
Date: Thu, 19 Jul 2018 17:27:29 +0200
Subject: [PATCH] cleanup basic example

---
 platformio.ini                                     |  1 -
 src/Sprocket.h                                     |  6 +++++-
 .../basic/{ExampleApp.h => ExampleApp.cpp}         | 14 +++-----------
 src/examples/basic/{basic.cpp => main.cpp}         |  3 ++-
 4 files changed, 10 insertions(+), 14 deletions(-)
 rename src/examples/basic/{ExampleApp.h => ExampleApp.cpp} (54%)
 rename src/examples/basic/{basic.cpp => main.cpp} (90%)

diff --git a/platformio.ini b/platformio.ini
index 6421b5d..750657e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,7 +19,6 @@ upload_speed = 921600
 monitor_baud = 115200
 lib_deps = 
     Hash
-    ESP Async WebServer
     ESPAsyncTCP
     TaskScheduler
     painlessMesh
diff --git a/src/Sprocket.h b/src/Sprocket.h
index 7133c62..aa59182 100644
--- a/src/Sprocket.h
+++ b/src/Sprocket.h
@@ -9,6 +9,9 @@
 using namespace std;
 using namespace std::placeholders;
 
+// FIXME move to some global fnc lib
+#define ARRAY_LENGTH(array) sizeof(array)/sizeof(array[0])
+
 struct SprocketConfig {
     int startupDelay;
     int serialBaudRate;
@@ -28,7 +31,8 @@ class Sprocket {
         virtual Sprocket* activate();
         virtual Sprocket* activate(Scheduler*) { return this; }
         virtual Sprocket* activate(Scheduler*, Network*) { return this; }
-        //virtual void dispatch(uint32_t from, String &msg) {};
+        // TODO bind onMessage to network->onReceive
+        //virtual void onMessage(uint32_t from, String &msg) {};
 };
 
 #endif
\ No newline at end of file
diff --git a/src/examples/basic/ExampleApp.h b/src/examples/basic/ExampleApp.cpp
similarity index 54%
rename from src/examples/basic/ExampleApp.h
rename to src/examples/basic/ExampleApp.cpp
index 7a21f8d..9fa7180 100644
--- a/src/examples/basic/ExampleApp.h
+++ b/src/examples/basic/ExampleApp.cpp
@@ -1,8 +1,6 @@
 #ifndef __EXAMPLE_APP__
 #define __EXAMPLE_APP__
 
-//#include "Sprocket.h"
-#include <ESPAsyncWebServer.h>
 #include <Sprocket.h>
 
 using namespace std;
@@ -12,23 +10,17 @@ class ExampleApp : public Sprocket {
     public:
         Task someTask;
         ExampleApp(SprocketConfig cfg) : Sprocket(cfg) {
-            Serial.println("joo");
+            Serial.println("init");
         }
         Sprocket* activate(Scheduler* scheduler) {
             Serial.println("activate");
-            someTask.set(TASK_SECOND, TASK_FOREVER, [this](){
+            someTask.set(TASK_SECOND, TASK_FOREVER, [](){
                 Serial.println("do stuff in task");
             });
             scheduler->addTask(someTask);
             someTask.enable();
+            return this;
         } using Sprocket::activate;
-        void server(AsyncWebServer* srv) {
-            srv->on("/ping", HTTP_POST, bind(&ExampleApp::handlePingRequest, this, _1));
-        }
-        void handlePingRequest(AsyncWebServerRequest *request) {
-            Serial.println("pinged");
-            request->send(200, "text/html", "pong");
-        }
 };
 
 #endif
\ No newline at end of file
diff --git a/src/examples/basic/basic.cpp b/src/examples/basic/main.cpp
similarity index 90%
rename from src/examples/basic/basic.cpp
rename to src/examples/basic/main.cpp
index 5eac4d8..1ba6d64 100644
--- a/src/examples/basic/basic.cpp
+++ b/src/examples/basic/main.cpp
@@ -1,9 +1,10 @@
 #define _TASK_SLEEP_ON_IDLE_RUN
 #define _TASK_STD_FUNCTION
+
 #define SERIAL_BAUD_RATE 115200
 #define STARTUP_DELAY 3000
 
-#include "ExampleApp.h"
+#include "ExampleApp.cpp"
 
 ExampleApp sprocket({ STARTUP_DELAY, SERIAL_BAUD_RATE });