From a8e0d9037e9861e1ac7d6e2de571a52cc8d8fc72 Mon Sep 17 00:00:00 2001
From: Patrick Balsiger <frupii@gmail.com>
Date: Thu, 8 Nov 2018 15:34:12 +0100
Subject: [PATCH] remove unused, move files

---
 src/MeshNet.h                       |  2 +-
 src/{base => }/MeshSprocketConfig.h |  0
 src/Plugin.h                        |  2 +-
 src/{base => }/SprocketMessage.h    |  0
 src/base/MeshSprocket.h             | 50 -----------------------------
 src/plugins/MeshNetworkPlugin.cpp   |  2 +-
 6 files changed, 3 insertions(+), 53 deletions(-)
 rename src/{base => }/MeshSprocketConfig.h (100%)
 rename src/{base => }/SprocketMessage.h (100%)
 delete mode 100644 src/base/MeshSprocket.h

diff --git a/src/MeshNet.h b/src/MeshNet.h
index f36b738..5da24c0 100644
--- a/src/MeshNet.h
+++ b/src/MeshNet.h
@@ -11,7 +11,7 @@
 #include <WiFiClient.h>
 #include "Network.h"
 #include "MeshConfig.h"
-#include "base/MeshSprocketConfig.h"
+#include "MeshSprocketConfig.h"
 
 using namespace std;
 using namespace std::placeholders;
diff --git a/src/base/MeshSprocketConfig.h b/src/MeshSprocketConfig.h
similarity index 100%
rename from src/base/MeshSprocketConfig.h
rename to src/MeshSprocketConfig.h
diff --git a/src/Plugin.h b/src/Plugin.h
index 5bbeaf3..9c83644 100644
--- a/src/Plugin.h
+++ b/src/Plugin.h
@@ -7,7 +7,7 @@
 
 #include <TaskSchedulerDeclarations.h>
 #include <Network.h>
-#include <base/SprocketMessage.h>
+#include <SprocketMessage.h>
 #include <Mediator.h>
 
 class Plugin {
diff --git a/src/base/SprocketMessage.h b/src/SprocketMessage.h
similarity index 100%
rename from src/base/SprocketMessage.h
rename to src/SprocketMessage.h
diff --git a/src/base/MeshSprocket.h b/src/base/MeshSprocket.h
deleted file mode 100644
index 938dfc7..0000000
--- a/src/base/MeshSprocket.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef __MESH_SPROCKET__
-#define __MESH_SPROCKET__
-
-#define DEBUG_ESP_OTA
-#include <vector>
-#include <painlessMesh.h>
-#include <Sprocket.h>
-#include <MeshNet.h>
-#include <base/SprocketMessage.h>
-#include <base/MeshSprocketConfig.h>
-#include "config.h"
-#include "utils_print.h"
-
-using namespace std;
-using namespace std::placeholders;
-
-class MeshSprocket : public Sprocket {
-    public:
-        MeshNet* net;
-
-        MeshSprocket(){};
-        MeshSprocket(SprocketConfig cfg) : Sprocket(cfg) {
-
-        }
-
-        Sprocket* activate(Scheduler* scheduler) {
-            Sprocket::activate(scheduler);
-            //net = static_cast<MeshNet*>(network);
-            //net->onReceive(bind(&MeshSprocket::dispatch,this, _1, _2));
-            
-            return this;
-        } using Sprocket::activate;
-
-        // TODO transmit SprocketMessage
-        virtual void dispatch( uint32_t from, String &msg ) {
-           SprocketMessage sMsg;
-            sMsg.fromJsonString(msg);
-            if(sMsg.valid){
-                sMsg.from = from;
-                publish(sMsg.topic, sMsg.payload);
-            }
-        }
-
-        void loop() {
-            //net->update();
-            scheduler->execute();
-        }
-};
-
-#endif
\ No newline at end of file
diff --git a/src/plugins/MeshNetworkPlugin.cpp b/src/plugins/MeshNetworkPlugin.cpp
index 87757ba..1b4c571 100644
--- a/src/plugins/MeshNetworkPlugin.cpp
+++ b/src/plugins/MeshNetworkPlugin.cpp
@@ -6,7 +6,7 @@
 #include <Network.h>
 #include <MeshNet.h>
 #include "plugins/NetworkPlugin.cpp"
-#include <base/SprocketMessage.h>
+#include <SprocketMessage.h>
 
 using namespace std;
 using namespace std::placeholders;