Merge branch 'dev'

Author: ewowi

docs/develop/development.md

@@ -82,7 +82,7 @@ There are 3 levels to add functionality:
 
 * **Standard ESP32-Sveltekit code**, e.g. Connections, Wifi and System. MoonBase files is also made using standard sveltekit as example but contains a few components used in MoonLight modules. Might be rewriteen as MoonLight Module in the future.
 * [MoonLight Modules](https://moonmodules.org/MoonLight/moonbase/modules/) e.g. Lights Control, Effects, Info, Channels. They are subclasses of Modules.h/cpp and implement setupDefinition, onUpdate and optional loop. New modules need to be defined in main.cpp and added to menu.svelte. All further UI is generated by Module.svelte.
-* **MoonLight Nodes**: the easiest and recommended way. See Effects.h, Layouts.h, Modifiers.h and Drivers.h for examples. They match closest WLED usermods. Each node has controls, a setup and a loop and can be switched on and off. For specific purposes hasLayout and hasModifier can be set.
+* **MoonLight Nodes**: the easiest and recommended way. See Effects.h, Layouts.h, Modifiers.h and Drivers.h for examples. They match closest WLED usermods. Each node has controls, a setup and a loop and can be switched on and off. For specific purposes hasLayout() and hasModifier() can return true.
 
 ### Adding an ESP32 device Definition
 

docs/develop/nodes.md

@@ -15,10 +15,10 @@ Nodes are inspired by WLED usermods, further developed in StarBase and now in Mo
 
 MoonLight specific
 
-* Node types: it is recommended that a node is one of the 4 types as described above. However each node could perform functionality of all types. To recognize what a node does the emojis 🚥, 🔥, 💎 and ☸️ are used in the name. The variables hasLayout and hasModifier indicate the specific functionality the node supports. They control when a physical to virtual mapping is recalculated
-    * **hasLayout**: a layout node specify the amount of position of lights controlled. E.g. a panel of 16x16 or a cube of 20x20x20. If hasLayout is defined you should implement addLayout calling addLight(position) and addPin() for all the lights. 
+* Node types: it is recommended that a node is one of the 4 types as described above. 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 hasLayout() and hasModifier() indicate the specific functionality the node supports. They control when a physical to virtual mapping is recalculated
+    * **hasLayout()**: a layout node specify the amount of position of lights controlled. E.g. a panel of 16x16 or a cube of 20x20x20. If hasLayout() 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.
-    * **hasModifier**: a modifier node which manipulates virtual size and positions and lights using one or more of the functions modifySize, modifyPosition and modifyXYZ.
+    * **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
     * **addLight** will show where the moving head will be on the stage. In general only an array of a few lights e.g. 4 moving heads in a row. A moving head effect will then iterate over 4 lights where each light might do something different (e.g. implement a wave of moving head movement)

firmware/esp32-p4.ini

@@ -69,8 +69,8 @@ board_build.psram_type = opi
 board_build.extra_flags = 
   -DBOARD_HAS_PSRAM
   -D FT_BATTERY=1 ; battery feature
-  -D VOLTAGE_PIN=8 ; 🚧
-  -D CURRENT_PIN=9 ; 🚧
+  -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}

firmware/esp32-s3.ini

@@ -29,9 +29,10 @@ <h2>Installer</h2>
     <tr><td>esp32-d0-16MB</td><td><img src="./images/esp32-d0-16MB.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-d0-16MB.json"></esp-web-install-button></td><td><a href="https://www.tindie.com/products/serg74/esp32-wroom-usb-c-d1-mini32-form-factor-board/" target="_blank">Serg74</a></td><td></td></tr>
     <tr><td>esp32-d0</td><td><img src="./images/esp32-d0.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-d0.json"></esp-web-install-button></td><td></td><td></td></tr>
     <tr><td>esp32-d0-moonbase</td><td><img src="./images/esp32-d0.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-d0-moonbase.json"></esp-web-install-button></td><td></td><td></td></tr>
-    <tr><td>esp32-c3-supermini</td><td><img src="./images/esp32-c3-supermini.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-c3-supermini.json"></esp-web-install-button></td><td><a href="https://s.click.aliexpress.com/e/_EIl7NKw" target="_blank">Ali*</a></td><td></td></tr>
     <tr><td>esp32-p4-nano</td><td><img src="./images/esp32-p4-nano.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-p4-nano.json"></esp-web-install-button></td><td><a href="https://www.waveshare.com/esp32-p4-nano.htm">Waveshare</a></td><td></td></tr>
     <tr><td>esp32-p4-olimex 🚧</td><td><img src="./images/esp32-p4-olimex.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-p4-olimex.json"></esp-web-install-button></td><td><a href="https://www.olimex.com/Products/IoT/ESP32-P4/ESP32-P4-DevKit/open-source-hardware" target="_blank">Olimex</a></td><td></td></tr>
+    <tr><td>esp32-c3-devkitm-1</td><td><img src="./images/esp32-c3-devkitm-1.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-c3-devkitm-1.json"></esp-web-install-button></td><td><a href="https://s.click.aliexpress.com/e/_EIl7NKw" target="_blank">Ali*</a></td><td></td></tr>
+    <tr><td>esp32-c3-supermini</td><td><img src="./images/esp32-c3-supermini.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest_esp32-c3-supermini.json"></esp-web-install-button></td><td><a href="https://s.click.aliexpress.com/e/_EIl7NKw" target="_blank">Ali*</a></td><td></td></tr>
     <tr><td>others</td><td><img src="./images/others.jpg" width="100"/></td><td><esp-web-install-button  manifest="https://raw.githack.com/MoonModules/MoonLight/refs/heads/main/firmware/installer/manifest.json"></esp-web-install-button></td><td></td><td></td></tr>
   </tbody>
 </table>

firmware/installer/images/esp32-c3-devkitm-1.jpg

@@ -0,0 +1,18 @@
+{
+  "name": "MoonLight on esp32-c3-devkitm-1",
+  "version": "0.5.9.2",
+  "home_assistant_domain": "esphome",
+  "funding_url": "https://esphome.io/guides/supporters.html",
+  "new_install_prompt_erase": true,
+  "new_install_immediately": false,
+  "builds": [
+    {
+      "chipFamily": "ESP32-C3",
+      "name": "esp32-c3-devkitm-1",
+      "image": "./images/esp32-c3-devkitm-1.jpg",
+      "parts": [
+        { "path": "./MoonLight_esp32-c3-devkitm-1_0-5-9-2_webflash.bin", "offset": 0 }
+      ]
+    }
+  ]
+}

firmware/installer/index.html

@@ -1,6 +1,6 @@
 {
   "name": "MoonLight on esp32-d0",
-  "version": "0.5.9",
+  "version": "0.5.9.2",
   "home_assistant_domain": "esphome",
   "funding_url": "https://esphome.io/guides/supporters.html",
   "new_install_prompt_erase": true,

firmware/installer/manifest_esp32-c3-devkitm-1.json

@@ -299,7 +299,7 @@
                         >
                             {x + y * property.width}
                             {#if popupCell === x + y * property.width}
-                                <div class="fixed z-50 bg-base-200 p-6 rounded shadow-lg mt-2 min-h-0 text-left inline-block min-w-0"
+                                <div class="fixed z-50 bg-neutral-100 p-6 rounded shadow-lg mt-2 min-h-0 text-left inline-block min-w-0"
                                     style="left: {popupX}px; top: {popupY}px;"
                                 >
                                     <!-- Popup for {cell} -->