Merge remote-tracking branch 'ewowi/main'

data/index.js

@@ -452,7 +452,7 @@ function createHTML(json, parentNode = null, rowNr = UINT8_MAX) {
 
       varNode = cE("input");
       varNode.type = "button";
-      varNode.disabled = variable.ro;
+      // varNode.disabled = variable.ro; //fileEdit should always be possible
       varNode.value = "🔍"; //initial label, button.value is the label shown on the button
       varNode.addEventListener('click', (event) => {
         let url = `http://${window.location.hostname}/file/`;

platformio.ini

@@ -69,9 +69,7 @@ lib_deps =
 build_flags = 
   -D STARBASE_USERMOD_LIVE
 lib_deps =
-  ; https://github.com/hpwit/ASMParser.git#4b2da1a ; mem branche commit of 20240716
-  ; https://github.com/hpwit/ASMParser.git#v2.1.1 ; 
-  https://github.com/hpwit/ASMParser.git#21186c0 ; this is release 1.1.0 of 20240808 but #1.1.0 gives error
+  https://github.com/hpwit/ASMParser.git#v2.5 ;0.0.1+sha.d1fed6d 20240904
 
 [STARLIGHT_CLOCKLESS_LED_DRIVER]
 build_flags = 

src/Sys/SysModFiles.cpp

@@ -36,14 +36,14 @@ void SysModFiles::setup() {
       ui->setComment(var, "List of files");
       return true;
     case onAdd:
-      rowNr = fileList.size();
+      rowNr = fileNames.size();
       web->getResponseObject()["onAdd"]["rowNr"] = rowNr;
       //add a row with all defaults
       //tbd: File upload does not call onAdd (bug?)
       return true;
     case onDelete:
-      if (rowNr != UINT8_MAX && rowNr < fileList.size()) {
-        const char * fileName = fileList[rowNr].name;
+      if (rowNr != UINT8_MAX && rowNr < fileNames.size()) {
+        const char * fileName = fileNames[rowNr].s;
         // ppf("fileTbl onDelete %s[%d] = %s %s\n", Variable(var).id(), rowNr, Variable(var).valueString().c_str(), fileName);
         this->removeFiles(fileName, false);
 
@@ -63,22 +63,14 @@ void SysModFiles::setup() {
     default: return false;
   }});
 
-  ui->initText(tableVar, "flName", nullptr, 32, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
-    case onSetValue:
-      for (forUnsigned8 rowNr = 0; rowNr < fileList.size(); rowNr++)
-        mdl->setValue(var, JsonString(fileList[rowNr].name, JsonString::Copied), rowNr);
-      return true;
+  ui->initTextVector(tableVar, "flName", &fileNames, 32, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
     case onUI:
       ui->setLabel(var, "Name");
       return true;
     default: return false;
   }});
 
-  ui->initNumber(tableVar, "flSize", UINT16_MAX, 0, UINT16_MAX, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
-    case onSetValue:
-      for (forUnsigned8 rowNr = 0; rowNr < fileList.size(); rowNr++)
-        mdl->setValue(var, fileList[rowNr].size, rowNr);
-      return true;
+  ui->initNumber(tableVar, "flSize", &fileSizes, 0, UINT16_MAX, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
     case onUI:
       ui->setLabel(var, "Size (B)");
       return true;
@@ -99,22 +91,15 @@ void SysModFiles::setup() {
   //   default: return false;
   // }});
 
-  ui->initNumber(tableVar, "flTime", UINT16_MAX, 0, UINT16_MAX, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
-    case onSetValue:
-      for (forUnsigned8 rowNr = 0; rowNr < fileList.size(); rowNr++)
-        mdl->setValue(var, fileList[rowNr].time, rowNr);
-      return true;
+  ui->initNumber(tableVar, "flTime", &fileTimes, 0, UINT16_MAX, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
     case onUI:
       ui->setLabel(var, "Time");
       return true;
     default: return false;
   }});
 
-  ui->initFileEdit(tableVar, "flEdit", nullptr, false, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
-    case onSetValue:
-      for (forUnsigned8 rowNr = 0; rowNr < fileList.size(); rowNr++)
-        mdl->setValue(var, JsonString(fileList[rowNr].name, JsonString::Copied), rowNr);
-      return true;
+  //readonly = true, but button must be pressable (done in index.js)
+  ui->initFileEditVector(tableVar, "flEdit", &fileNames, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun
     case onUI:
       ui->setLabel(var, "Edit");
       return true;
@@ -149,22 +134,35 @@ void SysModFiles::loop20ms() {
     File file = root.openNextFile();
 
     //repopulate file list
-    fileList.clear();
+    fileNames.clear();
+    fileSizes.clear();
+    fileTimes.clear();
+    uint8_t rowNr = 0;
     while (file) {
-      FileDetails details;
-      strcpy(details.name, file.name());
-      details.size = file.size();
-      details.time = file.getLastWrite(); // - millis()/1000; if (details.time < 0) details.time = 0;
-      fileList.push_back(details);
+
+      while (rowNr >= fileNames.size()) fileNames.push_back(VectorString()); //create vector space if needed...
+      strcpy(fileNames[rowNr].s, file.name());
+      while (rowNr >= fileSizes.size()) fileSizes.push_back(UINT8_MAX); //create vector space if needed...
+      fileSizes[rowNr] = file.size(); 
+      while (rowNr >= fileTimes.size()) fileTimes.push_back(UINT8_MAX); //create vector space if needed...
+      fileTimes[rowNr] = file.getLastWrite(); // - millis()/1000; if (details.time < 0) details.time = 0;
+
       file.close();
       file = root.openNextFile();
+      rowNr++;
     }
     root.close();
 
     mdl->setValue("drsize", files->usedBytes());
 
-    for (JsonObject childVar: Variable(mdl->findVar("fileTbl")).children())
-      ui->callVarFun(childVar, UINT8_MAX, onSetValue); //set the value (WIP)
+    uint8_t rowNrL = 0;
+    for (VectorString name: fileNames) {
+      mdl->setValue("flName", JsonString(name.s, JsonString::Copied), rowNrL);
+      mdl->setValue("flEdit", JsonString(name.s, JsonString::Copied), rowNrL);
+      rowNrL++;
+    }
+    rowNrL = 0; for (uint16_t size: fileSizes) mdl->setValue("flSize", size, rowNrL++);
+    rowNrL = 0; for (uint16_t time: fileTimes) mdl->setValue("flTime", time, rowNrL++);
   }
 }
 

src/Sys/SysModFiles.h

@@ -14,19 +14,16 @@
 #include "SysModule.h"
 #include "LittleFS.h"
 
-struct FileDetails {
-  char name[32];
-  size_t size;
-  time_t time;
-};
-
 class SysModFiles: public SysModule {
 
 public:
 
-  std::vector<FileDetails> fileList;
   bool filesChanged = true; //init fileTbl;
 
+  std::vector<VectorString> fileNames;
+  std::vector<uint16_t> fileSizes;
+  std::vector<uint16_t> fileTimes;
+
   SysModFiles();
   void setup();
   void loop20ms();

src/Sys/SysModModel.cpp

@@ -271,22 +271,22 @@ bool SysModModel::callVarOnChange(JsonObject var, unsigned8 rowNr, bool init) {
             std::vector<uint8_t> *valuePointer = (std::vector<uint8_t> *)pointer;
             while (rowNr >= (*valuePointer).size()) (*valuePointer).push_back(UINT8_MAX); //create vector space if needed...
             ppf("%s[%d]:%s (%d - %d - %s)\n", variable.id(), rowNr, variable.valueString().c_str(), pointer, (*valuePointer).size(), var["p"].as<String>().c_str());
-            (*valuePointer)[rowNr] = value; //value should be an uint16_t
+            (*valuePointer)[rowNr] = value;
           }
           else if (var["type"] == "number") {
             std::vector<uint16_t> *valuePointer = (std::vector<uint16_t> *)pointer;
             while (rowNr >= (*valuePointer).size()) (*valuePointer).push_back(UINT16_MAX); //create vector space if needed...
-            (*valuePointer)[rowNr] = value; //value should be an uint16_t
+            (*valuePointer)[rowNr] = value;
           }
           else if (var["type"] == "coord3D") {
             std::vector<Coord3D> *valuePointer = (std::vector<Coord3D> *)pointer;
             while (rowNr >= (*valuePointer).size()) (*valuePointer).push_back({-1,-1,-1}); //create vector space if needed...
-            (*valuePointer)[rowNr] = var["value"][rowNr]; //value should be an uint16_t
+            (*valuePointer)[rowNr] = value;
           }
           else
             print->printJson("dev callVarOnChange type not supported yet", var);
 
-          ppf("callVarOnChange set pointer to vector %s[%d]: v:%s p:%d\n", variable.id(), rowNr, variable.valueString().c_str(), pointer);
+          ppf("callVarOnChange set pointer to vector %s[%d]: v:%s p:%d\n", variable.id(), rowNr, value.as<String>().c_str(), pointer);
         } else 
           print->printJson("dev value is array but no rowNr\n", var);
       } else {

src/Sys/SysModUI.h

@@ -73,6 +73,11 @@ class SysModUI: public SysModule {
     return initVarAndValue<const char *>(parent, id, "text", value, 0, max, readOnly, varFun);
   }
 
+  //vector of text
+  JsonObject initTextVector(JsonObject parent, const char * id, std::vector<VectorString> *values, unsigned16 max = 32, bool readOnly = false, VarFun varFun = nullptr) {
+    return initVarAndValueVector(parent, id, "text", values, 0, max, readOnly, varFun);
+  }
+
   JsonObject initFileUpload(JsonObject parent, const char * id, const char * value = nullptr, unsigned16 max = 32, bool readOnly = false, VarFun varFun = nullptr) {
     return initVarAndValue<const char *>(parent, id, "fileUpload", value, 0, max, readOnly, varFun);
   }
@@ -157,6 +162,11 @@ class SysModUI: public SysModule {
     return initVarAndValue<const char *>(parent, id, "fileEdit", value, 0, 0, readOnly, varFun);
   }
 
+  //vector of fileEdit
+  JsonObject initFileEditVector(JsonObject parent, const char * id, std::vector<VectorString> *values, bool readOnly = false, VarFun varFun = nullptr) {
+    return initVarAndValueVector(parent, id, "fileEdit", values, 0, 0, readOnly, varFun);
+  }
+
   JsonObject initURL(JsonObject parent, const char * id, const char * value = nullptr, bool readOnly = false, VarFun varFun = nullptr) {
     return initVarAndValue<const char *>(parent, id, "url", value, 0, 0, readOnly, varFun);
   }
@@ -197,7 +207,7 @@ class SysModUI: public SysModule {
 
     if (initValue(var, min, max, (int)values)) {
       uint8_t rowNrL = 0;
-      for (uint16_t value: *values) { //loop over vector
+      for (Type value: *values) { //loop over vector
         mdl->setValue(var, value, rowNrL); //does onChange if needed, if var in table, update the table row
         rowNrL++;
       }
@@ -206,6 +216,26 @@ class SysModUI: public SysModule {
     return var;
   }
 
+  //initVarAndValue using vector of values .  WIP!!!
+  JsonObject initVarAndValueVector(JsonObject parent, const char * id, const char * type, std::vector<VectorString> *values, int min = 0, int max = 255, bool readOnly = true, VarFun varFun = nullptr) {
+    JsonObject var = initVar(parent, id, type, readOnly, varFun);
+
+    if (!var["value"].isNull()) {
+      print->printJson("Clearing the vector", var);
+      (*values).clear(); // if values already then rebuild the vector with it
+    }
+
+    if (initValue(var, min, max, (int)values)) {
+      uint8_t rowNrL = 0;
+      for (VectorString value: *values) { //loop over vector
+        mdl->setValue(var, JsonString(value.s, JsonString::Copied), rowNrL); //does onChange if needed, if var in table, update the table row
+        rowNrL++;
+      }
+    }
+
+    return var;
+  }
+
   //adds a variable to the model
   JsonObject initVar(JsonObject parent, const char * id, const char * type, bool readOnly = true, VarFun varFun = nullptr);
 

src/SysModule.h

@@ -54,6 +54,11 @@
 
 #include <vector>
 
+//used for init vars with vectors (vector<char[32]> not allowed)
+struct VectorString {
+  char s[32];
+};
+
 class SysModule {
 
 public: