iot/sprocket-device-illucat
1
0
Fork 0
mirror of https://gitlab.com/zwirbel/illucat.git synced 2025-12-15 17:58:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

reorder fnc calls

Browse Source
This commit is contained in:
0x1d
2018-11-05 15:34:14 +01:00
parent 299f7dae65
commit a940903bd3
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/IlluCat.h
View File

@@ -30,13 +30,12 @@ class IlluCat : public Sprocket {
OtaConfig otaConfig; OtaConfig otaConfig;
WebServerConfig webConfig; WebServerConfig webConfig;
SprocketMessage currentMessage;
IlluCat(SprocketConfig cfg, OtaConfig otaCfg, WebServerConfig webCfg) : Sprocket(cfg) { IlluCat(SprocketConfig cfg, OtaConfig otaCfg, WebServerConfig webCfg) : Sprocket(cfg) {
sprocketConfig = cfg; sprocketConfig = cfg;
otaConfig = otaCfg; otaConfig = otaCfg;
webConfig = webCfg; webConfig = webCfg;
server = new AsyncWebServer(80); server = new AsyncWebServer(80);
server->serveStatic(PIXEL_CONFIG_FILE, SPIFFS, "pixelConfig.json");
} }
void setup(){ void setup(){
@@ -44,16 +43,6 @@ class IlluCat : public Sprocket {
addPlugin(new WebServerPlugin(webConfig, server)); addPlugin(new WebServerPlugin(webConfig, server));
addPlugin(new WebConfigPlugin(server)); addPlugin(new WebConfigPlugin(server));
addPlugin(new WebApi(server, 1)); addPlugin(new WebApi(server, 1));
server->serveStatic(PIXEL_CONFIG_FILE, SPIFFS, "pixelConfig.json");
}
// TODO move to Sprocket
virtual void dispatch( uint32_t from, String &msg ) {
currentMessage.fromJsonString(msg);
if(currentMessage.valid){
currentMessage.from = from;
publish(currentMessage.topic, currentMessage.payload);
}
} }
}; };

7
src/PixelPlugin.cpp
View File

@@ -42,6 +42,10 @@ void PixelPlugin::defaultAnimation() {
void PixelPlugin::activate(Scheduler *userScheduler, Network *network) void PixelPlugin::activate(Scheduler *userScheduler, Network *network)
{ {
animation.set(TASK_MILLISECOND * pixelConfig.updateInterval, TASK_FOREVER, bind(&PixelPlugin::animate, this));
userScheduler->addTask(animation);
animation.enable();
subscribe("pixels/colorWheel", bind(&PixelPlugin::colorWheel, this, _1)); subscribe("pixels/colorWheel", bind(&PixelPlugin::colorWheel, this, _1));
subscribe("pixels/color", bind(&PixelPlugin::setColor, this, _1)); subscribe("pixels/color", bind(&PixelPlugin::setColor, this, _1));
subscribe("pixels/color2", bind(&PixelPlugin::setColor2, this, _1)); subscribe("pixels/color2", bind(&PixelPlugin::setColor2, this, _1));
@@ -50,9 +54,6 @@ void PixelPlugin::activate(Scheduler *userScheduler, Network *network)
subscribe("pixels/brightness", bind(&PixelPlugin::setBrightness, this, _1)); subscribe("pixels/brightness", bind(&PixelPlugin::setBrightness, this, _1));
subscribe("pixels/state", bind(&PixelPlugin::setState, this, _1)); subscribe("pixels/state", bind(&PixelPlugin::setState, this, _1));
animation.set(TASK_MILLISECOND * pixelConfig.updateInterval, TASK_FOREVER, bind(&PixelPlugin::animate, this));
userScheduler->addTask(animation);
animation.enable();
PRINT_MSG(Serial, SPROCKET_TYPE, "NeoPixels activated"); PRINT_MSG(Serial, SPROCKET_TYPE, "NeoPixels activated");
} }