Beta2

shana · Dec 23, 2023 · d1b80aa · d1b80aa
2 parents 5f62b4a + 1900686
commit d1b80aa
Show file tree

Hide file tree

Showing 10 changed files with 1,382 additions and 1,377 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## WLED changelog
 
+#### Build 2312230
+-   Version bump: 0.14.1-b2
+-   Fix for Pixel Magic button
+-   Fix for #2922 (option to force WiFi PHY mode to G on ESP8266)
+-   Fix for #3601, #3400 (incorrect sunrise/sunset, #3612 by @softhack007)
+
 #### Build 2312180
 -   Bugfixes (#3593, #3490, #3573, #3517, #3561, #3555, #3541, #3536, #3515, #3522, #3533, #3508)
 -   Various other internal cleanups and optimisations

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.14.1-b1",
+  "version": "0.14.1-b2",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {

diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -200,7 +200,7 @@
 			</div>
 		</div>
 		<div style="padding-block: 10px;">
-			<button class="btn btn-xs" type="button" onclick="togglePixelMagicTool()"><i class="icons btn-icon">&#xe410;</i></button>
+			<button class="btn btn-xs" type="button" onclick="window.location.href=getURL('/pxmagic.htm')"><i class="icons btn-icon">&#xe410;</i></button>
 			<button class="btn btn-xs" type="button" onclick="window.location.href=getURL('/cpal.htm')"><i class="icons btn-icon">&#xe18a;</i></button>
 			<button class="btn btn-xs" type="button" onclick="palettesData=null;localStorage.removeItem('wledPalx');requestJson({rmcpal:true});setTimeout(loadPalettes,250,loadPalettesData);"><i class="icons btn-icon">&#xe037;</i></button>
 		</div>

diff --git a/wled00/html_cpal.h b/wled00/html_cpal.h
@@ -9,7 +9,7 @@
 // Autogenerated from wled00/data/cpal/cpal.htm, do not edit!!
 const uint16_t PAGE_cpal_L = 4721;
 const uint8_t PAGE_cpal[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xbd, 0x3b, 0x7f, 0x73, 0xdb, 0xb6,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xbd, 0x3b, 0x7f, 0x73, 0xdb, 0xb6,
   0x92, 0xff, 0xe7, 0x53, 0x20, 0x4c, 0x5f, 0x42, 0xd6, 0x14, 0x45, 0xd2, 0xb6, 0x64, 0x4b, 0xa2,
   0x3b, 0xa9, 0x93, 0x77, 0xce, 0x8d, 0xdd, 0x64, 0x5e, 0x7c, 0x6e, 0x7b, 0x3e, 0xbf, 0x31, 0x4d,
   0x42, 0x12, 0x1b, 0x8a, 0xe0, 0x03, 0x21, 0xd9, 0xae, 0xac, 0xef, 0x7e, 0xbb, 0x00, 0x48, 0x91,

diff --git a/wled00/html_other.h b/wled00/html_other.h
@@ -44,44 +44,44 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
 const uint16_t PAGE_update_length = 616;
 const uint8_t PAGE_update[] PROGMEM = {
   0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0x5d, 0x6f, 0xd4, 0x30,
-  0x10, 0x7c, 0xcf, 0xaf, 0x70, 0xfd, 0x74, 0x27, 0x71, 0x36, 0x45, 0xbc, 0x50, 0x92, 0x14, 0x4a,
-  0x2b, 0x54, 0x09, 0xa9, 0x95, 0xda, 0x82, 0x78, 0x42, 0x8e, 0xbd, 0xb9, 0x98, 0x73, 0xec, 0xd4,
+  0x10, 0x7c, 0xcf, 0xaf, 0x70, 0xfd, 0x74, 0x27, 0x71, 0x36, 0xad, 0x78, 0xa1, 0x24, 0x29, 0x94,
+  0x56, 0xa8, 0x12, 0x12, 0x95, 0xda, 0x82, 0x78, 0x42, 0x8e, 0xbd, 0xb9, 0x98, 0x73, 0xec, 0xd4,
   0xde, 0xdc, 0xe9, 0x84, 0xfa, 0xdf, 0xd9, 0x38, 0x77, 0x05, 0xf1, 0xf1, 0x12, 0xc5, 0xd9, 0xd9,
-  0xf1, 0xee, 0xcc, 0xa4, 0x3c, 0xb9, 0xbc, 0xf9, 0x70, 0xff, 0xf5, 0xf6, 0x8a, 0x75, 0xd8, 0xbb,
-  0xba, 0x3c, 0x3c, 0x41, 0x99, 0xba, 0xec, 0x01, 0x15, 0xd3, 0xc1, 0x23, 0x78, 0xac, 0xf8, 0xce,
-  0x1a, 0xec, 0x2a, 0x03, 0x5b, 0xab, 0x61, 0x95, 0x0f, 0x9c, 0x79, 0xd5, 0x43, 0xc5, 0xb7, 0x16,
-  0x76, 0x43, 0x88, 0xc8, 0xeb, 0xa2, 0x44, 0x8b, 0x0e, 0xea, 0x2f, 0x9f, 0xae, 0x2e, 0xd9, 0xc3,
-  0x60, 0x14, 0x42, 0x29, 0xe7, 0x4f, 0x65, 0xd2, 0xd1, 0x0e, 0x58, 0x17, 0xed, 0xe8, 0x35, 0xda,
-  0xe0, 0xd9, 0xc5, 0x62, 0xf9, 0x63, 0x67, 0xbd, 0x09, 0x3b, 0xd1, 0xd9, 0x84, 0x21, 0xee, 0x45,
-  0xa3, 0xf4, 0x66, 0xb1, 0x7c, 0x7a, 0x86, 0x3c, 0x10, 0xc4, 0x04, 0x3d, 0xf6, 0x34, 0x81, 0x58,
-  0x03, 0x5e, 0x39, 0x98, 0x5e, 0x2f, 0xf6, 0xd7, 0x66, 0xc1, 0xc7, 0x96, 0x2f, 0x45, 0xc2, 0xbd,
-  0x03, 0x61, 0x6c, 0x1a, 0x9c, 0xda, 0x57, 0xdc, 0x07, 0x0f, 0xfc, 0xc5, 0x7f, 0x5b, 0xfa, 0xb4,
-  0xfe, 0xbb, 0xa7, 0x71, 0x41, 0x6f, 0xf8, 0x53, 0x51, 0xca, 0xc3, 0x88, 0x87, 0x51, 0x59, 0x8a,
-  0xba, 0xe2, 0x32, 0x01, 0xa2, 0xf5, 0xeb, 0x24, 0x93, 0xf8, 0x9e, 0xce, 0x87, 0xea, 0x0d, 0xaf,
-  0x7f, 0x43, 0x4e, 0x54, 0x75, 0xf1, 0xce, 0xf6, 0x93, 0x00, 0x6c, 0x8c, 0x6e, 0xc1, 0x67, 0x7a,
-  0x9d, 0x12, 0x5f, 0xbe, 0x25, 0x64, 0x46, 0x94, 0x72, 0x96, 0xb4, 0x09, 0x66, 0xcf, 0x82, 0x77,
-  0x41, 0x99, 0x8a, 0x7f, 0x04, 0xfc, 0xbc, 0x58, 0x12, 0x5d, 0xf7, 0xaa, 0x2e, 0xb2, 0x64, 0x77,
+  0xf1, 0xee, 0xcc, 0xa4, 0x3c, 0xb9, 0xfa, 0xf4, 0xfe, 0xfe, 0xeb, 0xed, 0x35, 0xeb, 0xb0, 0x77,
+  0x75, 0x79, 0x78, 0x82, 0x32, 0x75, 0xd9, 0x03, 0x2a, 0xa6, 0x83, 0x47, 0xf0, 0x58, 0xf1, 0x9d,
+  0x35, 0xd8, 0x55, 0x06, 0xb6, 0x56, 0xc3, 0x2a, 0x1f, 0x38, 0xf3, 0xaa, 0x87, 0x8a, 0x6f, 0x2d,
+  0xec, 0x86, 0x10, 0x91, 0xd7, 0x45, 0x89, 0x16, 0x1d, 0xd4, 0x5f, 0x3e, 0x5e, 0x5f, 0xb1, 0x87,
+  0xc1, 0x28, 0x84, 0x52, 0xce, 0x9f, 0xca, 0xa4, 0xa3, 0x1d, 0xb0, 0x2e, 0xda, 0xd1, 0x6b, 0xb4,
+  0xc1, 0xb3, 0xcb, 0xc5, 0xf2, 0xc7, 0xce, 0x7a, 0x13, 0x76, 0xa2, 0xb3, 0x09, 0x43, 0xdc, 0x8b,
+  0x46, 0xe9, 0xcd, 0x62, 0xf9, 0xf4, 0x0c, 0x79, 0x20, 0x88, 0x09, 0x7a, 0xec, 0x69, 0x02, 0xb1,
+  0x06, 0xbc, 0x76, 0x30, 0xbd, 0x5e, 0xee, 0x6f, 0xcc, 0x82, 0x8f, 0x2d, 0x5f, 0x8a, 0x84, 0x7b,
+  0x07, 0xc2, 0xd8, 0x34, 0x38, 0xb5, 0xaf, 0xb8, 0x0f, 0x1e, 0xf8, 0x8b, 0xff, 0xb6, 0xf4, 0x69,
+  0xfd, 0x77, 0x4f, 0xe3, 0x82, 0xde, 0xf0, 0xa7, 0xa2, 0x94, 0x87, 0x11, 0x0f, 0xa3, 0xb2, 0x14,
+  0x75, 0xc5, 0x65, 0x02, 0x44, 0xeb, 0xd7, 0x49, 0x26, 0xf1, 0x3d, 0x5d, 0x0c, 0xd5, 0x6b, 0x5e,
+  0xff, 0x86, 0x9c, 0xa8, 0xea, 0xe2, 0xad, 0xed, 0x27, 0x01, 0xd8, 0x18, 0xdd, 0x82, 0xcf, 0xf4,
+  0x3a, 0x25, 0xbe, 0x7c, 0x43, 0xc8, 0x8c, 0x28, 0xe5, 0x2c, 0x69, 0x13, 0xcc, 0x9e, 0x05, 0xef,
+  0x82, 0x32, 0x15, 0xff, 0x00, 0xf8, 0x79, 0xb1, 0x24, 0xba, 0xee, 0xac, 0x2e, 0xb2, 0x64, 0x77,
   0xa1, 0xc5, 0x9d, 0x8a, 0xf0, 0xac, 0x1d, 0x55, 0xca, 0x36, 0xc4, 0x9e, 0x91, 0x17, 0x5d, 0xa0,
-  0x9e, 0xdb, 0x9b, 0xbb, 0x7b, 0xce, 0x54, 0x96, 0xa7, 0xe2, 0x42, 0x8e, 0x19, 0xc8, 0x99, 0xa5,
-  0x1a, 0x09, 0xc2, 0x0a, 0x20, 0xe9, 0xf6, 0x03, 0xb9, 0xd2, 0x8f, 0x0e, 0xed, 0xa0, 0x22, 0xca,
-  0x89, 0x60, 0x45, 0x30, 0xc5, 0xe9, 0xea, 0x34, 0x36, 0xbd, 0x25, 0x3b, 0x1f, 0xa6, 0x9b, 0xaf,
-  0x7d, 0x42, 0xe5, 0x1c, 0x18, 0xb6, 0x85, 0x98, 0x88, 0xf2, 0x8c, 0x95, 0x69, 0x50, 0x9e, 0x15,
-  0xda, 0xa9, 0x94, 0x2a, 0x9e, 0xec, 0xc0, 0xeb, 0x97, 0xe2, 0xf4, 0xb5, 0x38, 0x5d, 0x35, 0xa7,
-  0xb4, 0x0d, 0x15, 0x69, 0x8b, 0x58, 0x5f, 0x86, 0x5d, 0xde, 0x82, 0x61, 0x07, 0xcc, 0xd1, 0x08,
-  0x09, 0x59, 0x63, 0xbd, 0x8a, 0x7b, 0xa2, 0x50, 0xac, 0xe8, 0x22, 0xb4, 0x15, 0xef, 0x10, 0x87,
-  0x74, 0x26, 0xe5, 0xda, 0x62, 0x37, 0x36, 0x42, 0x87, 0x5e, 0xbe, 0xb7, 0x51, 0x87, 0x10, 0x36,
-  0x16, 0xe4, 0xb4, 0xb2, 0x8c, 0xe0, 0x40, 0x25, 0x48, 0x9c, 0xa1, 0x8a, 0xe4, 0x57, 0xc5, 0xbf,
-  0x35, 0x4e, 0xf9, 0x0d, 0xc9, 0x62, 0xfb, 0x35, 0x2b, 0xb2, 0x09, 0x47, 0x1e, 0xfa, 0x22, 0x52,
-  0x67, 0xc1, 0x99, 0x24, 0x6c, 0x38, 0xd0, 0x1e, 0x29, 0xfe, 0xa4, 0x16, 0x69, 0xbb, 0x3e, 0xcf,
-  0xf2, 0x57, 0x2d, 0x4d, 0xb8, 0x4a, 0x8f, 0x23, 0x49, 0x3b, 0x85, 0x54, 0xaa, 0xbc, 0x43, 0x69,
-  0xfd, 0x30, 0x22, 0x9b, 0xe5, 0x6a, 0xad, 0x83, 0x63, 0xa0, 0x8f, 0xa2, 0x46, 0x78, 0x1c, 0x6d,
-  0x04, 0x33, 0xa3, 0x9b, 0x11, 0x91, 0x32, 0x39, 0xc3, 0x67, 0x19, 0x89, 0x6c, 0x76, 0xea, 0xa4,
-  0x94, 0x73, 0xf9, 0x1f, 0xd0, 0xf9, 0x30, 0x69, 0xaf, 0x9d, 0xd5, 0x9b, 0x8a, 0x5f, 0x4c, 0xd2,
-  0x5f, 0x50, 0xd4, 0x7f, 0x35, 0x65, 0x8f, 0xea, 0xd2, 0xd8, 0x6d, 0x91, 0xad, 0x9c, 0x82, 0x4a,
-  0x34, 0x75, 0x66, 0xa7, 0xf4, 0x09, 0x21, 0x08, 0x9c, 0xc9, 0x6f, 0xf3, 0xb2, 0xcc, 0x04, 0xe6,
-  0x03, 0x32, 0xed, 0x02, 0x1d, 0x42, 0xa4, 0x59, 0xdb, 0x08, 0xa9, 0xcb, 0x7e, 0x0c, 0x6a, 0x0d,
-  0xec, 0x6c, 0x59, 0x4a, 0xe2, 0x9b, 0xd6, 0x9d, 0x52, 0x37, 0x45, 0x70, 0xfa, 0xb7, 0x7f, 0x02,
-  0x7b, 0x93, 0x33, 0x90, 0xf1, 0x03, 0x00, 0x00
+  0x9e, 0xdb, 0x4f, 0x77, 0xf7, 0x9c, 0xa9, 0x2c, 0x4f, 0xc5, 0x85, 0x1c, 0x33, 0x90, 0x33, 0x4b,
+  0x35, 0x12, 0x84, 0x15, 0x40, 0xd2, 0xed, 0x07, 0x72, 0xa5, 0x1f, 0x1d, 0xda, 0x41, 0x45, 0x94,
+  0x13, 0xc1, 0x8a, 0x60, 0x8a, 0xd3, 0xd5, 0x69, 0x6c, 0x7a, 0x4b, 0x76, 0x3e, 0x4c, 0x37, 0xdf,
+  0xf8, 0x84, 0xca, 0x39, 0x30, 0x6c, 0x0b, 0x31, 0x11, 0xe5, 0x39, 0x2b, 0xd3, 0xa0, 0x3c, 0x2b,
+  0xb4, 0x53, 0x29, 0x55, 0x3c, 0xd9, 0x81, 0xd7, 0x2f, 0xc5, 0xe9, 0x2b, 0x71, 0xba, 0x6a, 0xce,
+  0x68, 0x1b, 0x2a, 0xd2, 0x16, 0xb1, 0xbe, 0x0a, 0xbb, 0xbc, 0x05, 0xc3, 0x0e, 0x98, 0xa3, 0x11,
+  0x12, 0xb2, 0xc6, 0x7a, 0x15, 0xf7, 0x44, 0xa1, 0x58, 0xd1, 0x45, 0x68, 0x2b, 0xde, 0x21, 0x0e,
+  0xe9, 0x5c, 0xca, 0xb5, 0xc5, 0x6e, 0x6c, 0x84, 0x0e, 0xbd, 0x7c, 0x67, 0xa3, 0x0e, 0x21, 0x6c,
+  0x2c, 0xc8, 0x69, 0x65, 0x19, 0xc1, 0x81, 0x4a, 0x90, 0x38, 0x43, 0x15, 0xc9, 0xaf, 0x8a, 0x7f,
+  0x6b, 0x9c, 0xf2, 0x1b, 0x92, 0xc5, 0xf6, 0x6b, 0x56, 0x64, 0x13, 0x8e, 0x3c, 0xf4, 0x45, 0xa4,
+  0xce, 0x82, 0x33, 0x49, 0xd8, 0x70, 0xa0, 0x3d, 0x52, 0xfc, 0x49, 0x2d, 0xd2, 0x76, 0x7d, 0x91,
+  0xe5, 0xaf, 0x5a, 0x9a, 0x70, 0x95, 0x1e, 0x47, 0x92, 0x76, 0x0a, 0xa9, 0x54, 0x79, 0x87, 0xd2,
+  0xfa, 0x61, 0x44, 0x36, 0xcb, 0xd5, 0x5a, 0x07, 0xc7, 0x40, 0x1f, 0x45, 0x8d, 0xf0, 0x38, 0xda,
+  0x08, 0x66, 0x46, 0x37, 0x23, 0x22, 0x65, 0x72, 0x86, 0xcf, 0x32, 0x12, 0xd9, 0xec, 0xd4, 0x49,
+  0x29, 0xe7, 0xf2, 0x3f, 0xa0, 0xf3, 0x61, 0xd2, 0x5e, 0x3b, 0xab, 0x37, 0x15, 0xbf, 0x9c, 0xa4,
+  0xbf, 0xa4, 0xa8, 0xff, 0x6a, 0xca, 0x1e, 0xd5, 0xa5, 0xb1, 0xdb, 0x22, 0x5b, 0x39, 0x05, 0x95,
+  0x68, 0xea, 0xcc, 0x4e, 0xe9, 0x13, 0x42, 0x10, 0x38, 0x93, 0xdf, 0xe6, 0x65, 0x99, 0x09, 0xcc,
+  0x07, 0x64, 0xda, 0x05, 0x3a, 0x84, 0x48, 0xb3, 0xb6, 0x11, 0x52, 0x97, 0xfd, 0x18, 0xd4, 0x1a,
+  0xd8, 0xf9, 0xb2, 0x94, 0xc4, 0x37, 0xad, 0x3b, 0xa5, 0x6e, 0x8a, 0xe0, 0xf4, 0x6f, 0xff, 0x04,
+  0xbf, 0xf4, 0xfc, 0x82, 0xf1, 0x03, 0x00, 0x00
 };
 
 

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
@@ -1753,7 +1753,7 @@ const uint8_t PAGE_settings_sec[] PROGMEM = {
   0xe3, 0x31, 0x6e, 0xb9, 0x6d, 0x91, 0x34, 0x85, 0xd0, 0xfe, 0x8c, 0x84, 0x86, 0x9b, 0x55, 0xe3,
   0x10, 0x57, 0xf7, 0xde, 0xb1, 0xd4, 0x89, 0x52, 0x6a, 0x26, 0x45, 0x8f, 0x66, 0xf0, 0x1e, 0xfa,
   0x74, 0xac, 0xa7, 0xf4, 0x73, 0xd7, 0xc7, 0x71, 0x8e, 0x16, 0xc9, 0x07, 0xb4, 0x4c, 0x49, 0xd0,
-  0x61, 0x77, 0x42, 0x13, 0xcd, 0xb0, 0xdd, 0x70, 0xef, 0x79, 0xb8, 0xb7, 0x33, 0xde, 0x5b, 0x71,
+  0x61, 0x77, 0x42, 0x13, 0xcd, 0xb0, 0xdd, 0x70, 0xef, 0x79, 0xb8, 0xb7, 0x33, 0xde, 0x5f, 0x71,
   0xd5, 0xcf, 0x68, 0x58, 0xc8, 0x99, 0xec, 0xb9, 0x6b, 0x1b, 0x4d, 0xb0, 0x4a, 0x9b, 0x1d, 0xb0,
   0xe1, 0x4e, 0xa2, 0x45, 0x2a, 0x29, 0x49, 0x3b, 0xf7, 0xf5, 0x6f, 0x6e, 0x45, 0xb7, 0x16, 0x74,
   0x01, 0x05, 0xff, 0x49, 0x51, 0xd3, 0xa8, 0x29, 0x45, 0x22, 0xc1, 0x39, 0x16, 0x1d, 0x61, 0xb6,
@@ -1767,8 +1767,8 @@ const uint8_t PAGE_settings_sec[] PROGMEM = {
   0x28, 0x34, 0xbc, 0x82, 0x1b, 0xc6, 0xa0, 0x41, 0x82, 0x50, 0x71, 0x5d, 0x2e, 0x5a, 0x26, 0x30,
   0xb2, 0xe4, 0x54, 0xb3, 0xee, 0x27, 0x05, 0xe6, 0x7e, 0x25, 0x20, 0xaa, 0xa7, 0x2d, 0x35, 0xaf,
   0x52, 0x9d, 0x10, 0x4b, 0xd4, 0x3f, 0xc3, 0x7c, 0x77, 0x90, 0xfd, 0x76, 0x8e, 0xed, 0xfc, 0xd4,
-  0x20, 0xdb, 0xa3, 0x6e, 0x83, 0x0f, 0x9a, 0xdf, 0x69, 0x98, 0xa7, 0x1f, 0x77, 0xff, 0x0b, 0x94,
-  0xf4, 0x73, 0x6b, 0xec, 0x15, 0x00, 0x00
+  0x20, 0xdb, 0xa3, 0x6e, 0x83, 0x0f, 0x9a, 0xdf, 0x69, 0x98, 0xa7, 0x1f, 0x77, 0xff, 0x0b, 0x3a,
+  0x94, 0x16, 0xe4, 0xec, 0x15, 0x00, 0x00
 };