Merge branch 'dev'

Author: ewowi

.clang-format

@@ -0,0 +1,8 @@
+BasedOnStyle: Google
+IndentWidth: 2
+TabWidth: 2
+UseTab: Never
+ColumnLimit: 200
+IndentCaseLabels: false
+IndentPPDirectives: BeforeHash
+PPIndentWidth: -1

docs/develop/layers.md

@@ -52,21 +52,21 @@
       "controls": [
         {
           "name": "xFrequency",
-          "type": "range",
+          "type": "slider",
           "default": 64,
           "p": 1065414703,
           "value": 64
         },
         {
           "name": "fadeRate",
-          "type": "range",
+          "type": "slider",
           "default": 128,
           "p": 1065414704,
           "value": 128
         },
         {
           "name": "speed",
-          "type": "range",
+          "type": "slider",
           "default": 128,
           "p": 1065414705,
           "value": 128
@@ -79,7 +79,7 @@
       "controls": [
         {
           "name": "speed",
-          "type": "range",
+          "type": "slider",
           "default": 128,
           "p": 1065405731,
           "value": 128

firmware/esp32-s3.ini

@@ -11,7 +11,7 @@ build_flags =
   -D ARDUINO_USB_DFU_ON_BOOT=0 ;download firmware update, disable
   ; -D ML_LIVE_MAPPING
   ; -D FASTLED_USES_ESP32S3_I2S ; S3 boards use the I2S driver (RMT is not supporting more then 4 outputs)
-  -DCOLOR_ORDER_RGB=1 ; not working yet, see also https://github.com/FastLED/FastLED/issues/1966, should use ML_COLOR_ORDER / FastLED.addLeds(RGB_ORDER), workaround change #define COLOR_ORDER_RBG in driver.h
+  ; -DCOLOR_ORDER_RGB=1 ; not working yet, see also https://github.com/FastLED/FastLED/issues/1966, should use ML_COLOR_ORDER / FastLED.addLeds(RGB_ORDER), workaround change #define COLOR_ORDER_RBG in driver.h
 lib_deps = 
   ${env.lib_deps}
   ${moonlight.lib_deps}

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

@@ -133,7 +133,7 @@
         bind:checked={value}
         on:change={onChange}
     />
-{:else if property.type == "range"}
+{:else if property.type == "slider"}
     <div class="flex-row flex items-center space-x-2">
         <!-- range colors: https://daisyui.com/components/range/ 
          on:input: direct response to server

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

@@ -220,7 +220,7 @@
                 <ObjectArray property={propertyN} bind:data={dataEditable} definition={localDefinition} onChange={onChange} changeOnInput={changeOnInput}></ObjectArray>
             {:else if propertyN.type == "controls"}
                 {#each dataEditable[propertyN.name] as control}
-                    <!-- e.g. dE["controls"] -> {"name":"xFrequency","type":"range","default":64,"p":1070417419,"value":64} -->
+                    <!-- e.g. dE["controls"] -> {"name":"xFrequency","type":"slider","default":64,"p":1070417419,"value":64} -->
                     <MultiInput property={control} bind:value={control.value} onChange={onChange} changeOnInput={changeOnInput}></MultiInput>
                 {/each}
             {:else}

lib/framework/WWWData.h

@@ -5,10 +5,10 @@ uint8_t range = 20;
 bool invert = false;
 
 void setup() {
-    addControl(&bpm, "bpm", "range", 1, 255);
-    addControl(&pan, "pan", "range", 0, 255);
-    addControl(&tilt, "tilt", "range", 0, 255);
-    addControl(&range, "range", "range", 0, 255);
+    addControl(&bpm, "bpm", "slider", 1, 255);
+    addControl(&pan, "pan", "slider", 0, 255);
+    addControl(&tilt, "tilt", "slider", 0, 255);
+    addControl(&range, "range", "slider", 0, 255);
     addControl(&invert, "invert", "checkbox", false, true);
 }
 void loop() {

misc/livescripts/E_PanTilt.sc

@@ -2,8 +2,8 @@ uint8_t speed = 128;
 uint8_t scale = 128;
 
 void setup() {
-  addControl(&speed, "speed", "range", 1, 255);
-  addControl(&scale, "scale", "range", 1, 255);
+  addControl(&speed, "speed", "slider", 1, 255);
+  addControl(&scale, "scale", "slider", 1, 255);
 }
 
 void loop() {

misc/livescripts/E_noise.sc

@@ -12,8 +12,8 @@ uint8_t branches = 4;
 
 void setup()
 {
-  addControl(&speed, "speed", "range", 1, 255);
-  addControl(&branches, "branches", "range", 1, 8);
+  addControl(&speed, "speed", "slider", 1, 255);
+  addControl(&branches, "branches", "slider", 1, 8);
 
   C_X = width / 2;
   C_Y = height / 2;

misc/livescripts/E_octo.sc

@@ -1,7 +1,7 @@
 uint8_t height = 16;
 
 void setup() {
-  addControl(&height, "height", "range", 1, 255);
+  addControl(&height, "height", "slider", 1, 255);
 }
 
 void addStrip( uint8_t xposition, uint8_t start_y,  uint8_t stop_y, uint8_t pin) {