Merge remote-tracking branch 'ewowi/dev' into dev

MoonModules · Nov 6, 2024 · 873be57 · 873be57
2 parents 6be0c98 + 64bcfb5
commit 873be57
Show file tree

Hide file tree

Showing 15 changed files with 387 additions and 413 deletions.
diff --git a/data/index.js b/data/index.js
@@ -559,7 +559,7 @@ function createHTML(json, parentNode = null, rowNr = UINT8_MAX) {
         let file = fileNode.files[0];
         let formData = new FormData();
         console.log("fileUpload " + variable.id, file, formData, file.size);
-        fileNode.parentNode.querySelector("progress").max = Math.round(file.size / 10000); //set progress max in blocks of 10K
+        fileNode.parentNode.querySelector("progress").max = Math.round(file.size / 50000); //set progress max in blocks of 50K
 
         formData.append("file", file);
         fetch('/' + variable.id, {method: "POST", body: formData});

diff --git a/src/App/LedModEffects.cpp b/src/App/LedModEffects.cpp
@@ -412,7 +412,7 @@ inline uint16_t getRGBWsize(uint16_t nleds){
           // ui->dashVarChanged = true;
           // //rebuild the table
           for (JsonObject childVar: Variable(mdl->findVar("E131", "watches")).children())
-            ui->callVarFun(childVar, UINT8_MAX, onSetValue); //set the value (WIP)
+            Variable(childVar).triggerEvent(onSetValue); //set the value (WIP)
 
       // }
       // else

diff --git a/src/App/LedModFixture.cpp b/src/App/LedModFixture.cpp
@@ -87,7 +87,7 @@
 
     JsonObject currentVar = ui->initCheckBox(parentVar, "on", true, false, [](JsonObject var, uint8_t rowNr, uint8_t funType) { switch (funType) { //varFun
       case onChange:
-        mdl->callVarOnChange(mdl->findVar("Fixture", "brightness"), UINT8_MAX, true); //set brightness (init is true so bri value not send via udp)
+        Variable(mdl->findVar("Fixture", "brightness")).triggerEvent(onChange, UINT8_MAX, true); //set brightness (init is true so bri value not send via udp)
         return true;
       default: return false;
     }});

diff --git a/src/App/LedModFixtureGen.h b/src/App/LedModFixtureGen.h
@@ -662,7 +662,7 @@ class LedModFixtureGen:public SysModule {
         generateOnChange(var, fileName);
 
         //set fixture in fixture module
-        ui->callVarFun("Fixture", "fixture", UINT8_MAX, onUI); //rebuild options
+        Variable(mdl->findVar("Fixture", "fixture")).triggerEvent(onUI); //rebuild options
 
         uint8_t value = ui->selectOptionToValue("fixture", fileName);
         if (value != UINT8_MAX)

diff --git a/src/Sys/SysModInstances.h b/src/Sys/SysModInstances.h
@@ -241,7 +241,7 @@ class SysModInstances:public SysModule {
           return true;
         case onUI:
           // call onUI of the base variable for the new variable
-          ui->varFunctions[var["fun"]](insVar, rowNr, onUI);
+          mdl->varFunctions[var["fun"]](insVar, rowNr, onUI);
           return true;
         case onChange: {
           //do not set this initially!!!
@@ -428,7 +428,7 @@ class SysModInstances:public SysModule {
 
           ppf("instances handleNotifications %d\n", notifierUdp.remoteIP()[3]);
           for (JsonObject childVar: Variable(mdl->findVar("Instances", "instances")).children())
-            ui->callVarFun(childVar, UINT8_MAX, onSetValue); //set the value (WIP) ); //rowNr //instance - instances.begin()
+            Variable(childVar).triggerEvent(onSetValue); //set the value (WIP) ); //rowNr //instance - instances.begin()
 
           web->recvUDPCounter++;
           web->recvUDPBytes+=packetSize;
@@ -529,12 +529,12 @@ class SysModInstances:public SysModule {
     if (erased) {
       ppf("instances remove inactive instances\n");
       for (JsonObject childVar: Variable(mdl->findVar("Instances", "instances")).children())
-        ui->callVarFun(childVar, UINT8_MAX, onSetValue); //set the value (WIP)); //no rowNr so all rows updated
+        Variable(childVar).triggerEvent(onSetValue); //set the value (WIP)); //no rowNr so all rows updated
 
       //tbd: pubsub mechanism
       //LEDs specific
-      ui->callVarFun("DDP", "instance", UINT8_MAX, onUI); //rebuild options
-      // ui->callVarFun("Artnet", "artInst", UINT8_MAX, onUI); //rebuild options
+      Variable(mdl->findVar("DDP", "instance")).triggerEvent(onUI); //rebuild options
+      // Variable(mdl->findVar("Artnet", "artInst")).triggerEvent(onUI); //rebuild options
     }
   }
 
@@ -802,7 +802,7 @@ class SysModInstances:public SysModule {
           // ppf("updateInstance updRow\n");
 
           for (JsonObject childVar: Variable(mdl->findVar("Instances", "instances")).children())
-            ui->callVarFun(childVar, UINT8_MAX, onSetValue); //set the value (WIP)); //rowNr instance - instances.begin()
+            Variable(childVar).triggerEvent(onSetValue); //set the value (WIP)); //rowNr instance - instances.begin()
 
           //tbd: now done for all rows, should be done only for updated rows!
         }
@@ -816,15 +816,15 @@ class SysModInstances:public SysModule {
 
       //tbd: pubsub mechanism
       //LEDs specific
-      ui->callVarFun("DDP", "instance", UINT8_MAX, onUI); //rebuild options
-      // ui->callVarFun("Artnet", "artInst", UINT8_MAX, onUI); //rebuild options
+      Variable(mdl->findVar("DDP", "instance")).triggerEvent(onUI); //rebuild options
+      // Variable(mdl->findVar(Artnet", "artInst")).triggerEvent(onUI); //rebuild options
 
       // ui->processOnUI("instances");
       //run though it sorted to find the right rowNr
       // for (std::vector<InstanceInfo>::iterator instance=instances.begin(); instance!=instances.end(); ++instance) {
       //   if (instance->ip == messageIP) {
           for (JsonObject childVar: Variable(mdl->findVar("Instances", "instances")).children()) {
-            ui->callVarFun(childVar, UINT8_MAX, onSetValue); //set the value (WIP)); //no rowNr, update all
+            Variable(childVar).triggerEvent(onSetValue); //set the value (WIP)); //no rowNr, update all
           }
       //   }
       // }