Merge remote-tracking branch 'upstream/main' into mdev

Everything merged except platformio.ini
4ld has not been merged previously
Update version to 0.14.0-b15.22

CHANGELOG.md

@@ -1,8 +1,27 @@
 ## WLED changelog
 
+#### Build 2303240
+-   Peek scaling of large 2D matrices
+-   Added 0D (1 pixel) metadata for effects & enhance 0D (analog strip) UI handling
+-   Added ability to disable ADAlight (-D WLED_DISABLE_ADALIGHT)
+-   Fixed APA102 output on Ethernet enabled controllers
+-   Added ArtNet virtual/network output (#3121)
+-   Klipper usermod (#3106)
+-   Remove DST from CST timezone
+-   various fixes and enhancements
+
 #### Build 2302180
 
 -   Removed Blynk support (servers shut down on 31st Dec 2022)
+-   Added `ledgap.json` to complement ledmaps for 2D matrices
+-   Added support for white addressable strips (#3073)
+-   Ability to use SHT temperature usermod with PWM fan usermod
+-   Added `onStateChange()` callback to usermods (#3081)
+-   Refactored `bus_manager` [internal]
+-   Dual 1D & 2D mode (add 1D strip after the matrix)
+-   Removed 1D -> 2D mapping for individual pixel control
+-   effect tweak: Fireworks 1D
+-   various bugfixes
 
 #### Build 2301240
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "wled",
-  "version": "0.14.0-b15.21",
+  "version": "0.14.0-b15.22",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wled",
-      "version": "0.14.0-b15.21",
+      "version": "0.14.0-b15.22",
       "license": "ISC",
       "dependencies": {
         "clean-css": "^4.2.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.14.0-b15.21",
+  "version": "0.14.0-b15.22",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {

platformio.ini

@@ -148,8 +148,6 @@ build_flags =
   -D DECODE_SONY=true
   -D DECODE_SAMSUNG=true
   -D DECODE_LG=true
-  ;-D DECODE_RC5=true
-  ;-D DECODE_RC6=true
   ; -Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library
   -DWLED_USE_MY_CONFIG
   ; -D USERMOD_SENSORSTOMQTT

wled00/data/index.js

@@ -671,7 +671,7 @@ function populateInfo(i)
 	if (i.ver.includes("0.14.1")) vcn = "Sitting Ducks"; // easter egg
 	if (i.ver.includes("0.14.0")) vcn = "Lupo";          // check for MM versioning scheme
 	if (i.ver.includes("0.14.0-b2.2")) vcn = "Sitting Ducks"; // early easter egg
-	if (i.ver.includes("0.14.0-b15.21")) vcn = "Lupo";
+	if (i.ver.includes("0.14.0-b15.22")) vcn = "Lupo";
 	cn += `v${i.ver} &nbsp;<i>"${vcn}"</i><p>(WLEDMM_${i.ver} ${i.rel}.bin)</p><p><em>build ${i.vid}</em></p><table>
 ${urows}
 ${urows===""?'':'<tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:Seagreen"></td></tr>'}

wled00/data/pixart/getPixelValues.js

@@ -273,7 +273,7 @@ function getPixelRGBValues(base64Image) {
       
       //Aggregated Strings That should be returned to the user
       if (i > 0){
-        JSONledString = JSONledString + '\n';
+        JSONledString = JSONledString + '\n<NEXT COMMAND (multiple commands not supported in API/preset setup)>\n';
         curlString = curlString + ' && ';
       }
       JSONledString += thisJSONledString;

wled00/data/pixart/pixart.htm

@@ -60,7 +60,7 @@
               </td>
               <td class="adaptiveTD">
                 <select id="colorFormatSelector" class="mainSelector">
-                  <option value="hex" selected>HEX (#f4f4f4)</option>
+                  <option value="hex" selected>HEX (&quot;f4f4f4&quot;)</option>
                   <option value="dec">DEC (244,244,244)</option>
                 </select>
             </td>
@@ -71,9 +71,9 @@
               </td>
               <td class="adaptiveTD">
                 <select id="addressingSelector" class="mainSelector">
-                  <option value="hybrid" selected>Hybrid (#f0f0f0,10, 17, #f4f4f4)</option>
+                  <option value="hybrid" selected>Hybrid (&quot;f0f0f0&quot;,10, 17, &quot;f4f4f4&quot;)</option>
-                  <option value="range">Range (10, 17, #f4f4f4)</option>
+                  <option value="range">Range (10, 17, &quot;f4f4f4&quot;)</option>
-                  <option value="single">Single (#f4f4f4)</option>
+                  <option value="single">Single (&quot;f4f4f4&quot;)</option>
                 </select>
               </td>
             </tr>
@@ -196,7 +196,7 @@
           <button id="sendJSONledbutton" class="buttonclass"></button>
         </div>
         <div>
-          <h3><div id="version">Version 1.0.7</div>&nbsp;-&nbsp; <a href="https://github.com/werkstrom/WLED-PixelArtConverter/blob/main/README.md" target="_blank">Help/About</a></h3>
+          <h3><div id="version">Version 1.0.8</div>&nbsp;-&nbsp; <a href="https://github.com/werkstrom/WLED-PixelArtConverter/blob/main/README.md" target="_blank">Help/About</a></h3>
         </div>
       </div>
       <div id=bottom-part style="display: none" class=bottom-part></div>

wled00/data/pixart/pixart.js

@@ -69,7 +69,6 @@ cjb.addEventListener('click', async () => {
 lSS.addEventListener("change", gen);
 szY.addEventListener("change", gen);
 szX.addEventListener("change", gen);
-//frm.addEventListener("change", gen);
 cFS.addEventListener("change", gen);
 aS.addEventListener("change", gen);
 brgh.addEventListener("change", gen);
@@ -115,6 +114,7 @@ cLN.oninput = () => {
 frm.addEventListener("change", () => {
   for (var i = 0; i < hideableRows.length; i++) {
     hideableRows[i].classList.toggle("hide", frm.value !== "ha");
+    gen();
   }
 });
 

wled00/improv.cpp

@@ -189,7 +189,7 @@ void sendImprovInfoResponse() {
   out[11] = 4; //Firmware len ("WLED")
   out[12] = 'W'; out[13] = 'L'; out[14] = 'E'; out[15] = 'D';
   uint8_t lengthSum = 17;
-  uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.14.0-b15.21/%i"),VERSION);
+  uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.14.0-b15.22/%i"),VERSION);
   out[16] = vlen; lengthSum += vlen;
   uint8_t hlen = 7;
   #ifdef ESP8266

wled00/wled.h

@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2304072
+#define VERSION 2304080
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG