Merge branch 'dev'

Author: ewowi

docs/develop/development.md

@@ -82,7 +82,7 @@ See [Documentation](https://moonmodules.org/MoonLight/develop/documentation/)
     🌙 and 💫 is also used in code comments of ESP32-SvelteKit to show where changes to upstream have been made.
 * The following ESP32-SvelteKit features have been switched off in the default builts (they can be switched on if you want to use them, see [features.ini](https://github.com/MoonModules/MoonLight/blob/main/features.ini))
     *   -D FT_SECURITY=0
-    *   ~~-D FT_SLEEP=1~~ enabled!
+    *   -D FT_SLEEP=0
     *   ~~-D FT_BATTERY=1~~ enabled!
 
 ### UI development server

docs/develop/modules.md

@@ -39,29 +39,29 @@ ModuleDemo(PsychicHttpServer *server
 
 ```cpp
 void setupDefinition(JsonArray root) override{
-    JsonObject property; // state.data has one or more properties
-    JsonArray details; // if a property is an array, this is the details of the array
-    JsonArray values; // if a property is a select, this is the values of the select
+    JsonObject control; // state.data has one or more properties
+    JsonArray details; // if a control is an array, this is the details of the array
+    JsonArray values; // if a control is a select, this is the values of the select
 
-    property = root.add<JsonObject>(); property["name"] = "hostName"; property["type"] = "text"; property["default"] = "MoonLight";
-    property = root.add<JsonObject>(); property["name"] = "connectionMode"; property["type"] = "select"; property["default"] = "Signal Strength"; values = property["values"].to<JsonArray>();
+    control = root.add<JsonObject>(); control["name"] = "hostName"; control["type"] = "text"; control["default"] = "MoonLight";
+    control = root.add<JsonObject>(); control["name"] = "connectionMode"; control["type"] = "select"; control["default"] = "Signal Strength"; values = control["values"].to<JsonArray>();
     values.add("Offline");
     values.add("Signal Strength");
     values.add("Priority");
 
-    property = root.add<JsonObject>(); property["name"] = "savedNetworks"; property["type"] = "array"; details = property["n"].to<JsonArray>();
+    control = root.add<JsonObject>(); control["name"] = "savedNetworks"; control["type"] = "rows"; details = control["n"].to<JsonArray>();
     {
-        property = details.add<JsonObject>(); property["name"] = "SSID"; property["type"] = "text"; property["default"] = "ewtr"; property["min"] = 3; property["max"] = 32; 
-        property = details.add<JsonObject>(); property["name"] = "Password"; property["type"] = "password"; property["default"] = "";
+        control = details.add<JsonObject>(); control["name"] = "SSID"; control["type"] = "text"; control["default"] = "ewtr"; control["min"] = 3; control["max"] = 32; 
+        control = details.add<JsonObject>(); control["name"] = "Password"; control["type"] = "password"; control["default"] = "";
     }
 
 }
 
 ```
 
 * Implement function **onUpdate** to define what happens if data changes
-    * struct UpdatedItem defines the update (parent property (including index in case of multiple records), name of property and value)
-    * This runs in the httpd / webserver task. To run it in another task (application task) use runInTask1 and 2 - see [ModuleLightsControl](https://github.com/MoonModules/MoonLight/blob/main/src/MoonLight/ModuleLightsControl.h)
+    * struct UpdatedItem defines the update (parent control (including index in case of multiple records), name of control and value)
+    * This runs in the httpd / webserver task. To run it in another task (application task) use runInAppTask - see [ModuleLightsControl](https://github.com/MoonModules/MoonLight/blob/main/src/MoonLight/ModuleLightsControl.h)
 
 ```cpp
     void onUpdate(UpdatedItem &updatedItem) override
@@ -131,7 +131,7 @@ submenu: [
 
 ### Readonly data
 
-A module can consist of data which is edited by the user (e.g. selecting a live script to run) and data which is send from the server to the UI (e.g. a list of running processes). Currently both type of valuas are stored in state data and definition. Distinguished by property["ro"] = true in setupDefinition. So the client uses state data and definition to build a screen with both types visually mixed together (what is desirable). Currently there are 2 websocket events: one for the entire state (including readonly) and one only for readonly which only contains the changed values. Module.svelte handles readonly differently by the function handleRO which calls updateRecursive which only update the parts of the data which has changed.
+A module can consist of data which is edited by the user (e.g. selecting a live script to run) and data which is send from the server to the UI (e.g. a list of running processes). Currently both type of values are stored in state data and definition. Distinguished by control["ro"] = true in setupDefinition. So the client uses state data and definition to build a screen with both types visually mixed together (what is desirable). Currently there are 2 websocket events: one for the entire state (including readonly) and one only for readonly which only contains the changed values. Module.svelte handles readonly differently by the function handleRO which calls updateRecursive which only update the parts of the data which has changed.
 
 It might be arguable that readonly variables are not stored in state data.
 

docs/develop/nodes.md

@@ -18,8 +18,8 @@ A node implements the following (overloaded) functions:
 * ...
 
 * Node types: it is recommended that a node is one of the 4 types (Effect, Modifier, Layer, Driver). However each node could perform functionality of all types. To recognize what a node does the emojis 🚥, 🔥, 💎 and ☸️ are used in the name. The function hasOnLayout() and hasModifier() indicate the specific functionality the node supports. They control when a physical to virtual mapping is recalculated
-    * **hasOnLayout()**: a layout node specify the amount of position of lights controlled. E.g. a panel of 16x16 or a cube of 20x20x20. If hasOnLayout() is true you should implement onLayout calling addLight(position) and addPin() for all the lights. 
-      * addPin() is needed if a LED driver is used to send the output to LED strips.
+    * **hasOnLayout()**: a layout node specify the amount of position of lights controlled. E.g. a panel of 16x16 or a cube of 20x20x20. If hasOnLayout() is true you should implement onLayout calling addLight(position) for all the lights and nextPin()
+      * nextPin() is needed to define how many ledsPerPin are used for each pin
     * **hasModifier()**: a modifier node which manipulates virtual size and positions and lights using one or more of the functions modifySize, modifyPosition and modifyXYZ.
     * if the loop() function contains setXXX functions is used it is an **effect** node. It will contain for-loops iterating over each virtual ! light defined by layout and modifier nodes. The iteration will be on the x-axis for 1D effects, but also on the y- and z-axis for 2D and 3D effects. setRGB is the default function setting the RGB values of the light. If a light has more 'channels' (e.g. Moving heads) they also can be set. 
 * Moving heads

docs/moonbase/overview.md

@@ -21,7 +21,7 @@
 
 * **Restart needed**: e.g. when drivers are changed, a restart might be needed, see 🔄 in the statusbar. Clicking on the 🔄 icon allows you to restart
 
-* **Save** and **Cancel** Changes are only saved after pressing the save button 💾. To undo changes, press the cancel button 🚫 and the last saved state will be restored.
+* **Save** and **Cancel** Changes are only saved after pressing the save button 💾. To undo changes, press the cancel button ↻ and the last saved state will be restored.
 
 * **Theme**: Light, Dark, Auto
 

docs/moonlight/lightscontrol.md

@@ -14,7 +14,7 @@ Controls:
         * Hover with the mouse to see effects and modifiers in the preset
         * Double click on a saved preset to delete the preset.
     * Red: Selected preset
-    * 🚨: Save (💾) or cancel (🚫 effects first, before storing them as a preset!
+    * 🚨: Save (💾) or cancel (↻) Save effects first, before storing them as a preset!
     * Note: Presets only stores Effects and Modifiers, not Layers and Drivers.
 * Preset loop: loop over presets (seconds per presets)
 * Monitor On: sends LED output to the monitor.

features.ini

@@ -6,7 +6,7 @@ build_flags =
   -D FT_UPLOAD_FIRMWARE=1
   -D FT_DOWNLOAD_FIRMWARE=1 ; requires FT_NTP=1
   -D FT_SLEEP=0
-  ; -D FT_BATTERY=0 ; 🌙 defined in specific firmwares
+  -D FT_BATTERY=1
   -D FT_ANALYTICS=1
   -D FT_COREDUMP=1
   -D FT_ETHERNET=1

firmware/esp32-d0.ini

@@ -28,8 +28,6 @@ build_flags = ${esp32-d0-base.build_flags}
   -D LOLIN_WIFI_FIX  ; some boards have wifi issues if this is not defined, this sets WIFI_POWER_8_5dBm
   ; -D LED_BUILTIN=2
   ; -D KEY_BUILTIN=0
-  ; -D VOLTAGE_PIN=8 ; 🚧
-  ; -D CURRENT_PIN=9 ; 🚧
 lib_deps = ${esp32-d0-base.lib_deps}
 ; RAM:   [===       ]  26.2% (used 85980 bytes from 327680 bytes)
 ; Flash: [=======   ]  65.2% (used 2051394 bytes from 3145728 bytes)
@@ -66,8 +64,6 @@ build_flags = ${esp32-d0-base.build_flags}
   -mfix-esp32-psram-cache-issue
   ; -D LED_BUILTIN=2
   ; -D USE_M5UNIFIED=1 ;for MoonManEffect (but low on heap)
-  -D VOLTAGE_PIN=8 ; 🚧
-  -D CURRENT_PIN=9 ; 🚧
 lib_deps = ${esp32-d0-base.lib_deps}
   ${livescripts.lib_deps}
   ; m5stack/M5Unified ;for MoonManEffect (but low on heap)

firmware/esp32-p4.ini

@@ -28,7 +28,6 @@ upload_speed            = 921600
 build_flags = ${esp32-p4-base.build_flags}
   -Wl,-wrap,esp_dma_capable_malloc ;; makes SDIO for ESP-Hosted use PSRAM if available.
   ; -D FT_ETHERNET=1 ; 🚧 not implemented yet
-  -D LED_PINS=\"2,3,4,5,6,20,21,22,23,26,27,32,33,36,47,48\" ; 🚧 Troy default showed in IO but not used in PIN allocations yet: set them in layout
 
 lib_deps = ${esp32-p4-base.lib_deps}
 ; RAM:   [=         ]  11.2% (used 36580 bytes from 327680 bytes)

firmware/esp32-s3.ini

@@ -32,7 +32,6 @@ board_build.extra_flags =
 build_flags = ${esp32-s3-base.build_flags}
   -D USE_M5UNIFIED=1
   -D USE_M5UNIFIEDDisplay=1
-  -D LED_PINS=\"5,6,7,8\" ; 🚧
 lib_deps = ${esp32-s3-base.lib_deps}
   m5stack/M5Unified
 
@@ -63,20 +62,6 @@ lib_deps = ${esp32-s3-base.lib_deps}
 ; RAM:   [==        ]  23.0% (used 75432 bytes from 327680 bytes)
 ; Flash: [=======   ]  67.8% (used 2266678 bytes from 3342336 bytes)
 
-[env:esp32-s3-stephanelec-16p]
-board = esp32-s3-devkitc-1 ; https://github.com/platformio/platform-espressif32/blob/develop/boards/esp32-s3-devkitc-1.json
-board_build.arduino.memory_type = qio_opi
-board_build.psram_type = opi
-board_build.extra_flags = 
-  -DBUILD_TARGET_ESP32_S3_STEPHANELEC_16P
-  -DBOARD_HAS_PSRAM
-  -D FT_BATTERY=1 ; battery feature
-  -D VOLTAGE_PIN=8
-  -D CURRENT_PIN=9
-  -D LED_PINS=\"47,48,21,38,14,39,13,40,12,41,11,42,10,2,3,1\" ; 🚧
-build_flags = ${esp32-s3-base.build_flags}
-lib_deps = ${esp32-s3-base.lib_deps}
-
 
 [env:esp32-s3-devkitc-1-n16r8v]
 ; board = esp32-s3-devkitc-1-n16r8v ;found in boards folder
@@ -92,10 +77,6 @@ board_build.extra_flags =
   -DBOARD_HAS_PSRAM
 build_flags = ${esp32-s3-base.build_flags}
   -D LOLIN_WIFI_FIX  ; some boards have wifi issues if this is not defined, this sets WIFI_POWER_8_5dBm
-  -D FT_BATTERY=1 ; battery feature
-  -D VOLTAGE_PIN=8 ; 🚧
-  -D CURRENT_PIN=9 ; 🚧
-  -D LED_PINS=\"47,48,21,38,14,39,13,40,12,41,11,42,10,2,3,1\" ; 🚧
   ; -D FT_ETHERNET=1 ; 🚧 not implemented yet
   ; -D USE_M5UNIFIED=1 ;for MoonManEffect (but low on heap) crashes on this board
 lib_deps = ${esp32-s3-base.lib_deps}

interface/src/lib/components/moonbase/EditObject.svelte

@@ -6,7 +6,7 @@
 	import Cancel from '~icons/tabler/x';
 
 	import MultiInput from '$lib/components/moonbase/MultiInput.svelte';
-	import ObjectArray from '$lib/components/moonbase/ObjectArray.svelte';
+	import MultiRow from '$src/lib/components/moonbase/MultiRow.svelte';
 
 	interface Props {
 		property: any;
@@ -51,13 +51,13 @@
 			{#each property.n as propertyN}
 				{#if propertyN.type == 'array'}
 					<label for={propertyN.name}>{propertyN.name}</label>
-					<ObjectArray
+					<MultiRow
 						property={propertyN}
 						bind:data={dataEditable}
 						definition={localDefinition}
 						{onChange}
 						{changeOnInput}
-					></ObjectArray>
+					></MultiRow>
 				{:else if propertyN.type == 'controls'}
 					{#each dataEditable[propertyN.name] as control}
 						<!-- e.g. dE["controls"] -> {"name":"xFrequency","type":"slider","default":64,"p":1070417419,"value":64} -->