Merge remote-tracking branch 'origin/ac_main' into mdev

2022-12-06 14:38:49 +01:00
parent a2c707831c e629c90a71
commit 3160a0b090
29 changed files with 5225 additions and 4981 deletions
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -458,6 +458,7 @@ void getSettingsJS(byte subPage, char* dest)
      oappend(itoa(buttonType[i],nS,10));
      oappend(SET_F(");"));
    }
+    sappend('c',SET_F("IP"),disablePullUp);
    sappend('v',SET_F("TT"),touchThreshold);
    sappend('v',SET_F("IR"),irPin);
    sappend('v',SET_F("IT"),irEnabled);