diff --git a/src/IlluCat.h b/src/IlluCat.h index a6b2b95..daa9c7d 100644 --- a/src/IlluCat.h +++ b/src/IlluCat.h @@ -36,23 +36,16 @@ class IlluCat : public Sprocket { sprocketConfig = cfg; otaConfig = otaCfg; webConfig = webCfg; + server = new AsyncWebServer(80); } - Sprocket* activate(Scheduler* scheduler, Network* network) { - - server = new AsyncWebServer(80); - // TODO how can any type of API be linked to another one? - // TODO add HTTP OTA instead of TCP - //addPlugin(new OtaTcpPlugin(otaConfig)); + void setup(){ + addPlugin(new PixelPlugin()); addPlugin(new WebServerPlugin(webConfig, server)); addPlugin(new WebConfigPlugin(server)); addPlugin(new WebApi(server, 1)); - - // setup web stuff server->serveStatic(PIXEL_CONFIG_FILE, SPIFFS, "pixelConfig.json"); - - return Sprocket::activate(scheduler, network); - } using Sprocket::activate; + } // TODO move to Sprocket virtual void dispatch( uint32_t from, String &msg ) { diff --git a/src/wifi/main.cpp b/src/wifi/main.cpp index 4f22af0..05f873b 100644 --- a/src/wifi/main.cpp +++ b/src/wifi/main.cpp @@ -18,7 +18,7 @@ IlluCat sprocket( ); void setup() { - sprocket.addPlugin(new PixelPlugin()); + sprocket.setup(); sprocket.join(net); } diff --git a/src/wifiMesh/main.cpp b/src/wifiMesh/main.cpp index 4e9e5c4..6dfc6a4 100644 --- a/src/wifiMesh/main.cpp +++ b/src/wifiMesh/main.cpp @@ -15,7 +15,7 @@ MeshCat sprocket( ); void setup() { - sprocket.addPlugin(new PixelPlugin()); + sprocket.setup(); sprocket.join(net); }