From c0dd98b6d74581c25e5a717589ba47f69e7be90d Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Thu, 4 Mar 2021 12:10:18 +0100
Subject: [PATCH 1/4] Fixed relay mode inverted when upgrading from 0.11.0

---
 CHANGELOG.md    | 14 ++++++++++++++
 wled00/cfg.cpp  | 22 +++++++++++++---------
 wled00/json.cpp |  4 ++--
 wled00/wled.h   |  5 +++--
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cbda3f6..b90934d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 ### Development versions after 0.11.1 release
 
+#### Build 2103040
+
+-   Fixed relay mode inverted when upgrading from 0.11.0
+-   Fixed no more than 2 pins per bus configurable in UI
+-   Changed to non-linear IR brightness steps (PR #1742)
+-   Fixed various warnings (PR #1744)
+-   Added UDP DNRGBW Mode (PR #1704)
+-   Added dynamic LED mapping with ledmap.json file (PR #1738)
+-   Added support for QuinLED-ESP32-Ethernet board
+-   Added support for WESP32 ethernet board (PR #1764)
+-   Added Caching for main UI (PR #1704)
+-   Added Tetrix mode (PR #1729)
+-   Added memory check on Bus creation
+
 #### Build 2102050
 
 -   Version bump to 0.12.0-a0 "Hikari"
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index a3d690dc..e5c00b34 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -30,8 +30,8 @@ void deserializeConfig() {
     return;
   }
 
-  //int rev_major = doc[F("rev")][0]; // 1
-  //int rev_minor = doc[F("rev")][1]; // 0
+  //int rev_major = doc["rev"][0]; // 1
+  //int rev_minor = doc["rev"][1]; // 0
 
   //long vid = doc[F("vid")]; // 2010020
 
@@ -95,7 +95,7 @@ void deserializeConfig() {
 
   CJSON(strip.ablMilliampsMax, hw_led[F("maxpwr")]);
   CJSON(strip.milliampsPerLed, hw_led[F("ledma")]);
-  CJSON(strip.reverseMode, hw_led[F("rev")]);
+  CJSON(strip.reverseMode, hw_led["rev"]);
   CJSON(strip.rgbwMode, hw_led[F("rgbwm")]);
 
   JsonArray ins = hw_led["ins"];
@@ -126,7 +126,7 @@ void deserializeConfig() {
     //limit length of strip if it would exceed total configured LEDs
     if (start + length > ledCount) length = ledCount - start;
     uint8_t ledType = elm[F("type")] | TYPE_WS2812_RGB;
-    bool reversed = elm[F("rev")];
+    bool reversed = elm["rev"];
     //RGBW mode is enabled if at least one of the strips is RGBW
     useRGBW = (useRGBW || BusManager::isRgbw(ledType));
     s++;
@@ -163,14 +163,18 @@ void deserializeConfig() {
   #endif
   CJSON(irEnabled, hw[F("ir")][F("type")]);
 
-  int hw_relay_pin = hw[F("relay")][F("pin")];
+  JsonObject relay = hw[F("relay")];
+
+  int hw_relay_pin = relay[F("pin")];
   if (pinManager.allocatePin(hw_relay_pin,true)) {
     rlyPin = hw_relay_pin;
     pinMode(rlyPin, OUTPUT);
   } else {
     rlyPin = -1;
   }
-  CJSON(rlyMde, hw[F("relay")][F("rev")]);
+  if (relay.containsKey("rev")) {
+    rlyMde = !relay["rev"];
+  }
 
   //int hw_status_pin = hw[F("status")][F("pin")]; // -1
 
@@ -443,7 +447,7 @@ void serializeConfig() {
   hw_led[F("total")] = ledCount;
   hw_led[F("maxpwr")] = strip.ablMilliampsMax;
   hw_led[F("ledma")] = strip.milliampsPerLed;
-  hw_led[F("rev")] = strip.reverseMode;
+  hw_led["rev"] = strip.reverseMode;
   hw_led[F("rgbwm")] = strip.rgbwMode;
 
   JsonArray hw_led_ins = hw_led.createNestedArray("ins");
@@ -460,7 +464,7 @@ void serializeConfig() {
     uint8_t nPins = bus->getPins(pins);
     for (uint8_t i = 0; i < nPins; i++) ins_pin.add(pins[i]);
     ins[F("order")] = bus->getColorOrder();
-    ins[F("rev")] = bus->reversed;
+    ins["rev"] = bus->reversed;
     ins[F("skip")] = (skipFirstLed && s == 0) ? 1 : 0;
     ins[F("type")] = bus->getType();
   }
@@ -491,7 +495,7 @@ void serializeConfig() {
 
   JsonObject hw_relay = hw.createNestedObject("relay");
   hw_relay[F("pin")] = rlyPin;
-  hw_relay[F("rev")] = rlyMde;
+  hw_relay["rev"] = !rlyMde;
 
   //JsonObject hw_status = hw.createNestedObject("status");
   //hw_status[F("pin")] = -1;
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 4b4714ac..0b14bc90 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -87,7 +87,7 @@ void deserializeSegment(JsonObject elem, byte it)
     
     //if (pal != seg.palette && pal < strip.getPaletteCount()) strip.setPalette(pal);
     seg.setOption(SEG_OPTION_SELECTED, elem[F("sel")] | seg.getOption(SEG_OPTION_SELECTED));
-    seg.setOption(SEG_OPTION_REVERSED, elem[F("rev")] | seg.getOption(SEG_OPTION_REVERSED));
+    seg.setOption(SEG_OPTION_REVERSED, elem["rev"] | seg.getOption(SEG_OPTION_REVERSED));
     seg.setOption(SEG_OPTION_MIRROR  , elem[F("mi")]  | seg.getOption(SEG_OPTION_MIRROR  ));
 
     //temporary, strip object gets updated via colorUpdated()
@@ -327,7 +327,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id, bool fo
 	root[F("ix")]  = seg.intensity;
 	root[F("pal")] = seg.palette;
 	root[F("sel")] = seg.isSelected();
-	root[F("rev")] = seg.getOption(SEG_OPTION_REVERSED);
+	root["rev"] = seg.getOption(SEG_OPTION_REVERSED);
   root[F("mi")]  = seg.getOption(SEG_OPTION_MIRROR);
 }
 
diff --git a/wled00/wled.h b/wled00/wled.h
index b6e8cfff..2a239b9c 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2102050
+#define VERSION 2103040
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
@@ -197,8 +197,9 @@ WLED_GLOBAL int8_t rlyPin _INIT(-1);
 #else
 WLED_GLOBAL int8_t rlyPin _INIT(RLYPIN);
 #endif
+//Relay mode (1 = active high, 0 = active low, flipped in cfg.json)
 #ifndef RLYMDE
-WLED_GLOBAL bool rlyMde _INIT(1);
+WLED_GLOBAL bool rlyMde _INIT(true);
 #else
 WLED_GLOBAL bool rlyMde _INIT(RLYMDE);
 #endif

From 05521bfd3a73393d6c7066931e08fcc85e1c3ff6 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Thu, 4 Mar 2021 22:17:25 +0100
Subject: [PATCH 2/4] Added destructor for BusPwm (fixes #1789)

---
 CHANGELOG.md         | 4 ++++
 wled00/bus_manager.h | 4 ++++
 wled00/wled.h        | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b90934d8..ef77e9e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### Development versions after 0.11.1 release
 
+#### Build 2103041
+
+-   Added destructor for BusPwm (fixes #1789)
+
 #### Build 2103040
 
 -   Fixed relay mode inverted when upgrading from 0.11.0
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 51965150..bc04452d 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -268,6 +268,10 @@ class BusPwm : public Bus {
     deallocatePins();
   }
 
+  ~BusPwm() {
+    cleanup();
+  }
+
   private: 
   uint8_t _pins[5] = {255, 255, 255, 255, 255};
   uint8_t _data[5] = {255, 255, 255, 255, 255};
diff --git a/wled00/wled.h b/wled00/wled.h
index 2a239b9c..e9a779a4 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2103040
+#define VERSION 2103041
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG

From 71edc3a084cd496d7ca27c68d961d39202b96bc9 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Sat, 6 Mar 2021 02:35:49 +0100
Subject: [PATCH 3/4] Fixed incorrect over-memory indication in LED settings on
 ESP32

---
 CHANGELOG.md                  |  4 ++++
 wled00/bus_manager.h          |  1 -
 wled00/data/settings_leds.htm | 24 ++++++++++++++----------
 wled00/html_settings.h        |  2 +-
 wled00/set.cpp                |  1 -
 wled00/wled.cpp               |  5 ++---
 wled00/wled.h                 |  2 +-
 wled00/xml.cpp                |  6 ++++--
 8 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef77e9e4..b2ceceb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### Development versions after 0.11.1 release
 
+#### Build 2103050
+
+-   Fixed incorrect over-memory indication in LED settings on ESP32
+
 #### Build 2103041
 
 -   Added destructor for BusPwm (fixes #1789)
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index bc04452d..d668f1ae 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -47,7 +47,6 @@ class Bus {
   virtual void cleanup() {};
 
   virtual ~Bus() { //throw the bus under the bus
-    //Serial.println("Destructor!");
   }
 
   virtual uint8_t getPins(uint8_t* pinArray) { return 0; }
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 9c92af3b..49638abf 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=500">
 	<title>LED Settings</title>
 	<script>
-    var d=document,laprev=55,maxST=1,bmax=5000,bquot=0; //maximum bytes for LED allocation: 5kB for 8266, 32kB for 32
+    var d=document,laprev=55,maxB=1,maxM=5000,bquot=0; //maximum bytes for LED allocation: 5kB for 8266, 32kB for 32
 		function H()
 		{
 			window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings");
@@ -14,6 +14,9 @@
 		{
 			window.open("/settings","_self");
     }
+    function bLimits(b,m) {
+      maxB = b; maxM = m;
+    }
     function trySubmit() {
       var LCs = d.getElementsByTagName("input");
       for (i=0; i<LCs.length; i++) {
@@ -32,10 +35,10 @@
             }
           }
       }
-      if (bquot > 100) {var msg = "Too many LEDs for me to handle!"; if (bmax < 10000) msg += " Consider using an ESP32."; alert(msg); return;}
+      if (bquot > 100) {var msg = "Too many LEDs for me to handle!"; if (maxM < 10000) msg += " Consider using an ESP32."; alert(msg); return;}
       if (d.Sf.reportValidity()) d.Sf.submit();
     }
-		function S(){GetV();setABL(); if (maxST>4) bmax=64000; d.getElementById('m1').innerHTML = bmax;}
+		function S(){GetV();setABL();}
     function enABL()
     {
       var en = d.getElementById('able').checked;
@@ -63,16 +66,17 @@
         case 255: d.Sf.LAsel.value = 255; break;
         default: d.getElementById('LAdis').style.display = 'inline';
       }
+      d.getElementById('m1').innerHTML = maxM;
       UI();
     }
     //returns mem usage
     function getMem(type, len, p0) {
       //len = parseInt(len);
       if (type < 32) {
-        if (bmax < 10000 && p0 ==3) { //8266 DMA uses 5x the mem
+        if (maxM < 10000 && p0 ==3) { //8266 DMA uses 5x the mem
           if (type > 29) return len*20; //RGBW
           return len*15;
-        } else if (bmax > 10000) //ESP32 RMT uses double buffer?
+        } else if (maxM >= 10000) //ESP32 RMT uses double buffer?
         {
           if (type > 29) return len*8; //RGBW
           return len*6;
@@ -117,7 +121,7 @@
               LK.value="";
             }
           }
-          if (type == 30 || type == 31 || type == 44 || type == 45) isRGBW = true;
+          if (type == 30 || type == 31 || (type > 40 && type < 46 && type != 43)) isRGBW = true;
           d.getElementById("dig"+n).style.display = (type > 31 && type < 48) ? "none":"inline";
           d.getElementById("psd"+n).innerHTML = (type > 31 && type < 48) ? "Index:":"Start:";
         }
@@ -143,7 +147,7 @@
       }
 
       d.getElementById('m0').innerHTML = memu;
-      bquot = memu / bmax * 100;
+      bquot = memu / maxM * 100;
       d.getElementById('dbar').style.background = `linear-gradient(90deg, ${bquot > 60 ? bquot > 90 ? "red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`;
       d.getElementById('ledwarning').style.display = (maxLC > 800 || bquot > 80) ? 'inline':'none';
       //TODO add warning "Recommended pins on ESP8266 are 1 and 2 (3 only with low LED count)"
@@ -176,12 +180,12 @@
     }
     function addLEDs(n)
     {
-      if (n>1) {maxST=n; d.getElementById("+").style.display="inline"; return;}
+      if (n>1) {maxB=n; d.getElementById("+").style.display="inline"; return;}
 
       var o = d.getElementsByClassName("iST");
       var i = o.length;
 
-      if ((n==1 && i>=maxST) || (n==-1 && i==0)) return;
+      if ((n==1 && i>=maxB) || (n==-1 && i==0)) return;
 
       var f = d.getElementById("mLC");
       if (n==1) {
@@ -229,7 +233,7 @@
         o[--i].remove();--i;
       }
 
-      d.getElementById("+").style.display = (i<maxST-1) ? "inline":"none";
+      d.getElementById("+").style.display = (i<maxB-1) ? "inline":"none";
       d.getElementById("-").style.display = (i>0) ? "inline":"none";
 
       UI();
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 3c6416ff..a1953325 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -72,7 +72,7 @@ Do not enable if WiFi is working correctly, increases power consumption.</i><div
 // Autogenerated from wled00/data/settings_leds.htm, do not edit!!
 const char PAGE_settings_leds[] PROGMEM = R"=====(<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta 
 name="viewport" content="width=500"><title>LED Settings</title><script>
-var d=document,laprev=55,maxST=1,bmax=5e3,bquot=0;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings")}function B(){window.open("/settings","_self")}function trySubmit(){var e=d.getElementsByTagName("input");for(i=0;i<e.length;i++){var n=e[i].name.substring(0,2);if(("L0"==n||"L1"==n||"RL"==n||"BT"==n||"IR"==n||"AX"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),void e[i].focus();if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert("Usermod pin conflict!"),void e[i].focus();for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"RL"==t||"BT"==t||"IR"==t||"AX"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert("Pin conflict!"),void e[i].focus()}}}if(bquot>100){var a="Too many LEDs for me to handle!";return bmax<1e4&&(a+=" Consider using an ESP32."),void alert(a)}d.Sf.reportValidity()&&d.Sf.submit()}function S(){GetV(),setABL(),maxST>4&&(bmax=64e3),d.getElementById("m1").innerHTML=bmax}function enABL(){var e=d.getElementById("able").checked;d.Sf.LA.value=e?laprev:0,d.getElementById("abl").style.display=e?"inline":"none",d.getElementById("psu2").style.display=e?"inline":"none",d.Sf.LA.value>0&&setABL()}function enLA(){var e=d.Sf.LAsel.value;d.Sf.LA.value=e,d.getElementById("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(d.getElementById("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:d.getElementById("able").checked=!1,enABL();break;case 30:d.Sf.LAsel.value=30;break;case 35:d.Sf.LAsel.value=35;break;case 55:d.Sf.LAsel.value=55;break;case 255:d.Sf.LAsel.value=255;break;default:d.getElementById("LAdis").style.display="inline"}UI()}function getMem(e,n,t){return e<32?bmax<1e4&&3==t?e>29?20*n:15*n:bmax>1e4?e>29?8*n:6*n:e>29?4*n:3*n:e>31&&e<48?5:44==e||45==e?4*n:3*n}function UI(){var e=!1,t=0;d.getElementById("ampwarning").style.display=d.Sf.MA.value>7200?"inline":"none",255==d.Sf.LA.value?laprev=12:d.Sf.LA.value>0&&(laprev=d.Sf.LA.value);var i=d.getElementsByTagName("select");for(u=0;u<i.length;u++)if("LT"==i[u].name.substring(0,2)){n=i[u].name.substring(2);var a=i[u].value;d.getElementById("p0d"+n).innerHTML=a>49?"Data pin:":a>41?"Pins:":"Pin:",d.getElementById("p1d"+n).innerHTML=a>49?"Clk:":"";var l=d.getElementsByName("L1"+n)[0];for(t+=getMem(a,d.getElementsByName("LC"+n)[0].value,d.getElementsByName("L0"+n)[0].value),p=1;p<5;p++){(l=d.getElementsByName("L"+p+n)[0])&&(a>49&&1==p||a>41&&a<50&&p+40<a?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}30!=a&&31!=a&&44!=a&&45!=a||(e=!0),d.getElementById("dig"+n).style.display=a>31&&a<48?"none":"inline",d.getElementById("psd"+n).innerHTML=a>31&&a<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(u=0;u<s;u++)o[u].style.display=e?"inline":"none";if(d.activeElement==d.getElementsByName("LC")[0]){var u=d.getElementsByClassName("iST").length;1==u&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}var r=d.getElementsByTagName("input"),m=0,v=0;for(u=0;u<r.length;u++){if("LC"!=r[u].name.substring(0,2)||"LC"==r[u].name);else{var y=parseInt(r[u].value,10);y&&(m+=y,y>v&&(v=y))}}d.getElementById("m0").innerHTML=t,bquot=t/bmax*100,d.getElementById("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,d.getElementById("ledwarning").style.display=v>800||bquot>80?"inline":"none",d.getElementById("wreason").innerHTML=bquot>80?"than 60%% of max. LED memory":"800 LEDs per pin";var g=Math.ceil((100+m*laprev)/500)/2;g=g>5?Math.ceil(g):g;i="";var L=30==d.Sf.LAsel.value,c=255==d.Sf.LAsel.value;g<1.02&&!L&&!c?i="ESP 5V pin with 1A USB supply":(i+=L?"12V ":c?"WS2815 12V ":"5V ",i+=g,i+="A supply connected to LEDs");var f=Math.ceil((100+m*laprev)/1500)/2,B="(for most effects, ~";B+=f=f>5?Math.ceil(f):f,B+="A is enough)<br>",d.getElementById("psu").innerHTML=i,d.getElementById("psu2").innerHTML=c?"":B}function addLEDs(e){if(e>1)return maxST=e,void(d.getElementById("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxST||-1==e&&0==t)){var i=d.getElementById("mLC");if(1==e){var a=`<div class="iST">\n          ${t>0?'<hr style="width:260px">':""}\n          ${t+1}:\n          <select name="LT${t}" onchange="UI()">\n            <option value="22">WS281x</option>\n            <option value="30">SK6812 RGBW</option>\n            <option value="31">TM1814</option>\n            <option value="24">400kHz</option>\n            <option value="50">WS2801</option>\n            <option value="51">APA102</option>\n            <option value="52">LPD8806</option>\n            <option value="53">P9813</option>\n            <option value="41">PWM White</option>\n            <option value="42">PWM WWCW</option>\n            <option value="43">PWM RGB</option>\n            <option value="44">PWM RGBW</option>\n            <option value="45">PWM RGBWC</option>\n          </select>&nbsp;\n          Color Order:\n          <select name="CO${t}">\n            <option value="0">GRB</option>\n            <option value="1">RGB</option>\n            <option value="2">BRG</option>\n            <option value="3">RBG</option>\n            <option value="4">BGR</option>\n            <option value="5">GBR</option>\n          </select><br>\n          <span id="p0d${t}">Pin:</span> <input type="number" name="L0${t}" min="0" max="40" required style="width:35px" oninput="UI()"/>\n          <span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px"/>\n          <span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px"/>\n          <span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px"/>\n          <span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px"/>\n          <br>\n          <span id="psd${t}">Start:</span> <input type="number" name="LS${t}" min="0" max="8191" value="0" required />&nbsp;\n          <div id="dig${t}" style="display:inline">\n          Count: <input type="number" name="LC${t}" min="0" max="2048" value="1" required oninput="UI()" /><br>\n          Reverse: <input type="checkbox" name="CV${t}"></div><br>\n        </div>`;i.insertAdjacentHTML("beforeend",a)}-1==e&&(n[--t].remove(),--t),d.getElementById("+").style.display=t<maxST-1?"inline":"none",d.getElementById("-").style.display=t>0?"inline":"none",UI()}}function GetV() {var d=document;
+var d=document,laprev=55,maxB=1,maxM=5e3,bquot=0;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings")}function B(){window.open("/settings","_self")}function bLimits(e,n){maxB=e,maxM=n}function trySubmit(){var e=d.getElementsByTagName("input");for(i=0;i<e.length;i++){var n=e[i].name.substring(0,2);if(("L0"==n||"L1"==n||"RL"==n||"BT"==n||"IR"==n||"AX"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),void e[i].focus();if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert("Usermod pin conflict!"),void e[i].focus();for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"RL"==t||"BT"==t||"IR"==t||"AX"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert("Pin conflict!"),void e[i].focus()}}}if(bquot>100){var a="Too many LEDs for me to handle!";return maxM<1e4&&(a+=" Consider using an ESP32."),void alert(a)}d.Sf.reportValidity()&&d.Sf.submit()}function S(){GetV(),setABL()}function enABL(){var e=d.getElementById("able").checked;d.Sf.LA.value=e?laprev:0,d.getElementById("abl").style.display=e?"inline":"none",d.getElementById("psu2").style.display=e?"inline":"none",d.Sf.LA.value>0&&setABL()}function enLA(){var e=d.Sf.LAsel.value;d.Sf.LA.value=e,d.getElementById("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(d.getElementById("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:d.getElementById("able").checked=!1,enABL();break;case 30:d.Sf.LAsel.value=30;break;case 35:d.Sf.LAsel.value=35;break;case 55:d.Sf.LAsel.value=55;break;case 255:d.Sf.LAsel.value=255;break;default:d.getElementById("LAdis").style.display="inline"}d.getElementById("m1").innerHTML=maxM,UI()}function getMem(e,n,t){return e<32?maxM<1e4&&3==t?e>29?20*n:15*n:maxM>=1e4?e>29?8*n:6*n:e>29?4*n:3*n:e>31&&e<48?5:44==e||45==e?4*n:3*n}function UI(){var e=!1,t=0;d.getElementById("ampwarning").style.display=d.Sf.MA.value>7200?"inline":"none",255==d.Sf.LA.value?laprev=12:d.Sf.LA.value>0&&(laprev=d.Sf.LA.value);var i=d.getElementsByTagName("select");for(u=0;u<i.length;u++)if("LT"==i[u].name.substring(0,2)){n=i[u].name.substring(2);var a=i[u].value;d.getElementById("p0d"+n).innerHTML=a>49?"Data pin:":a>41?"Pins:":"Pin:",d.getElementById("p1d"+n).innerHTML=a>49?"Clk:":"";var l=d.getElementsByName("L1"+n)[0];for(t+=getMem(a,d.getElementsByName("LC"+n)[0].value,d.getElementsByName("L0"+n)[0].value),p=1;p<5;p++){(l=d.getElementsByName("L"+p+n)[0])&&(a>49&&1==p||a>41&&a<50&&p+40<a?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}(30==a||31==a||a>40&&a<46&&43!=a)&&(e=!0),d.getElementById("dig"+n).style.display=a>31&&a<48?"none":"inline",d.getElementById("psd"+n).innerHTML=a>31&&a<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(u=0;u<s;u++)o[u].style.display=e?"inline":"none";if(d.activeElement==d.getElementsByName("LC")[0]){var u=d.getElementsByClassName("iST").length;1==u&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}var r=d.getElementsByTagName("input"),m=0,v=0;for(u=0;u<r.length;u++){if("LC"!=r[u].name.substring(0,2)||"LC"==r[u].name);else{var y=parseInt(r[u].value,10);y&&(m+=y,y>v&&(v=y))}}d.getElementById("m0").innerHTML=t,bquot=t/maxM*100,d.getElementById("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,d.getElementById("ledwarning").style.display=v>800||bquot>80?"inline":"none",d.getElementById("wreason").innerHTML=bquot>80?"than 60%% of max. LED memory":"800 LEDs per pin";var g=Math.ceil((100+m*laprev)/500)/2;g=g>5?Math.ceil(g):g;i="";var L=30==d.Sf.LAsel.value,c=255==d.Sf.LAsel.value;g<1.02&&!L&&!c?i="ESP 5V pin with 1A USB supply":(i+=L?"12V ":c?"WS2815 12V ":"5V ",i+=g,i+="A supply connected to LEDs");var f=Math.ceil((100+m*laprev)/1500)/2,B="(for most effects, ~";B+=f=f>5?Math.ceil(f):f,B+="A is enough)<br>",d.getElementById("psu").innerHTML=i,d.getElementById("psu2").innerHTML=c?"":B}function addLEDs(e){if(e>1)return maxB=e,void(d.getElementById("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var i=d.getElementById("mLC");if(1==e){var a=`<div class="iST">\n          ${t>0?'<hr style="width:260px">':""}\n          ${t+1}:\n          <select name="LT${t}" onchange="UI()">\n            <option value="22">WS281x</option>\n            <option value="30">SK6812 RGBW</option>\n            <option value="31">TM1814</option>\n            <option value="24">400kHz</option>\n            <option value="50">WS2801</option>\n            <option value="51">APA102</option>\n            <option value="52">LPD8806</option>\n            <option value="53">P9813</option>\n            <option value="41">PWM White</option>\n            <option value="42">PWM WWCW</option>\n            <option value="43">PWM RGB</option>\n            <option value="44">PWM RGBW</option>\n            <option value="45">PWM RGBWC</option>\n          </select>&nbsp;\n          Color Order:\n          <select name="CO${t}">\n            <option value="0">GRB</option>\n            <option value="1">RGB</option>\n            <option value="2">BRG</option>\n            <option value="3">RBG</option>\n            <option value="4">BGR</option>\n            <option value="5">GBR</option>\n          </select><br>\n          <span id="p0d${t}">Pin:</span> <input type="number" name="L0${t}" min="0" max="40" required style="width:35px" oninput="UI()"/>\n          <span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px"/>\n          <span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px"/>\n          <span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px"/>\n          <span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px"/>\n          <br>\n          <span id="psd${t}">Start:</span> <input type="number" name="LS${t}" min="0" max="8191" value="0" required />&nbsp;\n          <div id="dig${t}" style="display:inline">\n          Count: <input type="number" name="LC${t}" min="0" max="2048" value="1" required oninput="UI()" /><br>\n          Reverse: <input type="checkbox" name="CV${t}"></div><br>\n        </div>`;i.insertAdjacentHTML("beforeend",a)}-1==e&&(n[--t].remove(),--t),d.getElementById("+").style.display=t<maxB-1?"inline":"none",d.getElementById("-").style.display=t>0?"inline":"none",UI()}}function GetV() {var d=document;
 %CSS%%SCSS%</head><body onload="S()"><form
  id="form_s" name="Sf" method="post"><div class="helpB"><button type="button" 
 onclick="H()">?</button></div><button type="button" onclick="B()">Back</button>
diff --git a/wled00/set.cpp b/wled00/set.cpp
index bfa6d44c..234e0c1c 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -120,7 +120,6 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
     ledCount = request->arg(F("LC")).toInt();
     if (t > 0 && t <= MAX_LEDS) ledCount = t;
-    //DMA method uses too much ram, TODO: limit!
 
     // upate other pins
     #ifndef WLED_DISABLE_INFRARED
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 0cb6b85d..17ae25d7 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -66,7 +66,7 @@ ethernet_settings ethernetBoards[] = {
     5,			              // eth_power,
     23,			              // eth_mdc,
     18,			              // eth_mdio,
-    ETH_PHY_LAN8720,      // eth_type, (confirm this is right?)
+    ETH_PHY_LAN8720,      // eth_type,
     ETH_CLOCK_GPIO17_OUT	// eth_clk_mode
   }
 };
@@ -338,8 +338,7 @@ void WLED::setup()
   WiFi.persistent(false);
   WiFi.onEvent(WiFiEvent);
 
-  // Serial.println(F("Ada"));
-  DEBUG_PRINTLN(F("Ada"));
+  Serial.println(F("Ada"));
 
   // generate module IDs
   escapedMac = WiFi.macAddress();
diff --git a/wled00/wled.h b/wled00/wled.h
index e9a779a4..bf9e3235 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2103041
+#define VERSION 2103050
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 11a0cb48..d0c275b9 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -254,7 +254,7 @@ void getSettingsJS(byte subPage, char* dest)
   }
 
   if (subPage == 2) {
-    char nS[3];
+    char nS[8];
 
     // add usermod pins as d.um_p array (TODO: usermod config shouldn't use state. instead we should load "um" object from cfg.json)
     /*DynamicJsonDocument doc(JSON_BUFFER_SIZE);
@@ -273,8 +273,10 @@ void getSettingsJS(byte subPage, char* dest)
     }*/
 
     #if defined(WLED_MAX_BUSSES) && WLED_MAX_BUSSES>1
-      oappend(SET_F("addLEDs("));
+      oappend(SET_F("bLimits("));
       oappend(itoa(WLED_MAX_BUSSES,nS,10));
+      oappend(",");
+      oappend(itoa(MAX_LED_MEMORY,nS,10));
       oappend(SET_F(");"));
     #endif
 

From 9b3e6270d5ef37c9caf02a6ef2062a875eeaa45f Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Sun, 7 Mar 2021 00:42:21 +0100
Subject: [PATCH 4/4] Auto start field population in bus config

---
 CHANGELOG.md                  |  4 ++++
 wled00/const.h                |  6 +++++-
 wled00/data/settings_leds.htm | 16 +++++++++++-----
 wled00/html_settings.h        |  2 +-
 wled00/wled.h                 |  2 +-
 wled00/xml.cpp                | 14 +++++++-------
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2ceceb2..eed54e7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### Development versions after 0.11.1 release
 
+#### Build 2103060
+
+-   Auto start field population in bus config
+
 #### Build 2103050
 
 -   Fixed incorrect over-memory indication in LED settings on ESP32
diff --git a/wled00/const.h b/wled00/const.h
index 34eb650b..75798332 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -188,7 +188,7 @@
 // maximum number of LEDs - more than 1500 LEDs (or 500 DMA "LEDPIN 3" driven ones) will cause a low memory condition on ESP8266
 #ifndef MAX_LEDS
 #ifdef ESP8266
-#define MAX_LEDS 2048
+#define MAX_LEDS 8192 //rely on memory limit to limit this to 1600 LEDs
 #else
 #define MAX_LEDS 8192
 #endif
@@ -202,6 +202,10 @@
 #endif
 #endif
 
+#ifndef MAX_LEDS_PER_BUS
+#define MAX_LEDS_PER_BUS 4096
+#endif
+
 // string temp buffer (now stored in stack locally)
 #define OMAX 2048
 
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 49638abf..a02ff2bb 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=500">
 	<title>LED Settings</title>
 	<script>
-    var d=document,laprev=55,maxB=1,maxM=5000,bquot=0; //maximum bytes for LED allocation: 5kB for 8266, 32kB for 32
+    var d=document,laprev=55,maxB=1,maxM=5000,maxPB=4096,bquot=0; //maximum bytes for LED allocation: 5kB for 8266, 32kB for 32
 		function H()
 		{
 			window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings");
@@ -14,8 +14,8 @@
 		{
 			window.open("/settings","_self");
     }
-    function bLimits(b,m) {
-      maxB = b; maxM = m;
+    function bLimits(b,p,m) {
+      maxB = b; maxM = m; maxPB = p;
     }
     function trySubmit() {
       var LCs = d.getElementsByTagName("input");
@@ -178,6 +178,12 @@
 			d.getElementById('psu').innerHTML = s;
       d.getElementById('psu2').innerHTML = isWS2815 ? "" : s2;
     }
+    function lastEnd(i) {
+      if (i<1) return 0;
+      v = parseInt(d.getElementsByName("LS"+(i-1))[0].value) + parseInt(d.getElementsByName("LC"+(i-1))[0].value);
+      if (isNaN(v)) return 0;
+      return v;
+    }
     function addLEDs(n)
     {
       if (n>1) {maxB=n; d.getElementById("+").style.display="inline"; return;}
@@ -222,9 +228,9 @@
           <span id="p3d${i}"></span><input type="number" name="L3${i}" min="0" max="40" style="width:35px"/>
           <span id="p4d${i}"></span><input type="number" name="L4${i}" min="0" max="40" style="width:35px"/>
           <br>
-          <span id="psd${i}">Start:</span> <input type="number" name="LS${i}" min="0" max="8191" value="0" required />&nbsp;
+          <span id="psd${i}">Start:</span> <input type="number" name="LS${i}" min="0" max="8191" value="${lastEnd(i)}" required />&nbsp;
           <div id="dig${i}" style="display:inline">
-          Count: <input type="number" name="LC${i}" min="0" max="2048" value="1" required oninput="UI()" /><br>
+          Count: <input type="number" name="LC${i}" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>
           Reverse: <input type="checkbox" name="CV${i}"></div><br>
         </div>`;
         f.insertAdjacentHTML("beforeend", cn);
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index a1953325..2a2492b0 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -72,7 +72,7 @@ Do not enable if WiFi is working correctly, increases power consumption.</i><div
 // Autogenerated from wled00/data/settings_leds.htm, do not edit!!
 const char PAGE_settings_leds[] PROGMEM = R"=====(<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta 
 name="viewport" content="width=500"><title>LED Settings</title><script>
-var d=document,laprev=55,maxB=1,maxM=5e3,bquot=0;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings")}function B(){window.open("/settings","_self")}function bLimits(e,n){maxB=e,maxM=n}function trySubmit(){var e=d.getElementsByTagName("input");for(i=0;i<e.length;i++){var n=e[i].name.substring(0,2);if(("L0"==n||"L1"==n||"RL"==n||"BT"==n||"IR"==n||"AX"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),void e[i].focus();if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert("Usermod pin conflict!"),void e[i].focus();for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"RL"==t||"BT"==t||"IR"==t||"AX"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert("Pin conflict!"),void e[i].focus()}}}if(bquot>100){var a="Too many LEDs for me to handle!";return maxM<1e4&&(a+=" Consider using an ESP32."),void alert(a)}d.Sf.reportValidity()&&d.Sf.submit()}function S(){GetV(),setABL()}function enABL(){var e=d.getElementById("able").checked;d.Sf.LA.value=e?laprev:0,d.getElementById("abl").style.display=e?"inline":"none",d.getElementById("psu2").style.display=e?"inline":"none",d.Sf.LA.value>0&&setABL()}function enLA(){var e=d.Sf.LAsel.value;d.Sf.LA.value=e,d.getElementById("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(d.getElementById("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:d.getElementById("able").checked=!1,enABL();break;case 30:d.Sf.LAsel.value=30;break;case 35:d.Sf.LAsel.value=35;break;case 55:d.Sf.LAsel.value=55;break;case 255:d.Sf.LAsel.value=255;break;default:d.getElementById("LAdis").style.display="inline"}d.getElementById("m1").innerHTML=maxM,UI()}function getMem(e,n,t){return e<32?maxM<1e4&&3==t?e>29?20*n:15*n:maxM>=1e4?e>29?8*n:6*n:e>29?4*n:3*n:e>31&&e<48?5:44==e||45==e?4*n:3*n}function UI(){var e=!1,t=0;d.getElementById("ampwarning").style.display=d.Sf.MA.value>7200?"inline":"none",255==d.Sf.LA.value?laprev=12:d.Sf.LA.value>0&&(laprev=d.Sf.LA.value);var i=d.getElementsByTagName("select");for(u=0;u<i.length;u++)if("LT"==i[u].name.substring(0,2)){n=i[u].name.substring(2);var a=i[u].value;d.getElementById("p0d"+n).innerHTML=a>49?"Data pin:":a>41?"Pins:":"Pin:",d.getElementById("p1d"+n).innerHTML=a>49?"Clk:":"";var l=d.getElementsByName("L1"+n)[0];for(t+=getMem(a,d.getElementsByName("LC"+n)[0].value,d.getElementsByName("L0"+n)[0].value),p=1;p<5;p++){(l=d.getElementsByName("L"+p+n)[0])&&(a>49&&1==p||a>41&&a<50&&p+40<a?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}(30==a||31==a||a>40&&a<46&&43!=a)&&(e=!0),d.getElementById("dig"+n).style.display=a>31&&a<48?"none":"inline",d.getElementById("psd"+n).innerHTML=a>31&&a<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(u=0;u<s;u++)o[u].style.display=e?"inline":"none";if(d.activeElement==d.getElementsByName("LC")[0]){var u=d.getElementsByClassName("iST").length;1==u&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}var r=d.getElementsByTagName("input"),m=0,v=0;for(u=0;u<r.length;u++){if("LC"!=r[u].name.substring(0,2)||"LC"==r[u].name);else{var y=parseInt(r[u].value,10);y&&(m+=y,y>v&&(v=y))}}d.getElementById("m0").innerHTML=t,bquot=t/maxM*100,d.getElementById("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,d.getElementById("ledwarning").style.display=v>800||bquot>80?"inline":"none",d.getElementById("wreason").innerHTML=bquot>80?"than 60%% of max. LED memory":"800 LEDs per pin";var g=Math.ceil((100+m*laprev)/500)/2;g=g>5?Math.ceil(g):g;i="";var L=30==d.Sf.LAsel.value,c=255==d.Sf.LAsel.value;g<1.02&&!L&&!c?i="ESP 5V pin with 1A USB supply":(i+=L?"12V ":c?"WS2815 12V ":"5V ",i+=g,i+="A supply connected to LEDs");var f=Math.ceil((100+m*laprev)/1500)/2,B="(for most effects, ~";B+=f=f>5?Math.ceil(f):f,B+="A is enough)<br>",d.getElementById("psu").innerHTML=i,d.getElementById("psu2").innerHTML=c?"":B}function addLEDs(e){if(e>1)return maxB=e,void(d.getElementById("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var i=d.getElementById("mLC");if(1==e){var a=`<div class="iST">\n          ${t>0?'<hr style="width:260px">':""}\n          ${t+1}:\n          <select name="LT${t}" onchange="UI()">\n            <option value="22">WS281x</option>\n            <option value="30">SK6812 RGBW</option>\n            <option value="31">TM1814</option>\n            <option value="24">400kHz</option>\n            <option value="50">WS2801</option>\n            <option value="51">APA102</option>\n            <option value="52">LPD8806</option>\n            <option value="53">P9813</option>\n            <option value="41">PWM White</option>\n            <option value="42">PWM WWCW</option>\n            <option value="43">PWM RGB</option>\n            <option value="44">PWM RGBW</option>\n            <option value="45">PWM RGBWC</option>\n          </select>&nbsp;\n          Color Order:\n          <select name="CO${t}">\n            <option value="0">GRB</option>\n            <option value="1">RGB</option>\n            <option value="2">BRG</option>\n            <option value="3">RBG</option>\n            <option value="4">BGR</option>\n            <option value="5">GBR</option>\n          </select><br>\n          <span id="p0d${t}">Pin:</span> <input type="number" name="L0${t}" min="0" max="40" required style="width:35px" oninput="UI()"/>\n          <span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px"/>\n          <span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px"/>\n          <span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px"/>\n          <span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px"/>\n          <br>\n          <span id="psd${t}">Start:</span> <input type="number" name="LS${t}" min="0" max="8191" value="0" required />&nbsp;\n          <div id="dig${t}" style="display:inline">\n          Count: <input type="number" name="LC${t}" min="0" max="2048" value="1" required oninput="UI()" /><br>\n          Reverse: <input type="checkbox" name="CV${t}"></div><br>\n        </div>`;i.insertAdjacentHTML("beforeend",a)}-1==e&&(n[--t].remove(),--t),d.getElementById("+").style.display=t<maxB-1?"inline":"none",d.getElementById("-").style.display=t>0?"inline":"none",UI()}}function GetV() {var d=document;
+var d=document,laprev=55,maxB=1,maxM=5e3,maxPB=4096,bquot=0;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings")}function B(){window.open("/settings","_self")}function bLimits(e,n,t){maxB=e,maxM=t,maxPB=n}function trySubmit(){var e=d.getElementsByTagName("input");for(i=0;i<e.length;i++){var n=e[i].name.substring(0,2);if(("L0"==n||"L1"==n||"RL"==n||"BT"==n||"IR"==n||"AX"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),void e[i].focus();if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert("Usermod pin conflict!"),void e[i].focus();for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"RL"==t||"BT"==t||"IR"==t||"AX"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert("Pin conflict!"),void e[i].focus()}}}if(bquot>100){var a="Too many LEDs for me to handle!";return maxM<1e4&&(a+=" Consider using an ESP32."),void alert(a)}d.Sf.reportValidity()&&d.Sf.submit()}function S(){GetV(),setABL()}function enABL(){var e=d.getElementById("able").checked;d.Sf.LA.value=e?laprev:0,d.getElementById("abl").style.display=e?"inline":"none",d.getElementById("psu2").style.display=e?"inline":"none",d.Sf.LA.value>0&&setABL()}function enLA(){var e=d.Sf.LAsel.value;d.Sf.LA.value=e,d.getElementById("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(d.getElementById("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:d.getElementById("able").checked=!1,enABL();break;case 30:d.Sf.LAsel.value=30;break;case 35:d.Sf.LAsel.value=35;break;case 55:d.Sf.LAsel.value=55;break;case 255:d.Sf.LAsel.value=255;break;default:d.getElementById("LAdis").style.display="inline"}d.getElementById("m1").innerHTML=maxM,UI()}function getMem(e,n,t){return e<32?maxM<1e4&&3==t?e>29?20*n:15*n:maxM>=1e4?e>29?8*n:6*n:e>29?4*n:3*n:e>31&&e<48?5:44==e||45==e?4*n:3*n}function UI(){var e=!1,t=0;d.getElementById("ampwarning").style.display=d.Sf.MA.value>7200?"inline":"none",255==d.Sf.LA.value?laprev=12:d.Sf.LA.value>0&&(laprev=d.Sf.LA.value);var i=d.getElementsByTagName("select");for(u=0;u<i.length;u++)if("LT"==i[u].name.substring(0,2)){n=i[u].name.substring(2);var a=i[u].value;d.getElementById("p0d"+n).innerHTML=a>49?"Data pin:":a>41?"Pins:":"Pin:",d.getElementById("p1d"+n).innerHTML=a>49?"Clk:":"";var l=d.getElementsByName("L1"+n)[0];for(t+=getMem(a,d.getElementsByName("LC"+n)[0].value,d.getElementsByName("L0"+n)[0].value),p=1;p<5;p++){(l=d.getElementsByName("L"+p+n)[0])&&(a>49&&1==p||a>41&&a<50&&p+40<a?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}(30==a||31==a||a>40&&a<46&&43!=a)&&(e=!0),d.getElementById("dig"+n).style.display=a>31&&a<48?"none":"inline",d.getElementById("psd"+n).innerHTML=a>31&&a<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(u=0;u<s;u++)o[u].style.display=e?"inline":"none";if(d.activeElement==d.getElementsByName("LC")[0]){var u=d.getElementsByClassName("iST").length;1==u&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}var r=d.getElementsByTagName("input"),m=0,v=0;for(u=0;u<r.length;u++){if("LC"!=r[u].name.substring(0,2)||"LC"==r[u].name);else{var y=parseInt(r[u].value,10);y&&(m+=y,y>v&&(v=y))}}d.getElementById("m0").innerHTML=t,bquot=t/maxM*100,d.getElementById("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,d.getElementById("ledwarning").style.display=v>800||bquot>80?"inline":"none",d.getElementById("wreason").innerHTML=bquot>80?"than 60%% of max. LED memory":"800 LEDs per pin";var g=Math.ceil((100+m*laprev)/500)/2;g=g>5?Math.ceil(g):g;i="";var L=30==d.Sf.LAsel.value,B=255==d.Sf.LAsel.value;g<1.02&&!L&&!B?i="ESP 5V pin with 1A USB supply":(i+=L?"12V ":B?"WS2815 12V ":"5V ",i+=g,i+="A supply connected to LEDs");var c=Math.ceil((100+m*laprev)/1500)/2,f="(for most effects, ~";f+=c=c>5?Math.ceil(c):c,f+="A is enough)<br>",d.getElementById("psu").innerHTML=i,d.getElementById("psu2").innerHTML=B?"":f}function lastEnd(e){return e<1?0:(v=parseInt(d.getElementsByName("LS"+(e-1))[0].value)+parseInt(d.getElementsByName("LC"+(e-1))[0].value),isNaN(v)?0:v)}function addLEDs(e){if(e>1)return maxB=e,void(d.getElementById("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var i=d.getElementById("mLC");if(1==e){var a=`<div class="iST">\n          ${t>0?'<hr style="width:260px">':""}\n          ${t+1}:\n          <select name="LT${t}" onchange="UI()">\n            <option value="22">WS281x</option>\n            <option value="30">SK6812 RGBW</option>\n            <option value="31">TM1814</option>\n            <option value="24">400kHz</option>\n            <option value="50">WS2801</option>\n            <option value="51">APA102</option>\n            <option value="52">LPD8806</option>\n            <option value="53">P9813</option>\n            <option value="41">PWM White</option>\n            <option value="42">PWM WWCW</option>\n            <option value="43">PWM RGB</option>\n            <option value="44">PWM RGBW</option>\n            <option value="45">PWM RGBWC</option>\n          </select>&nbsp;\n          Color Order:\n          <select name="CO${t}">\n            <option value="0">GRB</option>\n            <option value="1">RGB</option>\n            <option value="2">BRG</option>\n            <option value="3">RBG</option>\n            <option value="4">BGR</option>\n            <option value="5">GBR</option>\n          </select><br>\n          <span id="p0d${t}">Pin:</span> <input type="number" name="L0${t}" min="0" max="40" required style="width:35px" oninput="UI()"/>\n          <span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px"/>\n          <span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px"/>\n          <span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px"/>\n          <span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px"/>\n          <br>\n          <span id="psd${t}">Start:</span> <input type="number" name="LS${t}" min="0" max="8191" value="${lastEnd(t)}" required />&nbsp;\n          <div id="dig${t}" style="display:inline">\n          Count: <input type="number" name="LC${t}" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>\n          Reverse: <input type="checkbox" name="CV${t}"></div><br>\n        </div>`;i.insertAdjacentHTML("beforeend",a)}-1==e&&(n[--t].remove(),--t),d.getElementById("+").style.display=t<maxB-1?"inline":"none",d.getElementById("-").style.display=t>0?"inline":"none",UI()}}function GetV() {var d=document;
 %CSS%%SCSS%</head><body onload="S()"><form
  id="form_s" name="Sf" method="post"><div class="helpB"><button type="button" 
 onclick="H()">?</button></div><button type="button" onclick="B()">Back</button>
diff --git a/wled00/wled.h b/wled00/wled.h
index bf9e3235..9642b2e8 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2103050
+#define VERSION 2103060
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index d0c275b9..84644650 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -272,13 +272,13 @@ void getSettingsJS(byte subPage, char* dest)
       oappend(SET_F("];"));
     }*/
 
-    #if defined(WLED_MAX_BUSSES) && WLED_MAX_BUSSES>1
-      oappend(SET_F("bLimits("));
-      oappend(itoa(WLED_MAX_BUSSES,nS,10));
-      oappend(",");
-      oappend(itoa(MAX_LED_MEMORY,nS,10));
-      oappend(SET_F(");"));
-    #endif
+    oappend(SET_F("bLimits("));
+    oappend(itoa(WLED_MAX_BUSSES,nS,10));
+    oappend(",");
+    oappend(itoa(MAX_LEDS_PER_BUS,nS,10));
+    oappend(",");
+    oappend(itoa(MAX_LED_MEMORY,nS,10));
+    oappend(SET_F(");"));
 
     oappend(SET_F("d.Sf.LC.max=")); //TODO Formula for max LEDs on ESP8266 depending on types. 500 DMA or 1500 UART (about 4kB mem usage)
     oappendi(MAX_LEDS);