diff --git a/data/www/index.html b/data/www/index.html index 27df621..a4eb0c2 100644 --- a/data/www/index.html +++ b/data/www/index.html @@ -11,11 +11,24 @@

-
- -
- -
+
+ Network +
+ + +
+ +
+
+
+ NeoPixel Config +
+ + +
+ +
+
diff --git a/data/www/script.js b/data/www/script.js index 0127995..2199f30 100644 --- a/data/www/script.js +++ b/data/www/script.js @@ -1,22 +1,16 @@ -// mesh topology: -const exampleMesh = [{ - "nodeId": 757307929, "subs": [ - { "nodeId": 2138241514, "subs": [] }, - { "nodeId": 757307466, "subs": [] } - ] -}, { - "nodeId": 757308244, "subs": [ - { "nodeId": 3154639577, "subs": [] } - ] -}, { - "nodeId": 3954439712, "subs": [] -}]; - $(() => { - // load config - $.get("/config.json", (data) => { - $('.js-config').val(JSON.stringify(data, null, 4)); + + $('form').each((i, el) => { + let $fEl = $(el); + $.get($fEl.find('[name="fileName"]').val(), (data) => { + $fEl.find('.js-config').val(JSON.stringify(data, null, 4)); + }); }); + + // load config + //$.get("/config.json", (data) => { + // $('.js-config').val(JSON.stringify(data, null, 4)); + //}); // add handlers $('.js-restart').click(() => { $.post('/restart'); diff --git a/src/IlluCat.h b/src/IlluCat.h index 6a0702b..5e98b9e 100644 --- a/src/IlluCat.h +++ b/src/IlluCat.h @@ -91,6 +91,7 @@ class IlluCat : public MeshSprocket { defaultAnimation(); // setup web stuff + server->serveStatic("/pixelConfig.json", SPIFFS, "pixelConfig.json"); server->on("/pixel/pattern", HTTP_POST, bind(&IlluCat::patternWebRequestHandler, this, _1)); ws->onEvent(bind(&IlluCat::onWsEvent, this, _1, _2, _3, _4, _5, _6)); server->addHandler(ws); @@ -126,7 +127,9 @@ class IlluCat : public MeshSprocket { virtual void onNewConnection(uint32_t nodeId){ PRINT_MSG(Serial, SPROCKET_TYPE, "connected to %u", nodeId); - defaultAnimation(); + //defaultAnimation(); + String stateJson = state.toJsonString(); + net->mesh.sendSingle(nodeId, stateJson); // TODO publish current state to pixel/color on new node } virtual void onConnectionChanged(){