Merge remote-tracking branch 'ewowi/main'

MoonModules · Aug 19, 2024 · 774af02 · 774af02
2 parents ae648b4 + 2fbcebd
commit 774af02
Show file tree

Hide file tree

Showing 45 changed files with 625 additions and 103 deletions.
diff --git a/data/app.js b/data/app.js
@@ -1,6 +1,6 @@
 // @title     StarBase
 // @file      app.js
-// @date      20240720
+// @date      20240819
 // @repo      https://github.com/ewowi/StarBase
 // @Authors   https://github.com/ewowi/StarBase/commits/main
 // @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/index.css b/data/index.css
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      index.css
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/index.htm b/data/index.htm
@@ -1,7 +1,7 @@
 <!-- 
   @title     StarBase
   @file      index.htm
-  @date      20240720
+  @date      20240819
   @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to StarBase
   @Authors   https://github.com/ewowi/StarBase/commits/main
   @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/index.js b/data/index.js
@@ -1,6 +1,6 @@
 // @title     StarBase
 // @file      index.css
-// @date      20240720
+// @date      20240819
 // @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
 // @Authors   https://github.com/ewowi/StarBase/commits/main
 // @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/newui/index.htm b/data/newui/index.htm
@@ -1,7 +1,7 @@
 <!-- 
   @title     StarBase
   @file      newui.htm
-  @date      20240720
+  @date      20240819
   @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to StarBase
   @Authors   https://github.com/ewowi/StarBase/commits/main
   @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/newui/index.js b/data/newui/index.js
@@ -1,6 +1,6 @@
 // @title     StarBase
 // @file      newui.js
-// @date      20240720
+// @date      20240819
 // @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
 // @Authors   https://github.com/ewowi/StarBase/commits/main
 // @Copyright © 2024 Github StarBase Commit Authors
@@ -182,7 +182,7 @@ class Controller {
 
       // console.log("requestJson", command);
 
-      this.ws.send(req);  
+      this.ws.send(req);
     }
   }
 

diff --git a/data/newui/mainnav.css b/data/newui/mainnav.css
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      mainnav.css
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/newui/mainnav.js b/data/newui/mainnav.js
@@ -1,6 +1,6 @@
 // @title     StarBase
 // @file      mainnav.js
-// @date      20240720
+// @date      20240819
 // @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
 // @Authors   https://github.com/ewowi/StarBase/commits/main
 // @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/newui/modules.css b/data/newui/modules.css
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      modules.css
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/newui/modules.js b/data/newui/modules.js
@@ -1,6 +1,6 @@
 // @title     StarBase
 // @file      modules.js
-// @date      20240720
+// @date      20240819
 // @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
 // @Authors   https://github.com/ewowi/StarBase/commits/main
 // @Copyright © 2024 Github StarBase Commit Authors
@@ -407,7 +407,7 @@ class CanvasVariable extends Variable {
     // console.log(this.variable)
     if (this.variable.file) {
       this.variable.file.new = true;
-      console.log("canvas createHTML", this.variable.file, this.variable.file.new);
+      // console.log("canvas createHTML", this.variable.file, this.variable.file.new);
     }
     return super.createHTML(`<canvas id=${this.variable.id} class="${this.variable.type}"></canvas>`);
   }
@@ -417,6 +417,7 @@ class CanvasVariable extends Variable {
   }
 
   generateData() {
+    //tbd: this is StarLight, remove here...
     if (this.node && this.variable.file == null)
       super.generateData(`"file":"F_panel2x2-16x16.json"`)
 

diff --git a/data/newui/theme.js b/data/newui/theme.js
@@ -1,6 +1,6 @@
 // @title     StarBase
 // @file      theme.js
-// @date      20240720
+// @date      20240819
 // @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
 // @Authors   https://github.com/ewowi/StarBase/commits/main
 // @Copyright © 2024 Github StarBase Commit Authors

diff --git a/data/theme.css b/data/theme.css
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      theme.css
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/misc/blink.sc → misc/LiveScripts/blinkSL.sc b/misc/blink.sc → misc/LiveScripts/blinkSL.sc
@@ -1,3 +1,5 @@
+//blinkSL.sc
+
 //externals generated
 
 //how to deal with external defines?
@@ -21,13 +23,3 @@ void loop() {
     digitalWrite(blinkPin, LOW);   // turn the LED off by making the voltage LOW
     delay(1000);                      // wait for a second
 }
-
-void main()
-{
-  setup();
-  while (0==0)
-  {
-    loop();
-    show();
-  }
-}
diff --git a/misc/LiveScripts/showtest1.sc b/misc/LiveScripts/showtest1.sc
diff --git a/misc/LiveScripts/showtest2.sc b/misc/LiveScripts/showtest2.sc
diff --git a/platformio.ini b/platformio.ini
@@ -1,6 +1,6 @@
 ;    @title     StarBase
 ;    @file      platformio.ini
-;    @date      20240720
+;    @date      20240819
 ;    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
 ;    @Authors   https://github.com/ewowi/StarBase/commits/main
 ;    @Copyright © 2024 Github StarBase Commit Authors
@@ -89,7 +89,7 @@ lib_deps =
 build_flags = 
   ; -D APP=StarBase
   -D PIOENV=$PIOENV
-  -D VERSION=24081321 ; Date and time (GMT!), update at every commit!!
+  -D VERSION=24081919 ; Date and time (GMT!), update at every commit!!
   -D LFS_THREADSAFE            ; enables use of semaphores in LittleFS driver
   -D STARBASE_DEVMODE
   ${ESPAsyncWebServer.build_flags} ;alternatively PsychicHttp
@@ -210,7 +210,7 @@ lib_deps =
 [env:lolin_s2_mini]
 board = lolin_s2_mini ;https://github.com/platformio/platform-espressif32/blob/develop/boards/lolin_s2_mini.json
 ; platform = espressif32@5.3.0 ; WLED default framework version
-platform = espressif32@6.3.0    ; this one behaves better for debugging  6.5.0 is latest!
+platform = espressif32@6.3.0    ; this one behaves better for debugging 6.5.0 is latest
 upload_speed = 256000
 build_flags = 
   ${env.build_flags}
@@ -227,6 +227,8 @@ lib_deps =
   ${env.lib_deps}
 ;   ${STARLIGHT_CLOCKLESS_LED_DRIVER_S3.lib_deps} ; temporary here, until there is one driver for s3 and non s3
 
+  ; using framework-arduinoespressif32 @ 3.20009.0 (2.0.9)
+
 ; attention! : manual action needed to select CLedDriver
 ; uncomment last 4 lines in the env description
 ; comment the following lines in the CLD-S3 repo (workaround), otherwise compile error:
@@ -236,7 +238,7 @@ lib_deps =
 ; [env:lolin_c3_mini]
 ; board = lolin_c3_mini ;https://github.com/platformio/platform-espressif32/blob/develop/boards/lolin_c3_mini.json
 ; ; platform = espressif32@5.3.0 ; WLED default framework version
-; platform = espressif32@6.3.0    ; this one behaves better for debugging
+; platform = espressif32@6.3.0    ; this one behaves better for debugging 6.5.0 is latest
 ; upload_speed = 256000
 ; build_unflags = 
 ;   ${env.build_unflags}
@@ -258,7 +260,7 @@ lib_deps =
 ; for Waveshare ESP32-S3 Mini/Zero https://www.waveshare.com/esp32-s3-zero.htm
 ; --> 4MB Flash, has PSRAM, memory type "qio_qspi", USB-CDC only
 [env:lolin_s3_mini]
-platform = espressif32@6.3.0    ; this one behaves better for debugging 6.5.0 is latest!
+platform = espressif32@6.3.0    ; this one behaves better for debugging 6.5.0 is latest
 board = lolin_s3_mini ;https://github.com/platformio/platform-espressif32/blob/develop/boards/lolin_s3_mini.json
 build_flags =
   ${env.build_flags}

diff --git a/src/Sys/SysModFiles.cpp b/src/Sys/SysModFiles.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModFiles.cpp
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors
@@ -39,13 +39,23 @@ void SysModFiles::setup() {
       rowNr = fileList.size();
       web->getResponseObject()["addRow"]["rowNr"] = rowNr;
       //add a row with all defaults
+      //tbd: File upload does not call onAddRow (bug?)
       return true;
     case onDeleteRow:
       if (rowNr != UINT8_MAX && rowNr < fileList.size()) {
         const char * fileName = fileList[rowNr].name;
         // ppf("fileTbl delRow %s[%d] = %s %s\n", mdl->varID(var), rowNr, var["value"].as<String>().c_str(), fileName);
         this->removeFiles(fileName, false);
 
+        #ifdef STARBASE_USERMOD_LIVE
+          if (strstr(fileName, ".sc") != nullptr) {
+            char name[32]="del:/"; //del:/ is recognized by LiveM->loop20ms
+            strcat(name, fileName);
+            ppf("sc file removed %s\n", name);
+            strcpy(web->lastFileUpdated, name);
+          }
+        #endif
+
         // print->printVar(var);
         // ppf("\n");
       }

diff --git a/src/Sys/SysModFiles.h b/src/Sys/SysModFiles.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModFiles.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModInstances.h b/src/Sys/SysModInstances.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModInstances.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewoudwijma/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewoudwijma/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModModel.cpp b/src/Sys/SysModModel.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModModel.cpp
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModModel.h b/src/Sys/SysModModel.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModModel.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModNetwork.cpp b/src/Sys/SysModNetwork.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModNetwork.cpp
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModNetwork.h b/src/Sys/SysModNetwork.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModNetwork.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModPins.cpp b/src/Sys/SysModPins.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModPins.cpp
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModPins.h b/src/Sys/SysModPins.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModPins.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModPrint.cpp b/src/Sys/SysModPrint.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModPrint.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModPrint.h b/src/Sys/SysModPrint.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModPrint.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModSystem.cpp b/src/Sys/SysModSystem.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModSystem.cpp
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModSystem.h b/src/Sys/SysModSystem.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModSystem.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModUI.cpp b/src/Sys/SysModUI.cpp
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModUI.cpp
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors

diff --git a/src/Sys/SysModUI.h b/src/Sys/SysModUI.h
@@ -1,7 +1,7 @@
 /*
    @title     StarBase
    @file      SysModUI.h
-   @date      20240720
+   @date      20240819
    @repo      https://github.com/ewowi/StarBase, submit changes to this file as PRs to ewowi/StarBase
    @Authors   https://github.com/ewowi/StarBase/commits/main
    @Copyright © 2024 Github StarBase Commit Authors