Instance module: full instance sync!

index.js
- generateHTML: better support for tables
- processUpdate: support for updrow (of table)
- processVarNode: no comment on th
- processVarNode: select th: propagate select options
- showHideModules improvements

AppModLeds
- projection: add x,y,z (WIP)
- set FastLed max power to 2 A (WIP, temp)

SysModPins
- add pin 19 checkbox (for relay on serg shield)

SysModUI
- add stageVarChanged
- chFun: add stageVarChanged

main
- instances last so all stage vars are initiated

SysModule and SysModules
- add one and ten secondMillis to each module (WIP)

UserModInstances
- rename dch, dun and sma (3 letters, stage vars)
- add addTblRow (wip)
- use initVar for simplified stage var handling
- updateNode: send updrow command instead of recreate table

data/index.htm

@@ -33,7 +33,7 @@
     <h1>StarMod by MoonModules 💫 <div id="instanceName"></div></h1>
     <input type="button" value="App" id="vApp" onclick="showHideModules(this)">
     <input type="button" value="Stage" id="vStage" onclick="showHideModules(this)">
-    <input type="button" value="User" id="vUser" onclick="showHideModules(this)">
+    <!-- <input type="button" value="User" id="vUser" onclick="showHideModules(this)"> -->
     <input type="button" value="System" id="vSys" onclick="showHideModules(this)">
     <input type="button" value="All" id="vAll" onclick="showHideModules(this)">
     <div id="instPH"></div>

data/model.json

@@ -121,7 +121,7 @@
           "max": 10
         },
         {
-          "id": "dmxChannel",
+          "id": "dch",
           "type": "number",
           "ro": false,
           "o": 87,
@@ -330,7 +330,7 @@
           ]
         },
         {
-          "id": "syncMaster",
+          "id": "sma",
           "type": "number",
           "ro": false,
           "o": 44,
@@ -776,7 +776,7 @@
       "o": 85,
       "n": [
         {
-          "id": "dmxUni",
+          "id": "dun",
           "type": "number",
           "ro": false,
           "o": 86,

src/App/AppLedsV.h

@@ -12,7 +12,7 @@
 #include <vector>
 #include "ArduinoJson.h"
 
-#define NUM_LEDS_Preview 8192
+#define NUM_LEDS_Preview 4096
 
 enum Projections
 {

src/App/AppModLeds.h

@@ -52,8 +52,6 @@ class AppModLeds:public SysModule {
 
     currentVar = ui->initCheckBox(parentVar, "on", true, false, [](JsonObject var) { //uiFun
       web->addResponse(var["id"], "label", "On/Off");
-    }, [](JsonObject var, uint8_t) { //chFun
-      ui->valChangedForInstancesTemp = true;
     });
     currentVar["stage"] = true;
 
@@ -68,7 +66,6 @@ class AppModLeds:public SysModule {
       FastLED.setBrightness(result);
 
       USER_PRINTF("Set Brightness to %d -> b:%d r:%d\n", var["value"].as<int>(), bri, result);
-      ui->valChangedForInstancesTemp = true;
     });
     currentVar["log"] = true; //logarithmic
     currentVar["stage"] = true; //these values override model.json???
@@ -103,7 +100,6 @@ class AppModLeds:public SysModule {
       USER_PRINTF("%s Change %s to %d\n", "initSelect chFun", var["id"].as<const char *>(), fx);
 
       doMap = effects.setEffect("fx", fx);
-      ui->valChangedForInstancesTemp = true;
     });
     currentVar["stage"] = true;
 
@@ -131,7 +127,6 @@ class AppModLeds:public SysModule {
         case 7: palette = HeatColors_p; break;
         default: palette = PartyColors_p; break;
       }
-      ui->valChangedForInstancesTemp = true;
     });
     currentVar["stage"] = true;
 
@@ -153,7 +148,18 @@ class AppModLeds:public SysModule {
 
       ledsV.projectionNr = var["value"];
       doMap = true;
-      ui->valChangedForInstancesTemp = true;
+
+      JsonObject parentVar = var;
+      parentVar.remove("n"); //tbd: we should also remove the uiFun and chFun !!
+
+      if (ledsV.projectionNr == 2) {
+        ui->initSlider(parentVar, "pointX", 128);
+        ui->initSlider(parentVar, "pointY", 128);
+        ui->initSlider(parentVar, "pointZ", 128);
+      }
+
+      web->sendDataWs(parentVar); //always send, also when no children, to remove them from ui
+
     });
     currentVar["stage"] = true;
 
@@ -219,7 +225,7 @@ class AppModLeds:public SysModule {
           // e131mod->patchChannel(3, "pro", Projections::count);
           // e131mod->patchChannel(4, "fixture", 5); //assuming 5!!!
 
-          ui->valChangedForInstancesTemp = true;
+          // ui->stageVarChanged = true;
 
       // }
       // else
@@ -228,6 +234,8 @@ class AppModLeds:public SysModule {
 
     effects.setup();
 
+    FastLED.setMaxPowerInVoltsAndMilliamps(5,2000); // 5v, 2000mA
+
     USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 

src/Sys/SysModModel.cpp

@@ -154,7 +154,24 @@ JsonObject SysModModel::setValueC(const char * id, const char * value, uint8_t r
         }
       }
     } else {
-      USER_PRINTF("setValueC Var %s (%s) table row nr not implemented yet %d\n", id, value, rowNr);
+      //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("setValueC 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] = (char *)value; //create a copy
+          ui->setChFunAndWs(var, rowNr);
+        }
+      }
+      else 
+        USER_PRINTF("setValueI %s could not create value array\n", id);
+      // USER_PRINTF("setValueC Var %s (%s) table row nr not implemented yet %d\n", id, value, rowNr);
     }
   }
   else

src/Sys/SysModPins.cpp

@@ -21,6 +21,7 @@ SysModPins::SysModPins() :SysModule("Pins") {
 
   pinMode(2, OUTPUT);
   pinMode(4, OUTPUT);
+  pinMode(19, OUTPUT);
   pinMode(33, OUTPUT);
 
   //start with no pins allocated
@@ -82,6 +83,7 @@ void SysModPins::setup() {
 
   // ui->initCheckBox(parentVar, "pin2", true, false, nullptr, updateGPIO);
   // ui->initCheckBox(parentVar, "pin4");
+  ui->initCheckBox(parentVar, "pin19", true, false, nullptr, updateGPIO);
   // ui->initCheckBox(parentVar, "pin33", true);
 
   USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
@@ -95,7 +97,7 @@ void SysModPins::loop1s() {
   }
 }
 
-void SysModPins::updateGPIO(JsonObject var) {
+void SysModPins::updateGPIO(JsonObject var, size_t index) {
   if (var["value"].is<bool>()) {
     bool pinValue = var["value"];
     JsonString id = var["id"];
@@ -104,6 +106,7 @@ void SysModPins::updateGPIO(JsonObject var) {
 
     if (id == "pin2") digitalWrite(2, pinValue?HIGH:LOW);
     if (id == "pin4") digitalWrite(4, pinValue?HIGH:LOW);
+    if (id == "pin19") digitalWrite(19, pinValue?HIGH:LOW);
     if (id == "pin33") digitalWrite(33, pinValue?HIGH:LOW);
   }
 }

src/Sys/SysModPins.h

@@ -33,7 +33,7 @@ class SysModPins:public SysModule {
   void allocatePin(uint8_t pinNr, const char * owner, const char * details);
   void deallocatePin(uint8_t pinNr, const char * owner);
 
-  void updateGPIO(JsonObject var);
+  static void updateGPIO(JsonObject var, size_t index);
 
 private:
   static bool pinsChanged; //update pins table if pins changed

src/Sys/SysModUI.cpp

@@ -20,7 +20,8 @@ std::vector<UFun> SysModUI::uFunctions;
 std::vector<CFun> SysModUI::cFunctions;
 std::vector<VarLoop> SysModUI::loopFunctions;
 int SysModUI::varCounter = 1; //start with 1 so it can be negative, see var["o"]
-bool SysModUI::varLoopsChanged = false;;
+bool SysModUI::varLoopsChanged = false;
+bool SysModUI::stageVarChanged = false;
 
 SysModUI::SysModUI() :SysModule("UI") {
   USER_PRINT_FUNCTION("%s %s\n", __PRETTY_FUNCTION__, name);
@@ -229,6 +230,9 @@ void SysModUI::setChFunAndWs(JsonObject var, uint8_t rowNr, const char * value)
       USER_PRINTF("setChFunAndWs function nr %s outside bounds %d >= %d\n", var["id"].as<const char *>(), funNr, cFunctions.size());
   }
 
+  if (var["stage"])
+    stageVarChanged = true;
+
   JsonDocument *responseDoc = web->getResponseDoc();
   responseDoc->clear(); //needed for deserializeJson?
   JsonVariant responseVariant = responseDoc->as<JsonVariant>();
@@ -265,11 +269,10 @@ const char * SysModUI::processJson(JsonVariant &json) {
 
       // commands
       if (pair.key() == "v") {
-        // do nothing as it is no real var bu  the verbose command of WLED
+        // do nothing as it is no real var but the verbose command of WLED
         USER_PRINTF("processJson v type %s\n", pair.value().as<String>());
       }
-      else if (pair.key() == "view") {
-        // do nothing as it is no real var bu  the verbose command of WLED
+      else if (pair.key() == "view") { //save the chosen view in System (see index.js)
         JsonObject var = mdl->findVar("System");
         USER_PRINTF("processJson view v:%s n: %d s:%s\n", pair.value().as<String>(), var.isNull(), var["id"].as<const char *>());
         var["view"] = (char *)value.as<const char *>(); //create a copy!

src/Sys/SysModUI.h

@@ -48,7 +48,7 @@ static uint8_t linearToLogarithm(JsonObject var, uint8_t value) {
 class SysModUI:public SysModule {
 
 public:
-  bool valChangedForInstancesTemp = false; //tbd: move mechanism to UserModInstances as there it will be used
+  static bool stageVarChanged;// = false; //tbd: move mechanism to UserModInstances as there it will be used
   static std::vector<UFun> uFunctions; //static because of static functions setChFunAndWs, processJson...
 
   SysModUI();

src/Sys/SysModWeb.cpp

@@ -544,8 +544,7 @@ bool SysModWeb::setupJsonHandlers(const char * uri, const char * (*processFunc)(
     if (json["v"]) { //WLED compatibility: verbose response
       serveJson (request);
     }
-    else
-    if (responseVariant.size()) { //responseVariant set by processFunc
+    else if (responseVariant.size()) { //responseVariant set by processFunc
       char resStr[200]; 
       serializeJson(responseVariant, resStr, 200);
       USER_PRINT_Async("processJsonUrl response %s\n", resStr);

src/SysModule.h

@@ -22,6 +22,8 @@ class SysModule {
   const char * name;
   bool success;
   bool isEnabled;
+  unsigned long oneSecondMillis = millis() - random(1000); //random so not all 1s are fired at once
+  unsigned long tenSecondMillis = millis() - random(1000); //random within a second
 
   JsonObject parentVar;
 

src/SysModules.cpp

@@ -68,21 +68,27 @@ void SysModules::setup() {
 }
 
 void SysModules::loop() {
-  bool oneSec = false;
+  // bool oneSec = false;
   bool tenSec = false;
-  if (millis() - oneSecondMillis >= 1000) {
-    oneSecondMillis = millis();
-    oneSec = true;
-  }
-  if (millis() - tenSecondMillis >= 10000) {
-    tenSecondMillis = millis();
-    tenSec = true;
-  }
+  // if (millis() - oneSecondMillis >= 1000) {
+  //   oneSecondMillis = millis();
+  //   oneSec = true;
+  // }
+  // if (millis() - tenSecondMillis >= 10000) {
+  //   tenSecondMillis = millis();
+  //   tenSec = true;
+  // }
   for (SysModule *module:modules) {
     if (module->isEnabled && module->success) {
       module->loop();
-      if (oneSec) module->loop1s();
-      if (tenSec) module->loop10s();
+      if (millis() - module->oneSecondMillis >= 1000) {
+        module->oneSecondMillis = millis();
+        module->loop1s();
+      }
+      if (millis() - module->tenSecondMillis >= 10000) {
+        module->tenSecondMillis = millis();
+        module->loop10s();
+      }
       // module->testManager();
       // module->performanceManager();
       // module->dataSizeManager();

src/SysModules.h

@@ -30,8 +30,8 @@ class SysModules {
 
 private:
   std::vector<SysModule *> modules;
-  unsigned long oneSecondMillis = 0;
-  unsigned long tenSecondMillis = millis() - 4500;
+  // unsigned long oneSecondMillis = 0;
+  // unsigned long tenSecondMillis = millis() - 4500;
 };
 
 static SysModules *mdls;

src/User/UserModE131.h

@@ -32,31 +32,27 @@ class UserModE131:public SysModule {
 
     parentVar = ui->initModule(parentVar, name);
 
-    ui->initNumber(parentVar, "dmxUni", universe, 0, 7, false, [](JsonObject var) { //uiFun
-      web->addResponse(var["id"], "label", "Universe");
+    ui->initNumber(parentVar, "dun", universe, 0, 7, false, [](JsonObject var) { //uiFun
+      web->addResponse(var["id"], "label", "DMX Universe");
     }, [this](JsonObject var, uint8_t) { //chFun
       universe = var["value"];
-      ui->valChangedForInstancesTemp = true;
     });
 
-    ui->initNumber(parentVar, "dmxChannel", 1, 0, 511, false, [](JsonObject var) { //uiFun
-      web->addResponse(var["id"], "label", "Channel");
+    JsonObject currentVar = ui->initNumber(parentVar, "dch", 1, 1, 512, false, [](JsonObject var) { //uiFun
+      web->addResponse(var["id"], "label", "DMX Channel");
       web->addResponse(var["id"], "comment", "First channel");
     }, [](JsonObject var, uint8_t) { //chFun
-
-      ui->valChangedForInstancesTemp = true;
-
       ui->processUiFun("e131Tbl"); //rebuild table
-
     });
+    currentVar["stage"] = true;
 
     JsonObject tableVar = ui->initTable(parentVar, "e131Tbl", nullptr, false, [this](JsonObject var) { //uiFun
       web->addResponse(var["id"], "label", "Vars to watch");
       web->addResponse(var["id"], "comment", "List of instances");
       JsonArray rows = web->addResponseA(var["id"], "table");
       for (auto varToWatch: varsToWatch) {
         JsonArray row = rows.createNestedArray();
-        row.add(varToWatch.channel + mdl->getValue("dmxChannel").as<uint8_t>());
+        row.add(varToWatch.channel + mdl->getValue("dch").as<uint8_t>());
         row.add((char *)varToWatch.id);
         row.add(varToWatch.max);
         row.add(varToWatch.savedValue);