From 446b4b084cd211d2c9458a1c431b59413dcbc8a3 Mon Sep 17 00:00:00 2001 From: yoeywire Date: Mon, 8 Nov 2021 17:05:47 +0100 Subject: [PATCH 1/9] Changed WLED_USE_DMX to WLED_ENABLE_DMX --- wled00/wled.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wled00/wled.cpp b/wled00/wled.cpp index f59a5b8f0..8bb5b1864 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -303,7 +303,7 @@ void WLED::setup() #ifdef WLED_DEBUG pinManager.allocatePin(1, true, PinOwner::DebugOut); // GPIO1 reserved for debug output #endif -#ifdef WLED_USE_DMX //reserve GPIO2 as hardcoded DMX pin +#ifdef WLED_ENABLE_DMX //reserve GPIO2 as hardcoded DMX pin pinManager.allocatePin(2, true, PinOwner::DMX); #endif From 5784092c1b12737ed8d5c13411353ec38f24ca41 Mon Sep 17 00:00:00 2001 From: Christian Schwinne Date: Tue, 9 Nov 2021 09:56:02 +0100 Subject: [PATCH 2/9] Fix settings JS buffer too small (#2323) --- wled00/const.h | 6 +++++- wled00/wled.cpp | 2 +- wled00/wled_server.cpp | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wled00/const.h b/wled00/const.h index 51205d296..62d12e55a 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -265,7 +265,11 @@ #endif // string temp buffer (now stored in stack locally) -#define OMAX 2048 +#ifdef ESP8266 +#define SETTINGS_STACK_BUF_SIZE 2048 +#else +#define SETTINGS_STACK_BUF_SIZE 3096 +#endif #ifdef WLED_USE_ETHERNET #define E131_MAX_UNIVERSE_COUNT 20 diff --git a/wled00/wled.cpp b/wled00/wled.cpp index 8bb5b1864..0c2910dc1 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -42,7 +42,7 @@ bool oappendi(int i) bool oappend(const char* txt) { uint16_t len = strlen(txt); - if (olen + len >= OMAX) + if (olen + len >= SETTINGS_STACK_BUF_SIZE) return false; // buffer full strcpy(obuf + olen, txt); olen += len; diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp index 908c3a4ea..04147827c 100644 --- a/wled00/wled_server.cpp +++ b/wled00/wled_server.cpp @@ -362,9 +362,10 @@ void serveMessage(AsyncWebServerRequest* request, uint16_t code, const String& h String settingsProcessor(const String& var) { if (var == "CSS") { - char buf[2048]; + char buf[SETTINGS_STACK_BUF_SIZE]; buf[0] = 0; getSettingsJS(optionType, buf); + //Serial.println(uxTaskGetStackHighWaterMark(NULL)); return String(buf); } From 3161f5fa47126fcb44ffb9a135b795bc753e9e11 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Tue, 9 Nov 2021 17:46:05 +0100 Subject: [PATCH 3/9] Fix for network 'pin' conflicts. --- wled00/data/settings_leds.htm | 2 +- wled00/html_settings.h | 49 +++++++++++++++++------------------ 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 187fd289f..f337e71e7 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -55,7 +55,7 @@ if (n2.substring(0,1)==="L") { var m = LCs[j].name.substring(2); var t2 = parseInt(d.getElementsByName("LT"+m)[0].value, 10); - if (t2<16) continue; + if (t2>=80) continue; } if (LCs[j].value!="" && LCs[i].value==LCs[j].value) {alert(`Pin conflict between ${LCs[i].name}/${LCs[j].name}!`);LCs[j].value="";LCs[j].focus();return false;} } diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 90e3fb540..b6007b13c 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -77,7 +77,7 @@ onclick="B()">Back // Autogenerated from wled00/data/settings_leds.htm, do not edit!! const char PAGE_settings_leds[] PROGMEM = R"=====(LED Settings