From fe816bdb9515af993ac3306ae4164aa9b4d58679 Mon Sep 17 00:00:00 2001
From: Ewoud <ewowi@icloud.com>
Date: Mon, 16 Oct 2023 10:51:19 +0200
Subject: [PATCH] Add mDNS (usermod) and serveJson for /json

AppEffects: Add Octopus2D (empty, wip)

Main: activate mDNS

SysModModel: setValueI, add table column (array) support (WIP)

SysModSystem: - add serverName (instance name) field

SysModUI: add serveJson on URL /json

SysModWeb:
- loop: update clTbl columns evert second, instead of whole table (WIP)
- add serveJson

UserModInstances
- remove inactive node bugfix
- user serverName from mdl
---
 data/app.js                 |  2 +-
 data/index.css              |  2 +-
 data/index.htm              |  2 +-
 data/index.js               |  2 +-
 platformio.ini              |  3 +-
 src/App/AppEffects.h        | 74 +++++++++++++++++++++++++++++++++--
 src/App/AppLedsV.cpp        |  2 +-
 src/App/AppLedsV.h          |  2 +-
 src/App/AppModLedFixGen.h   |  2 +-
 src/App/AppModLeds.h        |  2 +-
 src/Module.h                |  2 +-
 src/Sys/SysJsonRDWS.h       |  2 +-
 src/Sys/SysModFiles.cpp     |  2 +-
 src/Sys/SysModFiles.h       |  4 +-
 src/Sys/SysModModel.cpp     | 33 +++++++++++++---
 src/Sys/SysModModel.h       |  4 +-
 src/Sys/SysModModules.cpp   |  2 +-
 src/Sys/SysModModules.h     |  2 +-
 src/Sys/SysModNetwork.cpp   |  2 +-
 src/Sys/SysModNetwork.h     |  2 +-
 src/Sys/SysModPins.cpp      |  2 +-
 src/Sys/SysModPins.h        |  2 +-
 src/Sys/SysModPrint.cpp     |  2 +-
 src/Sys/SysModPrint.h       |  2 +-
 src/Sys/SysModSystem.cpp    |  6 ++-
 src/Sys/SysModSystem.h      |  2 +-
 src/Sys/SysModUI.cpp        |  8 ++--
 src/Sys/SysModUI.h          |  2 +-
 src/Sys/SysModWeb.cpp       | 78 ++++++++++++++++++++++++++++++-------
 src/Sys/SysModWeb.h         |  6 ++-
 src/User/UserModArtNet.h    |  4 +-
 src/User/UserModDDP.h       |  4 +-
 src/User/UserModE131.h      |  4 +-
 src/User/UserModExample.h   |  4 +-
 src/User/UserModHA.h        |  4 +-
 src/User/UserModInstances.h | 29 +++++++-------
 src/User/UserModMDNS.h      |  4 +-
 src/User/UserModWLEDAudio.h |  4 +-
 src/main.cpp                |  4 +-
 39 files changed, 230 insertions(+), 89 deletions(-)

diff --git a/data/app.js b/data/app.js
index 094e0d2e..b122ce02 100644
--- a/data/app.js
+++ b/data/app.js
@@ -1,6 +1,6 @@
 // @title     StarMod
 // @file      app.js
-// @date      20230810
+// @date      20231016
 // @repo      https://github.com/ewowi/StarMod
 // @Authors   https://github.com/ewowi/StarMod/commits/main
 // @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/data/index.css b/data/index.css
index 35235771..31fe9a84 100644
--- a/data/index.css
+++ b/data/index.css
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      index.css
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/data/index.htm b/data/index.htm
index 4847c901..5a33da50 100644
--- a/data/index.htm
+++ b/data/index.htm
@@ -1,6 +1,6 @@
 <!-- @title     StarMod
 @file      index.htm
-@date      20230810
+@date      20231016
 @repo      https://github.com/ewowi/StarMod
 @Authors   https://github.com/ewowi/StarMod/commits/main
 @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/data/index.js b/data/index.js
index 1c226dc2..98bddd09 100644
--- a/data/index.js
+++ b/data/index.js
@@ -1,6 +1,6 @@
 // @title     StarMod
 // @file      index.css
-// @date      20230810
+// @date      20231016
 // @repo      https://github.com/ewowi/StarMod
 // @Authors   https://github.com/ewowi/StarMod/commits/main
 // @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/platformio.ini b/platformio.ini
index 3df87564..71403d80 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,6 +1,6 @@
 ;    @title     StarMod
 ;    @file      platformio.ini
-;    @date      20230810
+;   @date      20231016
 ;    @repo      https://github.com/ewowi/StarMod
 ;    @Authors   https://github.com/ewowi/StarMod/commits/main
 ;    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -11,6 +11,7 @@ lib_deps =
     ; https://github.com/me-no-dev/ESPAsyncWebServer.git
     ; https://github.com/lost-hope/ESPAsyncWebServer.git#master
     https://github.com/ewowi/ESPAsyncWebServer.git
+    ; https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
     https://github.com/bblanchon/ArduinoJson.git
 
 [appmod_leds]
diff --git a/src/App/AppEffects.h b/src/App/AppEffects.h
index 35448a9d..47dee8e0 100644
--- a/src/App/AppEffects.h
+++ b/src/App/AppEffects.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      AppEffects.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -334,7 +334,7 @@ class DistortionWaves2D: public Effect {
     Effect::loop();
 
     const uint16_t cols = LedsV::widthV;
-    const uint16_t rows = LedsV::widthV;
+    const uint16_t rows = LedsV::heightV;
 
     uint8_t speed = mdl->getValue("speed").as<int>()/32;
     uint8_t scale = mdl->getValue("scale").as<int>()/32;
@@ -383,6 +383,73 @@ class DistortionWaves2D: public Effect {
   }
 }; // DistortionWaves2D
 
+class Octopus2D: public Effect {
+public:
+  const char * name() {
+    return "Octopus 2D";
+  }
+
+    // typedef struct {
+    //   uint8_t angle;
+    //   uint8_t radius;
+    // } map_t;
+
+    // map_t rMap ;
+
+  void setup() {
+    // fadeToBlackBy( ledsP, LedsV::nrOfLedsP, 100); //like more the gradual change
+  }
+
+  void loop() {
+    Effect::loop();
+
+    const uint16_t cols = LedsV::widthV;
+    const uint16_t rows = LedsV::widthV;
+
+    uint8_t offsX = mdl->getValue("Offset X").as<uint8_t>();
+    uint8_t offsYX = mdl->getValue("Offset Y").as<uint8_t>();
+    uint8_t legs = mdl->getValue("Legs").as<uint8_t>();
+
+    // const uint8_t mapp = 180 / MAX(cols,rows);
+
+    // // re-init if SEGMENT dimensions or offset changed
+    // if (SEGENV.call == 0 || SEGENV.aux0 != cols || SEGENV.aux1 != rows || offsX != *offsX || offsY != *offsY) {
+    //   SEGENV.step = 0; // t
+    //   SEGENV.aux0 = cols;
+    //   SEGENV.aux1 = rows;
+    //   *offsX = offsX;
+    //   *offsY = offsY;
+    //   const uint8_t C_X = cols / 2 + (offsX - 128)*cols/255;
+    //   const uint8_t C_Y = rows / 2 + (offsY - 128)*rows/255;
+    //   for (int x = 0; x < cols; x++) {
+    //     for (int y = 0; y < rows; y++) {
+    //       rMap[XY(x, y)].angle = 40.7436f * atan2f(y - C_Y, x - C_X); // avoid 128*atan2()/PI
+    //       rMap[XY(x, y)].radius = hypotf(x - C_X, y - C_Y) * mapp; //thanks Sutaburosu
+    //     }
+    //   }
+    // }
+
+    // SEGENV.step += SEGMENT.speed / 32 + 1;  // 1-4 range
+    // for (int x = 0; x < cols; x++) {
+    //   for (int y = 0; y < rows; y++) {
+    //     byte angle = rMap[XY(x,y)].angle;
+    //     byte radius = rMap[XY(x,y)].radius;
+    //     //CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (legs/3+1)));
+    //     uint16_t intensity = sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step/2) + radius - SEGENV.step + angle * (legs/4+1));
+    //     intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
+    //     CRGB c = ColorFromPalette(SEGPALETTE, SEGENV.step / 2 - radius, intensity);
+    //     SEGMENT.setPixelColorXY(x, y, c);
+    //   }
+    // }
+  }
+  bool controls(JsonObject parentVar) {
+    ui->initSlider(parentVar, "Offset X", false, false);
+    ui->initSlider(parentVar, "Offset Y", false, false);
+    ui->initSlider(parentVar, "Legs", false, false);
+    return true;
+  }
+}; // Octopus2D
+
 
 //BouncingBalls1D  inspired by WLED
 //each needs 12 bytes
@@ -464,7 +531,7 @@ class BouncingBalls1D: public Effect {
     ui->initSlider(parentVar, "nrOfBalls", 128, false);
     return true;
   }
-}; // DistortionWaves2D
+}; // BouncingBalls2D
 
 class RingEffect:public Effect {
   protected:
@@ -675,6 +742,7 @@ class Effects {
     effects.push_back(new Frizzles2D);
     effects.push_back(new Lines2D);
     effects.push_back(new DistortionWaves2D);
+    effects.push_back(new Octopus2D);
     effects.push_back(new BouncingBalls1D);
     effects.push_back(new RingRandomFlow);
     #ifdef USERMOD_WLEDAUDIO
diff --git a/src/App/AppLedsV.cpp b/src/App/AppLedsV.cpp
index 10b43a8f..c57f5850 100644
--- a/src/App/AppLedsV.cpp
+++ b/src/App/AppLedsV.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      AppModLeds.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/App/AppLedsV.h b/src/App/AppLedsV.h
index 4fda9948..9eca0108 100644
--- a/src/App/AppLedsV.h
+++ b/src/App/AppLedsV.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      AppLedsV.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/App/AppModLedFixGen.h b/src/App/AppModLedFixGen.h
index 310c359e..4c6776f7 100644
--- a/src/App/AppModLedFixGen.h
+++ b/src/App/AppModLedFixGen.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      AppModLedFixGen.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/App/AppModLeds.h b/src/App/AppModLeds.h
index c2aee616..6baadf08 100644
--- a/src/App/AppModLeds.h
+++ b/src/App/AppModLeds.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      AppModLeds.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Module.h b/src/Module.h
index 98ebcd5a..2153ebd5 100644
--- a/src/Module.h
+++ b/src/Module.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      Module.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysJsonRDWS.h b/src/Sys/SysJsonRDWS.h
index 8ce6b734..623f94da 100644
--- a/src/Sys/SysJsonRDWS.h
+++ b/src/Sys/SysJsonRDWS.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysJsonRDWS.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModFiles.cpp b/src/Sys/SysModFiles.cpp
index a8becc09..7b439c89 100644
--- a/src/Sys/SysModFiles.cpp
+++ b/src/Sys/SysModFiles.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModFiles.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModFiles.h b/src/Sys/SysModFiles.h
index c9a5505a..aab57385 100644
--- a/src/Sys/SysModFiles.h
+++ b/src/Sys/SysModFiles.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModFiles.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -19,8 +19,6 @@ class SysModFiles:public Module {
   void setup();
   void loop();
 
-  // void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final);
-
   bool remove(const char * path);
 
   size_t usedBytes();
diff --git a/src/Sys/SysModModel.cpp b/src/Sys/SysModModel.cpp
index ca116041..c012a0b9 100644
--- a/src/Sys/SysModModel.cpp
+++ b/src/Sys/SysModModel.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModModel.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -162,13 +162,34 @@ JsonObject SysModModel::setValueC(const char * id, const char * value) {
 }
 
 //setValue int
-JsonObject SysModModel::setValueI(const char * id, int value) {
+JsonObject SysModModel::setValueI(const char * id, int value, uint8_t rowNr) {
   JsonObject var = findVar(id);
   if (!var.isNull()) {
-    if (var["value"].isNull() || var["value"] != value) {
-      // USER_PRINTF("setValue changed %s %s->%s\n", id, var["value"].as<String>().c_str(), value);
-      var["value"] = value;
-      ui->setChFunAndWs(var);
+    if (rowNr == (uint8_t)-1) { //normal situation
+      if (var["value"].isNull() || var["value"] != value) {
+        // USER_PRINTF("setValue changed %s %s->%s\n", id, var["value"].as<String>().c_str(), value);
+        var["value"] = value;
+        ui->setChFunAndWs(var);
+      }
+    }
+    else {
+      //if we deal with multiple rows, value should be an array, if not we create one
+
+      if (var["value"].isNull() || !var["value"].is<JsonArray>()) {
+        USER_PRINTF("setValueB var %s (%d) value %s not array, creating\n", id, rowNr, var["value"].as<String>().c_str());
+        // print->printJson("setValueB var %s value %s not array, creating", id, var["value"].as<String>().c_str());
+        var.createNestedArray("value");
+      }
+
+      if (var["value"].is<JsonArray>()) {
+        //set the right value in the array (if array did not contain values yet, all values before rownr are set to false)
+        if (var["value"][rowNr] != value) {
+          var["value"][rowNr] = value;
+          ui->setChFunAndWs(var);
+        }
+      }
+      else 
+        USER_PRINTF("setValueB %s could not create value array\n", id);
     }
   }
   else
diff --git a/src/Sys/SysModModel.h b/src/Sys/SysModModel.h
index 502ad45b..18dbe5c3 100644
--- a/src/Sys/SysModModel.h
+++ b/src/Sys/SysModModel.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModModel.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -31,7 +31,7 @@ class SysModModel:public Module {
   static JsonObject setValueC(const char * id, const char * value);
 
   //setValue int
-  static JsonObject setValueI(const char * id, int value);
+  static JsonObject setValueI(const char * id, int value, uint8_t rowNr=-1);
 
   //setValue bool
   static JsonObject setValueB(const char * id, bool value, uint8_t rowNr=-1);
diff --git a/src/Sys/SysModModules.cpp b/src/Sys/SysModModules.cpp
index f77d4045..41bb1951 100644
--- a/src/Sys/SysModModules.cpp
+++ b/src/Sys/SysModModules.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      Modules.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModModules.h b/src/Sys/SysModModules.h
index d5cd948c..7e97a4e1 100644
--- a/src/Sys/SysModModules.h
+++ b/src/Sys/SysModModules.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModModules.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModNetwork.cpp b/src/Sys/SysModNetwork.cpp
index f1dbb781..b71fc2e8 100644
--- a/src/Sys/SysModNetwork.cpp
+++ b/src/Sys/SysModNetwork.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModNetwork.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModNetwork.h b/src/Sys/SysModNetwork.h
index b5726f64..5fef313d 100644
--- a/src/Sys/SysModNetwork.h
+++ b/src/Sys/SysModNetwork.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModNetwork.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModPins.cpp b/src/Sys/SysModPins.cpp
index 4eefadd9..fa81f956 100644
--- a/src/Sys/SysModPins.cpp
+++ b/src/Sys/SysModPins.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModPins.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModPins.h b/src/Sys/SysModPins.h
index aa2bb261..8400d4a2 100644
--- a/src/Sys/SysModPins.h
+++ b/src/Sys/SysModPins.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModPins.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModPrint.cpp b/src/Sys/SysModPrint.cpp
index b3c3c249..466c2678 100644
--- a/src/Sys/SysModPrint.cpp
+++ b/src/Sys/SysModPrint.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModPrint.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModPrint.h b/src/Sys/SysModPrint.h
index 8b5cc538..d10e5c59 100644
--- a/src/Sys/SysModPrint.h
+++ b/src/Sys/SysModPrint.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModPrint.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModSystem.cpp b/src/Sys/SysModSystem.cpp
index 4ba831c4..e0b81716 100644
--- a/src/Sys/SysModSystem.cpp
+++ b/src/Sys/SysModSystem.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModSystem.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -26,6 +26,10 @@ void SysModSystem::setup() {
 
   parentVar = ui->initModule(parentVar, name);
 
+  ui->initText(parentVar, "serverName", "StarMod", false, [](JsonObject var) { //uiFun
+    web->addResponse(var["id"], "label", "Name");
+    web->addResponse(var["id"], "comment", "Instance name");
+  });
   ui->initText(parentVar, "upTime", nullptr, true, [](JsonObject var) { //uiFun
     web->addResponse(var["id"], "comment", "Uptime of board");
   });
diff --git a/src/Sys/SysModSystem.h b/src/Sys/SysModSystem.h
index c922cd7f..2ec36592 100644
--- a/src/Sys/SysModSystem.h
+++ b/src/Sys/SysModSystem.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModSystem.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModUI.cpp b/src/Sys/SysModUI.cpp
index ff4952b5..e507c551 100644
--- a/src/Sys/SysModUI.cpp
+++ b/src/Sys/SysModUI.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModUI.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -30,7 +30,9 @@ SysModUI::SysModUI() :Module("UI") {
   // success &= web->addURL("/app.js", "application/javascript", nullptr, PAGE_appJs, PAGE_appJs_length);
   // success &= web->addURL("/index.css", "text/css", "/index.css");
 
-  success &= web->setupJsonHandlers("/json", processJson);
+  success &= web->setupJsonHandlers("/json", processJson); //for websocket ("GET") and curl (POST)
+
+  web->processURL("/json", web->serveJson);
 
   USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
 };
@@ -107,7 +109,7 @@ void SysModUI::loop() {
               client->binary(wsBuf);
             else {
               // web->clientsChanged = true; tbd: changed also if full status changes
-              web->printClient("loopFun skip frame", client);
+              // web->printClient("loopFun skip frame", client);
             }
           }
           wsBuf->unlock();
diff --git a/src/Sys/SysModUI.h b/src/Sys/SysModUI.h
index ccf2925b..aae5f215 100644
--- a/src/Sys/SysModUI.h
+++ b/src/Sys/SysModUI.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModUI.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
diff --git a/src/Sys/SysModWeb.cpp b/src/Sys/SysModWeb.cpp
index 4c0a693a..bcb3b451 100644
--- a/src/Sys/SysModWeb.cpp
+++ b/src/Sys/SysModWeb.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModWeb.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -15,6 +15,8 @@
 #include "SysModFiles.h"
 #include "SysModModules.h"
 
+#include "User/UserModMDNS.h"
+
 #include "AsyncJson.h"
 
 //https://techtutorialsx.com/2018/08/24/esp32-web-server-serving-html-from-file-system/
@@ -101,17 +103,18 @@ void SysModWeb::loop() {
     // if something changed in clTbl
     if (clientsChanged) {
       clientsChanged = false;
+      ui->processUiFun("clTbl"); //every second (temp)
     }
 
-    ui->processUiFun("clTbl"); //every second (temp)
 
-    // uint8_t rowNr = 0;
-    // for (auto client:SysModWeb::ws->getClients()) {
-    //   mdl->setValueB("clIsFull", client->queueIsFull(), rowNr);
-    //   mdl->setValueI("clStatus", client->status(), rowNr);
-    //   mdl->setValueI("clLength", client->queueLength(), rowNr);
-    //   rowNr++;
-    // }
+    uint8_t rowNr = 0;
+    for (auto client:SysModWeb::ws->getClients()) {
+      // printClient("up", client);
+      mdl->setValueB("clIsFull", client->queueIsFull(), rowNr);
+      mdl->setValueI("clStatus", client->status(), rowNr);
+      mdl->setValueI("clLength", client->queueLength(), rowNr);
+      rowNr++;
+    }
 
     mdl->setValueLossy("wsSendBytes", "%lu /s", wsSendBytesCounter);
     wsSendBytesCounter = 0;
@@ -485,10 +488,6 @@ bool SysModWeb::addUpload(const char * uri) {
 
 bool SysModWeb::addFileServer(const char * uri) {
 
-  // AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler("/json", [](AsyncWebServerRequest *request) {
-  // });
-  // server->addHandler(handler);
-
   server->on(uri, HTTP_GET, [uri](AsyncWebServerRequest *request){
     const char * ddd = request->url().c_str();
     const char * path = ddd + strlen(uri); //remove the uri from the path (skip their positions)
@@ -503,8 +502,8 @@ bool SysModWeb::addFileServer(const char * uri) {
 bool SysModWeb::setupJsonHandlers(const char * uri, const char * (*processFunc)(JsonVariant &)) {
   processWSFunc = processFunc; //for WebSocket requests
 
-  //URL handler
-  AsyncCallbackJsonWebHandler *handler = new AsyncCallbackJsonWebHandler("/json", [processFunc](AsyncWebServerRequest *request, JsonVariant &json) {
+  //URL handler, e.g. for curl calls
+  AsyncCallbackJsonWebHandler *handler = new AsyncCallbackJsonWebHandler(uri, [processFunc](AsyncWebServerRequest *request, JsonVariant &json) {
     JsonDocument *responseDoc = web->getResponseDoc();
     responseDoc->clear(); //needed for deserializeJson?
     JsonVariant responseVariant = responseDoc->as<JsonVariant>();
@@ -588,3 +587,52 @@ JsonDocument * SysModWeb::getResponseDoc() {
 
   return strncmp(pcTaskGetTaskName(NULL), "loopTask", 8) == 0?web->responseDocLoopTask:web->responseDocAsyncTCP;
 }
+
+void SysModWeb::serveJson(AsyncWebServerRequest *request) {
+  JsonArray model = SysModModel::model->as<JsonArray>();
+  USER_PRINTF("serveJson %s, %s %d %d %d %d\n", request->client()->remoteIP().toString().c_str(), request->url().c_str(), model.size(),  measureJson(model), model.memoryUsage(), SysModModel::model->capacity());
+
+  AsyncJsonResponse * response;
+
+  if (request->url().indexOf("si")    > 0) {
+    response = new AsyncJsonResponse(false, 5000); //object
+    JsonObject root = response->getRoot();
+
+    //temporary set all WLED variables (as otherwise WLED-native does not show the instance): tbd: clean up
+    const char* jsonState = "{\"on\":true,\"bri\":10,\"transition\":7,\"ps\":9,\"pl\":-1,\"AudioReactive\":{\"on\":false},\"CustomEffects\":{\"on\":true},\"nl\":{\"on\":false,\"dur\":60,\"mode\":1,\"tbri\":0,\"rem\":-1},\"udpn\":{\"send\":false,\"recv\":true},\"lor\":0,\"mainseg\":0,\"seg\":[{\"id\":0,\"start\":0,\"stop\":144,\"len\":144,\"grp\":1,\"spc\":0,\"of\":0,\"on\":true,\"frz\":false,\"bri\":255,\"cct\":127,\"col\":[[182,15,98,0],[0,0,0,0],[255,224,160,0]],\"fx\":174,\"sx\":128,\"ix\":128,\"pal\":11,\"c1\":8,\"c2\":20,\"c3\":31,\"sel\":true,\"rev\":false,\"mi\":false,\"o1\":false,\"o2\":false,\"o3\":false,\"ssim\":0,\"mp12\":1}]}";
+    const char* jsonInfo = "{\"ver\":\"0.14.0-mdev\",\"vid\":2209091,\"leds\":{\"count\":144,\"pwr\":248,\"fps\":41,\"maxpwr\":2000,\"maxseg\":32,\"cpal\":0,\"seglc\":[11],\"lc\":11,\"rgbw\":true,\"wv\":2,\"cct\":0},\"str\":false,\"name\":\"StarModewowi\",\"udpport\":21324,\"live\":false,\"liveseg\":-1,\"lm\":\"\",\"lip\":\"\",\"ws\":0,\"fxcount\":177,\"palcount\":71,\"maps\":[0],\"wifi\":{\"bssid\":\"96:83:C4:2D:4B:8A\",\"rssi\":-43,\"signal\":100,\"channel\":11},\"fs\":{\"u\":45,\"t\":983,\"pmt\":0},\"ndc\":1,\"arch\":\"esp32\",\"core\":\"v3.3.6-16-gcc5440f6a2\",\"lwip\":0,\"freeheap\":173488,\"uptime\":31264,\"u\":{\"Temperature\":[0,\" Sensor Error!\"],\"opt\":111,\"brand\":\"StarMod\",\"product\":\"LED\",\"mac\":\"3ce90e874ac0\",\"ip\":\"192.168.8.102\"}";
+    StaticJsonDocument<5000> docState;
+    deserializeJson(docState, jsonState);
+    StaticJsonDocument<5000> docInfo;
+    deserializeJson(docInfo, jsonInfo);
+    root["state"] = docState;
+    root["info"] = docInfo;
+
+
+    root["state"]["bri"] = mdl->getValue("bri");
+    root["state"]["on"] = true;
+    root["info"]["name"] = mdl->getValue("serverName");
+    // root["info"]["ver"] = "0.14.0-mdev";
+    // root["info"]["arch"] = "esp32"; //platformName
+    // root["info"]["wifi"]["rssi"] = -42;
+    String escapedMac;
+    escapedMac = WiFi.macAddress();
+    escapedMac.replace(":", "");
+    escapedMac.toLowerCase();
+    root["info"]["mac"] = (char *)escapedMac.c_str(); //copy mdns->escapedMac gives LoadProhibited crash, tbd: find out why
+    root["info"]["ip"] = (char *)WiFi.localIP().toString().c_str();
+    // print->printJson("serveJson", root);
+  }
+  else { // return model.json
+    response = new AsyncJsonResponse(true,  model.memoryUsage()); //array tbd: here copy is mode, see WLED for using reference
+    JsonArray root = response->getRoot();
+
+    // root = module does not work? so add ead element individually
+    for (JsonObject module: model)
+      root.add(module);
+
+  }
+
+  response->setLength();
+  request->send(response);
+} //serveJson
\ No newline at end of file
diff --git a/src/Sys/SysModWeb.h b/src/Sys/SysModWeb.h
index b22a065a..c6e7af34 100644
--- a/src/Sys/SysModWeb.h
+++ b/src/Sys/SysModWeb.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      SysModWeb.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -48,7 +48,7 @@ class SysModWeb:public Module {
   //try this !!!: curl -X POST "http://192.168.121.196/json" -d '{"pin2":false}' -H "Content-Type: application/json"
   //curl -X POST "http://4.3.2.1/json" -d '{"pin2":false}' -H "Content-Type: application/json"
   //curl -X POST "http://4.3.2.1/json" -d '{"bri":20}' -H "Content-Type: application/json"
-  //curl -X POST "http://192.168.8.152/json" -d '{"fx":2}' -H "Content-Type: application/json"
+  //curl -X POST "http://192.168.8.102/json" -d '{"fx":2}' -H "Content-Type: application/json"
   //curl -X POST "http://192.168.8.152/json" -d '{"nrOfLeds":2000}' -H "Content-Type: application/json"
 
   bool setupJsonHandlers(const char * uri, const char * (*processFunc)(JsonVariant &));
@@ -66,6 +66,8 @@ class SysModWeb:public Module {
 
   //gets the right responseDoc, depending on which task you are in
   JsonDocument * getResponseDoc();
+
+  static void serveJson(AsyncWebServerRequest *request);
   
   static unsigned long wsSendBytesCounter;
   static unsigned long wsSendJsonCounter;
diff --git a/src/User/UserModArtNet.h b/src/User/UserModArtNet.h
index e1092d62..b4f9f8e6 100644
--- a/src/User/UserModArtNet.h
+++ b/src/User/UserModArtNet.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModArtNet.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -56,7 +56,7 @@ class UserModArtNet:public Module {
     USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
 
     if(!SysModModules::isConnected) return;
diff --git a/src/User/UserModDDP.h b/src/User/UserModDDP.h
index 8c247f9d..a29f5395 100644
--- a/src/User/UserModDDP.h
+++ b/src/User/UserModDDP.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModDDP.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -72,7 +72,7 @@ class UserModDDP:public Module {
     USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
 
     if(!SysModModules::isConnected) return;
diff --git a/src/User/UserModE131.h b/src/User/UserModE131.h
index 1e406b43..e132d852 100644
--- a/src/User/UserModE131.h
+++ b/src/User/UserModE131.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModE131.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -75,7 +75,7 @@ class UserModE131:public Module {
     }
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
     if(!e131Created) {
       return;
diff --git a/src/User/UserModExample.h b/src/User/UserModExample.h
index ca6825f4..1640f0c4 100644
--- a/src/User/UserModExample.h
+++ b/src/User/UserModExample.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModExample.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -26,7 +26,7 @@ class UserModExample:public Module {
     USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
   }
 
diff --git a/src/User/UserModHA.h b/src/User/UserModHA.h
index a571eb12..1236839d 100644
--- a/src/User/UserModHA.h
+++ b/src/User/UserModHA.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModHA.h
-   @date      20230731
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -80,7 +80,7 @@ class UserModHA:public Module {
     USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
     mqtt->loop();
   }
diff --git a/src/User/UserModInstances.h b/src/User/UserModInstances.h
index 797952d3..5b22a132 100644
--- a/src/User/UserModInstances.h
+++ b/src/User/UserModInstances.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModInstances.h
-   @date      20230928
+   @date      20231016
    @repo      https://github.com/ewoudwijma/StarMod
    @Authors   https://github.com/ewoudwijma/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -112,11 +112,12 @@ class UserModInstances:public Module {
     }
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
 
     //everysecond better to save on cpu?
     if (millis() - secondMillis >= 1000) {
+      USER_PRINTF(".");
       secondMillis = millis();
 
       handleNotifications();
@@ -171,15 +172,16 @@ class UserModInstances:public Module {
     }
 
     //remove inactive nodes
-    size_t index = 0;
-    for (std::vector<NodeInfo>::iterator node=nodes.begin(); node!=nodes.end(); ++node) {
+    // size_t index = 0;
+    for (std::vector<NodeInfo>::iterator node=nodes.begin(); node!=nodes.end(); ) {
       if (millis() - node->timeStamp > 32000) { //assuming a ping each 30 seconds
-        nodes.erase(nodes.begin() + index);
+        node = nodes.erase(node);
         ui->processUiFun("insTbl");
         ui->processUiFun("ddpInst");
         ui->processUiFun("artInst");
       }
-      index++;
+      else
+        ++node;
     }
   }
 
@@ -198,15 +200,12 @@ class UserModInstances:public Module {
     starModMessage.header.ip1 = ip[1];
     starModMessage.header.ip2 = ip[2];
     starModMessage.header.ip3 = ip[3];
-    strncpy(starModMessage.header.name, serverDescription, 32);
+    strncpy(starModMessage.header.name, mdl->getValue("serverName").as<const char *>(), 32);
     starModMessage.header.type = 32; //esp32 tbd: CONFIG_IDF_TARGET_ESP32S3 etc
     starModMessage.header.nodeId = ip[3];
     starModMessage.header.version = 2309280; //tbd
     strncpy(starModMessage.body, "Effect x, Projection y, Leds begin..end", 1416-1);
 
-    // const char *bump = reinterpret_cast<const char*>(starModMessage.body);
-    // bump = "SM";
-
     updateNode(starModMessage.header, starModMessage.body); //temp? to show new node in list
 
     IPAddress broadcastIP(255, 255, 255, 255);
@@ -227,10 +226,9 @@ class UserModInstances:public Module {
 
   void updateNode( UDPWLEDMessage udpMessage, char *body = nullptr) {
     USER_PRINTF("Instance: %d.%d.%d.%d n:%s b:%s\n", udpMessage.ip0, udpMessage.ip1, udpMessage.ip2, udpMessage.ip3, udpMessage.name, body );
-    if (body) {
-      // const char *bump = reinterpret_cast<const char*>(body);
-      USER_PRINTF("body %s\n", body);
-    }
+    // if (body) {
+    //   USER_PRINTF("body %s\n", body);
+    // }
 
     bool found = false;
     //iterate vector pointers so we can update the nodes
@@ -260,6 +258,7 @@ class UserModInstances:public Module {
       ui->processUiFun("ddpInst"); //show the new instance in the dropdown  
       ui->processUiFun("artInst"); //show the new instance in the dropdown  
     }
+
     ui->processUiFun("insTbl");
 
   }
@@ -269,8 +268,6 @@ class UserModInstances:public Module {
     uint16_t instanceUDPPort = 65506;
     bool udp2Connected = false;
     unsigned long second30Millis = 0;
-    char serverDescription[33] = "StarModInstance"; //tbd
-
 };
 
 static UserModInstances *instances;
diff --git a/src/User/UserModMDNS.h b/src/User/UserModMDNS.h
index 9c235efc..f5142bcc 100644
--- a/src/User/UserModMDNS.h
+++ b/src/User/UserModMDNS.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModMDNS.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -37,7 +37,7 @@ class UserModMDNS:public Module {
     USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
   }
 
diff --git a/src/User/UserModWLEDAudio.h b/src/User/UserModWLEDAudio.h
index d2d3ff9c..ff3da24a 100644
--- a/src/User/UserModWLEDAudio.h
+++ b/src/User/UserModWLEDAudio.h
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      UserModWLEDAudio.h
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -43,7 +43,7 @@ class UserModWLEDAudio:public Module {
     }
   }
 
-  void loop(){
+  void loop() {
     // Module::loop();
     if (sync.read()) {
       if(debug) USER_PRINTF("WLED-Sync: ");
diff --git a/src/main.cpp b/src/main.cpp
index 3032ad5a..754136b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarMod
    @file      main.cpp
-   @date      20230810
+   @date      20231016
    @repo      https://github.com/ewowi/StarMod
    @Authors   https://github.com/ewowi/StarMod/commits/main
    @Copyright (c) 2023 Github StarMod Commit Authors
@@ -111,7 +111,7 @@ void setup() {
   #ifdef USERMOD_WLEDAUDIO
     mdls->add(wledAudioMod);
   #endif
-  // mdls->add(mdns); //no ui
+  mdls->add(mdns); //no ui
 
   //do not add mdls itself as it does setup and loop for itself!!! (it is the orchestrator)
   mdls->setup();