From 2ba0684982a279e50257c23c7bceafe440015f5d Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Fri, 28 Sep 2018 11:09:39 +0200 Subject: [PATCH] comment out all mesh stuff --- src/IlluCat.h | 46 +++++++++++++++++++++++++++------------------- src/config.h | 3 +++ src/main.cpp | 8 +++++--- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/IlluCat.h b/src/IlluCat.h index b1b010a..9e68357 100644 --- a/src/IlluCat.h +++ b/src/IlluCat.h @@ -1,10 +1,11 @@ #ifndef __MESH_APP__ #define __MESH_APP__ -#include -#include -#include -#include +#include +//#include +//#include +#include +//#include #include "config.h" @@ -23,16 +24,17 @@ using namespace std; using namespace std::placeholders; -const byte DNS_PORT = 53; +//const byte DNS_PORT = 53; -class IlluCat : public MeshSprocket { +class IlluCat : public Sprocket { public: + Scheduler* ts; NeoPattern* pixels; NeoPatternDto defaultState; NeoPatternDto state; AsyncWebServer* server; AsyncWebSocket* ws; - DNSServer* dnsServer; + //DNSServer* dnsServer; NeoPixelConfig pixelConfig; SprocketConfig sprocketConfig; @@ -41,7 +43,7 @@ class IlluCat : public MeshSprocket { SprocketMessage currentMessage; - IlluCat(SprocketConfig cfg, OtaConfig otaCfg, WebServerConfig webCfg/* , NeoPixelConfig pixelCfg */) : MeshSprocket(cfg) { + IlluCat(SprocketConfig cfg, OtaConfig otaCfg, WebServerConfig webCfg/* , NeoPixelConfig pixelCfg */) : Sprocket(cfg) { //pixelConfig = pixelCfg; sprocketConfig = cfg; @@ -53,6 +55,8 @@ class IlluCat : public MeshSprocket { pixelConfig.brightness = 32; pixelConfig.updateInterval = 100; pixelConfig.defaultColor = 100; + + ts = new Scheduler(); } virtual void scanningAnimation() { @@ -64,7 +68,7 @@ class IlluCat : public MeshSprocket { } Sprocket* activate(Scheduler* scheduler, Network* network) { - net = static_cast(network); + //net = static_cast(network); // load config files from SPIFFS if(SPIFFS.begin()){ @@ -77,10 +81,10 @@ class IlluCat : public MeshSprocket { pixels = new NeoPattern(pixelConfig.length, pixelConfig.pin, NEO_GRB + NEO_KHZ800); server = new AsyncWebServer(80); ws = new AsyncWebSocket("/pixel"); - dnsServer = new DNSServer(); + //dnsServer = new DNSServer(); // add plugins - addPlugin(new OtaTcpPlugin(otaConfig)); + //addPlugin(new OtaTcpPlugin(otaConfig)); addPlugin(new WebServerPlugin(webConfig, server)); addPlugin(new WebConfigPlugin(server)); addPlugin(new PixelPlugin(pixelConfig, pixels)); @@ -88,8 +92,8 @@ class IlluCat : public MeshSprocket { // configure DNS // plugin? - dnsServer->setErrorReplyCode(DNSReplyCode::NoError); - dnsServer->start(DNS_PORT, "*", WiFi.softAPIP()); + //dnsServer->setErrorReplyCode(DNSReplyCode::NoError); + //dnsServer->start(DNS_PORT, "*", WiFi.softAPIP()); String softApPrt = "SoftAP IP: " + WiFi.softAPIP().toString(); PRINT_MSG(Serial, SPROCKET_TYPE, softApPrt.c_str()); @@ -100,8 +104,8 @@ class IlluCat : public MeshSprocket { ws->onEvent(bind(&IlluCat::onWsEvent, this, _1, _2, _3, _4, _5, _6)); server->addHandler(ws); - return MeshSprocket::activate(scheduler, network); - } using MeshSprocket::activate; + return Sprocket::activate(scheduler, network); + } using Sprocket::activate; // TODO move to utils String getRequestParameterOrDefault(AsyncWebServerRequest *request, String param, String defaultValue, bool isPost = true){ @@ -111,6 +115,8 @@ class IlluCat : public MeshSprocket { return defaultValue; } + + void patternWebRequestHandler(AsyncWebServerRequest *request) { PRINT_MSG(Serial, SPROCKET_TYPE, "POST /pixel/api"); currentMessage.topic = getRequestParameterOrDefault(request, "topic", ""); @@ -119,7 +125,7 @@ class IlluCat : public MeshSprocket { String msg = currentMessage.toJsonString(); publish(currentMessage.topic, currentMessage.payload); if(currentMessage.broadcast){ - net->mesh.sendBroadcast(msg); + network.broadcast(msg); } request->send(200, "text/plain", msg); } @@ -137,14 +143,16 @@ class IlluCat : public MeshSprocket { currentMessage.from = from; publish(currentMessage.topic, currentMessage.payload); if(currentMessage.broadcast){ - net->mesh.sendBroadcast(msg); + network.broadcast(msg); } } } void loop(){ - MeshSprocket::loop(); - dnsServer->processNextRequest(); + Sprocket::loop(); + yield(); + //ts->execute(); + //dnsServer->processNextRequest(); } }; diff --git a/src/config.h b/src/config.h index ec43677..7108353 100644 --- a/src/config.h +++ b/src/config.h @@ -14,11 +14,14 @@ #define SPROCKET_MODE 0 #define WIFI_CHANNEL 11 #define MESH_PORT 5555 +#define AP_SSID "illucat" +#define AP_PASSWORD "illumination" #define MESH_PREFIX "illucat-mesh" #define MESH_PASSWORD "th3r31sn0sp00n" #define STATION_SSID "MyAP" #define STATION_PASSWORD "th3r31sn0sp00n" #define HOSTNAME "illucat" +#define CONNECT_TIMEOUT 10000 #define MESH_DEBUG_TYPES ERROR | STARTUP | CONNECTION //ERROR | MESH_STATUS | CONNECTION | SYNC | COMMUNICATION | GENERAL | MSG_TYPES | REMOTE diff --git a/src/main.cpp b/src/main.cpp index 440847f..72f3185 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,13 +1,15 @@ #include "config.h" -#include "MeshNet.h" +//#include "MeshNet.h" +#include "WiFiNet.h" #include "IlluCat.h" -MeshNet net({ +/* MeshNet net({ SPROCKET_MODE, WIFI_CHANNEL, MESH_PORT, MESH_PREFIX, MESH_PASSWORD, STATION_SSID, STATION_PASSWORD, HOSTNAME, MESH_DEBUG_TYPES -}); +}); */ +WiFiNet net(SPROCKET_MODE,STATION_SSID, STATION_PASSWORD,AP_SSID, AP_PASSWORD,HOSTNAME,CONNECT_TIMEOUT); IlluCat sprocket( { STARTUP_DELAY, SERIAL_BAUD_RATE }, { OTA_PORT, OTA_PASSWORD },