diff --git a/wled00/WS2812FX_fcn.cpp b/wled00/WS2812FX_fcn.cpp index f6e8e9eb..b60d95d8 100644 --- a/wled00/WS2812FX_fcn.cpp +++ b/wled00/WS2812FX_fcn.cpp @@ -44,7 +44,7 @@ void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst) if (_skipFirstMode) lengthRaw += LED_SKIP_AMOUNT; bus->Begin((NeoPixelType)ty, lengthRaw); - if (_locked != NULL) delete _locked; + delete[] _locked; _locked = new byte[_length]; _segments[0].start = 0; diff --git a/wled00/html_other.h b/wled00/html_other.h index 75b13c1e..90b66164 100644 --- a/wled00/html_other.h +++ b/wled00/html_other.h @@ -18,7 +18,7 @@ const char PAGE_msg[] PROGMEM = R"=====( //firmware update page const char PAGE_update[] PROGMEM = R"=====( -WLED Message +WLED Update %CSS%.bt{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}input[type=file]{font-size:16px}body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%%}

WLED Software Update

Installed version: 0.8.4-dev
Download the latest binary:

)====="; diff --git a/wled00/wled00.ino b/wled00/wled00.ino index def802a6..b2fbed74 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -89,7 +89,7 @@ //version code in format yymmddb (b = daily build) -#define VERSION 1903092 +#define VERSION 1903111 char versionString[] = "0.8.4-dev"; @@ -114,7 +114,7 @@ char ntpServerName[] = "0.wled.pool.ntp.org"; //NTP server to use char clientSSID[33] = "Your_Network"; char clientPass[65] = ""; char cmDNS[33] = "x"; //mDNS address (placeholder, will be replaced by wledXXXXXXXXXXXX.local) -char apSSID[65] = ""; //AP off by default (unless setup) +char apSSID[33] = ""; //AP off by default (unless setup) byte apChannel = 1; //2.4GHz WiFi AP channel (1-13) byte apHide = 0; //hidden AP SSID byte apWaitTimeSecs = 32; //time to wait for connection before opening AP diff --git a/wled00/wled07_notify.ino b/wled00/wled07_notify.ino index 7d58094a..1cd35f38 100644 --- a/wled00/wled07_notify.ino +++ b/wled00/wled07_notify.ino @@ -59,11 +59,11 @@ void notify(byte callMode, bool followUp=false) void arlsLock(uint32_t timeoutMs) { if (!realtimeActive){ - for (uint16_t i = 0; i < ledCount; i++) - { - strip.setPixelColor(i,0,0,0,0); - } - strip.unlockAll(); + for (uint16_t i = 0; i < ledCount; i++) + { + strip.setPixelColor(i,0,0,0,0); + } + strip.unlockAll(); } realtimeActive = true; realtimeTimeout = millis() + timeoutMs; @@ -160,8 +160,9 @@ void handleNotifications() //wled notifier, block if realtime packets active if (udpIn[0] == 0 && !realtimeActive && receiveNotifications) { + bool someSel = (receiveNotificationBrightness || receiveNotificationColor || receiveNotificationEffects); //apply colors from notification - if (receiveNotificationColor) + if (receiveNotificationColor || !someSel) { col[0] = udpIn[3]; col[1] = udpIn[4]; @@ -180,7 +181,7 @@ void handleNotifications() } //apply effects from notification - if (receiveNotificationEffects) + if (receiveNotificationEffects || !someSel) { if (udpIn[8] < strip.getModeCount()) effectCurrent = udpIn[8]; effectSpeed = udpIn[9]; @@ -196,7 +197,7 @@ void handleNotifications() nightlightActive = udpIn[6]; if (nightlightActive) nightlightDelayMins = udpIn[7]; - if (receiveNotificationBrightness) bri = udpIn[2]; + if (receiveNotificationBrightness || !someSel) bri = udpIn[2]; colorUpdated(3); } else if (udpIn[0] > 0 && udpIn[0] < 4 && receiveDirect) //1 warls //2 drgb //3 drgbw diff --git a/wled00/wled19_json.ino b/wled00/wled19_json.ino index 6aabc2db..2a499c8c 100644 --- a/wled00/wled19_json.ino +++ b/wled00/wled19_json.ino @@ -4,7 +4,7 @@ void deserializeState(JsonObject& root) { - bri = root["bri"] | briLast; + bri = root["bri"] | bri; bool on = root["on"] | (bri > 0); if (!on != !bri) toggleOnOff(); @@ -60,7 +60,6 @@ void deserializeState(JsonObject& root) if (sz > 0 && sz < 5) { int rgbw[] = {0,0,0,0}; - memset(rgbw, 0, 4); byte cp = colX.copyTo(rgbw); seg.colors[i] = ((rgbw[3] << 24) | ((rgbw[0]&0xFF) << 16) | ((rgbw[1]&0xFF) << 8) | ((rgbw[2]&0xFF))); if (cp == 1 && rgbw[0] == 0) seg.colors[i] = 0;