From a0fd02e0c0b7ccf35b77b9b11a3fc6c8dcfed347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Kristan?= <blaz@kristan-sp.si>
Date: Thu, 20 May 2021 06:45:02 +0200
Subject: [PATCH] Inverted button support. Config save/load fix.

---
 wled00/button.cpp             | 25 ++++++++++++++++++++-----
 wled00/cfg.cpp                | 22 ++++++++++++++++------
 wled00/data/settings_leds.htm |  2 ++
 wled00/data/settings_time.htm |  4 ++--
 wled00/html_settings.h        | 12 ++++++------
 wled00/set.cpp                | 23 +++++++++++------------
 wled00/wled.h                 |  2 +-
 7 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/wled00/button.cpp b/wled00/button.cpp
index 1b949feb4..26218c154 100644
--- a/wled00/button.cpp
+++ b/wled00/button.cpp
@@ -20,11 +20,26 @@ void shortPressAction(uint8_t b)
 bool isButtonPressed(uint8_t i)
 {
   if (btnPin[i]<0) return false;
-  //TODO: this may need switch statement (for inverted buttons)
-  #ifdef ARDUINO_ARCH_ESP32
-  if (buttonType[i]==BTN_TYPE_TOUCH && touchRead(btnPin[i]) <= touchThreshold) return true; else
-  #endif
-  if (digitalRead(btnPin[i]) == LOW) return true;
+  switch (buttonType[i]) {
+    case BTN_TYPE_NONE:
+    case BTN_TYPE_RESERVED:
+      break;
+    case BTN_TYPE_PUSH:
+    case BTN_TYPE_SWITCH:
+      if (digitalRead(btnPin[i]) == LOW) return true;
+      break;
+    case BTN_TYPE_PUSH_ACT_HIGH:
+    case BTN_TYPE_SWITCH_ACT_HIGH:
+      if (digitalRead(btnPin[i]) == HIGH) return true;
+      break;
+    case BTN_TYPE_TOUCH:
+      #ifdef ARDUINO_ARCH_ESP32
+      if (touchRead(btnPin[i]) <= touchThreshold) return true;
+      DEBUG_PRINT(F("Touch value: "));
+      DEBUG_PRINTLN(touchRead(btnPin[i]));
+      #endif
+      break;
+  }
   return false;
 }
 
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 437918ff4..5db704904 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -161,9 +161,18 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
       macroDoublePress[s] = 0;
     }
   } else {
-    //TODO: fix JSON API call (and new install)
+    // new install/missing configuration (button 0 has defaults)
+    if (fromFS)
+      for (uint8_t s=1; s<WLED_MAX_BUTTONS; s++) {
+        btnPin[s]           = -1;
+        buttonType[s]       = BTN_TYPE_NONE;
+        macroButton[s]      = 0;
+        macroLongPress[s]   = 0;
+        macroDoublePress[s] = 0;
+      }
   }
   CJSON(touchThreshold,hw[F("btn")][F("tt")]);
+  DEBUG_PRINTLN(F("  Done buttons."));
 
 /*
   JsonObject hw_btn_ins_0 = hw[F("btn")][F("ins")][0];
@@ -546,8 +555,10 @@ void serializeConfig() {
 
   // button(s)
   JsonObject hw_btn = hw.createNestedObject("btn");
+  hw_btn["max"] = WLED_MAX_BUTTONS; // just information about max number of buttons (not actually used)
   JsonArray hw_btn_ins = hw_btn.createNestedArray("ins");
 
+  // there is always at least one button
   JsonObject hw_btn_ins_0 = hw_btn_ins.createNestedObject();
   hw_btn_ins_0["type"] = buttonType[0];
   JsonArray hw_btn_ins_0_pin = hw_btn_ins_0.createNestedArray("pin");
@@ -559,13 +570,12 @@ void serializeConfig() {
 
   // additional buttons
   for (uint8_t i=1; i<WLED_MAX_BUTTONS; i++) {
-    if (btnPin[i]<0) continue;
-    JsonObject hw_btn_ins_0 = hw_btn_ins.createNestedObject();
+    //if (btnPin[i]<0) continue;
+    hw_btn_ins_0 = hw_btn_ins.createNestedObject();
     hw_btn_ins_0["type"] = buttonType[i];
-    JsonArray hw_btn_ins_0_pin = hw_btn_ins_0.createNestedArray("pin");
+    hw_btn_ins_0_pin = hw_btn_ins_0.createNestedArray("pin");
     hw_btn_ins_0_pin.add(btnPin[i]);
-
-    JsonArray hw_btn_ins_0_macros = hw_btn_ins_0.createNestedArray("macros");
+    hw_btn_ins_0_macros = hw_btn_ins_0.createNestedArray("macros");
     hw_btn_ins_0_macros.add(macroButton[i]);
     hw_btn_ins_0_macros.add(macroLongPress[i]);
     hw_btn_ins_0_macros.add(macroDoublePress[i]);
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 81e3727cb..c4ea65610 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -291,7 +291,9 @@ Reverse (rotated 180°): <input type="checkbox" name="CV${i}">
       c += `<select name="${be}">`
       c += `<option value="0" ${t==0?"selected":""}>Disabled</option>`;
       c += `<option value="2" ${t==2?"selected":""}>Pushbutton</option>`;
+      c += `<option value="2" ${t==3?"selected":""}>Push inverted</option>`;
       c += `<option value="4" ${t==4?"selected":""}>Switch</option>`;
+      c += `<option value="5" ${t==4?"selected":""}>Switch inverted</option>`;
       c += `<option value="6" ${t==6?"selected":""}>Touch</option>`;
       c += `</select>`;
       c += `<span style="cursor: pointer;" onclick="off('${bt}')">&nbsp;&#215;</span><br>`;
diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index a2426c99b..0515de1f3 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -172,10 +172,10 @@
 		<table style="margin: 0 auto;" id="macros">
 			<thead>
 				<tr>
-					<td></td>
+					<td>push<br>switch</td>
 					<td>short<br>on-&gt;off</td>
 					<td>long<br>off-&gt;on</td>
-					<td>double</td>
+					<td>double<br>N/A</td>
 			</tr>
 			</thead>
 			<tbody>
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index b07d34d4b..ce8f05acd 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -74,7 +74,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,maxPB=4096,bquot=0;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings")}function B(){window.open("/settings","_self")}function gId(e){return d.getElementById(e)}function off(e){d.getElementsByName(e)[0].value=-1}function bLimits(e,n,t){maxB=e,maxM=t,maxPB=n}function pinsOK(){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||"L2"==n||"L3"==n||"L4"==n||"RL"==n||"BT"==n||"IR"==n||"AX"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert(`Sorry, pins ${JSON.stringify(d.um_p)} can't be used.`),e[i].value="",e[i].focus(),!1;if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),e[i].value="",e[i].focus(),!1;for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"L2"==t||"L3"==t||"L4"==t||"RL"==t||"BT"==t||"IR"==t||"AX"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert(`Pin conflict between ${n}/${t}!`),e[j].value="",e[j].focus(),!1}}}return!0}function trySubmit(e){if(e.preventDefault(),!pinsOK())return e.stopPropagation(),!1;if(bquot>100){var n="Too many LEDs for me to handle!";maxM<1e4&&(n+="\n\rConsider using an ESP32."),alert(n)}d.Sf.checkValidity()&&d.Sf.submit()}function S(){GetV(),setABL()}function enABL(){var e=gId("able").checked;d.Sf.LA.value=e?laprev:0,gId("abl").style.display=e?"inline":"none",gId("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,gId("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(gId("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:gId("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:gId("LAdis").style.display="inline"}gId("m1").innerHTML=maxM,d.getElementsByName("Sf")[0].addEventListener("submit",trySubmit),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(e=!1){var n=!1,t=0;gId("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 a=d.getElementsByTagName("select");for(y=0;y<a.length;y++)if("LT"==a[y].name.substring(0,2)){L=a[y].name.substring(2);var i=parseInt(a[y].value,10);gId("p0d"+L).innerHTML=i>49?"Data:":i>41?"Pins:":"Pin:",gId("p1d"+L).innerHTML=i>49?"Clk:":"";var l=d.getElementsByName("L1"+L)[0];for(t+=getMem(i,d.getElementsByName("LC"+L)[0].value,d.getElementsByName("L0"+L)[0].value),v=1;v<5;v++){(l=d.getElementsByName("L"+v+L)[0])&&(i>49&&1==v||i>41&&i<50&&v+40<i?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}gId("ls"+L).readOnly=!(i>31&&i<48),gId("LC").readOnly=!(i>31&&i<48),e&&(gId("ls"+L).value=L+1),n|=30==i||31==i||44==i||45==i,gId("dig"+L).style.display=i>31&&i<48?"none":"inline",gId("psd"+L).innerHTML=i>31&&i<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(y=0;y<s;y++)o[y].style.display=n?"inline":"none";var u=d.getElementsByTagName("input"),r=0,p=0;for(y=0;y<u.length;y++){var m=u[y].name.substring(0,2);if("LC"!=m||"LC"===u[y].name){if("L0"==m||"L1"==m)d.getElementsByName("LC"+u[y].name.substring(2))[0].max=maxPB;if(("L0"==m||"L1"==m||"L2"==m||"L3"==m||"L4"==m||"RL"==m||"BT"==m||"IR"==m||"AX"==m)&&""!=u[y].value&&"-1"!=u[y].value){var v=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)v.push(d.um_p[k]);for(j=0;j<u.length;j++)if(y!=j){var g=u[j].name.substring(0,2);"L0"!=g&&"L1"!=g&&"L2"!=g&&"L3"!=g&&"L4"!=g&&"RL"!=g&&"BT"!=g&&"IR"!=g&&"AX"!=g||""!=u[j].value&&"-1"!=u[j].value&&v.push(parseInt(u[j].value,10))}v.some(e=>e==parseInt(u[y].value,10))?u[y].style.color="red":u[y].style.color="#fff"}}else{var L=u[y].name.substring(2),c=parseInt(u[y].value,10);gId("ls"+L).readOnly&&(gId("ls"+L).value=r),c&&(r+=c,c>p&&(p=c))}}if(gId("LC").readOnly&&(d.getElementsByName("LC")[0].value=r),d.activeElement==d.getElementsByName("LC")[0]){var y=d.getElementsByClassName("iST").length;1==y&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}gId("m0").innerHTML=t,bquot=t/maxM*100,gId("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,gId("ledwarning").style.display=r>maxPB||p>800||bquot>80?"inline":"none",gId("ledwarning").style.color=r>maxPB||p>maxPB||bquot>100?"red":"orange",gId("wreason").innerHTML=bquot>80?"80% of max. LED memory"+(bquot>100?` (<b>WARNING: Using over ${maxM}B!</b>)`:""):"800 LEDs per pin";var f=Math.ceil((100+r*laprev)/500)/2;f=f>5?Math.ceil(f):f;a="";var b=30==d.Sf.LAsel.value,I=255==d.Sf.LAsel.value;f<1.02&&!b&&!I?a="ESP 5V pin with 1A USB supply":(a+=b?"12V ":I?"WS2815 12V ":"5V ",a+=f,a+="A supply connected to LEDs");var B=Math.ceil((100+r*laprev)/1500)/2,h="(for most effects, ~";h+=B=B>5?Math.ceil(B):B,h+="A is enough)<br>",gId("psu").innerHTML=a,gId("psu2").innerHTML=I?"":h}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(gId("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var a=gId("mLC");if(1==e){var i=`<div class="iST">\n${t>0?'<hr style="width:260px">':""}\n${t+1}:\n<select name="LT${t}" onchange="UI(true)">\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;\nColor 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" onchange="UI()"/>\n<span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<br>\n<span id="psd${t}">Start:</span> <input type="number" name="LS${t}" id="ls${t}" min="0" max="8191" value="${lastEnd(t)}" required />&nbsp;\n<div id="dig${t}" style="display:inline">\nCount: <input type="number" name="LC${t}" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>\nReverse (rotated 180°): <input type="checkbox" name="CV${t}">\n&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${t}" type="checkbox" name="SL${t}"><br>\n</div>\n</div>`;a.insertAdjacentHTML("beforeend",i)}-1==e&&(n[--t].remove(),--t),gId("+").style.display=t<maxB-1?"inline":"none",gId("-").style.display=t>0?"inline":"none",UI()}}function addBtn(e,n,t){var a=gId("btns").innerHTML,i="BT"+e;a+=`Button ${e} pin: <input type="number" min="-1" max="40" name="${i}" onchange="UI()" value="${n}">`,a+=`<select name="${"BE"+e}">`,a+=`<option value="0" ${0==t?"selected":""}>Disabled</option>`,a+=`<option value="2" ${2==t?"selected":""}>Pushbutton</option>`,a+=`<option value="4" ${4==t?"selected":""}>Switch</option>`,a+=`<option value="6" ${6==t?"selected":""}>Touch</option>`,a+="</select>",a+=`<span style="cursor: pointer;" onclick="off('${i}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=a}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 gId(e){return d.getElementById(e)}function off(e){d.getElementsByName(e)[0].value=-1}function bLimits(e,n,t){maxB=e,maxM=t,maxPB=n}function pinsOK(){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||"L2"==n||"L3"==n||"L4"==n||"RL"==n||"BT"==n||"IR"==n||"AX"==n)&&""!=e[i].value&&"-1"!=e[i].value){if(d.um_p&&d.um_p.some(n=>n==parseInt(e[i].value,10)))return alert(`Sorry, pins ${JSON.stringify(d.um_p)} can't be used.`),e[i].value="",e[i].focus(),!1;if(e[i].value>5&&e[i].value<12)return alert("Sorry, pins 6-11 can not be used."),e[i].value="",e[i].focus(),!1;for(j=i+1;j<e.length;j++){var t=e[j].name.substring(0,2);if(("L0"==t||"L1"==t||"L2"==t||"L3"==t||"L4"==t||"RL"==t||"BT"==t||"IR"==t||"AX"==t)&&""!=e[j].value&&e[i].value==e[j].value)return alert(`Pin conflict between ${n}/${t}!`),e[j].value="",e[j].focus(),!1}}}return!0}function trySubmit(e){if(e.preventDefault(),!pinsOK())return e.stopPropagation(),!1;if(bquot>100){var n="Too many LEDs for me to handle!";maxM<1e4&&(n+="\n\rConsider using an ESP32."),alert(n)}d.Sf.checkValidity()&&d.Sf.submit()}function S(){GetV(),setABL()}function enABL(){var e=gId("able").checked;d.Sf.LA.value=e?laprev:0,gId("abl").style.display=e?"inline":"none",gId("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,gId("LAdis").style.display=50==e?"inline":"none",UI()}function setABL(){switch(gId("able").checked=!0,d.Sf.LAsel.value=50,parseInt(d.Sf.LA.value)){case 0:gId("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:gId("LAdis").style.display="inline"}gId("m1").innerHTML=maxM,d.getElementsByName("Sf")[0].addEventListener("submit",trySubmit),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(e=!1){var n=!1,t=0;gId("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 a=d.getElementsByTagName("select");for(y=0;y<a.length;y++)if("LT"==a[y].name.substring(0,2)){L=a[y].name.substring(2);var i=parseInt(a[y].value,10);gId("p0d"+L).innerHTML=i>49?"Data:":i>41?"Pins:":"Pin:",gId("p1d"+L).innerHTML=i>49?"Clk:":"";var l=d.getElementsByName("L1"+L)[0];for(t+=getMem(i,d.getElementsByName("LC"+L)[0].value,d.getElementsByName("L0"+L)[0].value),v=1;v<5;v++){(l=d.getElementsByName("L"+v+L)[0])&&(i>49&&1==v||i>41&&i<50&&v+40<i?(l.style.display="inline",l.required=!0):(l.style.display="none",l.required=!1,l.value=""))}gId("ls"+L).readOnly=!(i>31&&i<48),gId("LC").readOnly=!(i>31&&i<48),e&&(gId("ls"+L).value=L+1),n|=30==i||31==i||44==i||45==i,gId("dig"+L).style.display=i>31&&i<48?"none":"inline",gId("psd"+L).innerHTML=i>31&&i<48?"Index:":"Start:"}var o=d.querySelectorAll(".wc"),s=o.length;for(y=0;y<s;y++)o[y].style.display=n?"inline":"none";var u=d.getElementsByTagName("input"),r=0,p=0;for(y=0;y<u.length;y++){var m=u[y].name.substring(0,2);if("LC"!=m||"LC"===u[y].name){if("L0"==m||"L1"==m)d.getElementsByName("LC"+u[y].name.substring(2))[0].max=maxPB;if(("L0"==m||"L1"==m||"L2"==m||"L3"==m||"L4"==m||"RL"==m||"BT"==m||"IR"==m||"AX"==m)&&""!=u[y].value&&"-1"!=u[y].value){var v=[];if(d.um_p&&Array.isArray(d.um_p))for(k=0;k<d.um_p.length;k++)v.push(d.um_p[k]);for(j=0;j<u.length;j++)if(y!=j){var g=u[j].name.substring(0,2);"L0"!=g&&"L1"!=g&&"L2"!=g&&"L3"!=g&&"L4"!=g&&"RL"!=g&&"BT"!=g&&"IR"!=g&&"AX"!=g||""!=u[j].value&&"-1"!=u[j].value&&v.push(parseInt(u[j].value,10))}v.some(e=>e==parseInt(u[y].value,10))?u[y].style.color="red":u[y].style.color="#fff"}}else{var L=u[y].name.substring(2),c=parseInt(u[y].value,10);gId("ls"+L).readOnly&&(gId("ls"+L).value=r),c&&(r+=c,c>p&&(p=c))}}if(gId("LC").readOnly&&(d.getElementsByName("LC")[0].value=r),d.activeElement==d.getElementsByName("LC")[0]){var y=d.getElementsByClassName("iST").length;1==y&&(d.getElementsByName("LC0")[0].value=d.getElementsByName("LC")[0].value)}gId("m0").innerHTML=t,bquot=t/maxM*100,gId("dbar").style.background=`linear-gradient(90deg, ${bquot>60?bquot>90?"red":"orange":"#ccc"} 0 ${bquot}%%, #444 ${bquot}%% 100%%)`,gId("ledwarning").style.display=r>maxPB||p>800||bquot>80?"inline":"none",gId("ledwarning").style.color=r>maxPB||p>maxPB||bquot>100?"red":"orange",gId("wreason").innerHTML=bquot>80?"80% of max. LED memory"+(bquot>100?` (<b>WARNING: Using over ${maxM}B!</b>)`:""):"800 LEDs per pin";var f=Math.ceil((100+r*laprev)/500)/2;f=f>5?Math.ceil(f):f;a="";var b=30==d.Sf.LAsel.value,I=255==d.Sf.LAsel.value;f<1.02&&!b&&!I?a="ESP 5V pin with 1A USB supply":(a+=b?"12V ":I?"WS2815 12V ":"5V ",a+=f,a+="A supply connected to LEDs");var B=Math.ceil((100+r*laprev)/1500)/2,h="(for most effects, ~";h+=B=B>5?Math.ceil(B):B,h+="A is enough)<br>",gId("psu").innerHTML=a,gId("psu2").innerHTML=I?"":h}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(gId("+").style.display="inline");var n=d.getElementsByClassName("iST"),t=n.length;if(!(1==e&&t>=maxB||-1==e&&0==t)){var a=gId("mLC");if(1==e){var i=`<div class="iST">\n${t>0?'<hr style="width:260px">':""}\n${t+1}:\n<select name="LT${t}" onchange="UI(true)">\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;\nColor 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" onchange="UI()"/>\n<span id="p1d${t}">Clock:</span> <input type="number" name="L1${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p2d${t}"></span><input type="number" name="L2${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p3d${t}"></span><input type="number" name="L3${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<span id="p4d${t}"></span><input type="number" name="L4${t}" min="0" max="40" style="width:35px" onchange="UI()"/>\n<br>\n<span id="psd${t}">Start:</span> <input type="number" name="LS${t}" id="ls${t}" min="0" max="8191" value="${lastEnd(t)}" required />&nbsp;\n<div id="dig${t}" style="display:inline">\nCount: <input type="number" name="LC${t}" min="0" max="${maxPB}" value="1" required oninput="UI()" /><br>\nReverse (rotated 180°): <input type="checkbox" name="CV${t}">\n&nbsp;Skip 1<sup>st</sup> LED: <input id="sl${t}" type="checkbox" name="SL${t}"><br>\n</div>\n</div>`;a.insertAdjacentHTML("beforeend",i)}-1==e&&(n[--t].remove(),--t),gId("+").style.display=t<maxB-1?"inline":"none",gId("-").style.display=t>0?"inline":"none",UI()}}function addBtn(e,n,t){var a=gId("btns").innerHTML,i="BT"+e;a+=`Button ${e} pin: <input type="number" min="-1" max="40" name="${i}" onchange="UI()" value="${n}">`,a+=`<select name="${"BE"+e}">`,a+=`<option value="0" ${0==t?"selected":""}>Disabled</option>`,a+=`<option value="2" ${2==t?"selected":""}>Pushbutton</option>`,a+=`<option value="2" ${3==t?"selected":""}>Pushbutton inversed</option>`,a+=`<option value="4" ${4==t?"selected":""}>Switch</option>`,a+=`<option value="5" ${4==t?"selected":""}>Switch inversed</option>`,a+=`<option value="6" ${6==t?"selected":""}>Touch</option>`,a+="</select>",a+=`<span style="cursor: pointer;" onclick="off('${i}')">&nbsp;&#215;</span><br>`,gId("btns").innerHTML=a}function GetV() {var d=document;
 %CSS%%SCSS%</head><body onload="S()"><form
  id="form_s" name="Sf" method="post"><div class="toprow"><div class="helpB">
 <button type="button" onclick="H()">?</button></div><button type="button" 
@@ -352,11 +352,11 @@ type="number" min="0" max="250" required><br>Countdown-Over Preset: <input
 name="MC" type="number" min="0" max="250" required><br>
 Timed-Light-Over Presets: <input name="MN" type="number" min="0" max="250" 
 required><br><h3>Button actions</h3><table style="margin:0 auto" id="macros">
-<thead><tr><td></td><td>short<br>on-&gt;off</td><td>long<br>off-&gt;on</td><td>
-double</td></tr></thead><tbody></tbody></table><h3>Time-controlled presets</h3>
-<div style="display:inline-block"><table id="TMT"></table></div><hr><button 
-type="button" onclick="B()">Back</button><button type="submit">Save</button>
-</form></body></html>)=====";
+<thead><tr><td>push<br>switch</td><td>short<br>on-&gt;off</td><td>long<br>
+off-&gt;on</td><td>double<br>N/A</td></tr></thead><tbody></tbody></table><h3>
+Time-controlled presets</h3><div style="display:inline-block"><table id="TMT">
+</table></div><hr><button type="button" onclick="B()">Back</button><button 
+type="submit">Save</button></form></body></html>)=====";
 
 
 // Autogenerated from wled00/data/settings_sec.htm, do not edit!!
diff --git a/wled00/set.cpp b/wled00/set.cpp
index bc8ee726a..64d77c5a6 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -151,17 +151,15 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     for (uint8_t i=0; i<WLED_MAX_BUTTONS; i++) {
       char bt[4] = "BT"; bt[2] = 48+i; bt[3] = 0; // button pin
       char be[4] = "BE"; be[2] = 48+i; be[3] = 0; // button type
-      //if (request->hasArg(bt)) {
-        int hw_btn_pin = request->arg(bt).toInt();
-        if (pinManager.allocatePin(hw_btn_pin,false)) {
-          btnPin[i] = hw_btn_pin;
-          pinMode(btnPin[i], INPUT_PULLUP);
-          buttonType[i] = request->arg(be).toInt();
-        } else {
-          btnPin[i] = -1;
-          buttonType[i] = BTN_TYPE_NONE;
-        }
-      //}
+      int hw_btn_pin = request->arg(bt).toInt();
+      if (pinManager.allocatePin(hw_btn_pin,false)) {
+        btnPin[i] = hw_btn_pin;
+        pinMode(btnPin[i], INPUT_PULLUP);
+        buttonType[i] = request->arg(be).toInt();
+      } else {
+        btnPin[i] = -1;
+        buttonType[i] = BTN_TYPE_NONE;
+      }
     }
     touchThreshold = request->arg(F("TT")).toInt();
 
@@ -342,7 +340,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       char mp[4] = "MP"; mp[2] = 48+i; mp[3] = 0; // short
       char ml[4] = "ML"; ml[2] = 48+i; ml[3] = 0; // long
       char md[4] = "MD"; md[2] = 48+i; md[3] = 0; // double
-      macroButton[i] = request->arg(mp).toInt();
+      //if (!request->hasArg(mp)) break;
+      macroButton[i] = request->arg(mp).toInt();      // these will default to 0 if not present
       macroLongPress[i] = request->arg(ml).toInt();
       macroDoublePress[i] = request->arg(md).toInt();
     }
diff --git a/wled00/wled.h b/wled00/wled.h
index e2892379b..fbc4a3657 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2105191
+#define VERSION 2105201
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG