Fixed undesirable boot color transition

Prinnc3 · Aug 6, 2021 · bd13336 · bd13336
1 parent 8159409
commit bd13336
Show file tree

Hide file tree

Showing 7 changed files with 1,618 additions and 1,607 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ### Builds after release 0.12.0
 
+#### Build 2108050
+
+-   Fixed undesirable color transition from Orange to boot preset color on first boot
+-   Removed misleading Delete button on new playlist with one entry
+-   Updated NeoPixelBus to 2.6.7 and AsyncTCP to 1.1.1
+
+#### Build 2107230
+
+-   Added skinning (extra custom CSS) (PR #2084)
+-   Added presets/config backup/restore (PR #2084)
+-   Added option for using length instead of Stop LED in UI (PR #2048)
+-   Added custom `holidays.json` holiday list (PR #2048)
+
 #### Build 2107100
 
 -   Version bump to 0.13.0-b2 "Toki"

diff --git a/platformio.ini b/platformio.ini
@@ -196,7 +196,7 @@ lib_deps =
   ${env.lib_deps}
   # ESPAsyncTCP @ 1.2.0
   ESPAsyncUDP
-  makuna/NeoPixelBus @ 2.6.4 # 2.6.5 and newer do not compile on ESP core < 3.0.0
+  makuna/NeoPixelBus @ 2.6.7 # 2.6.5/2.6.6 and newer do not compile on ESP core < 3.0.0
 
 [esp32]
 build_flags = -g
@@ -205,8 +205,8 @@ build_flags = -g
 
 lib_deps =
   ${env.lib_deps}
-  https://github.com/Makuna/NeoPixelBus.git # until next upstream release
-  AsyncTCP @ 1.0.3
+  makuna/NeoPixelBus @ 2.6.7
+  AsyncTCP @ 1.1.1
 
 [esp32s2]
 build_flags = -g
@@ -217,8 +217,8 @@ build_flags = -g
 
 lib_deps =
   ${env.lib_deps}
-  https://github.com/Makuna/NeoPixelBus.git # until next upstream release
-  AsyncTCP @ 1.0.3
+  makuna/NeoPixelBus @ 2.6.7
+  AsyncTCP @ 1.1.1
 
 # ------------------------------------------------------------------------------
 # WLED BUILDS

diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -156,7 +156,7 @@
     <p>Transition: <input id="tt" class="noslide" type="number" min="0" max="65.5" step="0.1" value="0.7">s</p>
 	</div>
 
-	<div id="Favorites" class="tabcontent">
+	<div id="Presets" class="tabcontent">
 		<div id="putil">
 
 		</div>
@@ -173,7 +173,7 @@
 	<button class="tablinks" onclick="openTab(0)"><i class="icons">&#xe2b3;</i><p class="tab-label">Colors</p></button>
 	<button class="tablinks" onclick="openTab(1)"><i class="icons">&#xe23d;</i><p class="tab-label">Effects</p></button>
 	<button class="tablinks" onclick="openTab(2)"><i class="icons">&#xe34b;</i><p class="tab-label">Segments</p></button>
-	<button class="tablinks" onclick="openTab(3)"><i class="icons">&#xe04c;</i><p class="tab-label">Favorites</p></button>
+	<button class="tablinks" onclick="openTab(3)"><i class="icons">&#xe04c;</i><p class="tab-label">Presets</p></button>
 </div>
 
 <div id="connind"></div>

diff --git a/wled00/data/index.js b/wled00/data/index.js
@@ -1311,7 +1311,7 @@ function refreshPlE(p) {
 	}
 	plEDiv.innerHTML = content;
 	var dels = plEDiv.getElementsByClassName("btn-pl-del");
-	if (dels.length < 2 && p > 0) dels[0].style.display = "none";
+	if (dels.length < 2) dels[0].style.display = "none";
 
 	var sels = d.getElementById(`seg${p+100}`).getElementsByClassName("sel");
 	for (var i of sels) {
@@ -1331,7 +1331,7 @@ function addPl(p,i) {
 }
 
 function delPl(p,i) {
-	if (plJson[p].ps.length < 2) {if (p == 0) resetPUtil(); return;}
+	if (plJson[p].ps.length < 2) return;
 	plJson[p].ps.splice(i,1);
 	plJson[p].dur.splice(i,1);
 	plJson[p].transition.splice(i,1);

diff --git a/wled00/html_ui.h b/wled00/html_ui.h
diff --git a/wled00/led.cpp b/wled00/led.cpp
@@ -46,10 +46,6 @@ byte scaledBri(byte in)
 
 
 void setAllLeds() {
-  if (!realtimeMode || !arlsForceMaxBri)
-  {
-    strip.setBrightness(scaledBri(briT));
-  }
   if (strip.isRgbw && strip.rgbwMode == RGBW_MODE_LEGACY)
   {
     colorRGBtoRGBW(col);
@@ -61,6 +57,10 @@ void setAllLeds() {
   {
     col[3] = 0; colSec[3] = 0;
   }
+  if (!realtimeMode || !arlsForceMaxBri)
+  {
+    strip.setBrightness(scaledBri(briT));
+  }
 }
 
 
@@ -142,7 +142,6 @@ void colorUpdated(int callMode)
   }
   if (briT == 0)
   {
-    //setLedsStandard(true); //do not color transition if starting from off!
     if (callMode != CALL_MODE_NOTIFICATION) resetTimebase(); //effect start from beginning
   }
 

diff --git a/wled00/wled.h b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2107230
+#define VERSION 2108050
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG