From 4a09e18d9ac43c7ba4a02193f20894f21b6a08c9 Mon Sep 17 00:00:00 2001 From: Frank <91616163+softhack007@users.noreply.github.com> Date: Mon, 2 Jan 2023 22:52:37 +0100 Subject: [PATCH 01/11] UM Battery: fix compilation error + bad snprintf --- usermods/Battery/usermod_v2_Battery.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usermods/Battery/usermod_v2_Battery.h b/usermods/Battery/usermod_v2_Battery.h index c46a8791..62b7b82d 100644 --- a/usermods/Battery/usermod_v2_Battery.h +++ b/usermods/Battery/usermod_v2_Battery.h @@ -198,7 +198,7 @@ class UsermodBattery : public Usermod // still don't know much about MQTT and/or HA if (WLED_MQTT_CONNECTED) { char buf[64]; // buffer for snprintf() - snprintf_P(buf, 63, PSTR("/voltage"), mqttDeviceTopic); + snprintf_P(buf, 63, PSTR("/voltage%s"), mqttDeviceTopic); mqtt->publish(buf, 0, false, String(voltage).c_str()); } @@ -393,7 +393,7 @@ class UsermodBattery : public Usermod } #ifdef ARDUINO_ARCH_ESP32 - newBatteryPin = battery[F("pin"] | newBatteryPin; + newBatteryPin = battery[F("pin")] | newBatteryPin; #endif // calculateTimeLeftEnabled = battery[F("time-left")] | calculateTimeLeftEnabled; setMinBatteryVoltage(battery[F("min-Voltage")] | minBatteryVoltage); @@ -727,4 +727,4 @@ const char UsermodBattery::_enabled[] PROGMEM = "enabled"; const char UsermodBattery::_threshold[] PROGMEM = "threshold"; const char UsermodBattery::_preset[] PROGMEM = "preset"; const char UsermodBattery::_duration[] PROGMEM = "duration"; -const char UsermodBattery::_init[] PROGMEM = "init"; \ No newline at end of file +const char UsermodBattery::_init[] PROGMEM = "init"; From faf616cbea4bbe6b72bed64e129c07450634b728 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 3 Jan 2023 14:17:42 +0100 Subject: [PATCH 02/11] fixing a potential stack corruption .. overlooked this one when reviewing the PR. @blazoncek, @ctjet : three questions on the new code remain, because its not clear to me if its correct. Please check. --- wled00/set.cpp | 9 ++++++--- wled00/xml.cpp | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/wled00/set.cpp b/wled00/set.cpp index 6314d7c8..664d008b 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -655,9 +655,12 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) strip.panel.reserve(strip.panels); // pre-allocate memory for (uint8_t i=0; ihasArg(pO)) break; + char pO[8] = { '\0' }; + snprintf_P(pO, 7, PSTR("P%d"), i); + pO[7] = '\0'; + uint8_t l = strlen(pO); + // softhack007: please check if the code below is correct. The first element is pO[0], so maybe you want to modify pO[l-1]? + pO[l] = 'B'; if (!request->hasArg(pO)) break; // softhack007: this line looks suspicious to me .. break() aborts the loop .. maybe you need continue()? pO[l] = 'B'; p.bottomStart = request->arg(pO).toInt(); pO[l] = 'R'; p.rightStart = request->arg(pO).toInt(); pO[l] = 'V'; p.vertical = request->arg(pO).toInt(); diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 21b73ae2..60473658 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -744,8 +744,11 @@ void getSettingsJS(byte subPage, char* dest) oappend(SET_F("addPanel(")); oappend(itoa(i,n,10)); oappend(SET_F(");")); - char pO[8]; sprintf_P(pO, PSTR("P%d"), i); - uint8_t l = strlen(pO); pO[l+1] = 0; + char pO[8] = { '\0' }; + snprintf_P(pO, 7, PSTR("P%d"), i); + pO[7] = '\0'; + uint8_t l = strlen(pO); + // softhack007: please check if the code below is correct. The first element is pO[0], so maybe you want to modify pO[l-1]? pO[l] = 'B'; sappend('v',pO,strip.panel[i].bottomStart); pO[l] = 'R'; sappend('v',pO,strip.panel[i].rightStart); pO[l] = 'V'; sappend('v',pO,strip.panel[i].vertical); From 7ef184223764887f927248bedfbbbb7241d4decf Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 3 Jan 2023 15:16:45 +0100 Subject: [PATCH 03/11] comments updated see discussion in https://github.com/Aircoookie/WLED/commit/faf616cbea4bbe6b72bed64e129c07450634b728 --- wled00/set.cpp | 6 +++--- wled00/xml.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wled00/set.cpp b/wled00/set.cpp index 664d008b..40301a49 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -656,11 +656,11 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) for (uint8_t i=0; ihasArg(pO)) break; // softhack007: this line looks suspicious to me .. break() aborts the loop .. maybe you need continue()? + // create P0B, P1B, ..., P63B, etc for other PxxX + pO[l] = 'B'; if (!request->hasArg(pO)) break; pO[l] = 'B'; p.bottomStart = request->arg(pO).toInt(); pO[l] = 'R'; p.rightStart = request->arg(pO).toInt(); pO[l] = 'V'; p.vertical = request->arg(pO).toInt(); diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 60473658..80d9e4a8 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -745,10 +745,10 @@ void getSettingsJS(byte subPage, char* dest) oappend(itoa(i,n,10)); oappend(SET_F(");")); char pO[8] = { '\0' }; - snprintf_P(pO, 7, PSTR("P%d"), i); + snprintf_P(pO, 7, PSTR("P%d"), i); // MAX_PANELS is 64 so pO will always only be 4 characters or less pO[7] = '\0'; uint8_t l = strlen(pO); - // softhack007: please check if the code below is correct. The first element is pO[0], so maybe you want to modify pO[l-1]? + // create P0B, P1B, ..., P63B, etc for other PxxX pO[l] = 'B'; sappend('v',pO,strip.panel[i].bottomStart); pO[l] = 'R'; sappend('v',pO,strip.panel[i].rightStart); pO[l] = 'V'; sappend('v',pO,strip.panel[i].vertical); From 6270d2408f47da1463acd7c50b457a7ac67d0ea4 Mon Sep 17 00:00:00 2001 From: Frank <91616163+softhack007@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:29:15 +0100 Subject: [PATCH 04/11] UM Battery: fix build error on linux Fixes build error on linux: wled00/usermods_list.cpp:15:54: fatal error: ../usermods/battery/usermod_v2_battery.h: No such file or directory compilation terminated. --- wled00/usermods_list.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wled00/usermods_list.cpp b/wled00/usermods_list.cpp index 4e459988..ee1e7bc3 100644 --- a/wled00/usermods_list.cpp +++ b/wled00/usermods_list.cpp @@ -12,7 +12,7 @@ //#include "../usermods/EXAMPLE_v2/usermod_v2_example.h" #ifdef USERMOD_BATTERY - #include "../usermods/battery/usermod_v2_battery.h" + #include "../usermods/Battery/usermod_v2_battery.h" #endif #ifdef USERMOD_DALLASTEMPERATURE From e9616916456cc2fb0ecc69d1a20ac11533211ad6 Mon Sep 17 00:00:00 2001 From: Frank <91616163+softhack007@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:36:35 +0100 Subject: [PATCH 05/11] Battery, second try --- wled00/usermods_list.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wled00/usermods_list.cpp b/wled00/usermods_list.cpp index ee1e7bc3..98226fd0 100644 --- a/wled00/usermods_list.cpp +++ b/wled00/usermods_list.cpp @@ -12,7 +12,7 @@ //#include "../usermods/EXAMPLE_v2/usermod_v2_example.h" #ifdef USERMOD_BATTERY - #include "../usermods/Battery/usermod_v2_battery.h" + #include "../usermods/Battery/usermod_v2_Battery.h" #endif #ifdef USERMOD_DALLASTEMPERATURE From 90c965a6ba9cdb5621c0b334ac547fea027ada9a Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Tue, 3 Jan 2023 17:12:35 +0100 Subject: [PATCH 06/11] Bugfix editing 2D set-up. --- wled00/data/settings_2D.htm | 35 +++-- wled00/html_settings.h | 279 ++++++++++++++++++------------------ 2 files changed, 154 insertions(+), 160 deletions(-) diff --git a/wled00/data/settings_2D.htm b/wled00/data/settings_2D.htm index cfd77320..ffac029d 100644 --- a/wled00/data/settings_2D.htm +++ b/wled00/data/settings_2D.htm @@ -24,6 +24,7 @@ //console.log("File loaded"); GetV(); UI(); + Sf.MPC.setAttribute("max",maxPanels); }); // error event scE.addEventListener("error", (ev) => { @@ -44,29 +45,27 @@ loadJS(url, false); // If we set async false, file is loaded and executed, then next statement is processed } - function UI(panels=1) - { - gId("mpdiv").style.display = "block"; - + function UI() { if (gId("somp").value === "0") { gId("mpdiv").style.display = "none"; resetPanels(); return; } - - let i = gId("panels").children.length; - if (ipanels) for (let j=i; j>panels; j--) remPanel(); + gId("mpdiv").style.display = "block"; } function addPanels() { let c = parseInt(d.Sf.MPC.value); - for (let i=0; ic) for (let j=i; j>c; j--) remPanel(); } function addPanel(i=0) { let p = gId("panels"); if (p.children.length >= maxPanels) return; + var pw = parseInt(d.Sf.PW.value); + var ph = parseInt(d.Sf.PH.value); let b = `

Panel ${i}
1st LED:
Serpentine:
-Dimensions (WxH): x
+Dimensions (WxH): x
Offset X: Y:
(offset from top-left corner in # LEDs)
`; @@ -96,22 +95,21 @@ Y:
0; i--) e[i-1].remove(); } - +/* function btnPanel(i) { gId("pnl_add").style.display = (i1) ? "inline":"none"; } - +*/ function gen() { resetPanels(); var pansH = parseInt(d.Sf.MPH.value); var pansV = parseInt(d.Sf.MPV.value); var c = pansH*pansV; - //maxPanels = c; d.Sf.MPC.value = c; // number of panels var ps = d.Sf.PS.checked; @@ -136,7 +134,6 @@ Y:
@@ -156,8 +153,8 @@ Y:

Matrix Generator

Panel dimensions (WxH): x
- Horizontal panels: - Vertical panels:
+ Horizontal panels: + Vertical panels:
1st panel:
Populate

Panel set-up

- Number of panels:
+ Number of panels:
A matrix is made of 1 or more physical LED panels.
Each panel can be of different size and/or have different LED orientation and/or starting point and/or layout.

diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 77ca1a46..a7816b85 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -8,7 +8,7 @@ // Autogenerated from wled00/data/style.css, do not edit!! const uint16_t PAGE_settingsCss_length = 847; const uint8_t PAGE_settingsCss[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30, 0x10, 0xfd, 0x15, 0xaa, 0x68, 0xa5, 0xad, 0x14, 0x10, 0x10, 0xc8, 0xa6, 0x46, 0x95, 0xaa, 0xde, 0x7b, 0xab, 0xaa, 0x4a, 0xd5, 0x1e, 0x0c, 0x1e, 0x82, 0x15, 0x63, 0x23, 0xdb, 0x74, 0x49, 0x11, 0xff, 0x5e, 0xdb, 0xc0, 0x42, 0xb2, 0x68, 0x7b, 0xa9, 0xa2, 0x44, 0xc4, 0x63, 0xc6, 0x6f, 0xde, @@ -67,7 +67,7 @@ const uint8_t PAGE_settingsCss[] PROGMEM = { // Autogenerated from wled00/data/settings.htm, do not edit!! const uint16_t PAGE_settings_length = 985; const uint8_t PAGE_settings[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36, 0x10, 0xfe, 0xee, 0x5f, 0xc1, 0xb0, 0x58, 0x23, 0xa1, 0xb2, 0xec, 0x38, 0xc3, 0xb0, 0xc9, 0x96, 0x8b, 0x35, 0x2f, 0x9d, 0x87, 0x04, 0x0d, 0x90, 0xa4, 0xdd, 0x80, 0x7d, 0xa1, 0xc9, 0x93, 0xcc, 0x46, 0x22, 0x05, 0xf2, 0xe4, 0xc4, 0x73, 0xf3, 0xdf, 0x77, 0x94, 0x9d, 0xb7, 0x36, 0xd8, 0x8a, @@ -135,7 +135,7 @@ const uint8_t PAGE_settings[] PROGMEM = { // Autogenerated from wled00/data/settings_wifi.htm, do not edit!! const uint16_t PAGE_settings_wifi_length = 2098; const uint8_t PAGE_settings_wifi[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x58, 0x6b, 0x6f, 0xdb, 0xca, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xb5, 0x58, 0x6b, 0x6f, 0xdb, 0xca, 0x11, 0xfd, 0xae, 0x5f, 0xb1, 0xde, 0x16, 0x06, 0x09, 0xd3, 0x94, 0x64, 0x35, 0x69, 0x60, 0x8b, 0x4a, 0xfd, 0xd0, 0x8d, 0xdd, 0x3a, 0x8e, 0x0a, 0x19, 0xd7, 0x28, 0xd2, 0xe0, 0x5e, 0x9a, 0x1c, 0x49, 0x1b, 0x93, 0xbb, 0xbc, 0xdc, 0xa5, 0x64, 0xc3, 0xd6, 0x7f, 0xef, 0xcc, 0x2e, 0xf5, 0xb4, @@ -273,7 +273,7 @@ const uint8_t PAGE_settings_wifi[] PROGMEM = { // Autogenerated from wled00/data/settings_leds.htm, do not edit!! const uint16_t PAGE_settings_leds_length = 7445; const uint8_t PAGE_settings_leds[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48, 0x92, 0xef, 0x7c, 0x45, 0x3a, 0xbb, 0xc7, 0x25, 0x0d, 0x32, 0x48, 0x5c, 0xaa, 0x5d, 0x80, 0xf0, 0x1a, 0xbb, 0xaa, 0xda, 0x33, 0x76, 0xdb, 0xc7, 0xb8, 0xbb, 0x66, 0x4e, 0x75, 0x9d, 0x2a, 0x21, 0x12, 0x50, 0x59, 0x48, 0x8c, 0x24, 0x6c, 0xb3, 0x36, 0xfb, 0x4d, 0xfb, 0x0d, 0xfb, 0x65, 0x1b, @@ -745,7 +745,7 @@ const uint8_t PAGE_settings_leds[] PROGMEM = { // Autogenerated from wled00/data/settings_dmx.htm, do not edit!! const uint16_t PAGE_settings_dmx_length = 1612; const uint8_t PAGE_settings_dmx[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36, 0x10, 0x7d, 0xd7, 0x57, 0x20, 0x78, 0x88, 0xc9, 0x31, 0x43, 0x4a, 0x4e, 0x95, 0x36, 0x32, 0x49, 0x37, 0x56, 0x5c, 0xdb, 0x1d, 0xdb, 0xf5, 0x44, 0x49, 0xd3, 0x4e, 0xd3, 0xe9, 0x40, 0xe4, 0x4a, 0x44, 0x4c, 0x02, 0x2c, 0x00, 0x4a, 0x76, 0x2e, 0xff, 0xde, 0x05, 0x48, 0x5d, 0xec, 0xd8, 0x69, @@ -852,7 +852,7 @@ const uint8_t PAGE_settings_dmx[] PROGMEM = { // Autogenerated from wled00/data/settings_ui.htm, do not edit!! const uint16_t PAGE_settings_ui_length = 3181; const uint8_t PAGE_settings_ui[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38, 0x16, 0xfe, 0xce, 0xaf, 0x50, 0xd5, 0x39, 0x19, 0x38, 0x71, 0x81, 0xb4, 0xb3, 0x67, 0x5b, 0xc0, 0x64, 0x9b, 0x34, 0xd3, 0x66, 0x4e, 0x3a, 0xed, 0x96, 0x74, 0x3b, 0x73, 0xba, 0x3d, 0x19, 0x63, 0x0b, 0x50, 0x63, 0x5b, 0x1e, 0x4b, 0x0e, 0xc9, 0x52, 0xfe, 0xfb, 0x3e, 0x57, 0xb2, 0xc1, 0x90, @@ -1057,7 +1057,7 @@ const uint8_t PAGE_settings_ui[] PROGMEM = { // Autogenerated from wled00/data/settings_sync.htm, do not edit!! const uint16_t PAGE_settings_sync_length = 3345; const uint8_t PAGE_settings_sync[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x5a, 0xeb, 0x73, 0xe2, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x5a, 0xeb, 0x73, 0xe2, 0x38, 0x12, 0xff, 0xee, 0xbf, 0x42, 0xe3, 0xad, 0x9a, 0x83, 0x0d, 0x01, 0x13, 0x42, 0x26, 0x93, 0x60, 0xcf, 0x85, 0x90, 0x49, 0xb8, 0x9d, 0x24, 0x0c, 0x24, 0xfb, 0xa8, 0xba, 0xaa, 0x2d, 0x61, 0x0b, 0x70, 0x62, 0x5b, 0x5e, 0x4b, 0xce, 0xa3, 0x66, 0xe7, 0x7f, 0xbf, 0x6e, 0xc9, 0x36, 0xe0, 0xf0, @@ -1273,7 +1273,7 @@ const uint8_t PAGE_settings_sync[] PROGMEM = { // Autogenerated from wled00/data/settings_time.htm, do not edit!! const uint16_t PAGE_settings_time_length = 3313; const uint8_t PAGE_settings_time[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38, 0xf6, 0x7b, 0x7e, 0x85, 0x50, 0x7b, 0x98, 0x78, 0x70, 0x9e, 0x90, 0x16, 0x92, 0xd8, 0xdd, 0x10, 0xd2, 0x42, 0x4b, 0x02, 0x67, 0x92, 0x0e, 0xbb, 0xd3, 0xf6, 0x4c, 0x15, 0x5b, 0x49, 0x0c, 0x8e, 0xe4, 0xb5, 0x65, 0x02, 0x4b, 0xf9, 0xef, 0x7b, 0x25, 0x39, 0xce, 0xd3, 0xd0, 0x76, 0x66, 0x3f, @@ -1487,7 +1487,7 @@ const uint8_t PAGE_settings_time[] PROGMEM = { // Autogenerated from wled00/data/settings_sec.htm, do not edit!! const uint16_t PAGE_settings_sec_length = 2405; const uint8_t PAGE_settings_sec[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48, 0x12, 0xfe, 0xee, 0x5f, 0x31, 0x4c, 0xaa, 0x58, 0xeb, 0x22, 0x2c, 0x43, 0x72, 0x5b, 0x09, 0x20, 0xe7, 0x20, 0x90, 0x0d, 0x57, 0x10, 0x28, 0x6c, 0x36, 0x77, 0x95, 0x4b, 0xa5, 0xc6, 0xd2, 0xd8, 0x9a, 0x58, 0xd6, 0x68, 0x67, 0x46, 0x38, 0xbe, 0xec, 0xfe, 0xf7, 0x7b, 0x7a, 0x24, 0xd9, 0x86, @@ -1644,7 +1644,7 @@ const uint8_t PAGE_settings_sec[] PROGMEM = { // Autogenerated from wled00/data/settings_um.htm, do not edit!! const uint16_t PAGE_settings_um_length = 2748; const uint8_t PAGE_settings_um[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xcd, 0x59, 0x6d, 0x6f, 0xdb, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x59, 0x6d, 0x6f, 0xdb, 0x38, 0x12, 0xfe, 0x9e, 0x5f, 0xa1, 0xb0, 0x41, 0x22, 0xc1, 0x8a, 0xec, 0xb4, 0xbb, 0x40, 0xd7, 0xb6, 0x94, 0x6b, 0xd3, 0xee, 0xd6, 0xd7, 0x97, 0x04, 0x48, 0xbb, 0x8b, 0x43, 0x9a, 0x6b, 0x64, 0x89, 0xb6, 0xd9, 0xc8, 0xa4, 0x4e, 0xa4, 0xf2, 0x72, 0x8e, 0xff, 0xfb, 0x3d, 0x43, 0x49, 0xb6, 0x9c, @@ -1820,144 +1820,141 @@ const uint8_t PAGE_settings_um[] PROGMEM = { // Autogenerated from wled00/data/settings_2D.htm, do not edit!! -const uint16_t PAGE_settings_2D_length = 2053; +const uint16_t PAGE_settings_2D_length = 2010; const uint8_t PAGE_settings_2D[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x9d, 0x58, 0x6b, 0x53, 0xdc, 0x38, - 0x16, 0xfd, 0xee, 0x5f, 0x21, 0x34, 0xbb, 0x29, 0x3b, 0xb8, 0x5f, 0xcc, 0x4c, 0x6a, 0xaa, 0xdb, - 0x36, 0x1b, 0x1e, 0x3b, 0xb0, 0x05, 0x9b, 0xae, 0x74, 0x16, 0x42, 0x6d, 0xb6, 0x32, 0x6a, 0xfb, - 0x1a, 0x2b, 0xd8, 0x92, 0xcb, 0x52, 0xf3, 0x18, 0xc2, 0x7f, 0xdf, 0x2b, 0xd9, 0xed, 0x7e, 0x02, - 0x9b, 0xfd, 0x02, 0x58, 0xba, 0xf7, 0xe8, 0xea, 0x3e, 0x8f, 0x08, 0x76, 0x8e, 0x3e, 0x1c, 0x7e, - 0xba, 0x1a, 0x1f, 0x93, 0x4c, 0x17, 0x79, 0x14, 0x98, 0x9f, 0x24, 0x67, 0xe2, 0x3a, 0xa4, 0x20, - 0x28, 0x7e, 0x03, 0x4b, 0xa2, 0xa0, 0x00, 0xcd, 0x48, 0x9c, 0xb1, 0x4a, 0x81, 0x0e, 0xe9, 0x4c, - 0xa7, 0x9d, 0xdf, 0x68, 0xb3, 0xea, 0x08, 0x56, 0x40, 0x48, 0x6f, 0x39, 0xdc, 0x95, 0xb2, 0xd2, - 0x94, 0xc4, 0x52, 0x68, 0x10, 0x28, 0x76, 0xc7, 0x13, 0x9d, 0x85, 0xbf, 0xf6, 0xfb, 0xad, 0xe8, - 0xda, 0x56, 0x02, 0xb7, 0x3c, 0x86, 0x8e, 0xfd, 0xf0, 0xb9, 0xe0, 0x9a, 0xb3, 0xbc, 0xa3, 0x62, - 0x96, 0x43, 0x38, 0xf0, 0x0b, 0x76, 0xcf, 0x8b, 0x59, 0xd1, 0x7e, 0xcf, 0x14, 0x54, 0xf6, 0x83, - 0x4d, 0xf1, 0x5b, 0x48, 0xba, 0x71, 0x72, 0x14, 0x68, 0xae, 0x73, 0x88, 0xf6, 0x8e, 0xc8, 0x04, - 0x74, 0x67, 0x56, 0x06, 0xbd, 0x7a, 0x21, 0x50, 0x71, 0xc5, 0x4b, 0x1d, 0x39, 0xb7, 0xac, 0x22, - 0xb9, 0x8c, 0x79, 0xe9, 0x27, 0x61, 0x22, 0xe3, 0x59, 0x81, 0xc6, 0xf8, 0xb8, 0x10, 0xee, 0xd8, - 0xf3, 0xc6, 0x4c, 0x40, 0xae, 0xc2, 0x77, 0xbf, 0x8c, 0xd2, 0x99, 0x88, 0x35, 0x97, 0x82, 0x9c, - 0xb8, 0xde, 0xe3, 0x1d, 0x17, 0x89, 0xbc, 0xeb, 0xca, 0x12, 0x84, 0x4b, 0x33, 0xad, 0x4b, 0x35, - 0xec, 0xf5, 0x6e, 0x84, 0xec, 0xde, 0xe5, 0x90, 0x74, 0xaf, 0xa1, 0x97, 0x02, 0xd3, 0xb3, 0x0a, - 0x54, 0x6f, 0xef, 0x88, 0x7a, 0x4f, 0xad, 0xee, 0xc1, 0xba, 0x6e, 0x0f, 0xbd, 0xa7, 0xb9, 0xb8, - 0x56, 0xd4, 0xa7, 0x5f, 0x15, 0xe4, 0xe9, 0xb2, 0xf4, 0xf5, 0x69, 0xe2, 0x82, 0xf7, 0x58, 0x01, - 0x42, 0x09, 0x62, 0x70, 0xf5, 0x71, 0x0e, 0xc6, 0xc2, 0x83, 0x07, 0xbb, 0xb5, 0x10, 0xcd, 0x25, - 0x4b, 0xfe, 0x31, 0x71, 0xc1, 0x17, 0xe1, 0x4e, 0xdf, 0x7b, 0xcc, 0x41, 0x13, 0x1d, 0x26, 0xdd, - 0xb8, 0x42, 0x3b, 0xa0, 0x51, 0x72, 0x69, 0x7d, 0x69, 0xea, 0x8d, 0x74, 0x17, 0xcf, 0x7d, 0xaf, - 0x75, 0xc5, 0xa7, 0x33, 0x0d, 0xb8, 0x51, 0xc5, 0xd4, 0x07, 0xcf, 0x5f, 0x5f, 0xd7, 0x0f, 0x25, - 0xa0, 0x65, 0x1a, 0xee, 0x75, 0xef, 0x1b, 0xbb, 0x65, 0x73, 0x80, 0x0d, 0x41, 0xa6, 0x1e, 0x04, - 0x42, 0x08, 0xcf, 0x4f, 0xba, 0x53, 0x99, 0x3c, 0x74, 0x59, 0x89, 0xf7, 0x4b, 0x0e, 0x33, 0x9e, - 0x27, 0xae, 0x36, 0xf2, 0x2c, 0x49, 0x8e, 0x6f, 0xd1, 0x8a, 0x33, 0xae, 0x30, 0xe0, 0x50, 0xb9, - 0xd4, 0xd8, 0x4c, 0x7d, 0xd7, 0x0b, 0xa3, 0xc7, 0xdf, 0x41, 0x5f, 0xb8, 0x9e, 0xff, 0xaf, 0x53, - 0xd7, 0x7b, 0xda, 0x2e, 0x0c, 0x55, 0x25, 0x2b, 0xb4, 0x11, 0x85, 0x31, 0x65, 0x94, 0xcc, 0xa1, - 0x9b, 0xcb, 0x6b, 0x97, 0x1e, 0x9b, 0x75, 0xd2, 0x78, 0x00, 0x1d, 0x49, 0x52, 0x9e, 0x83, 0xbd, - 0x0b, 0xe6, 0x48, 0x85, 0x77, 0x3e, 0x6b, 0xd6, 0x65, 0x6a, 0xd2, 0x30, 0xe5, 0xd7, 0xb3, 0x8a, - 0x59, 0x97, 0xd5, 0x77, 0x21, 0x29, 0xe3, 0x26, 0x66, 0x5f, 0xc4, 0xa9, 0x88, 0x65, 0x51, 0xa2, - 0xe7, 0x80, 0x94, 0xec, 0x1a, 0x48, 0xc2, 0x34, 0xdb, 0xc1, 0x70, 0x2c, 0x79, 0x79, 0x82, 0xe1, - 0xa3, 0xe6, 0x80, 0x21, 0x0d, 0xc3, 0x26, 0x8e, 0x98, 0x2b, 0x16, 0xaf, 0x5b, 0x56, 0x52, 0xcb, - 0x58, 0xe6, 0x6f, 0xde, 0xb8, 0x36, 0x7f, 0xfa, 0xbe, 0x6b, 0x13, 0x2b, 0x34, 0x12, 0xf9, 0x44, - 0xcb, 0x0a, 0x51, 0x4d, 0x0c, 0x4f, 0x35, 0x14, 0xe6, 0xf6, 0xf1, 0x69, 0x49, 0x3d, 0xef, 0xfb, - 0xf7, 0x46, 0x0c, 0xf5, 0x8b, 0x12, 0x0d, 0xfe, 0x3b, 0xe2, 0x93, 0x73, 0x99, 0x40, 0x97, 0x8c, - 0x73, 0x60, 0x0a, 0x08, 0x3a, 0x02, 0x2a, 0x72, 0x79, 0x76, 0x7c, 0x44, 0x4e, 0xc7, 0x68, 0x92, - 0xbf, 0x82, 0xa8, 0x56, 0x11, 0x7d, 0x8b, 0xe6, 0x79, 0x46, 0xca, 0xe6, 0x84, 0x81, 0xdf, 0xb7, - 0x49, 0x8a, 0x39, 0x4a, 0x77, 0xed, 0xf6, 0x90, 0x52, 0x6f, 0x77, 0x91, 0x7c, 0x3d, 0xd5, 0xfd, - 0xa6, 0xf6, 0xcb, 0x70, 0xd0, 0xa7, 0xfe, 0xce, 0x60, 0xe9, 0xc2, 0x18, 0x10, 0x2c, 0x34, 0xef, - 0x91, 0xa7, 0xae, 0x49, 0x46, 0x5a, 0x94, 0x09, 0xbf, 0xa5, 0x5e, 0x57, 0xe9, 0x07, 0x0c, 0x40, - 0xc2, 0x55, 0x99, 0xb3, 0x87, 0x90, 0x4e, 0x11, 0xf4, 0x06, 0xf3, 0xa4, 0x8f, 0x6e, 0x09, 0xad, - 0xa0, 0xc2, 0xbb, 0xa0, 0xdc, 0x2d, 0xcb, 0x67, 0xe0, 0x35, 0x09, 0xfc, 0x12, 0x82, 0x90, 0x02, - 0xa3, 0x76, 0x2b, 0x79, 0x42, 0xb0, 0x6a, 0x40, 0xd7, 0x75, 0xe7, 0x7a, 0x23, 0x93, 0xc9, 0xa2, - 0xc6, 0x2c, 0xed, 0x1a, 0xea, 0xc6, 0x26, 0xab, 0x2a, 0x10, 0xdd, 0x1c, 0xc4, 0xb5, 0xce, 0x46, - 0x68, 0x9d, 0x08, 0xc0, 0x4b, 0x65, 0xe5, 0xd6, 0x89, 0x2f, 0x46, 0x3a, 0x80, 0x91, 0xde, 0xdd, - 0xf5, 0x30, 0x91, 0x2c, 0x14, 0xe6, 0xa0, 0x15, 0x8b, 0xd6, 0xc4, 0x22, 0x14, 0xeb, 0x74, 0xd0, - 0xc2, 0xa2, 0x16, 0x5b, 0xba, 0xfb, 0x5c, 0x15, 0xad, 0xb0, 0xf5, 0x04, 0x61, 0x69, 0x9a, 0xdd, - 0x29, 0x16, 0x52, 0xd2, 0x9d, 0xa4, 0xdd, 0xf3, 0xf1, 0x61, 0x73, 0xbf, 0xd1, 0x1c, 0x52, 0x84, - 0xfd, 0x11, 0x5a, 0x32, 0x12, 0xcb, 0x27, 0x8b, 0x2d, 0x98, 0xe8, 0xd5, 0xa6, 0x4a, 0xd7, 0xee, - 0x66, 0x8d, 0x5c, 0xbf, 0x60, 0x14, 0xb6, 0x9d, 0xa8, 0xf1, 0xe5, 0xa8, 0xbe, 0xc0, 0x1f, 0x01, - 0x3a, 0x93, 0xf0, 0x24, 0xa4, 0xa5, 0xc8, 0xff, 0xf2, 0x08, 0x4f, 0xa6, 0x3b, 0x57, 0x24, 0xce, - 0x99, 0x52, 0x21, 0x55, 0x45, 0x4e, 0x23, 0xab, 0x46, 0xcc, 0x5e, 0x30, 0xad, 0xa2, 0x2f, 0x62, - 0x10, 0xa8, 0x59, 0x19, 0x29, 0x1d, 0xf4, 0xcc, 0x6f, 0x82, 0x39, 0x35, 0x24, 0x01, 0x36, 0x1e, - 0x88, 0xd1, 0x16, 0xdb, 0x3c, 0xc7, 0x46, 0xf8, 0x80, 0xa2, 0xec, 0x17, 0x1d, 0xc8, 0xd2, 0xda, - 0x6d, 0xef, 0x19, 0x62, 0x7c, 0xa3, 0x4f, 0x12, 0x7b, 0x68, 0xbd, 0xba, 0x4d, 0x62, 0x40, 0xa3, - 0x03, 0xa9, 0xb5, 0x2c, 0x96, 0x84, 0xf0, 0x28, 0x8b, 0x1f, 0x6d, 0x39, 0xe7, 0xe3, 0x73, 0xe7, - 0x9c, 0x41, 0xaa, 0x5f, 0x39, 0xe8, 0x23, 0xbf, 0xce, 0xf4, 0xd6, 0x73, 0xec, 0x4d, 0x3f, 0x54, - 0x1c, 0x0b, 0xc7, 0xd6, 0xe6, 0xd6, 0x2b, 0x5e, 0x3c, 0x77, 0xf4, 0x89, 0xac, 0xf8, 0x9f, 0x38, - 0x96, 0x58, 0xfe, 0x8a, 0x01, 0x17, 0xd8, 0x60, 0x78, 0xbc, 0x22, 0xb6, 0x66, 0xc3, 0x04, 0x2a, - 0x6c, 0x83, 0x58, 0x63, 0x80, 0x26, 0x70, 0x51, 0xce, 0x30, 0x6a, 0xd8, 0x52, 0x43, 0x1a, 0x67, - 0x10, 0xdf, 0x4c, 0xe5, 0x3d, 0x5d, 0xb6, 0x68, 0x42, 0x1b, 0xb5, 0x23, 0x8e, 0xfd, 0x5a, 0x21, - 0xa2, 0x22, 0xee, 0xe5, 0xfd, 0x89, 0xd7, 0x2a, 0x9b, 0x50, 0x5b, 0xd1, 0xcb, 0x15, 0x45, 0xfc, - 0xaa, 0x61, 0xc5, 0xac, 0x98, 0x42, 0x45, 0x49, 0xc1, 0x85, 0xb1, 0x90, 0x60, 0xde, 0xe0, 0xef, - 0xbd, 0xdf, 0xe8, 0xdc, 0x6a, 0x9c, 0xd1, 0xe4, 0x7e, 0x03, 0xed, 0x64, 0x05, 0xed, 0xe4, 0x47, - 0xd0, 0x1a, 0x5f, 0xa7, 0x29, 0x16, 0x2d, 0xf9, 0x3c, 0x5c, 0x47, 0xfe, 0xbc, 0x82, 0xfc, 0x79, - 0x2b, 0x72, 0xbf, 0x41, 0xde, 0xfb, 0xf5, 0x1d, 0x5d, 0x0a, 0xc3, 0x17, 0x71, 0xb5, 0x01, 0x77, - 0xb5, 0x02, 0x77, 0xf5, 0x23, 0x70, 0xc6, 0xd0, 0x80, 0x47, 0xae, 0xac, 0x4d, 0x4d, 0xb1, 0xdb, - 0x12, 0x2d, 0xcb, 0x4e, 0x8e, 0x89, 0x86, 0x93, 0xa1, 0xc2, 0x29, 0x43, 0xb8, 0x20, 0x3f, 0x99, - 0x92, 0x50, 0x5e, 0xd0, 0xe3, 0x36, 0x9a, 0x58, 0x5f, 0xd1, 0x1f, 0x23, 0xd1, 0xe5, 0x02, 0xb9, - 0x86, 0x7e, 0x9f, 0x7c, 0x63, 0x31, 0xc6, 0xf3, 0xe4, 0xd3, 0xf9, 0x99, 0x4b, 0xa7, 0x80, 0x75, - 0x0f, 0x38, 0xe5, 0xa8, 0xaf, 0x97, 0x6a, 0x7c, 0xd1, 0x4b, 0x9a, 0xb6, 0xb1, 0xbd, 0x79, 0x8d, - 0x0c, 0xf3, 0x10, 0x21, 0xcc, 0x9b, 0x98, 0x08, 0xc2, 0xc1, 0xf7, 0xef, 0xf0, 0x6f, 0xd1, 0x19, - 0xfc, 0xa7, 0x8b, 0x18, 0xf2, 0x16, 0xdc, 0x15, 0xd4, 0xa5, 0xae, 0xf8, 0xb8, 0xda, 0x80, 0xc2, - 0x41, 0xdb, 0x81, 0xc0, 0xcc, 0xb9, 0xed, 0x07, 0x7a, 0xd0, 0xc2, 0xfe, 0xa0, 0xf8, 0xc2, 0x8a, - 0xa9, 0x16, 0x4d, 0xff, 0xf2, 0x1e, 0x6b, 0x35, 0x91, 0x7f, 0xc5, 0xa6, 0xb6, 0xd1, 0xd0, 0x21, - 0x68, 0x5b, 0xd6, 0x3e, 0xe5, 0x22, 0xc7, 0x0a, 0xa0, 0xc3, 0xa6, 0xcb, 0xb7, 0x8a, 0x88, 0xbf, - 0xa9, 0x18, 0x0d, 0xd6, 0x15, 0x96, 0x08, 0x11, 0x52, 0x26, 0xc3, 0x87, 0x96, 0x07, 0x84, 0x71, - 0xe3, 0x66, 0x6b, 0x3e, 0x69, 0x5a, 0x33, 0xf2, 0xa1, 0xf5, 0xad, 0x8b, 0xf9, 0x96, 0x0e, 0xe1, - 0xad, 0x18, 0xad, 0xb9, 0x52, 0x5b, 0xc0, 0x3c, 0xb4, 0xcb, 0xe3, 0x49, 0xd7, 0x16, 0x2a, 0x24, - 0x3e, 0x33, 0x15, 0x80, 0xd3, 0xad, 0x5e, 0x6f, 0x30, 0x7c, 0xb9, 0xb2, 0x7a, 0xd0, 0xac, 0xf2, - 0x95, 0xd5, 0x8f, 0xcd, 0x6a, 0xb5, 0x66, 0xc9, 0xf8, 0x72, 0x6e, 0x48, 0xb9, 0xbe, 0xd3, 0x5a, - 0xaf, 0x42, 0xb6, 0x2f, 0x86, 0xe0, 0xcf, 0xf0, 0x37, 0x0c, 0xc5, 0x22, 0x6e, 0x61, 0xdf, 0x37, - 0xc3, 0x06, 0x82, 0xd9, 0x08, 0x70, 0xd8, 0x2c, 0x66, 0x5a, 0x1f, 0x47, 0x9f, 0x32, 0xa3, 0xcf, - 0x37, 0x43, 0xe8, 0x11, 0xde, 0xea, 0x45, 0x24, 0xde, 0xbc, 0x59, 0x1a, 0x4a, 0xf6, 0x9e, 0x71, - 0xe8, 0xb2, 0x7d, 0x3e, 0x94, 0xde, 0xfe, 0xac, 0x03, 0x9d, 0x01, 0x9e, 0x94, 0x9a, 0x15, 0x39, - 0xe4, 0xde, 0xbe, 0xea, 0x68, 0x5c, 0xd1, 0xa3, 0x34, 0x44, 0x4a, 0x03, 0x7f, 0xdd, 0xc3, 0x85, - 0x14, 0x17, 0xd2, 0x3a, 0x7e, 0x63, 0xba, 0x2b, 0x76, 0xe9, 0xe7, 0xf9, 0x8c, 0x37, 0x5a, 0xf1, - 0x30, 0xf5, 0xde, 0x56, 0xcb, 0xdb, 0x57, 0xcb, 0xdb, 0xe9, 0x30, 0xf6, 0xde, 0x96, 0xcb, 0xdb, - 0x97, 0xed, 0xf6, 0x8a, 0xd6, 0x49, 0xbb, 0x5c, 0x3e, 0x3d, 0x39, 0xd8, 0x51, 0x6b, 0xaa, 0x1e, - 0xd8, 0x44, 0x89, 0xfe, 0xc6, 0x0b, 0x43, 0xed, 0xc9, 0xac, 0xca, 0x91, 0x66, 0xd8, 0xdc, 0x89, - 0x95, 0x99, 0x9c, 0x28, 0x68, 0x05, 0x82, 0x5e, 0xfd, 0x40, 0x31, 0x34, 0x14, 0x89, 0xa1, 0x61, - 0x41, 0x21, 0x45, 0xe6, 0x86, 0x2d, 0x00, 0xdd, 0x54, 0x38, 0xb6, 0x9b, 0x98, 0xbf, 0xbe, 0xaa, - 0x79, 0x37, 0x99, 0xa4, 0xd8, 0x33, 0x40, 0x67, 0xd2, 0x4c, 0x52, 0xa9, 0xcc, 0xbb, 0xc1, 0x0c, - 0xd6, 0x66, 0x8e, 0x62, 0x97, 0xa8, 0xe4, 0xdd, 0xea, 0x5a, 0x06, 0x79, 0x89, 0x33, 0xd2, 0x09, - 0x90, 0xfe, 0x6a, 0xcc, 0xcc, 0xba, 0x0f, 0xd5, 0x1f, 0x14, 0x4f, 0x8d, 0x73, 0x1e, 0xdf, 0x84, - 0xf4, 0xc4, 0x1c, 0xbb, 0x1f, 0xf4, 0xea, 0x8d, 0xa8, 0xee, 0x27, 0xdb, 0x75, 0x9c, 0x56, 0xe9, - 0xc0, 0x28, 0x1d, 0xb0, 0xf8, 0x66, 0xa1, 0xb7, 0xa2, 0xa1, 0x66, 0xd3, 0x82, 0xa3, 0x8d, 0x13, - 0x76, 0x0b, 0x0b, 0x91, 0xac, 0x9a, 0xc3, 0x67, 0x7b, 0x91, 0x83, 0x0f, 0x1e, 0x2c, 0x12, 0xf3, - 0xde, 0xc1, 0xaf, 0x09, 0xd2, 0xf4, 0x92, 0x20, 0x4d, 0xb6, 0x45, 0xbe, 0x18, 0x86, 0xc6, 0x11, - 0x96, 0xa8, 0xcd, 0xdd, 0xf0, 0xe1, 0x7c, 0x5c, 0x1b, 0x92, 0xe1, 0x6b, 0x0f, 0x17, 0x56, 0x2a, - 0xcd, 0x5f, 0x22, 0x44, 0x96, 0xa9, 0xa3, 0x47, 0x36, 0x66, 0xe7, 0x00, 0x1f, 0x5a, 0xe6, 0xb4, - 0x76, 0x24, 0x3a, 0x9b, 0x63, 0x13, 0x6d, 0x3b, 0x67, 0x28, 0x74, 0xdf, 0x0a, 0xad, 0x4c, 0xcd, - 0x96, 0xd3, 0xd4, 0x54, 0x91, 0x38, 0x36, 0xac, 0x21, 0x6d, 0x3a, 0xc4, 0xd0, 0xf6, 0x84, 0x0d, - 0x9e, 0x13, 0x64, 0x3f, 0x47, 0x35, 0x2a, 0xf9, 0xdd, 0xbc, 0x18, 0x18, 0xb2, 0x63, 0xbc, 0xfc, - 0xcf, 0x91, 0x53, 0x33, 0xa0, 0xe4, 0xb9, 0x91, 0xda, 0xcc, 0x93, 0xff, 0x61, 0x84, 0x3a, 0xdb, - 0x66, 0x68, 0xa3, 0xfe, 0xc3, 0x33, 0xd3, 0x59, 0xb0, 0x8c, 0x3a, 0x2c, 0x6a, 0xcd, 0xa2, 0xf3, - 0x57, 0x30, 0x17, 0x88, 0x03, 0x1b, 0x33, 0xab, 0x1b, 0xd2, 0x3a, 0x30, 0x64, 0x4e, 0x4d, 0x9e, - 0xc3, 0xbe, 0x78, 0x0e, 0xdb, 0xd9, 0x04, 0x5f, 0xc3, 0x36, 0xd6, 0xaf, 0xb1, 0xc8, 0xb5, 0xbc, - 0x6a, 0x7c, 0x62, 0xeb, 0xe3, 0x45, 0x02, 0xf9, 0x2a, 0x79, 0xdc, 0xa0, 0x8e, 0xcd, 0x03, 0x7f, - 0xfc, 0x71, 0x5b, 0xf2, 0xad, 0x70, 0xc6, 0xd7, 0xf8, 0xa2, 0xb3, 0x92, 0x74, 0x2f, 0x91, 0xc5, - 0x8b, 0x6d, 0x67, 0x2d, 0xc2, 0xe7, 0xbc, 0x70, 0xe4, 0x06, 0x43, 0x5c, 0x39, 0x74, 0x0b, 0x3b, - 0x74, 0x9e, 0xa1, 0x87, 0x93, 0x39, 0x81, 0x21, 0x4d, 0x35, 0xe0, 0x43, 0x53, 0x56, 0xc3, 0x9f, - 0x52, 0x86, 0xb6, 0x38, 0x87, 0x4c, 0x90, 0x52, 0x96, 0xb3, 0x1c, 0x1f, 0xfb, 0x86, 0xbf, 0xd4, - 0x01, 0x21, 0x58, 0x2d, 0x12, 0x31, 0xef, 0xb8, 0xce, 0x48, 0x59, 0x41, 0x87, 0x55, 0x95, 0xa9, - 0xeb, 0x04, 0x13, 0xc8, 0x14, 0x4a, 0xd7, 0xe6, 0xe1, 0xa7, 0x0c, 0x8b, 0xbc, 0x36, 0x59, 0x91, - 0x44, 0x12, 0x21, 0x35, 0x61, 0x69, 0x6a, 0xee, 0x9f, 0x72, 0xc1, 0xe6, 0x28, 0x5d, 0xc3, 0x88, - 0xac, 0x09, 0xaf, 0x74, 0x2f, 0x3b, 0xa3, 0xf1, 0xdd, 0xd1, 0x98, 0xb3, 0xdc, 0xa0, 0x36, 0x0a, - 0xb6, 0x2e, 0x4d, 0xd5, 0xfc, 0x67, 0xc6, 0x14, 0xeb, 0x3f, 0x6d, 0x3a, 0x1a, 0x56, 0xf2, 0x4c, - 0xe2, 0x1e, 0xbe, 0x58, 0x14, 0xef, 0x7e, 0x79, 0xb6, 0x2a, 0xda, 0x11, 0xab, 0x33, 0xae, 0x9a, - 0xf9, 0xea, 0xb5, 0xb4, 0xd0, 0x79, 0xdf, 0x38, 0x85, 0x70, 0x85, 0x7f, 0x25, 0x96, 0x18, 0x0d, - 0x4c, 0xcf, 0x2c, 0x90, 0xe3, 0x91, 0x32, 0x7b, 0x50, 0xb6, 0x9c, 0x5a, 0xe7, 0xaa, 0xda, 0x7b, - 0xc7, 0x2c, 0xce, 0x1a, 0x6f, 0xc7, 0x18, 0x84, 0xa9, 0xd5, 0x4b, 0x38, 0xfa, 0x0f, 0x29, 0x94, - 0x26, 0x8a, 0xff, 0x09, 0x84, 0x89, 0xa4, 0x87, 0x40, 0x19, 0xb6, 0xeb, 0xa5, 0x2d, 0x83, 0x24, - 0x17, 0x59, 0x37, 0x97, 0x52, 0x9a, 0x55, 0xe6, 0x4d, 0x8e, 0xf1, 0xe4, 0x28, 0xd5, 0xac, 0x36, - 0x31, 0x70, 0xda, 0x20, 0xa0, 0xaf, 0xd6, 0xe3, 0x6c, 0x1d, 0xb8, 0x78, 0x10, 0xd6, 0x7c, 0x6e, - 0x3e, 0x13, 0x9a, 0xc9, 0xb0, 0x08, 0x9f, 0xf3, 0xcc, 0xc4, 0xfa, 0xbf, 0x86, 0x0f, 0xda, 0x65, - 0x06, 0x2a, 0x1e, 0x63, 0x86, 0xae, 0x99, 0xc0, 0xe6, 0x1f, 0x87, 0xff, 0x05, 0xfe, 0x7e, 0xc2, - 0xdf, 0x48, 0x14, 0x00, 0x00 + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x9d, 0x58, 0x5b, 0x73, 0xdb, 0x36, + 0x16, 0x7e, 0xd7, 0xaf, 0x80, 0xd1, 0x6e, 0x86, 0x8c, 0x29, 0x4a, 0x72, 0xdb, 0x4c, 0x46, 0x22, + 0xe9, 0x8d, 0x2f, 0x5b, 0x79, 0xc7, 0x6e, 0x3c, 0x51, 0xd6, 0x8e, 0x67, 0xb3, 0xd3, 0xc2, 0xe4, + 0xa1, 0x84, 0x98, 0x04, 0x38, 0x04, 0x24, 0xdb, 0x75, 0xfc, 0xdf, 0x7b, 0x00, 0x52, 0x12, 0x75, + 0x4b, 0xbc, 0x7d, 0xb1, 0xcd, 0x83, 0x73, 0xc3, 0xb9, 0x7e, 0x70, 0xb0, 0x77, 0xf2, 0xfe, 0xf8, + 0xe3, 0xcd, 0xe5, 0x29, 0x99, 0xe8, 0x3c, 0x8b, 0x02, 0xf3, 0x93, 0x64, 0x4c, 0x8c, 0x43, 0x0a, + 0x82, 0xe2, 0x37, 0xb0, 0x24, 0x0a, 0x72, 0xd0, 0x8c, 0xc4, 0x13, 0x56, 0x2a, 0xd0, 0x21, 0x9d, + 0xea, 0xb4, 0xfd, 0x96, 0xd6, 0xd4, 0x96, 0x60, 0x39, 0x84, 0x74, 0xc6, 0xe1, 0xbe, 0x90, 0xa5, + 0xa6, 0x24, 0x96, 0x42, 0x83, 0x40, 0xb6, 0x7b, 0x9e, 0xe8, 0x49, 0xf8, 0x4b, 0xb7, 0xbb, 0x60, + 0x5d, 0x3b, 0x4a, 0x60, 0xc6, 0x63, 0x68, 0xdb, 0x0f, 0x8f, 0x0b, 0xae, 0x39, 0xcb, 0xda, 0x2a, + 0x66, 0x19, 0x84, 0x3d, 0x2f, 0x67, 0x0f, 0x3c, 0x9f, 0xe6, 0x8b, 0xef, 0xa9, 0x82, 0xd2, 0x7e, + 0xb0, 0x5b, 0xfc, 0x16, 0x92, 0x6e, 0x58, 0x8e, 0x02, 0xcd, 0x75, 0x06, 0xd1, 0xc1, 0x09, 0x19, + 0x81, 0x6e, 0x4f, 0x8b, 0xa0, 0x53, 0x11, 0x02, 0x15, 0x97, 0xbc, 0xd0, 0x51, 0x6b, 0xc6, 0x4a, + 0x92, 0xc9, 0x98, 0x17, 0x5e, 0x12, 0x26, 0x32, 0x9e, 0xe6, 0xe8, 0x8c, 0x87, 0x84, 0x70, 0xcf, + 0xda, 0xbb, 0x64, 0x02, 0x32, 0x15, 0xbe, 0xf9, 0x79, 0x90, 0x4e, 0x45, 0xac, 0xb9, 0x14, 0x64, + 0xe8, 0xb8, 0x4f, 0xf7, 0x5c, 0x24, 0xf2, 0xde, 0x97, 0x05, 0x08, 0x87, 0x4e, 0xb4, 0x2e, 0x54, + 0xbf, 0xd3, 0xb9, 0x13, 0xd2, 0xbf, 0xcf, 0x20, 0xf1, 0xc7, 0xd0, 0x49, 0x81, 0xe9, 0x69, 0x09, + 0xaa, 0x73, 0x70, 0x42, 0xdd, 0xe7, 0x85, 0xec, 0xd1, 0xba, 0x6c, 0x07, 0xa3, 0xa7, 0xb9, 0x18, + 0x2b, 0xea, 0xd1, 0xdf, 0x15, 0x64, 0x69, 0x93, 0x7b, 0x7c, 0x96, 0x38, 0xe0, 0x3e, 0x95, 0x80, + 0xaa, 0x04, 0x31, 0x7a, 0xf5, 0x69, 0x06, 0xc6, 0xc3, 0xa3, 0x47, 0x7b, 0xb4, 0x64, 0xcd, 0x24, + 0x4b, 0xfe, 0x3d, 0x72, 0xc0, 0x13, 0xe1, 0x5e, 0xd7, 0x7d, 0xca, 0x40, 0x13, 0x1d, 0x26, 0x7e, + 0x5c, 0xa2, 0x1f, 0x50, 0x0b, 0x39, 0xb4, 0xba, 0x34, 0x75, 0x07, 0xda, 0x47, 0xbb, 0xef, 0xb4, + 0x2e, 0xf9, 0xed, 0x54, 0x03, 0x1e, 0x94, 0x31, 0xf5, 0xc0, 0xf5, 0xd6, 0xe9, 0xfa, 0xb1, 0x00, + 0xf4, 0x4c, 0xc3, 0x83, 0xee, 0x7c, 0x61, 0x33, 0x36, 0x57, 0xb0, 0xc1, 0xc8, 0xd4, 0xa3, 0x40, + 0x15, 0xc2, 0xf5, 0x12, 0xff, 0x56, 0x26, 0x8f, 0x3e, 0x2b, 0xf0, 0x7e, 0xc9, 0xf1, 0x84, 0x67, + 0x89, 0xa3, 0x0d, 0x3f, 0x4b, 0x92, 0xd3, 0x19, 0x7a, 0x71, 0xce, 0x15, 0x26, 0x1c, 0x4a, 0x87, + 0x1a, 0x9f, 0xa9, 0xe7, 0xb8, 0x61, 0xf4, 0xf4, 0x2b, 0xe8, 0x2b, 0xc7, 0xf5, 0xfe, 0x73, 0x86, + 0x3f, 0x46, 0xa9, 0x7f, 0x71, 0x79, 0xbc, 0xa6, 0x1f, 0x53, 0x41, 0x97, 0xf9, 0x70, 0x9f, 0xb7, + 0x6b, 0x84, 0xb2, 0x94, 0x25, 0x5e, 0x04, 0x35, 0x62, 0x5d, 0x29, 0x99, 0x81, 0x9f, 0xc9, 0xb1, + 0x43, 0x4f, 0x0d, 0x9d, 0xd4, 0x61, 0xc2, 0x68, 0x93, 0x94, 0x67, 0x60, 0x2f, 0x8c, 0x85, 0x54, + 0x62, 0x60, 0xce, 0x6b, 0xba, 0x4c, 0x4d, 0xad, 0xa6, 0x7c, 0x3c, 0x2d, 0x99, 0x8d, 0x6b, 0x75, + 0x61, 0x92, 0x32, 0x6e, 0x12, 0xfb, 0x59, 0x9c, 0x89, 0x58, 0xe6, 0x05, 0x86, 0x17, 0x48, 0xc1, + 0xc6, 0x40, 0x12, 0xa6, 0xd9, 0x1e, 0xe6, 0xac, 0x91, 0x8a, 0x11, 0xe6, 0x98, 0x1a, 0x03, 0x7d, + 0x1a, 0x86, 0x75, 0xb2, 0xb1, 0xa0, 0xac, 0x3e, 0xbf, 0x28, 0xa5, 0x96, 0xb1, 0xcc, 0x5e, 0xbd, + 0x72, 0x6c, 0x91, 0x75, 0x3d, 0xc7, 0x56, 0x5f, 0x68, 0x38, 0xb2, 0x91, 0x96, 0x25, 0x6a, 0x35, + 0x89, 0x3e, 0xd3, 0x90, 0x9b, 0x10, 0xc5, 0x67, 0x05, 0x75, 0xdd, 0xaf, 0x5f, 0x6b, 0x36, 0x94, + 0xcf, 0x0b, 0x74, 0xf8, 0x5f, 0xa8, 0x9f, 0x5c, 0xc8, 0x04, 0x7c, 0x72, 0x99, 0x01, 0x53, 0x40, + 0x30, 0x10, 0x50, 0x92, 0xeb, 0xf3, 0xd3, 0x13, 0x72, 0x76, 0x89, 0x2e, 0x79, 0x2b, 0x1a, 0xd5, + 0xaa, 0x46, 0xcf, 0x6a, 0x73, 0x5d, 0xc3, 0x65, 0x0b, 0xc7, 0xa8, 0x3f, 0xb4, 0x95, 0x8c, 0x85, + 0x4c, 0xf7, 0xed, 0x71, 0x9f, 0x52, 0x77, 0x7f, 0x59, 0xa1, 0x1d, 0xe5, 0x7f, 0x51, 0x87, 0x45, + 0xd8, 0xeb, 0x52, 0x6f, 0xaf, 0xd7, 0xb8, 0xb0, 0xc9, 0xda, 0x13, 0x4f, 0x1d, 0xda, 0xc5, 0x0b, + 0x87, 0xa6, 0x68, 0xa9, 0x42, 0x2f, 0xa9, 0xeb, 0xcf, 0x58, 0x36, 0x05, 0xb7, 0xae, 0x5f, 0x7b, + 0x90, 0x17, 0x09, 0x9f, 0xe1, 0x89, 0xd2, 0x8f, 0x98, 0x9c, 0x84, 0xab, 0x22, 0x63, 0x8f, 0x21, + 0x15, 0x52, 0x60, 0x3e, 0x66, 0x92, 0x27, 0x04, 0x9b, 0x06, 0x74, 0x95, 0x66, 0xc7, 0x1d, 0x7c, + 0x4b, 0xe8, 0x16, 0xbd, 0xbc, 0xa3, 0x4b, 0x3f, 0xb0, 0x1e, 0xe6, 0x72, 0xb6, 0x01, 0x20, 0x2c, + 0xcc, 0x74, 0x3a, 0xc3, 0xca, 0x4f, 0xfc, 0xba, 0xaa, 0x2a, 0x8f, 0xb0, 0x4b, 0xac, 0xe2, 0xc2, + 0xb2, 0xa3, 0xe6, 0xd8, 0xd4, 0x69, 0x09, 0xc2, 0xcf, 0x40, 0x8c, 0xf5, 0x64, 0x80, 0xb7, 0x11, + 0x01, 0xb8, 0xa9, 0x2c, 0x9d, 0xaa, 0x95, 0xc4, 0x40, 0x07, 0x30, 0xd0, 0xfb, 0xfb, 0xee, 0xdc, + 0x0a, 0x56, 0xb5, 0x65, 0x8b, 0xd6, 0xd8, 0x22, 0x64, 0x6b, 0xb7, 0xf1, 0xd2, 0x79, 0xc5, 0xe6, + 0x6e, 0x3a, 0xe8, 0x40, 0x58, 0xf7, 0xe8, 0x9a, 0x1f, 0x56, 0xe1, 0xba, 0x33, 0x51, 0xb8, 0xac, + 0xfb, 0x2a, 0x94, 0x83, 0xca, 0xd8, 0x1f, 0x01, 0x86, 0x85, 0xf0, 0x24, 0xa4, 0x85, 0xc8, 0x7e, + 0x7c, 0x82, 0x67, 0x33, 0x9b, 0x4b, 0x12, 0x67, 0x4c, 0xa9, 0x90, 0xaa, 0x3c, 0xa3, 0x91, 0x15, + 0x23, 0xe6, 0x2c, 0xb8, 0x2d, 0xa3, 0xcf, 0xa2, 0x17, 0xa8, 0x69, 0x11, 0x29, 0x1d, 0x74, 0xcc, + 0x6f, 0x82, 0xc5, 0xd2, 0x27, 0x01, 0x8e, 0x1d, 0x88, 0xd1, 0x17, 0x3b, 0x3a, 0x2f, 0x0d, 0xf3, + 0x11, 0x45, 0xde, 0xcf, 0x3a, 0x90, 0x85, 0xf5, 0xdb, 0x06, 0x2d, 0xc4, 0xf4, 0x46, 0x1f, 0x25, + 0x4e, 0xd0, 0x8a, 0xba, 0x8d, 0xa3, 0x47, 0xa3, 0x23, 0xa9, 0xb5, 0xcc, 0x1b, 0x4c, 0x68, 0xca, + 0xea, 0x8f, 0xb6, 0xd8, 0xf9, 0xb0, 0xcb, 0xce, 0x39, 0xa4, 0xfa, 0x3b, 0x86, 0x3e, 0xf0, 0xf1, + 0x44, 0x6f, 0xb5, 0x63, 0x6f, 0xfa, 0xbe, 0xe4, 0xd8, 0x11, 0xb6, 0xe9, 0xb6, 0x5e, 0xf1, 0x6a, + 0x97, 0xe9, 0xa1, 0x2c, 0xf9, 0x9f, 0xb8, 0x94, 0x58, 0xf6, 0x1d, 0x07, 0xae, 0x70, 0x72, 0xf0, + 0x78, 0x85, 0x6d, 0xcd, 0x87, 0x11, 0x94, 0x38, 0x04, 0xb1, 0x79, 0x00, 0x5d, 0xe0, 0xa2, 0x98, + 0x62, 0xd6, 0x70, 0xa0, 0x86, 0x34, 0x9e, 0x40, 0x7c, 0x77, 0x2b, 0x1f, 0x68, 0xd3, 0xa3, 0x11, + 0xad, 0xc5, 0x4e, 0x38, 0x4e, 0x6b, 0x85, 0x1a, 0x15, 0x71, 0xae, 0x1f, 0x86, 0xee, 0x42, 0xd8, + 0xa4, 0xda, 0xb2, 0x5e, 0xaf, 0x08, 0xe2, 0x57, 0xa5, 0x56, 0x4c, 0xf3, 0x5b, 0x28, 0x29, 0xc9, + 0xb9, 0x30, 0x1e, 0x12, 0xac, 0x1b, 0xfc, 0x7d, 0xf0, 0x96, 0xce, 0xbd, 0xfe, 0xf1, 0x69, 0xb5, + 0x23, 0x2e, 0xaf, 0xeb, 0x86, 0xc0, 0xd2, 0x21, 0x0f, 0x1b, 0x66, 0x86, 0x2b, 0x66, 0x86, 0x7f, + 0xdf, 0xcc, 0x70, 0x69, 0xa6, 0xce, 0x4e, 0x9a, 0x62, 0x97, 0x93, 0x4f, 0xfd, 0x75, 0x93, 0x9f, + 0x56, 0x4c, 0x7e, 0xda, 0x6a, 0xb2, 0x5b, 0x9b, 0x3c, 0xf8, 0xe5, 0x0d, 0x6d, 0x24, 0xee, 0xb3, + 0xb8, 0xd9, 0x50, 0x77, 0xb3, 0xa2, 0xee, 0xe6, 0xff, 0x51, 0x67, 0x1c, 0x0d, 0x78, 0xe4, 0xc8, + 0xca, 0xd5, 0x14, 0x07, 0x2f, 0xd1, 0xb2, 0x68, 0x67, 0x58, 0x9a, 0xb8, 0x24, 0x4a, 0x5c, 0x38, + 0x84, 0x0b, 0xf2, 0x83, 0x69, 0x22, 0xe5, 0x06, 0x1d, 0x6e, 0xf3, 0x8f, 0x1d, 0x19, 0xfd, 0x31, + 0x10, 0x3e, 0x17, 0x88, 0x4d, 0xf4, 0xbb, 0xe4, 0x0b, 0x8b, 0xb1, 0x02, 0x86, 0x1f, 0x2f, 0xce, + 0x1d, 0x7a, 0x0b, 0x38, 0x28, 0x00, 0xb7, 0x22, 0xf5, 0x74, 0x63, 0x2a, 0x2c, 0x27, 0x45, 0x3d, + 0xb5, 0xb6, 0x8f, 0xa6, 0x81, 0x41, 0x2a, 0x22, 0x84, 0xf9, 0x88, 0x12, 0x41, 0xd8, 0xfb, 0xfa, + 0x15, 0xfe, 0x2b, 0xda, 0xbd, 0xff, 0xf9, 0xa8, 0x43, 0xce, 0xc0, 0x59, 0xd1, 0xda, 0x18, 0xa3, + 0x4f, 0xab, 0xf3, 0x2f, 0xec, 0x0d, 0xbe, 0x69, 0x69, 0x3e, 0xcf, 0x9a, 0xd6, 0xa2, 0xee, 0x40, + 0xe0, 0x58, 0xdb, 0x69, 0x6f, 0x8c, 0x68, 0xc6, 0x40, 0x95, 0xe6, 0xf0, 0x36, 0x1e, 0x6f, 0x0e, + 0xe1, 0xe1, 0x72, 0x08, 0xaf, 0x1f, 0x5d, 0xcd, 0x8f, 0x74, 0x08, 0xaf, 0xc5, 0x60, 0xcd, 0x6b, + 0x6d, 0x15, 0x66, 0x61, 0x55, 0x53, 0x23, 0xdf, 0x76, 0x11, 0x24, 0x1e, 0x33, 0x55, 0x88, 0x9b, + 0xa7, 0xa2, 0xd7, 0x3a, 0x3c, 0xb9, 0x42, 0x3d, 0xaa, 0xa9, 0x7c, 0x85, 0xfa, 0xa1, 0xa6, 0x96, + 0xe1, 0x8e, 0xbe, 0xf0, 0x54, 0xb8, 0xa3, 0x94, 0xbd, 0x22, 0x64, 0x87, 0xa2, 0x0f, 0xde, 0x14, + 0x7f, 0x43, 0x7f, 0x19, 0x34, 0x9c, 0xed, 0x78, 0xb3, 0xee, 0x00, 0x82, 0xe9, 0x00, 0x70, 0x5f, + 0x2c, 0x97, 0x43, 0x17, 0x77, 0x48, 0x61, 0x76, 0x88, 0x27, 0x90, 0xfe, 0x04, 0xaf, 0x75, 0xb0, + 0x98, 0xec, 0xaf, 0x5e, 0x2d, 0x96, 0x83, 0xa8, 0x02, 0x17, 0x87, 0x0e, 0x3b, 0xe4, 0x7d, 0xe9, + 0x1e, 0x4e, 0xdb, 0xd0, 0xee, 0xa1, 0xa5, 0xd4, 0x50, 0x64, 0x9f, 0xbb, 0x87, 0x45, 0x5b, 0x23, + 0x45, 0x0f, 0xd2, 0x10, 0x81, 0x04, 0xfc, 0xe3, 0x00, 0x09, 0x29, 0x12, 0x52, 0xcf, 0x26, 0xf4, + 0x92, 0xee, 0x8b, 0x7d, 0xfa, 0x69, 0xbe, 0x7f, 0x8d, 0x54, 0xdc, 0x4f, 0xdd, 0xd7, 0x65, 0xf3, + 0xf8, 0xa6, 0x79, 0x9c, 0xf6, 0x63, 0xf7, 0xb5, 0x6a, 0x1e, 0x5f, 0x2f, 0x8e, 0x57, 0xa4, 0x86, + 0x0b, 0xb2, 0x7a, 0x7e, 0x6e, 0xe1, 0xb8, 0xab, 0x50, 0x74, 0x60, 0x37, 0x73, 0xf4, 0x4f, 0x9e, + 0x1b, 0xd4, 0x4d, 0xa6, 0x65, 0x86, 0x10, 0xc0, 0x2e, 0xeb, 0x58, 0x99, 0xb5, 0x86, 0x8c, 0x96, + 0x21, 0xe8, 0x54, 0x6f, 0x07, 0x83, 0x10, 0x11, 0x8e, 0x19, 0xec, 0x11, 0x52, 0xc4, 0x4b, 0xd8, + 0x6d, 0x18, 0xa6, 0xbc, 0x65, 0x1b, 0xd7, 0xfc, 0xf5, 0xbb, 0x9a, 0x37, 0xee, 0x28, 0xc5, 0xf6, + 0x04, 0x3d, 0x91, 0x66, 0xcd, 0x49, 0x65, 0x20, 0xbd, 0xd9, 0x7a, 0xf5, 0x92, 0xc3, 0x86, 0x2c, + 0xe5, 0xfd, 0x2a, 0x6d, 0x02, 0x59, 0x81, 0x0b, 0xac, 0x15, 0x20, 0x72, 0xd4, 0x58, 0x99, 0x55, + 0xcb, 0x57, 0x1f, 0x14, 0xad, 0xc6, 0x19, 0x8f, 0xef, 0x42, 0x3a, 0x34, 0x66, 0x0f, 0x83, 0x4e, + 0x75, 0x10, 0x55, 0xad, 0xbb, 0x5d, 0xa6, 0xb5, 0x10, 0x3a, 0x32, 0x42, 0x47, 0x2c, 0xbe, 0x5b, + 0xca, 0xad, 0x48, 0xa8, 0xe9, 0x6d, 0xce, 0xd1, 0xc7, 0x11, 0x9b, 0xc1, 0x92, 0x65, 0x52, 0xce, + 0xd5, 0x4f, 0x0e, 0xa2, 0x16, 0xbe, 0x45, 0xb0, 0x49, 0xcc, 0x53, 0x04, 0xbf, 0x46, 0x88, 0x70, + 0x0b, 0x82, 0xe0, 0xd4, 0x76, 0xe1, 0x72, 0x53, 0x99, 0x40, 0x58, 0x10, 0x35, 0x0f, 0xc3, 0xfb, + 0x8b, 0xcb, 0xca, 0x91, 0x09, 0x3e, 0xc4, 0x90, 0xb0, 0xd2, 0x69, 0x5e, 0x03, 0xfa, 0x58, 0x10, + 0x8d, 0x11, 0xd9, 0x58, 0x6c, 0x3d, 0x7c, 0x03, 0x19, 0x6b, 0x8b, 0x7d, 0xd5, 0xda, 0xdc, 0x69, + 0xe8, 0xdb, 0x05, 0x43, 0xa6, 0x87, 0x05, 0xd3, 0xca, 0x4a, 0x5b, 0x00, 0x8e, 0x0a, 0x91, 0x91, + 0x96, 0x4d, 0x6b, 0x48, 0x6b, 0x48, 0xd6, 0xb7, 0x30, 0x6e, 0x03, 0x84, 0x04, 0x93, 0x9f, 0xa2, + 0x4a, 0x2b, 0xf9, 0xd5, 0xe0, 0x74, 0x86, 0x98, 0x14, 0x2f, 0xff, 0x53, 0xd4, 0xaa, 0xe0, 0x49, + 0xb2, 0x6b, 0xdf, 0xd5, 0xa3, 0xfb, 0x05, 0xfb, 0xad, 0x55, 0x5f, 0xe1, 0x6d, 0x73, 0x8f, 0xd5, + 0xe2, 0x2f, 0xdf, 0x5b, 0x6f, 0xab, 0xa9, 0xdf, 0x5a, 0x42, 0x80, 0x2a, 0x2d, 0x6a, 0xcd, 0xa3, + 0x8b, 0xef, 0xe8, 0x5c, 0x6a, 0xc4, 0x90, 0xb6, 0xc8, 0x1c, 0x28, 0xec, 0x52, 0x76, 0xf5, 0x72, + 0x65, 0xd6, 0xbd, 0x35, 0x10, 0xb7, 0x56, 0x39, 0xf5, 0xad, 0x8f, 0xb6, 0x95, 0x40, 0x13, 0xbe, + 0xcd, 0x4f, 0x5b, 0x3b, 0xb1, 0xdb, 0x2e, 0xe4, 0xf6, 0x61, 0x9b, 0x6a, 0x83, 0xd8, 0x5a, 0x1b, + 0xca, 0x77, 0xc1, 0xb5, 0x95, 0xaa, 0xda, 0x0a, 0xd5, 0xea, 0x97, 0x3c, 0x06, 0x27, 0x7a, 0x11, + 0x46, 0xdb, 0x8d, 0xcf, 0x5a, 0xdb, 0xad, 0xbe, 0x1c, 0x9c, 0x8d, 0xe6, 0x60, 0x60, 0x51, 0xef, + 0xf8, 0x80, 0x93, 0x65, 0xff, 0x87, 0x94, 0xa1, 0x2f, 0xc7, 0x4c, 0x90, 0x42, 0x16, 0xd3, 0x0c, + 0x1f, 0xda, 0x06, 0x0b, 0x54, 0xf9, 0x20, 0xd8, 0x0e, 0x12, 0x55, 0xde, 0x73, 0x3d, 0x21, 0x45, + 0x09, 0x6d, 0x56, 0x96, 0xa6, 0x71, 0x13, 0x4c, 0xaa, 0xe9, 0x04, 0xdf, 0x66, 0xf2, 0xe3, 0x04, + 0xbb, 0xb8, 0x72, 0x59, 0x91, 0x44, 0x12, 0x21, 0x35, 0x61, 0x69, 0x6a, 0xee, 0x9f, 0x72, 0xc1, + 0xe6, 0x5a, 0x7c, 0x83, 0x2e, 0xac, 0x0b, 0xdf, 0x19, 0x4f, 0x76, 0x09, 0x23, 0xea, 0xaf, 0xdd, + 0x69, 0x4e, 0xa0, 0x8d, 0x8e, 0xac, 0x7a, 0x4f, 0xd5, 0xff, 0x15, 0x31, 0xdd, 0xf8, 0x9b, 0x2d, + 0x3f, 0xf3, 0x06, 0xde, 0x51, 0xa8, 0xc7, 0xdf, 0x2c, 0xd4, 0x37, 0x3f, 0x37, 0x2a, 0xd5, 0x38, + 0x65, 0x85, 0x43, 0xda, 0x98, 0x4d, 0x0b, 0x54, 0xf5, 0xae, 0x0e, 0x03, 0xe1, 0x0a, 0xff, 0x4a, + 0xc0, 0x18, 0xed, 0x99, 0x31, 0x98, 0x23, 0x42, 0x22, 0xc5, 0xe4, 0x51, 0xd9, 0x86, 0x59, 0x84, + 0x53, 0xf9, 0x2d, 0x1b, 0xb0, 0x53, 0x16, 0x4f, 0xea, 0x00, 0xc7, 0x18, 0xf7, 0x5b, 0x2b, 0x98, + 0x70, 0x0c, 0x19, 0xe2, 0x16, 0x4d, 0x14, 0xff, 0x13, 0x08, 0x13, 0x49, 0x07, 0x35, 0x4d, 0x70, + 0x04, 0x37, 0x8e, 0x8c, 0x2a, 0xb9, 0x2c, 0xb4, 0x39, 0x97, 0xd2, 0xac, 0x34, 0xaf, 0x5b, 0x4c, + 0x21, 0x47, 0xae, 0x9a, 0x5a, 0x87, 0xbd, 0xb5, 0x88, 0x3b, 0x86, 0x67, 0x3d, 0xb5, 0x36, 0x66, + 0xcb, 0x17, 0x58, 0x05, 0xa2, 0xe6, 0x73, 0xbe, 0x9e, 0xf6, 0xcb, 0x8c, 0xb5, 0x76, 0x6c, 0xa1, + 0xbf, 0xb5, 0x50, 0xd0, 0x2f, 0xb3, 0x24, 0xd1, 0x8c, 0x59, 0xa4, 0x66, 0xab, 0x9a, 0xff, 0xd3, + 0xfd, 0x05, 0x3c, 0x62, 0xd3, 0x2a, 0xb7, 0x13, 0x00, 0x00 }; // Autogenerated from wled00/data/settings_pin.htm, do not edit!! const uint16_t PAGE_settings_pin_length = 471; const uint8_t PAGE_settings_pin[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31, 0x10, 0xbd, 0xef, 0xaf, 0x30, 0x73, 0x69, 0x82, 0x92, 0x6c, 0xa8, 0xa8, 0x04, 0xaa, 0xbd, 0x42, 0x81, 0x1e, 0xb8, 0x94, 0x48, 0xe5, 0x52, 0x55, 0x55, 0xe5, 0xd8, 0xb3, 0x89, 0x55, 0x7f, 0x2c, 0xb6, 0x37, 0x21, 0x54, 0xfc, 0x77, 0xc6, 0xbb, 0xa1, 0xa0, 0x5c, 0xd6, 0x7e, 0x33, 0xe3, 0x37, From 90463d86130f012b790fd0ba97345dc5c8ce1d8c Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Tue, 3 Jan 2023 17:14:24 +0100 Subject: [PATCH 07/11] Battery UM fix for MQTT voltage topic. --- usermods/Battery/usermod_v2_Battery.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usermods/Battery/usermod_v2_Battery.h b/usermods/Battery/usermod_v2_Battery.h index 62b7b82d..ba61edd2 100644 --- a/usermods/Battery/usermod_v2_Battery.h +++ b/usermods/Battery/usermod_v2_Battery.h @@ -198,7 +198,7 @@ class UsermodBattery : public Usermod // still don't know much about MQTT and/or HA if (WLED_MQTT_CONNECTED) { char buf[64]; // buffer for snprintf() - snprintf_P(buf, 63, PSTR("/voltage%s"), mqttDeviceTopic); + snprintf_P(buf, 63, PSTR("%s/voltage"), mqttDeviceTopic); mqtt->publish(buf, 0, false, String(voltage).c_str()); } From d039a40d7cd62df721c77a8663f73cb3b30cf274 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 3 Jan 2023 17:15:55 +0100 Subject: [PATCH 08/11] Invert pull up config value, fixes #2996 Cronixie usermod format change fix --- usermods/Cronixie/usermod_cronixie.h | 1 + wled00/cfg.cpp | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usermods/Cronixie/usermod_cronixie.h b/usermods/Cronixie/usermod_cronixie.h index 5702d8fa..534fd3a7 100644 --- a/usermods/Cronixie/usermod_cronixie.h +++ b/usermods/Cronixie/usermod_cronixie.h @@ -271,6 +271,7 @@ class UsermodCronixie : public Usermod { { if (root["nx"].is()) { strncpy(cronixieDisplay, root["nx"], 6); + setCronixie(); } } diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 20607255..8bd9aaeb 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -198,9 +198,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { // read multiple button configuration JsonObject btn_obj = hw["btn"]; - int pull = -1; // trick for inverted setting - CJSON(pull, btn_obj[F("pull")]); - if (pull>=0) disablePullUp = pull; + bool pull = btn_obj[F("pull")] | true; // if true, pullup is enabled + disablePullUp = !pull; JsonArray hw_btn_ins = btn_obj[F("ins")]; if (!hw_btn_ins.isNull()) { uint8_t s = 0; From e84b0c91f81b5dc866d5912eab64d41479c67326 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 3 Jan 2023 17:36:24 +0100 Subject: [PATCH 09/11] Update year --- wled00/cfg.cpp | 2 +- wled00/data/settings_sec.htm | 4 +- wled00/html_settings.h | 326 +++++++++++++++++------------------ wled00/wled.h | 2 +- 4 files changed, 167 insertions(+), 167 deletions(-) diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 8bd9aaeb..e2527581 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -198,7 +198,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { // read multiple button configuration JsonObject btn_obj = hw["btn"]; - bool pull = btn_obj[F("pull")] | true; // if true, pullup is enabled + bool pull = btn_obj[F("pull")] | (!disablePullUp); // if true, pullup is enabled disablePullUp = !pull; JsonArray hw_btn_ins = btn_obj[F("ins")]; if (!hw_btn_ins.isNull()) { diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm index a6098300..16f2f64b 100644 --- a/wled00/data/settings_sec.htm +++ b/wled00/data/settings_sec.htm @@ -89,7 +89,7 @@

Security & Update setup

Settings PIN:
-
⚠ Unencrypted transmission. Be prudent when selecting PIN, do NOT use your banking, door, SIM, etc. pin!


+
⚠ Unencrypted transmission. Be prudent when selecting PIN, do NOT use your banking, door, SIM, etc. pin!

Lock wireless (OTA) software update:
Passphrase:
To enable OTA, for security reasons you need to also enter the correct password!
@@ -118,7 +118,7 @@ WLED version ##VERSION##

Contributors, dependencies and special thanks
A huge thank you to everyone who helped me create WLED!

- (c) 2016-2022 Christian Schwinne
+ (c) 2016-2023 Christian Schwinne
Licensed under the MIT license

Server message: Response error!
diff --git a/wled00/html_settings.h b/wled00/html_settings.h index a7816b85..b10744c5 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -8,7 +8,7 @@ // Autogenerated from wled00/data/style.css, do not edit!! const uint16_t PAGE_settingsCss_length = 847; const uint8_t PAGE_settingsCss[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30, 0x10, 0xfd, 0x15, 0xaa, 0x68, 0xa5, 0xad, 0x14, 0x10, 0x10, 0xc8, 0xa6, 0x46, 0x95, 0xaa, 0xde, 0x7b, 0xab, 0xaa, 0x4a, 0xd5, 0x1e, 0x0c, 0x1e, 0x82, 0x15, 0x63, 0x23, 0xdb, 0x74, 0x49, 0x11, 0xff, 0x5e, 0xdb, 0xc0, 0x42, 0xb2, 0x68, 0x7b, 0xa9, 0xa2, 0x44, 0xc4, 0x63, 0xc6, 0x6f, 0xde, @@ -67,7 +67,7 @@ const uint8_t PAGE_settingsCss[] PROGMEM = { // Autogenerated from wled00/data/settings.htm, do not edit!! const uint16_t PAGE_settings_length = 985; const uint8_t PAGE_settings[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36, 0x10, 0xfe, 0xee, 0x5f, 0xc1, 0xb0, 0x58, 0x23, 0xa1, 0xb2, 0xec, 0x38, 0xc3, 0xb0, 0xc9, 0x96, 0x8b, 0x35, 0x2f, 0x9d, 0x87, 0x04, 0x0d, 0x90, 0xa4, 0xdd, 0x80, 0x7d, 0xa1, 0xc9, 0x93, 0xcc, 0x46, 0x22, 0x05, 0xf2, 0xe4, 0xc4, 0x73, 0xf3, 0xdf, 0x77, 0x94, 0x9d, 0xb7, 0x36, 0xd8, 0x8a, @@ -135,7 +135,7 @@ const uint8_t PAGE_settings[] PROGMEM = { // Autogenerated from wled00/data/settings_wifi.htm, do not edit!! const uint16_t PAGE_settings_wifi_length = 2098; const uint8_t PAGE_settings_wifi[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xb5, 0x58, 0x6b, 0x6f, 0xdb, 0xca, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x58, 0x6b, 0x6f, 0xdb, 0xca, 0x11, 0xfd, 0xae, 0x5f, 0xb1, 0xde, 0x16, 0x06, 0x09, 0xd3, 0x94, 0x64, 0x35, 0x69, 0x60, 0x8b, 0x4a, 0xfd, 0xd0, 0x8d, 0xdd, 0x3a, 0x8e, 0x0a, 0x19, 0xd7, 0x28, 0xd2, 0xe0, 0x5e, 0x9a, 0x1c, 0x49, 0x1b, 0x93, 0xbb, 0xbc, 0xdc, 0xa5, 0x64, 0xc3, 0xd6, 0x7f, 0xef, 0xcc, 0x2e, 0xf5, 0xb4, @@ -273,7 +273,7 @@ const uint8_t PAGE_settings_wifi[] PROGMEM = { // Autogenerated from wled00/data/settings_leds.htm, do not edit!! const uint16_t PAGE_settings_leds_length = 7445; const uint8_t PAGE_settings_leds[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48, 0x92, 0xef, 0x7c, 0x45, 0x3a, 0xbb, 0xc7, 0x25, 0x0d, 0x32, 0x48, 0x5c, 0xaa, 0x5d, 0x80, 0xf0, 0x1a, 0xbb, 0xaa, 0xda, 0x33, 0x76, 0xdb, 0xc7, 0xb8, 0xbb, 0x66, 0x4e, 0x75, 0x9d, 0x2a, 0x21, 0x12, 0x50, 0x59, 0x48, 0x8c, 0x24, 0x6c, 0xb3, 0x36, 0xfb, 0x4d, 0xfb, 0x0d, 0xfb, 0x65, 0x1b, @@ -745,7 +745,7 @@ const uint8_t PAGE_settings_leds[] PROGMEM = { // Autogenerated from wled00/data/settings_dmx.htm, do not edit!! const uint16_t PAGE_settings_dmx_length = 1612; const uint8_t PAGE_settings_dmx[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36, 0x10, 0x7d, 0xd7, 0x57, 0x20, 0x78, 0x88, 0xc9, 0x31, 0x43, 0x4a, 0x4e, 0x95, 0x36, 0x32, 0x49, 0x37, 0x56, 0x5c, 0xdb, 0x1d, 0xdb, 0xf5, 0x44, 0x49, 0xd3, 0x4e, 0xd3, 0xe9, 0x40, 0xe4, 0x4a, 0x44, 0x4c, 0x02, 0x2c, 0x00, 0x4a, 0x76, 0x2e, 0xff, 0xde, 0x05, 0x48, 0x5d, 0xec, 0xd8, 0x69, @@ -852,7 +852,7 @@ const uint8_t PAGE_settings_dmx[] PROGMEM = { // Autogenerated from wled00/data/settings_ui.htm, do not edit!! const uint16_t PAGE_settings_ui_length = 3181; const uint8_t PAGE_settings_ui[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38, 0x16, 0xfe, 0xce, 0xaf, 0x50, 0xd5, 0x39, 0x19, 0x38, 0x71, 0x81, 0xb4, 0xb3, 0x67, 0x5b, 0xc0, 0x64, 0x9b, 0x34, 0xd3, 0x66, 0x4e, 0x3a, 0xed, 0x96, 0x74, 0x3b, 0x73, 0xba, 0x3d, 0x19, 0x63, 0x0b, 0x50, 0x63, 0x5b, 0x1e, 0x4b, 0x0e, 0xc9, 0x52, 0xfe, 0xfb, 0x3e, 0x57, 0xb2, 0xc1, 0x90, @@ -1057,7 +1057,7 @@ const uint8_t PAGE_settings_ui[] PROGMEM = { // Autogenerated from wled00/data/settings_sync.htm, do not edit!! const uint16_t PAGE_settings_sync_length = 3345; const uint8_t PAGE_settings_sync[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x5a, 0xeb, 0x73, 0xe2, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x5a, 0xeb, 0x73, 0xe2, 0x38, 0x12, 0xff, 0xee, 0xbf, 0x42, 0xe3, 0xad, 0x9a, 0x83, 0x0d, 0x01, 0x13, 0x42, 0x26, 0x93, 0x60, 0xcf, 0x85, 0x90, 0x49, 0xb8, 0x9d, 0x24, 0x0c, 0x24, 0xfb, 0xa8, 0xba, 0xaa, 0x2d, 0x61, 0x0b, 0x70, 0x62, 0x5b, 0x5e, 0x4b, 0xce, 0xa3, 0x66, 0xe7, 0x7f, 0xbf, 0x6e, 0xc9, 0x36, 0xe0, 0xf0, @@ -1273,7 +1273,7 @@ const uint8_t PAGE_settings_sync[] PROGMEM = { // Autogenerated from wled00/data/settings_time.htm, do not edit!! const uint16_t PAGE_settings_time_length = 3313; const uint8_t PAGE_settings_time[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38, 0xf6, 0x7b, 0x7e, 0x85, 0x50, 0x7b, 0x98, 0x78, 0x70, 0x9e, 0x90, 0x16, 0x92, 0xd8, 0xdd, 0x10, 0xd2, 0x42, 0x4b, 0x02, 0x67, 0x92, 0x0e, 0xbb, 0xd3, 0xf6, 0x4c, 0x15, 0x5b, 0x49, 0x0c, 0x8e, 0xe4, 0xb5, 0x65, 0x02, 0x4b, 0xf9, 0xef, 0x7b, 0x25, 0x39, 0xce, 0xd3, 0xd0, 0x76, 0x66, 0x3f, @@ -1485,166 +1485,166 @@ const uint8_t PAGE_settings_time[] PROGMEM = { // Autogenerated from wled00/data/settings_sec.htm, do not edit!! -const uint16_t PAGE_settings_sec_length = 2405; +const uint16_t PAGE_settings_sec_length = 2407; const uint8_t PAGE_settings_sec[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48, - 0x12, 0xfe, 0xee, 0x5f, 0x31, 0x4c, 0xaa, 0x58, 0xeb, 0x22, 0x2c, 0x43, 0x72, 0x5b, 0x09, 0x20, - 0xe7, 0x20, 0x90, 0x0d, 0x57, 0x10, 0x28, 0x6c, 0x36, 0x77, 0x95, 0x4b, 0xa5, 0xc6, 0xd2, 0xd8, - 0x9a, 0x58, 0xd6, 0x68, 0x67, 0x46, 0x38, 0xbe, 0xec, 0xfe, 0xf7, 0x7b, 0x7a, 0x24, 0xd9, 0x86, - 0x40, 0x52, 0xa9, 0xfb, 0x00, 0xf6, 0xbc, 0x75, 0x4f, 0x3f, 0xdd, 0xfd, 0x74, 0x8f, 0x0f, 0xb7, - 0x4e, 0x2e, 0x5f, 0x8f, 0xfe, 0x7d, 0x75, 0xca, 0x32, 0x37, 0xcf, 0x07, 0x87, 0xf4, 0x9f, 0xe5, - 0xa2, 0x98, 0xc6, 0x5c, 0x16, 0x1c, 0x63, 0x29, 0xd2, 0xc1, 0xe1, 0x5c, 0x3a, 0xc1, 0x0a, 0x31, - 0x97, 0x31, 0xbf, 0x55, 0x72, 0x51, 0x6a, 0xe3, 0x38, 0x4b, 0x74, 0xe1, 0x64, 0xe1, 0x62, 0xbe, - 0x50, 0xa9, 0xcb, 0xe2, 0xbf, 0xf7, 0xfb, 0x7c, 0xd0, 0xa9, 0xb7, 0x76, 0xee, 0xad, 0xa5, 0xf2, - 0x56, 0x25, 0x72, 0xc7, 0x0f, 0x42, 0x55, 0x28, 0xa7, 0x44, 0xbe, 0x63, 0x13, 0x91, 0xcb, 0x78, - 0x37, 0x9c, 0x8b, 0x2f, 0x6a, 0x5e, 0xcd, 0x57, 0xe3, 0xca, 0x4a, 0xe3, 0x07, 0x62, 0x8c, 0x71, - 0xa1, 0x39, 0xeb, 0xdc, 0x53, 0xdd, 0x5c, 0x28, 0xc9, 0x84, 0xb1, 0x12, 0x4a, 0x2a, 0x37, 0xd9, - 0x79, 0x81, 0x59, 0xa7, 0x5c, 0x2e, 0x07, 0x17, 0xca, 0x26, 0x6c, 0x28, 0x9d, 0x53, 0xc5, 0xd4, - 0x1e, 0x46, 0xf5, 0xe4, 0xa1, 0x4d, 0x8c, 0x2a, 0xdd, 0xa0, 0x73, 0x2b, 0x0c, 0xcb, 0x75, 0xa2, - 0xca, 0xd0, 0xa9, 0xb9, 0xd4, 0x95, 0x0b, 0xd3, 0x38, 0xd5, 0x49, 0x35, 0xc7, 0x75, 0x43, 0x2c, - 0xc4, 0x5b, 0xbb, 0x07, 0x93, 0xaa, 0x48, 0x9c, 0xd2, 0x05, 0x7b, 0xdb, 0x0d, 0xbe, 0x2e, 0x54, - 0x91, 0xea, 0x45, 0x4f, 0x97, 0xb2, 0xe8, 0xf2, 0xcc, 0xb9, 0xd2, 0xee, 0x47, 0xd1, 0xac, 0xd0, - 0xbd, 0x45, 0x2e, 0xd3, 0xde, 0x54, 0x46, 0x13, 0x29, 0x5c, 0x65, 0xa4, 0x8d, 0x6c, 0xa3, 0x33, - 0x7a, 0x62, 0x65, 0x52, 0x19, 0xe5, 0x96, 0x3b, 0xed, 0x14, 0x0f, 0xfe, 0x5a, 0x09, 0x3d, 0xbe, - 0x2f, 0x74, 0x75, 0x90, 0x87, 0xfc, 0x93, 0x95, 0xf9, 0x64, 0x73, 0xf7, 0xcd, 0x37, 0xbb, 0xab, - 0x32, 0x15, 0x4e, 0x3e, 0xb4, 0x77, 0x7a, 0x96, 0x76, 0x65, 0xf0, 0xd5, 0x48, 0xdc, 0xa7, 0x60, - 0x74, 0x39, 0x77, 0x9a, 0x4b, 0xb2, 0xec, 0x78, 0xe9, 0x97, 0xd6, 0x5b, 0x95, 0xbd, 0x1c, 0x7f, - 0xde, 0xd8, 0x2c, 0xb7, 0xb7, 0xb9, 0x1e, 0x7f, 0x96, 0x89, 0xe3, 0x71, 0xec, 0x96, 0xa5, 0xd4, - 0x13, 0x9a, 0xdb, 0x3a, 0x32, 0x46, 0x2c, 0x7b, 0xca, 0xfa, 0xcf, 0x3b, 0x12, 0x72, 0x2d, 0xd2, - 0x7f, 0x0e, 0xbb, 0x32, 0x74, 0xf1, 0x56, 0x3f, 0xf8, 0x9a, 0x4b, 0xc7, 0x74, 0x9c, 0xf6, 0x12, - 0x03, 0x38, 0x64, 0xa3, 0xb6, 0xcb, 0x6b, 0xd8, 0x79, 0x70, 0xa0, 0x7b, 0xb0, 0xf2, 0xc8, 0x39, - 0xa3, 0xc6, 0x95, 0x93, 0x58, 0x30, 0x09, 0x0f, 0x65, 0x10, 0xde, 0x9f, 0x27, 0xdd, 0xb0, 0xcd, - 0xc9, 0x2f, 0x2e, 0xfa, 0x2c, 0x6e, 0x45, 0x2b, 0xe0, 0x9b, 0x8d, 0xc2, 0x2e, 0x0b, 0x88, 0x70, - 0x41, 0x98, 0xf6, 0xc6, 0x3a, 0x5d, 0xf6, 0x44, 0x09, 0x7c, 0xd2, 0xd7, 0x99, 0xca, 0xd3, 0xae, - 0xa6, 0xfd, 0x22, 0x4d, 0x4f, 0x6f, 0x71, 0x8b, 0x73, 0x65, 0x11, 0x8c, 0xd2, 0x74, 0x39, 0xdd, - 0x99, 0x87, 0xdd, 0x20, 0x1e, 0x7c, 0xfd, 0x4d, 0xba, 0xdf, 0xbb, 0x41, 0x08, 0x99, 0xc7, 0xc9, - 0xec, 0x8d, 0xca, 0x25, 0xc5, 0x58, 0x97, 0x10, 0xe4, 0xe3, 0x64, 0x96, 0x4c, 0xa6, 0x3c, 0x78, - 0x74, 0xb5, 0x84, 0xb7, 0xa5, 0x83, 0x53, 0x83, 0xbf, 0x1e, 0xd6, 0x23, 0x8d, 0xd1, 0x06, 0xe6, - 0x41, 0x0f, 0x32, 0xc1, 0xea, 0x5c, 0xf6, 0x72, 0x3d, 0xed, 0xf2, 0x53, 0x9a, 0x67, 0x0d, 0x78, - 0xf0, 0x38, 0x9b, 0x40, 0xb4, 0x87, 0x01, 0xa1, 0x6f, 0x00, 0xd7, 0x79, 0x33, 0x0f, 0xf4, 0x71, - 0x70, 0xa2, 0xa6, 0x95, 0x11, 0x1e, 0xed, 0x1a, 0x06, 0x36, 0x11, 0x8a, 0xa2, 0xee, 0x3f, 0xc5, - 0x59, 0x91, 0xe8, 0x79, 0x09, 0xd0, 0x25, 0x2b, 0xc5, 0x54, 0x32, 0x84, 0x84, 0xd8, 0x42, 0x2c, - 0x6c, 0x38, 0xc8, 0x66, 0x7a, 0x31, 0xd2, 0xc2, 0xba, 0xda, 0x47, 0xbb, 0xc1, 0x57, 0x8a, 0x7d, - 0x1d, 0x7b, 0x2b, 0x1c, 0x2d, 0x78, 0xb7, 0xa8, 0x02, 0x57, 0x7e, 0x3b, 0xba, 0x38, 0x8f, 0x25, - 0x6c, 0x49, 0x72, 0x61, 0x2d, 0x19, 0x42, 0x56, 0x75, 0xdd, 0xab, 0xc6, 0x94, 0x7d, 0x4e, 0xd2, - 0xe0, 0x85, 0x24, 0x97, 0xc2, 0x8c, 0xea, 0xcc, 0xe9, 0x36, 0x19, 0xe4, 0x7d, 0xe3, 0x96, 0x30, - 0x52, 0x14, 0x6a, 0xee, 0xef, 0x1b, 0xf3, 0x42, 0x17, 0xb0, 0xac, 0xd9, 0x11, 0x03, 0xae, 0xf6, - 0x50, 0xb7, 0xbd, 0x20, 0x02, 0x7b, 0x53, 0x9f, 0x91, 0x73, 0x7d, 0x4b, 0x81, 0xe1, 0x15, 0x01, - 0xd8, 0xbd, 0x97, 0xfd, 0xfe, 0x86, 0x39, 0x55, 0x49, 0xa0, 0x91, 0x2f, 0xc8, 0x9e, 0xd6, 0x98, - 0x42, 0x2e, 0xd8, 0xbf, 0x2e, 0xce, 0xdf, 0x22, 0x2f, 0xaf, 0xe5, 0x1f, 0x95, 0xb4, 0xee, 0xe0, - 0x3b, 0x8e, 0xdf, 0x50, 0xbd, 0x46, 0xc7, 0x65, 0xca, 0x42, 0xbb, 0x2d, 0xe1, 0x29, 0x39, 0x42, - 0xdc, 0x85, 0x7e, 0xc6, 0x3a, 0xa4, 0xb5, 0x1d, 0xc4, 0xcf, 0xe9, 0x16, 0xc1, 0x77, 0xfd, 0xbc, - 0x96, 0x2b, 0x37, 0x05, 0x4b, 0x92, 0x91, 0xcc, 0xc2, 0xad, 0x56, 0x40, 0x9d, 0xc0, 0x57, 0x97, - 0xc3, 0x11, 0x22, 0x3c, 0xaa, 0x0d, 0x82, 0x0f, 0xc8, 0x92, 0xc2, 0x5b, 0xf2, 0x46, 0x9b, 0xf9, - 0x09, 0x3c, 0x79, 0xd0, 0x64, 0x65, 0xd1, 0x04, 0x75, 0x97, 0x93, 0x7f, 0x11, 0x28, 0x3d, 0x0a, - 0x18, 0xfb, 0xa1, 0xff, 0x31, 0xac, 0x51, 0xa7, 0xb5, 0x22, 0xc0, 0xfc, 0xad, 0xc8, 0x2b, 0x50, - 0x24, 0x0f, 0xb7, 0x76, 0xd7, 0x90, 0x25, 0x99, 0x4c, 0x66, 0xef, 0xaa, 0xf9, 0x3a, 0xcf, 0xb7, - 0xba, 0x5b, 0x92, 0x4c, 0xe8, 0xcd, 0xe4, 0xb2, 0x07, 0x57, 0x25, 0x59, 0x37, 0xfa, 0xd0, 0xdf, - 0x79, 0xf9, 0x31, 0x0a, 0x90, 0xec, 0x1f, 0xf8, 0x31, 0xee, 0x6b, 0x4b, 0x91, 0x50, 0x0a, 0x8e, - 0xc4, 0x18, 0xff, 0x4f, 0x41, 0xe4, 0x30, 0x91, 0x0f, 0x33, 0x35, 0x71, 0xf8, 0x7c, 0x0d, 0x66, - 0x37, 0x3a, 0xc7, 0xb7, 0xa3, 0x9c, 0xc6, 0x57, 0x02, 0x7c, 0x4d, 0xf3, 0xa2, 0xb4, 0xe7, 0x3a, - 0x99, 0xd1, 0x11, 0x90, 0xb7, 0x4f, 0xe2, 0x61, 0x23, 0xe9, 0x0a, 0x11, 0x7a, 0x53, 0x36, 0x5f, - 0x4e, 0xf4, 0xa2, 0xf0, 0x72, 0xe1, 0x10, 0xfe, 0x56, 0xcf, 0x69, 0x03, 0xd8, 0x45, 0x2f, 0xce, - 0xa5, 0x57, 0xe0, 0xbf, 0xfb, 0xdd, 0xfe, 0xdb, 0xb5, 0x9a, 0x66, 0xab, 0xe9, 0xe6, 0xec, 0x19, - 0x1c, 0x65, 0x68, 0xf2, 0x44, 0x52, 0x06, 0xf0, 0x8f, 0x08, 0xe2, 0x24, 0xaf, 0x52, 0x69, 0xbb, - 0x2b, 0xeb, 0x82, 0xe0, 0xcf, 0x3f, 0x9b, 0x11, 0xd2, 0x95, 0x3e, 0x4f, 0xe4, 0x44, 0x54, 0xb9, - 0x43, 0xd2, 0x23, 0x17, 0x36, 0xd2, 0xe4, 0x6e, 0x8e, 0x03, 0x2a, 0x79, 0x8f, 0x69, 0xc0, 0xbd, - 0x45, 0x1d, 0x40, 0x9c, 0x38, 0xff, 0x13, 0x7f, 0x2a, 0x89, 0x5a, 0x1f, 0xda, 0x11, 0x3c, 0xed, - 0xf2, 0xf7, 0xe7, 0xa7, 0x27, 0x20, 0x51, 0x9b, 0xbe, 0xe2, 0xc8, 0x1b, 0xec, 0xb6, 0x69, 0xb0, - 0xa1, 0x6f, 0x88, 0xe0, 0xe3, 0xe4, 0xc6, 0x7d, 0x6c, 0x6a, 0x98, 0x1d, 0x75, 0xc7, 0xa7, 0x0d, - 0xae, 0xaa, 0x9d, 0x4e, 0x74, 0xbe, 0xbd, 0xdd, 0xf5, 0xb5, 0xa8, 0x1f, 0x76, 0x7d, 0xb1, 0x8a, - 0x69, 0x47, 0x3e, 0x74, 0xda, 0x00, 0x41, 0x52, 0x7e, 0xe6, 0xe4, 0x9c, 0xc2, 0x3a, 0x39, 0x2b, - 0xb9, 0x37, 0xb5, 0xde, 0x86, 0xf3, 0xf3, 0x12, 0x3c, 0x42, 0xe6, 0xb0, 0x0b, 0x9d, 0xca, 0x1e, - 0xbb, 0x42, 0xc6, 0x5a, 0xc9, 0x24, 0xf9, 0x91, 0xd1, 0xdd, 0xd8, 0xd9, 0x15, 0x98, 0x22, 0xbc, - 0x23, 0xd1, 0xde, 0x95, 0x18, 0x7a, 0x69, 0x41, 0x40, 0xbb, 0x3c, 0xcb, 0x93, 0xf8, 0x57, 0xbe, - 0xfa, 0xa1, 0xf8, 0xf1, 0xa7, 0x7e, 0x79, 0x9f, 0xc3, 0xdc, 0x75, 0xf1, 0x8a, 0x6c, 0xef, 0xb3, - 0x7d, 0x55, 0xc6, 0xbf, 0x72, 0x8f, 0x6f, 0xe7, 0x30, 0x6a, 0x4a, 0xee, 0xa1, 0xe7, 0x86, 0xc1, - 0x3f, 0xd4, 0x9c, 0x8a, 0x37, 0xab, 0x4c, 0x8e, 0x24, 0xf7, 0x74, 0x91, 0x58, 0x70, 0xe8, 0x01, - 0x36, 0xfa, 0x0d, 0x87, 0x51, 0xdd, 0x6c, 0x10, 0x99, 0x83, 0x23, 0x49, 0x73, 0xcc, 0x81, 0x16, - 0x0a, 0xfb, 0x04, 0x79, 0xd1, 0x61, 0x0a, 0x63, 0xfa, 0xf6, 0xc9, 0xf2, 0xa6, 0x19, 0x19, 0x4e, - 0x38, 0x43, 0x2b, 0x90, 0x69, 0xac, 0x94, 0xda, 0x52, 0x67, 0x90, 0xaa, 0x5b, 0xe6, 0x49, 0x25, - 0x06, 0xc7, 0x01, 0x8e, 0xc5, 0xdd, 0xb9, 0x4c, 0xe6, 0xe5, 0x31, 0xf5, 0x29, 0x70, 0x9c, 0x83, - 0x37, 0xa8, 0xdc, 0xc4, 0xbc, 0x1e, 0x70, 0x68, 0x4d, 0x72, 0x95, 0xcc, 0x62, 0xfe, 0x96, 0xd4, - 0xbe, 0x3a, 0x8c, 0xea, 0x05, 0x5c, 0x0d, 0x22, 0x06, 0x0f, 0x9f, 0xe9, 0xac, 0x0e, 0x1d, 0xd3, - 0x21, 0xca, 0xa0, 0xf5, 0xb9, 0x3b, 0x27, 0x6c, 0x35, 0x9e, 0x2b, 0xdc, 0x71, 0x28, 0x6e, 0xe5, - 0x7a, 0x4b, 0x66, 0x5a, 0xf1, 0xd9, 0xde, 0xa0, 0x33, 0x6c, 0x3a, 0x07, 0xb6, 0xcd, 0x6e, 0x7c, - 0x9d, 0xa7, 0xf8, 0xac, 0x4a, 0x60, 0xb3, 0x37, 0x68, 0x7b, 0x1a, 0x76, 0x75, 0xf6, 0x6e, 0x9f, - 0x1d, 0xaa, 0xa2, 0xac, 0x5c, 0x23, 0xba, 0x84, 0x71, 0x0b, 0x6d, 0x52, 0xee, 0x41, 0xc2, 0xfa, - 0xaa, 0x69, 0xf2, 0xdf, 0xad, 0xfa, 0x2f, 0xbe, 0x3e, 0x07, 0x58, 0xe2, 0x0b, 0xe2, 0x7c, 0x8a, - 0x96, 0xcc, 0x8f, 0x54, 0xb1, 0x31, 0xd2, 0x05, 0xd2, 0x86, 0x22, 0x39, 0xe6, 0x2b, 0xe2, 0x20, - 0x26, 0x0c, 0x20, 0xab, 0x14, 0x0e, 0xe1, 0x83, 0x15, 0x4f, 0x16, 0x7f, 0x83, 0x1a, 0x52, 0x3e, - 0x47, 0x80, 0x81, 0xe9, 0xd1, 0x3b, 0x19, 0x95, 0x70, 0xe6, 0x3b, 0x2d, 0x68, 0xdc, 0x0c, 0x38, - 0xc1, 0x9e, 0xb3, 0x54, 0x4d, 0x95, 0x63, 0xd8, 0x36, 0x06, 0x93, 0x00, 0x13, 0x03, 0xf8, 0xc9, - 0x25, 0xde, 0xed, 0x50, 0xa6, 0x73, 0x6d, 0xf6, 0x9f, 0x4c, 0x04, 0xf5, 0x8f, 0xdb, 0x4f, 0x5e, - 0xbe, 0x78, 0xf1, 0xe2, 0x80, 0xdd, 0x14, 0xb2, 0x48, 0xcc, 0xb2, 0x74, 0x32, 0x65, 0xce, 0x88, - 0xc2, 0xce, 0x95, 0xb5, 0x94, 0x21, 0xec, 0x18, 0x15, 0xcf, 0x20, 0xd7, 0x0b, 0xc7, 0x16, 0x99, - 0xa4, 0xfc, 0xcd, 0xd1, 0xb5, 0x50, 0xd1, 0x84, 0xa9, 0x21, 0x4b, 0x35, 0x7b, 0x77, 0x39, 0x62, - 0x20, 0x25, 0xb6, 0xd4, 0x95, 0x61, 0x63, 0x51, 0xcc, 0xb0, 0x48, 0x0b, 0xda, 0x84, 0x6c, 0x78, - 0x76, 0x11, 0x32, 0xe9, 0x92, 0x1e, 0x2b, 0x55, 0xb1, 0xd5, 0x69, 0x1d, 0x6b, 0xfc, 0x1f, 0xf1, - 0x17, 0x5b, 0x28, 0x03, 0x89, 0xd6, 0xb2, 0xee, 0xe5, 0xe8, 0x28, 0x60, 0x56, 0x4f, 0xdc, 0x42, - 0x18, 0xc9, 0xea, 0xb6, 0xeb, 0x1e, 0xee, 0x1e, 0xa8, 0xb1, 0xfe, 0xb2, 0x82, 0xfb, 0xdd, 0x65, - 0x6d, 0xe1, 0x15, 0x1c, 0x52, 0x66, 0x06, 0x40, 0x3c, 0xea, 0xa9, 0xfa, 0xc0, 0xe5, 0xd5, 0x1d, - 0xaf, 0x3c, 0xdb, 0x6b, 0x10, 0x1a, 0x69, 0x20, 0x48, 0x1d, 0x30, 0xc3, 0x35, 0x42, 0x86, 0xb8, - 0x67, 0x6d, 0x57, 0xc9, 0xd0, 0x62, 0x59, 0x14, 0x2b, 0x32, 0x90, 0x15, 0x92, 0x10, 0xd2, 0x4c, - 0xe4, 0x56, 0x37, 0x98, 0xbb, 0x4c, 0xa2, 0x7b, 0x30, 0x06, 0xb0, 0xb0, 0x56, 0x1d, 0x4c, 0x85, - 0xd4, 0x51, 0x26, 0x57, 0x33, 0xd4, 0x1f, 0x54, 0x79, 0xca, 0xc6, 0x92, 0x1a, 0xe9, 0x62, 0x0a, - 0x31, 0x1e, 0x4f, 0xa8, 0x43, 0x77, 0xd8, 0x28, 0x4f, 0x7b, 0x35, 0x36, 0x83, 0xce, 0x89, 0xb2, - 0xed, 0x6d, 0xea, 0x7d, 0x85, 0x76, 0x88, 0x02, 0x02, 0x3a, 0x64, 0x1a, 0x2a, 0xcd, 0x42, 0x01, - 0x73, 0x51, 0x30, 0x84, 0x0a, 0x72, 0x00, 0xf7, 0x48, 0x30, 0x30, 0x72, 0x82, 0xc4, 0xcb, 0x58, - 0xfd, 0x02, 0x58, 0xa1, 0x49, 0xc8, 0x8f, 0x6b, 0xdc, 0xd5, 0x3a, 0xae, 0x29, 0x53, 0x10, 0x70, - 0x75, 0x47, 0x43, 0x98, 0x83, 0x05, 0x96, 0xf5, 0xed, 0xbc, 0x6e, 0x35, 0xf1, 0xea, 0x73, 0x72, - 0x13, 0xb6, 0xa5, 0xf5, 0x95, 0xd2, 0xad, 0xc3, 0x48, 0x0d, 0xbc, 0x7d, 0x27, 0xb2, 0x58, 0x32, - 0x91, 0x24, 0xe4, 0x3e, 0x60, 0xf2, 0x5e, 0xbd, 0x51, 0xac, 0xe5, 0x27, 0x3a, 0x4d, 0x27, 0x65, - 0xfa, 0xa8, 0x0f, 0x1b, 0x8f, 0xbc, 0xe7, 0xb5, 0x34, 0xfa, 0x7b, 0x23, 0x12, 0x50, 0x24, 0x41, - 0x0e, 0x39, 0x3f, 0x38, 0x78, 0x3d, 0x6c, 0x7c, 0x77, 0x94, 0xe7, 0x6b, 0xb5, 0xa2, 0x48, 0x59, - 0xd3, 0x30, 0x22, 0xb6, 0xb0, 0x02, 0xc0, 0x25, 0x05, 0x46, 0x8b, 0xad, 0x19, 0xfc, 0x1f, 0xd9, - 0x70, 0xb4, 0x81, 0xb7, 0x87, 0x0f, 0x18, 0xe3, 0x32, 0x08, 0x0b, 0x07, 0x27, 0xcf, 0xbc, 0x0f, - 0x14, 0x45, 0x45, 0x22, 0xa9, 0x7d, 0x04, 0x7b, 0xd6, 0xad, 0x62, 0x1b, 0xf9, 0xc4, 0x3e, 0xd9, - 0xb3, 0xc1, 0xb0, 0x8d, 0xf2, 0x9a, 0x74, 0x40, 0x37, 0xcf, 0x06, 0x3f, 0xa0, 0xc8, 0x1b, 0x62, - 0xbb, 0xce, 0x85, 0x28, 0x2a, 0x91, 0x7b, 0xb7, 0xb4, 0x47, 0x57, 0xdc, 0x67, 0x06, 0xa7, 0x75, - 0x04, 0x1f, 0x99, 0xb4, 0x52, 0x85, 0xc6, 0xa6, 0x1f, 0xa5, 0xcf, 0x11, 0xa5, 0x4f, 0x73, 0x27, - 0x62, 0xd2, 0xaa, 0x04, 0x11, 0x5e, 0xa3, 0xab, 0xd3, 0xa6, 0xb9, 0x94, 0x68, 0x99, 0x7c, 0xec, - 0xd0, 0x46, 0x17, 0xb3, 0x9a, 0xf1, 0x9a, 0x96, 0x9d, 0x75, 0x32, 0x04, 0x5c, 0xcc, 0xa3, 0x06, - 0x70, 0x54, 0x24, 0xba, 0x73, 0x5b, 0x9e, 0x91, 0x7d, 0x4d, 0xe7, 0xde, 0x0a, 0x6f, 0xc6, 0x87, - 0x91, 0x58, 0x39, 0x62, 0xd0, 0x69, 0xf4, 0xad, 0x16, 0x7d, 0x94, 0x6e, 0xdc, 0xda, 0x37, 0xed, - 0x8d, 0xcf, 0x7d, 0x5f, 0xe6, 0x43, 0xae, 0xc4, 0x43, 0xb4, 0xd6, 0x37, 0x60, 0x2d, 0x74, 0x9d, - 0x87, 0xb1, 0xfb, 0x65, 0xa3, 0x97, 0x4d, 0x7b, 0xc3, 0x49, 0x8f, 0xa4, 0x84, 0xf7, 0x6e, 0x1d, - 0xfc, 0x32, 0xb8, 0xf1, 0xdb, 0x56, 0x88, 0xd6, 0x41, 0xb9, 0x66, 0xac, 0x47, 0xa1, 0x68, 0xad, - 0x64, 0x0d, 0x1a, 0x80, 0xa6, 0x41, 0xa2, 0xb3, 0x86, 0x82, 0xf0, 0x6a, 0x61, 0xb8, 0xf3, 0xd6, - 0xb8, 0x03, 0x46, 0x8b, 0xc5, 0xdd, 0x1d, 0x6b, 0x44, 0x3a, 0x0f, 0x43, 0xb2, 0xf7, 0x38, 0x26, - 0x8f, 0x54, 0xcf, 0x07, 0x31, 0xd9, 0x0b, 0x37, 0x2e, 0xff, 0x2d, 0x20, 0x1b, 0x78, 0x50, 0x06, - 0x75, 0xbe, 0x97, 0x42, 0xb5, 0x21, 0x54, 0x26, 0x1a, 0x74, 0xa2, 0xbb, 0x0f, 0x2c, 0x9f, 0x9a, - 0x97, 0xbf, 0x9f, 0x5e, 0xbf, 0xbf, 0x3e, 0x1b, 0x9d, 0xd6, 0xb5, 0x03, 0x74, 0x6b, 0xa8, 0xce, - 0x3c, 0x78, 0xa2, 0xe7, 0xdd, 0xd1, 0xa1, 0x87, 0x58, 0x4d, 0xb5, 0x77, 0xe5, 0xcd, 0x05, 0x91, - 0xc6, 0x1f, 0x15, 0xaa, 0x09, 0x8a, 0xe0, 0x64, 0x93, 0x46, 0x18, 0xb8, 0xdc, 0xc8, 0x1d, 0x4f, - 0x8c, 0xcd, 0x63, 0xcf, 0xab, 0x3b, 0x1d, 0x5e, 0xf5, 0x9a, 0xbc, 0x7c, 0xf3, 0x00, 0xdd, 0x87, - 0x2b, 0xea, 0xb6, 0x9e, 0x1c, 0x89, 0x80, 0xc7, 0x94, 0xf9, 0x29, 0x6a, 0x53, 0xaf, 0xcd, 0x9a, - 0xa3, 0x31, 0x1e, 0x59, 0x6d, 0xaa, 0x34, 0xe9, 0xd0, 0xfe, 0x6a, 0x81, 0x32, 0x9c, 0x55, 0xe3, - 0x1e, 0x5e, 0x8e, 0xd1, 0x91, 0x32, 0x89, 0xd6, 0x7a, 0xa6, 0x64, 0x44, 0x3d, 0x61, 0x84, 0xea, - 0x2d, 0xcc, 0x94, 0x7e, 0x4c, 0xf9, 0x34, 0xce, 0x51, 0x32, 0xf9, 0x80, 0xa6, 0x29, 0x14, 0x3a, - 0xec, 0x56, 0x1a, 0x22, 0x1b, 0xd6, 0xef, 0xed, 0x3e, 0xef, 0xf5, 0x77, 0xc6, 0xbb, 0x2b, 0xde, - 0xfa, 0x19, 0x0d, 0x0b, 0x35, 0x53, 0x91, 0x7f, 0x3d, 0x50, 0xd3, 0xac, 0x8d, 0xdd, 0x01, 0x33, - 0xee, 0x24, 0x46, 0xa6, 0x8a, 0x42, 0xb5, 0x73, 0x5f, 0xff, 0xe6, 0x56, 0x54, 0x6f, 0x49, 0xef, - 0x20, 0xb0, 0xa0, 0x92, 0x35, 0xa5, 0xda, 0x52, 0x26, 0x0a, 0xcc, 0xe3, 0x50, 0x1d, 0x66, 0xab, - 0x04, 0xee, 0x1c, 0xb1, 0xac, 0x42, 0xf1, 0xf0, 0xb3, 0xbe, 0x3e, 0xa2, 0x0c, 0xa0, 0xfb, 0x37, - 0x4b, 0x3c, 0x47, 0x51, 0xb7, 0x34, 0xa3, 0x06, 0x10, 0x88, 0x81, 0x22, 0xeb, 0x5f, 0x2a, 0x7c, - 0x4b, 0xbc, 0xd5, 0x5a, 0xd4, 0xe9, 0x26, 0x01, 0xdb, 0xeb, 0xef, 0xfe, 0xba, 0xb3, 0xd7, 0xdf, - 0xdb, 0x63, 0xaf, 0x33, 0x83, 0xb7, 0x9e, 0x02, 0x87, 0x0e, 0x93, 0x6c, 0x41, 0x2f, 0xe5, 0xa6, - 0x64, 0x9d, 0xa3, 0x98, 0xe1, 0x11, 0x02, 0xe4, 0x71, 0xa9, 0xba, 0xe2, 0xfe, 0x14, 0x18, 0xe3, - 0x5c, 0x8f, 0xa3, 0x39, 0x1e, 0x89, 0xd2, 0x44, 0xe7, 0x67, 0xaf, 0x4f, 0xdf, 0x0d, 0x4f, 0xbf, - 0xf5, 0x40, 0xe7, 0xe2, 0x6c, 0xc4, 0xf2, 0x5a, 0x93, 0x37, 0x10, 0x65, 0xae, 0xbd, 0xe8, 0x50, - 0x1a, 0x58, 0x05, 0x33, 0xac, 0x45, 0xb1, 0x04, 0xad, 0xe2, 0xd5, 0x56, 0xb4, 0x7c, 0x60, 0x55, - 0xc9, 0x29, 0x73, 0xfd, 0x8b, 0x96, 0xf9, 0x47, 0x2a, 0x11, 0x3e, 0x6d, 0xa9, 0xd9, 0x95, 0xb2, - 0x85, 0xb8, 0xa2, 0xfe, 0x15, 0xe0, 0xbb, 0xed, 0xed, 0xb7, 0xdd, 0x6d, 0xe7, 0xa7, 0xda, 0xdb, - 0x88, 0x6a, 0x0e, 0x3e, 0xa8, 0xab, 0xa7, 0x16, 0x9f, 0x7e, 0x65, 0xfc, 0x1f, 0x6e, 0x01, 0x28, - 0x3c, 0x75, 0x14, 0x00, 0x00 + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48, + 0x12, 0xfe, 0xee, 0x5f, 0x31, 0x9e, 0x54, 0xb1, 0xd6, 0x45, 0x58, 0x40, 0x72, 0x5b, 0x09, 0x58, + 0xce, 0x41, 0x20, 0x1b, 0xae, 0x20, 0x50, 0xd8, 0x6c, 0xee, 0x2a, 0x97, 0x4a, 0x8d, 0xa5, 0xb1, + 0x35, 0xb1, 0xac, 0xd1, 0xce, 0x8c, 0x70, 0x7c, 0xd9, 0xfd, 0xef, 0xf7, 0xf4, 0x48, 0x32, 0x86, + 0x40, 0x52, 0xa9, 0xfb, 0x00, 0xf6, 0xbc, 0x76, 0xf7, 0xd3, 0xdd, 0x4f, 0xf7, 0x78, 0xd0, 0x3d, + 0xbe, 0x78, 0x3d, 0xfe, 0xf7, 0xe5, 0x09, 0xcb, 0xdc, 0x22, 0x1f, 0x0e, 0xe8, 0x3f, 0xcb, 0x45, + 0x31, 0x8b, 0xb9, 0x2c, 0x38, 0xc6, 0x52, 0xa4, 0xc3, 0xc1, 0x42, 0x3a, 0xc1, 0x0a, 0xb1, 0x90, + 0x31, 0xbf, 0x51, 0x72, 0x59, 0x6a, 0xe3, 0x38, 0x4b, 0x74, 0xe1, 0x64, 0xe1, 0x62, 0xbe, 0x54, + 0xa9, 0xcb, 0xe2, 0xbf, 0xef, 0xec, 0xf0, 0x61, 0xa7, 0xde, 0xda, 0xb9, 0xb7, 0x96, 0xca, 0x1b, + 0x95, 0xc8, 0x6d, 0x3f, 0x08, 0x55, 0xa1, 0x9c, 0x12, 0xf9, 0xb6, 0x4d, 0x44, 0x2e, 0xe3, 0xdd, + 0x70, 0x21, 0xbe, 0xa8, 0x45, 0xb5, 0x58, 0x8f, 0x2b, 0x2b, 0x8d, 0x1f, 0x88, 0x09, 0xc6, 0x85, + 0xe6, 0xac, 0x73, 0x4f, 0x74, 0xa3, 0x50, 0x92, 0x09, 0x63, 0x25, 0x84, 0x54, 0x6e, 0xba, 0xfd, + 0x02, 0xb3, 0x4e, 0xb9, 0x5c, 0x0e, 0xcf, 0x95, 0x4d, 0xd8, 0x48, 0x3a, 0xa7, 0x8a, 0x99, 0x1d, + 0x44, 0xf5, 0xe4, 0xc0, 0x26, 0x46, 0x95, 0x6e, 0xd8, 0xb9, 0x11, 0x86, 0xe5, 0x3a, 0x51, 0x65, + 0xe8, 0xd4, 0x42, 0xea, 0xca, 0x85, 0x69, 0x9c, 0xea, 0xa4, 0x5a, 0x40, 0xdd, 0x10, 0x0b, 0x71, + 0x77, 0xf7, 0x60, 0x5a, 0x15, 0x89, 0x53, 0xba, 0x60, 0x6f, 0x7b, 0xc1, 0xd7, 0xa5, 0x2a, 0x52, + 0xbd, 0xec, 0xeb, 0x52, 0x16, 0x3d, 0x9e, 0x39, 0x57, 0xda, 0xfd, 0x28, 0x9a, 0x17, 0xba, 0xbf, + 0xcc, 0x65, 0xda, 0x9f, 0xc9, 0x68, 0x2a, 0x85, 0xab, 0x8c, 0xb4, 0x91, 0x6d, 0x64, 0x46, 0x4f, + 0xac, 0x4c, 0x2a, 0xa3, 0xdc, 0x6a, 0xbb, 0x9d, 0xe2, 0xc1, 0x5f, 0xeb, 0x4b, 0x8f, 0xee, 0x5f, + 0xba, 0x3e, 0xc8, 0x43, 0xfe, 0xc9, 0xca, 0x7c, 0xba, 0xb9, 0xfb, 0xfa, 0x9b, 0xdd, 0x55, 0x99, + 0x0a, 0x27, 0x1f, 0xda, 0x3b, 0x3b, 0x4d, 0x7b, 0x32, 0xf8, 0x6a, 0x24, 0xf4, 0x29, 0x18, 0x29, + 0xe7, 0x4e, 0x72, 0x49, 0x96, 0x1d, 0xad, 0xfc, 0xd2, 0xed, 0x56, 0x65, 0x2f, 0x26, 0x9f, 0x37, + 0x36, 0xcb, 0xad, 0x2d, 0xae, 0x27, 0x9f, 0x65, 0xe2, 0x78, 0x1c, 0xbb, 0x55, 0x29, 0xf5, 0x94, + 0xe6, 0xba, 0x87, 0xc6, 0x88, 0x55, 0x5f, 0x59, 0xff, 0x79, 0xe7, 0x86, 0x5c, 0x8b, 0xf4, 0x9f, + 0xa3, 0x9e, 0x0c, 0x5d, 0xdc, 0xdd, 0x09, 0xbe, 0xe6, 0xd2, 0x31, 0x1d, 0xa7, 0xfd, 0xc4, 0x00, + 0x0e, 0xd9, 0x88, 0xed, 0xf1, 0x1a, 0x76, 0x1e, 0x1c, 0xe8, 0x3e, 0xac, 0x3c, 0x74, 0xce, 0xa8, + 0x49, 0xe5, 0x24, 0x16, 0x4c, 0xc2, 0x43, 0x19, 0x84, 0xf7, 0xe7, 0x49, 0x36, 0x6c, 0x73, 0xf2, + 0x8b, 0x8b, 0x3e, 0x8b, 0x1b, 0xd1, 0x5e, 0xf0, 0xcd, 0x46, 0x61, 0x57, 0x05, 0xae, 0x70, 0x41, + 0x98, 0xf6, 0x27, 0x3a, 0x5d, 0xf5, 0x45, 0x09, 0x7c, 0xd2, 0xd7, 0x99, 0xca, 0xd3, 0x9e, 0xa6, + 0xfd, 0x22, 0x4d, 0x4f, 0x6e, 0xa0, 0xc5, 0x99, 0xb2, 0x08, 0x46, 0x69, 0x7a, 0x9c, 0x74, 0xe6, + 0x61, 0x2f, 0x88, 0x87, 0x5f, 0x7f, 0x93, 0xee, 0xf7, 0x5e, 0x10, 0xe2, 0xce, 0xa3, 0x64, 0xfe, + 0x46, 0xe5, 0x92, 0x62, 0xac, 0x47, 0x08, 0xf2, 0x49, 0x32, 0x4f, 0xa6, 0x33, 0x1e, 0x3c, 0xba, + 0x5a, 0xc2, 0xdb, 0xd2, 0xc1, 0xa9, 0xc1, 0x5f, 0x0f, 0xcb, 0x91, 0xc6, 0x68, 0x03, 0xf3, 0x20, + 0x07, 0x99, 0x60, 0x75, 0x2e, 0xfb, 0xb9, 0x9e, 0xf5, 0xf8, 0x09, 0xcd, 0xb3, 0x06, 0x3c, 0x78, + 0x9c, 0x4d, 0x71, 0xb5, 0x87, 0x01, 0xa1, 0x6f, 0x00, 0xd7, 0x59, 0x33, 0x0f, 0xf4, 0x71, 0x70, + 0xaa, 0x66, 0x95, 0x11, 0x1e, 0xed, 0x1a, 0x06, 0x36, 0x15, 0x8a, 0xa2, 0xee, 0x3f, 0xc5, 0x69, + 0x91, 0xe8, 0x45, 0x09, 0xd0, 0x25, 0x2b, 0xc5, 0x4c, 0x32, 0x84, 0x84, 0xe8, 0x22, 0x16, 0x36, + 0x1c, 0x64, 0x33, 0xbd, 0x1c, 0x6b, 0x61, 0x5d, 0xed, 0xa3, 0xdd, 0xe0, 0x2b, 0xc5, 0xbe, 0x8e, + 0xbd, 0x15, 0x8e, 0x16, 0xbc, 0x5b, 0x54, 0x01, 0x95, 0xdf, 0x8e, 0xcf, 0xcf, 0x62, 0x09, 0x5b, + 0x92, 0x5c, 0x58, 0x4b, 0x86, 0x90, 0x55, 0x3d, 0xf7, 0xaa, 0x31, 0x65, 0x9f, 0xd3, 0x6d, 0xf0, + 0x42, 0x92, 0x4b, 0x61, 0xc6, 0x75, 0xe6, 0xf4, 0x9a, 0x0c, 0xf2, 0xbe, 0x71, 0x2b, 0x18, 0x29, + 0x0a, 0xb5, 0xf0, 0xfa, 0xc6, 0xbc, 0xd0, 0x05, 0x2c, 0x6b, 0x76, 0xc4, 0x80, 0xab, 0x3d, 0xd4, + 0x6b, 0x15, 0x44, 0x60, 0x6f, 0xca, 0x33, 0x72, 0xa1, 0x6f, 0x28, 0x30, 0xbc, 0x20, 0x00, 0xbb, + 0xf7, 0x72, 0x67, 0x67, 0xc3, 0x9c, 0xaa, 0x24, 0xd0, 0xc8, 0x17, 0x64, 0x4f, 0x6b, 0x4c, 0x21, + 0x97, 0xec, 0x5f, 0xe7, 0x67, 0x6f, 0x91, 0x97, 0x57, 0xf2, 0x8f, 0x4a, 0x5a, 0x77, 0xf0, 0x1d, + 0xc7, 0x6f, 0x88, 0xbe, 0x45, 0xc7, 0x65, 0xca, 0x42, 0xba, 0x2d, 0xe1, 0x29, 0x39, 0x46, 0xdc, + 0x85, 0x7e, 0xc6, 0x3a, 0xa4, 0xb5, 0x1d, 0xc6, 0xcf, 0x49, 0x8b, 0xe0, 0xbb, 0x7e, 0xbe, 0xbd, + 0x57, 0x6e, 0x5e, 0x2c, 0xe9, 0x8e, 0x64, 0x1e, 0x76, 0xdb, 0x0b, 0xea, 0x04, 0xbe, 0xbc, 0x18, + 0x8d, 0x11, 0xe1, 0x51, 0x6d, 0x10, 0x7c, 0x40, 0x96, 0x14, 0xde, 0x92, 0x37, 0xda, 0x2c, 0x8e, + 0xe1, 0xc9, 0x83, 0x26, 0x2b, 0x8b, 0x26, 0xa8, 0x7b, 0x9c, 0xfc, 0x8b, 0x40, 0xe9, 0x53, 0xc0, + 0xd8, 0x0f, 0x3b, 0x1f, 0xc3, 0x1a, 0x75, 0x5a, 0x2b, 0x02, 0xcc, 0xdf, 0x88, 0xbc, 0x02, 0x45, + 0xf2, 0xb0, 0xbb, 0x7b, 0x0b, 0x59, 0x92, 0xc9, 0x64, 0xfe, 0xae, 0x5a, 0xdc, 0xe6, 0x79, 0xb7, + 0xd7, 0x95, 0x64, 0x42, 0x7f, 0x2e, 0x57, 0x7d, 0xb8, 0x2a, 0xc9, 0x7a, 0xd1, 0x87, 0x9d, 0xed, + 0x97, 0x1f, 0xa3, 0x00, 0xc9, 0xfe, 0x81, 0x1f, 0x41, 0x5f, 0x5b, 0x8a, 0x84, 0x52, 0x70, 0x2c, + 0x26, 0xf8, 0x7f, 0x02, 0x22, 0x87, 0x89, 0x7c, 0x94, 0xa9, 0xa9, 0xc3, 0xe7, 0x6b, 0x30, 0xbb, + 0xd1, 0x39, 0xbe, 0x1d, 0xe6, 0x34, 0xbe, 0x14, 0xe0, 0x6b, 0x9a, 0x17, 0xa5, 0x3d, 0xd3, 0xc9, + 0x9c, 0x8e, 0x80, 0xbc, 0x7d, 0x12, 0x8f, 0x9a, 0x9b, 0x2e, 0x11, 0xa1, 0xd7, 0x65, 0xf3, 0xe5, + 0x58, 0x2f, 0x0b, 0x7f, 0x2f, 0x1c, 0xc2, 0xdf, 0xea, 0x05, 0x6d, 0x00, 0xbb, 0xe8, 0xe5, 0x99, + 0xf4, 0x02, 0xfc, 0x77, 0xbf, 0xdb, 0x7f, 0xbb, 0x52, 0xb3, 0x6c, 0x3d, 0xdd, 0x9c, 0x3d, 0x85, + 0xa3, 0x0c, 0x4d, 0x1e, 0x4b, 0xca, 0x00, 0xfe, 0x11, 0x41, 0x9c, 0xe4, 0x55, 0x2a, 0x6d, 0x6f, + 0x6d, 0x5d, 0x10, 0xfc, 0xf9, 0x67, 0x33, 0x42, 0xba, 0xd2, 0xe7, 0xb1, 0x9c, 0x8a, 0x2a, 0x77, + 0x48, 0x7a, 0xe4, 0xc2, 0x46, 0x9a, 0xdc, 0xcd, 0x71, 0x40, 0x25, 0xef, 0x31, 0x0d, 0xb8, 0xb7, + 0xa8, 0x03, 0x88, 0x13, 0xe7, 0x7f, 0xe2, 0x4f, 0x25, 0x51, 0xeb, 0x43, 0x3b, 0x82, 0xa7, 0x3d, + 0xfe, 0xfe, 0xec, 0xe4, 0x18, 0x24, 0x6a, 0xd3, 0x57, 0x1c, 0x79, 0x83, 0xdd, 0x36, 0x0d, 0x36, + 0xe4, 0x8d, 0x10, 0x7c, 0x9c, 0xdc, 0xb8, 0x8f, 0x4d, 0x0d, 0xb3, 0xa3, 0xee, 0xf8, 0xb4, 0x81, + 0xaa, 0xda, 0xe9, 0x44, 0xe7, 0x5b, 0x5b, 0x3d, 0x5f, 0x8b, 0x76, 0xc2, 0x9e, 0x2f, 0x56, 0x31, + 0xed, 0xc8, 0x47, 0x4e, 0x1b, 0x20, 0x48, 0xc2, 0x4f, 0x9d, 0x5c, 0x50, 0x58, 0x27, 0xa7, 0x25, + 0xf7, 0xa6, 0xd6, 0xdb, 0x70, 0x7e, 0x51, 0x82, 0x47, 0xc8, 0x1c, 0x76, 0xae, 0x53, 0xd9, 0x67, + 0x97, 0xc8, 0x58, 0x2b, 0x99, 0x24, 0x3f, 0x32, 0xd2, 0x8d, 0x9d, 0x5e, 0x82, 0x29, 0xc2, 0x3b, + 0x37, 0xda, 0xbb, 0x37, 0x86, 0xfe, 0xb6, 0x20, 0xa0, 0x5d, 0x9e, 0xe5, 0xe9, 0xfa, 0x57, 0xbe, + 0xfa, 0xa1, 0xf8, 0xf1, 0xa7, 0x7e, 0x79, 0x9f, 0xc3, 0xdc, 0xdb, 0xe2, 0x15, 0xd9, 0xfe, 0x67, + 0xfb, 0xaa, 0x8c, 0x7f, 0xe5, 0x1e, 0xdf, 0xce, 0x20, 0x6a, 0x4a, 0xee, 0xc0, 0x73, 0xc3, 0xf0, + 0x1f, 0x6a, 0x41, 0xc5, 0x9b, 0x55, 0x26, 0x47, 0x92, 0x7b, 0xba, 0x48, 0x2c, 0x38, 0xf4, 0x00, + 0x1b, 0xfd, 0x86, 0x41, 0x54, 0x37, 0x1b, 0x44, 0xe6, 0xe0, 0x48, 0x92, 0x1c, 0x73, 0xa0, 0x85, + 0xc2, 0x3e, 0x45, 0x5e, 0x74, 0x98, 0xc2, 0x98, 0xbe, 0x7d, 0xb2, 0xbc, 0x69, 0x46, 0x46, 0x53, + 0xce, 0xd0, 0x0a, 0x64, 0x1a, 0x2b, 0xa5, 0xb6, 0xd4, 0x19, 0xa4, 0xea, 0x86, 0x79, 0x52, 0x89, + 0xc1, 0x71, 0x80, 0x63, 0x79, 0x77, 0x2e, 0x93, 0x79, 0x79, 0x44, 0x7d, 0x0a, 0x1c, 0xe7, 0xe0, + 0x0d, 0x2a, 0x37, 0x31, 0xaf, 0x07, 0x1c, 0x52, 0x93, 0x5c, 0x25, 0xf3, 0x98, 0xbf, 0x25, 0xb1, + 0xaf, 0x06, 0x51, 0xbd, 0x00, 0xd5, 0x70, 0xc5, 0xf0, 0xe1, 0x33, 0x9d, 0xf5, 0xa1, 0x23, 0x3a, + 0x44, 0x19, 0x74, 0x7b, 0xee, 0xce, 0x09, 0x5b, 0x4d, 0x16, 0x0a, 0x3a, 0x8e, 0xc4, 0x8d, 0xbc, + 0xdd, 0x92, 0x99, 0xf6, 0xfa, 0x6c, 0x6f, 0xd8, 0x19, 0x35, 0x9d, 0x03, 0xdb, 0x62, 0xd7, 0xbe, + 0xce, 0x53, 0x7c, 0x56, 0x25, 0xb0, 0xd9, 0x1b, 0xb6, 0x3d, 0x0d, 0xbb, 0x3c, 0x7d, 0xb7, 0xcf, + 0x06, 0xaa, 0x28, 0x2b, 0xd7, 0x5c, 0x5d, 0xc2, 0xb8, 0xa5, 0x36, 0x29, 0xf7, 0x20, 0x61, 0x7d, + 0xdd, 0x34, 0xf9, 0xef, 0x56, 0xfd, 0x17, 0x5f, 0x9f, 0x03, 0x2c, 0xf1, 0x05, 0x71, 0x3e, 0x43, + 0x4b, 0xe6, 0x47, 0xaa, 0xd8, 0x18, 0xe9, 0x02, 0x69, 0x43, 0x91, 0x1c, 0xf3, 0x35, 0x71, 0x10, + 0x13, 0x06, 0xb8, 0xab, 0x14, 0x0e, 0xe1, 0x83, 0x15, 0x4f, 0x16, 0x7f, 0x83, 0x18, 0x12, 0xbe, + 0x40, 0x80, 0x81, 0xe9, 0xd1, 0x3b, 0x19, 0x95, 0x70, 0xe6, 0x3b, 0x2d, 0x48, 0xdc, 0x0c, 0x38, + 0xc1, 0x9e, 0xb3, 0x54, 0xcd, 0x94, 0x63, 0xd8, 0x36, 0x01, 0x93, 0x00, 0x13, 0x03, 0xf8, 0xc9, + 0x25, 0xde, 0xed, 0x10, 0xa6, 0x73, 0x6d, 0xf6, 0x9f, 0x4c, 0x05, 0xf5, 0x8f, 0x5b, 0x4f, 0x5e, + 0xbe, 0x78, 0xf1, 0xe2, 0x80, 0x5d, 0x17, 0xb2, 0x48, 0xcc, 0xaa, 0x74, 0x32, 0x65, 0xce, 0x88, + 0xc2, 0x2e, 0x94, 0xb5, 0x94, 0x21, 0xec, 0x08, 0x15, 0xcf, 0x20, 0xd7, 0x0b, 0xc7, 0x96, 0x99, + 0xa4, 0xfc, 0xcd, 0xd1, 0xb5, 0x50, 0xd1, 0x84, 0xa9, 0x21, 0x4b, 0x35, 0x7b, 0x77, 0x31, 0x66, + 0x20, 0x25, 0xb6, 0xd2, 0x95, 0x61, 0x13, 0x51, 0xcc, 0xb1, 0x48, 0x0b, 0xda, 0x84, 0x6c, 0x74, + 0x7a, 0x1e, 0x32, 0xe9, 0x92, 0x3e, 0x2b, 0x55, 0xd1, 0xed, 0xb4, 0x8e, 0x35, 0x43, 0xe2, 0x2e, + 0xb6, 0x54, 0x06, 0xb7, 0x59, 0xcb, 0x7a, 0x17, 0xe3, 0xc3, 0x80, 0x59, 0x3d, 0x75, 0x4b, 0x61, + 0x24, 0xab, 0x5b, 0xae, 0x7b, 0x98, 0x7b, 0x90, 0x26, 0xfa, 0x4b, 0x1b, 0x8c, 0xef, 0x2e, 0x7c, + 0x5c, 0x99, 0xe1, 0x25, 0x9c, 0x51, 0x66, 0x06, 0x20, 0x3c, 0xea, 0xa5, 0xfa, 0xc4, 0xc5, 0xe5, + 0x1d, 0x8f, 0x3c, 0xdb, 0x6b, 0xd0, 0x19, 0x6b, 0xa0, 0x47, 0xdd, 0x2f, 0x83, 0x1a, 0x21, 0x43, + 0xcc, 0xb3, 0xb6, 0xa3, 0x64, 0x68, 0xaf, 0x2c, 0x0a, 0x15, 0x19, 0xc7, 0x0a, 0x49, 0xe8, 0x68, + 0x26, 0x72, 0xab, 0x1b, 0xbc, 0x5d, 0x26, 0xd1, 0x39, 0x18, 0x03, 0x48, 0x58, 0x2b, 0xae, 0xeb, + 0xb5, 0x1a, 0x67, 0x72, 0x3d, 0x43, 0xbd, 0x41, 0x95, 0xa7, 0x6c, 0x22, 0xa9, 0x89, 0x2e, 0x66, + 0xb8, 0xc6, 0x63, 0x09, 0x71, 0xe8, 0x0c, 0x1b, 0xe1, 0x69, 0x9f, 0x8e, 0x0d, 0x26, 0xc3, 0xce, + 0xb1, 0xb2, 0xad, 0x36, 0xf5, 0xbe, 0x42, 0x3b, 0x44, 0x00, 0x81, 0x1c, 0x32, 0x0d, 0x91, 0x66, + 0xa9, 0x80, 0xb7, 0x28, 0x18, 0xc2, 0x04, 0xf1, 0x0f, 0x3d, 0x12, 0x0c, 0x8c, 0x9c, 0x22, 0xe9, + 0x32, 0x56, 0x77, 0xff, 0x6b, 0x34, 0x09, 0xf5, 0x89, 0x37, 0x74, 0xa0, 0x6e, 0x63, 0x9a, 0xb2, + 0x04, 0xc1, 0x56, 0x77, 0x33, 0x84, 0x39, 0x18, 0x60, 0x55, 0x6b, 0xe7, 0x65, 0xab, 0xa9, 0x17, + 0x9f, 0x93, 0x9b, 0xb0, 0x2d, 0xad, 0x55, 0x4a, 0xbb, 0x83, 0x48, 0xd5, 0xa8, 0x1f, 0xcb, 0x62, + 0xc5, 0x44, 0x92, 0x90, 0xfb, 0x80, 0xc9, 0x7b, 0xf5, 0x46, 0xb1, 0x96, 0x9b, 0xe8, 0x34, 0x9d, + 0x94, 0xe9, 0x0f, 0x7c, 0x78, 0xf1, 0xbe, 0xf1, 0x21, 0xfd, 0xbd, 0x11, 0x09, 0xe8, 0x91, 0x20, + 0xc7, 0x3d, 0x3f, 0x38, 0x78, 0x35, 0x6a, 0x7c, 0x77, 0x98, 0xe7, 0xb7, 0x62, 0x45, 0x91, 0xb2, + 0xa6, 0x59, 0x44, 0x6c, 0x61, 0x05, 0x80, 0x4b, 0x0a, 0x8c, 0x16, 0x5b, 0x33, 0xfc, 0x3f, 0x32, + 0xe1, 0x70, 0x03, 0x6f, 0x0f, 0x1f, 0x30, 0x86, 0x32, 0x08, 0x0b, 0x07, 0x27, 0xcf, 0xbd, 0x0f, + 0x14, 0x45, 0x45, 0x22, 0xa9, 0x75, 0x04, 0x73, 0xd6, 0x6d, 0x62, 0x1b, 0xf5, 0xc4, 0x3c, 0xd9, + 0xb3, 0xe1, 0xa8, 0x8d, 0xf2, 0x9a, 0x70, 0x40, 0x35, 0xcf, 0x86, 0x3f, 0xa0, 0xc7, 0x6b, 0x62, + 0xba, 0xce, 0xb9, 0x28, 0x2a, 0x91, 0x7b, 0xb7, 0xb4, 0x47, 0xd7, 0xbc, 0x67, 0x86, 0x27, 0x75, + 0x04, 0x1f, 0x9a, 0xb4, 0x52, 0x85, 0xc6, 0xa6, 0x47, 0x11, 0x6c, 0x98, 0xea, 0xf0, 0x82, 0xaf, + 0x75, 0x22, 0x16, 0xad, 0x4a, 0x90, 0xe0, 0x15, 0x3a, 0x3a, 0x6d, 0x1a, 0xa5, 0x44, 0xcb, 0xe2, + 0x13, 0x87, 0x16, 0xba, 0x98, 0xd7, 0x6c, 0xd7, 0xb4, 0xeb, 0xac, 0x93, 0x21, 0xe0, 0x62, 0x1e, + 0x35, 0x80, 0xa3, 0x1a, 0x91, 0xce, 0x6d, 0x69, 0x46, 0xf6, 0x35, 0x5d, 0x7b, 0x7b, 0x79, 0x33, + 0x1e, 0x44, 0x62, 0xed, 0x88, 0x61, 0xa7, 0x91, 0xb7, 0x5e, 0xf4, 0x51, 0xba, 0xa1, 0xb5, 0x6f, + 0xd8, 0x1b, 0x9f, 0xfb, 0x9e, 0xcc, 0x87, 0x5c, 0x89, 0x47, 0x68, 0x2d, 0x6f, 0xc8, 0x5a, 0xe8, + 0x3a, 0x0f, 0x63, 0xf7, 0xcb, 0x46, 0x1f, 0x9b, 0xf6, 0x47, 0xd3, 0x3e, 0xdd, 0x12, 0xde, 0xd3, + 0x3a, 0xf8, 0x65, 0x78, 0xed, 0xb7, 0xad, 0x11, 0xad, 0x83, 0x72, 0xcd, 0x56, 0x8f, 0x43, 0xd1, + 0x5a, 0xc9, 0x1a, 0x34, 0x00, 0x4d, 0x83, 0x44, 0xe7, 0x16, 0x0a, 0xc2, 0xab, 0x85, 0xe1, 0xce, + 0x3b, 0xe3, 0x0e, 0x18, 0x2d, 0x16, 0x77, 0x77, 0xdc, 0x22, 0xd2, 0x79, 0x18, 0x92, 0xbd, 0xc7, + 0x31, 0x79, 0xa4, 0x72, 0x3e, 0x88, 0xc9, 0x5e, 0xb8, 0xa1, 0xfc, 0xb7, 0x80, 0x6c, 0xe0, 0x41, + 0x19, 0xd4, 0xf9, 0x5e, 0x0a, 0xd5, 0x86, 0x50, 0x89, 0x68, 0xd0, 0x89, 0xee, 0x3e, 0xae, 0x7c, + 0x6a, 0x5e, 0xfc, 0x7e, 0x72, 0xf5, 0xfe, 0xea, 0x74, 0x7c, 0x52, 0xd7, 0x0d, 0xd0, 0xad, 0xa1, + 0x1a, 0xf3, 0xe0, 0x89, 0xbe, 0x77, 0x47, 0x87, 0x1e, 0x61, 0x35, 0xd5, 0xde, 0xbd, 0x6f, 0x21, + 0x88, 0x34, 0xfe, 0xa8, 0x50, 0x4d, 0x50, 0x00, 0xa7, 0x9b, 0x34, 0xc2, 0xc0, 0xe5, 0x46, 0x6e, + 0x7b, 0x62, 0x6c, 0x1e, 0x7a, 0x5e, 0xdc, 0xc9, 0xe8, 0xb2, 0xdf, 0xe4, 0xe5, 0x9b, 0x07, 0xe8, + 0x3e, 0x5c, 0x53, 0xb7, 0xf5, 0xe4, 0x48, 0x04, 0x3c, 0xa1, 0xcc, 0x4f, 0x51, 0x9b, 0xfa, 0x6d, + 0xd6, 0x1c, 0x4e, 0xf0, 0xc0, 0x6a, 0x53, 0xa5, 0x49, 0x87, 0xf6, 0x17, 0x0b, 0x94, 0xe0, 0xac, + 0x9a, 0xf4, 0xf1, 0x6a, 0x8c, 0x0e, 0x95, 0x49, 0xb4, 0xd6, 0x73, 0x25, 0x23, 0xea, 0x07, 0x23, + 0x54, 0x6e, 0x61, 0x66, 0xf4, 0x43, 0xca, 0xa7, 0x49, 0x8e, 0x72, 0xc9, 0x87, 0x34, 0x4d, 0xa1, + 0xd0, 0x61, 0x37, 0xd2, 0x10, 0xd9, 0xb0, 0x9d, 0xfe, 0xee, 0xf3, 0xfe, 0xce, 0xf6, 0x64, 0x77, + 0xcd, 0x5b, 0x3f, 0x23, 0x61, 0xa9, 0xe6, 0x2a, 0xf2, 0x2f, 0x07, 0x6a, 0x98, 0xb5, 0xb1, 0xdb, + 0x60, 0xc6, 0xed, 0xc4, 0xc8, 0x54, 0x51, 0xa8, 0x76, 0xee, 0xcb, 0xdf, 0xdc, 0x8a, 0xca, 0x2d, + 0xe9, 0x0d, 0x04, 0x16, 0x54, 0xb2, 0xa6, 0x54, 0x5b, 0xca, 0x44, 0x81, 0x79, 0x1c, 0xaa, 0xc3, + 0x7c, 0x9d, 0xc0, 0x9d, 0x43, 0x96, 0x55, 0x28, 0x1e, 0x7e, 0xd6, 0xd7, 0x47, 0x94, 0x01, 0x74, + 0xfe, 0x66, 0x85, 0xa7, 0x28, 0xea, 0x96, 0x66, 0xd4, 0xfc, 0x01, 0x31, 0x50, 0x64, 0xfd, 0x2b, + 0x85, 0x6f, 0x87, 0xbb, 0xad, 0x45, 0x9d, 0x5e, 0x12, 0xb0, 0xbd, 0x9d, 0xdd, 0x5f, 0xb7, 0xf7, + 0x76, 0xf6, 0x9e, 0xb1, 0xd7, 0x99, 0xc1, 0x3b, 0x4f, 0x81, 0x43, 0x47, 0x49, 0xb6, 0xa4, 0x57, + 0x72, 0x53, 0xb2, 0xce, 0x50, 0xcc, 0xf0, 0x00, 0x01, 0xf2, 0x50, 0xaa, 0xae, 0xb8, 0x3f, 0x05, + 0xc6, 0x24, 0xd7, 0x93, 0x68, 0x81, 0x07, 0xa2, 0x34, 0xd1, 0xd9, 0xe9, 0xeb, 0x93, 0x77, 0xa3, + 0x93, 0x6f, 0x3d, 0xd0, 0x39, 0x3f, 0x1d, 0xb3, 0xbc, 0x96, 0xe4, 0x0d, 0x44, 0x99, 0x6b, 0x15, + 0x1d, 0x49, 0x03, 0xab, 0x60, 0x86, 0xb5, 0x28, 0x96, 0xa0, 0x55, 0xbc, 0xd8, 0x8a, 0x96, 0x0f, + 0xac, 0x2a, 0x39, 0x65, 0xae, 0x7f, 0xcd, 0x32, 0xff, 0x40, 0x25, 0xc2, 0xa7, 0x2d, 0x35, 0xbb, + 0x52, 0xb6, 0x10, 0x57, 0xd4, 0xbf, 0x00, 0x7c, 0xb7, 0xb5, 0xfd, 0xb6, 0xb3, 0xed, 0xfc, 0x54, + 0x6b, 0x1b, 0x51, 0xcd, 0xc1, 0x07, 0x75, 0xf4, 0xd4, 0xde, 0xd3, 0x2f, 0x8c, 0xff, 0x03, 0xf7, + 0x2d, 0xda, 0x12, 0x71, 0x14, 0x00, 0x00 }; // Autogenerated from wled00/data/settings_um.htm, do not edit!! const uint16_t PAGE_settings_um_length = 2748; const uint8_t PAGE_settings_um[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x59, 0x6d, 0x6f, 0xdb, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xcd, 0x59, 0x6d, 0x6f, 0xdb, 0x38, 0x12, 0xfe, 0x9e, 0x5f, 0xa1, 0xb0, 0x41, 0x22, 0xc1, 0x8a, 0xec, 0xb4, 0xbb, 0x40, 0xd7, 0xb6, 0x94, 0x6b, 0xd3, 0xee, 0xd6, 0xd7, 0x97, 0x04, 0x48, 0xbb, 0x8b, 0x43, 0x9a, 0x6b, 0x64, 0x89, 0xb6, 0xd9, 0xc8, 0xa4, 0x4e, 0xa4, 0xf2, 0x72, 0x8e, 0xff, 0xfb, 0x3d, 0x43, 0x49, 0xb6, 0x9c, @@ -1822,7 +1822,7 @@ const uint8_t PAGE_settings_um[] PROGMEM = { // Autogenerated from wled00/data/settings_2D.htm, do not edit!! const uint16_t PAGE_settings_2D_length = 2010; const uint8_t PAGE_settings_2D[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x9d, 0x58, 0x5b, 0x73, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x9d, 0x58, 0x5b, 0x73, 0xdb, 0x36, 0x16, 0x7e, 0xd7, 0xaf, 0x80, 0xd1, 0x6e, 0x86, 0x8c, 0x29, 0x4a, 0x72, 0xdb, 0x4c, 0x46, 0x22, 0xe9, 0x8d, 0x2f, 0x5b, 0x79, 0xc7, 0x6e, 0x3c, 0x51, 0xd6, 0x8e, 0x67, 0xb3, 0xd3, 0xc2, 0xe4, 0xa1, 0x84, 0x98, 0x04, 0x38, 0x04, 0x24, 0xdb, 0x75, 0xfc, 0xdf, 0x7b, 0x00, 0x52, 0x12, 0x75, @@ -1954,7 +1954,7 @@ const uint8_t PAGE_settings_2D[] PROGMEM = { // Autogenerated from wled00/data/settings_pin.htm, do not edit!! const uint16_t PAGE_settings_pin_length = 471; const uint8_t PAGE_settings_pin[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31, 0x10, 0xbd, 0xef, 0xaf, 0x30, 0x73, 0x69, 0x82, 0x92, 0x6c, 0xa8, 0xa8, 0x04, 0xaa, 0xbd, 0x42, 0x81, 0x1e, 0xb8, 0x94, 0x48, 0xe5, 0x52, 0x55, 0x55, 0xe5, 0xd8, 0xb3, 0x89, 0x55, 0x7f, 0x2c, 0xb6, 0x37, 0x21, 0x54, 0xfc, 0x77, 0xc6, 0xbb, 0xa1, 0xa0, 0x5c, 0xd6, 0x7e, 0x33, 0xe3, 0x37, diff --git a/wled00/wled.h b/wled00/wled.h index c9df0e7e..3e6fbe49 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2301020 +#define VERSION 2301030 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG From 7cdafa76a5c99678632af763a87a56e328ae3e6b Mon Sep 17 00:00:00 2001 From: Frank <91616163+softhack007@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:32:31 +0100 Subject: [PATCH 10/11] UM Battery - improvements for esp32 * added missing pinMode(.., INPUT) on esp32 * do not try reading from pin = -1 (ESP32-S2 shows very allergic reactions to this) * Info page - show "n/a" when pin = -1 * readme: esp32 default pin = 35 --- usermods/Battery/readme.md | 2 +- usermods/Battery/usermod_v2_Battery.h | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/usermods/Battery/readme.md b/usermods/Battery/readme.md index d77eeccd..5a667870 100644 --- a/usermods/Battery/readme.md +++ b/usermods/Battery/readme.md @@ -36,7 +36,7 @@ define `USERMOD_BATTERY` in `wled00/my_config.h` | Name | Unit | Description | | ----------------------------------------------- | ----------- |-------------------------------------------------------------------------------------- | | `USERMOD_BATTERY` | | define this (in `my_config.h`) to have this usermod included wled00\usermods_list.cpp | -| `USERMOD_BATTERY_MEASUREMENT_PIN` | | defaults to A0 on ESP8266 and GPIO32 on ESP32 | +| `USERMOD_BATTERY_MEASUREMENT_PIN` | | defaults to A0 on ESP8266 and GPIO35 on ESP32 | | `USERMOD_BATTERY_MEASUREMENT_INTERVAL` | ms | battery check interval. defaults to 30 seconds | | `USERMOD_BATTERY_MIN_VOLTAGE` | v | minimum battery voltage. default is 2.6 (18650 battery standard) | | `USERMOD_BATTERY_MAX_VOLTAGE` | v | maximum battery voltage. default is 4.2 (18650 battery standard) | diff --git a/usermods/Battery/usermod_v2_Battery.h b/usermods/Battery/usermod_v2_Battery.h index ba61edd2..461613a4 100644 --- a/usermods/Battery/usermod_v2_Battery.h +++ b/usermods/Battery/usermod_v2_Battery.h @@ -93,6 +93,7 @@ class UsermodBattery : public Usermod void lowPowerIndicator() { if (!lowPowerIndicatorEnabled) return; + if (batteryPin < 0) return; // no measurement if (lowPowerIndicationDone && lowPowerIndicatorReactivationThreshold <= batteryLevel) lowPowerIndicationDone = false; if (lowPowerIndicatorThreshold <= batteryLevel) return; if (lowPowerIndicationDone) return; @@ -130,6 +131,8 @@ class UsermodBattery : public Usermod if (!success) { DEBUG_PRINTLN(F("Battery pin allocation failed.")); batteryPin = -1; // allocation failed + } else { + pinMode(batteryPin, INPUT); } #else //ESP8266 boards have only one analog input pin A0 @@ -168,6 +171,9 @@ class UsermodBattery : public Usermod nextReadTime = millis() + readingInterval; lastReadTime = millis(); + + if (batteryPin < 0) return; // nothing to read + initializing = false; // read battery raw input @@ -214,6 +220,13 @@ class UsermodBattery : public Usermod JsonObject user = root["u"]; if (user.isNull()) user = root.createNestedObject("u"); + if (batteryPin < 0) { + JsonArray infoVoltage = user.createNestedArray(F("Battery voltage")); + infoVoltage.add(F("n/a")); + infoVoltage.add(F(" invalid GPIO")); + return; // no GPIO - nothing to report + } + // info modal display names JsonArray infoPercentage = user.createNestedArray(F("Battery level")); JsonArray infoVoltage = user.createNestedArray(F("Battery voltage")); @@ -561,7 +574,7 @@ class UsermodBattery : public Usermod { #ifdef ARDUINO_ARCH_ESP32 // esp32 - return 4095.0f; + return 4096.0f; #else // esp8266 return 1024.0f; From 15bc6159f9dd70766bd74d0627943e1ef828c95e Mon Sep 17 00:00:00 2001 From: Frank <91616163+softhack007@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:54:02 +0100 Subject: [PATCH 11/11] UM Battery: fix for deprecated function call wled00/../usermods/Battery/usermod_v2_Battery.h:446:48: warning: 'void PinManagerClass::deallocatePin(byte)' is deprecated: Replaced by two-parameter deallocatePin(gpio, ownerTag) --- usermods/Battery/usermod_v2_Battery.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usermods/Battery/usermod_v2_Battery.h b/usermods/Battery/usermod_v2_Battery.h index 461613a4..64e13ec6 100644 --- a/usermods/Battery/usermod_v2_Battery.h +++ b/usermods/Battery/usermod_v2_Battery.h @@ -443,7 +443,7 @@ class UsermodBattery : public Usermod if (newBatteryPin != batteryPin) { // deallocate pin - pinManager.deallocatePin(batteryPin); + pinManager.deallocatePin(batteryPin, PinOwner::UM_Battery); batteryPin = newBatteryPin; // initialise setup();