Merge branch 'main' into beta-3

This commit is contained in:
Blaz Kristan 2023-06-04 20:11:27 +02:00
commit 7dfc4a651d
4 changed files with 191 additions and 169 deletions

View File

@ -1,9 +1,17 @@
## WLED changelog ## WLED changelog
#### Build 2306020
- Support for segment sets (PR #3171)
- Reduce sound simulation modes to 2 to facilitiate segment sets
- Trigger button immediately on press if all configured presets are the same (PR #3226)
- Changes for allowing Alexa to change light color to White when auto-calculating from RGB (PR #3211)
#### Build 2305280 #### Build 2305280
- DDP protocol update (#3193) - DDP protocol update (#3193)
- added PCF8574 I2C port expander support for Multi relay usermod - added PCF8574 I2C port expander support for Multi relay usermod
- MQTT multipacket (fragmented) message fix - MQTT multipacket (fragmented) message fix
- added option to retain MQTT brightness and color messages
- new ethernet board: @srg74 Ethernet Shield - new ethernet board: @srg74 Ethernet Shield
- new 2D effects: Soap (#3184) & Octopus & Waving cell (credit @St3P40 https://github.com/80Stepko08) - new 2D effects: Soap (#3184) & Octopus & Waving cell (credit @St3P40 https://github.com/80Stepko08)
- various fixes and enhancements - various fixes and enhancements

View File

@ -227,9 +227,8 @@ void handleButton()
static unsigned long lastRun = 0UL; static unsigned long lastRun = 0UL;
unsigned long now = millis(); unsigned long now = millis();
//if (strip.isUpdating()) return; // don't interfere with strip updates. Our button will still be there in 1ms (next cycle) if (strip.isUpdating() && (now - lastRun < 400)) return; // don't interfere with strip update (unless strip is updating continuously, e.g. very long strips)
if (strip.isUpdating() && (millis() - lastRun < 400)) return; // be niced, but avoid button starvation lastRun = now;
lastRun = millis();
for (uint8_t b=0; b<WLED_MAX_BUTTONS; b++) { for (uint8_t b=0; b<WLED_MAX_BUTTONS; b++) {
#ifdef ESP8266 #ifdef ESP8266
@ -257,6 +256,15 @@ void handleButton()
// momentary button logic // momentary button logic
if (isButtonPressed(b)) { // pressed if (isButtonPressed(b)) { // pressed
// if all macros are the same, fire action immediately on rising edge
if (macroButton[b] && macroButton[b] == macroLongPress[b] && macroButton[b] == macroDoublePress[b]) {
if (!buttonPressedBefore[b])
shortPressAction(b);
buttonPressedBefore[b] = true;
buttonPressedTime[b] = now; // continually update (for debouncing to work in release handler)
return;
}
if (!buttonPressedBefore[b]) buttonPressedTime[b] = now; if (!buttonPressedBefore[b]) buttonPressedTime[b] = now;
buttonPressedBefore[b] = true; buttonPressedBefore[b] = true;
@ -270,8 +278,14 @@ void handleButton()
} }
} else if (!isButtonPressed(b) && buttonPressedBefore[b]) { //released } else if (!isButtonPressed(b) && buttonPressedBefore[b]) { //released
long dur = now - buttonPressedTime[b]; long dur = now - buttonPressedTime[b];
// released after rising-edge short press action
if (macroButton[b] && macroButton[b] == macroLongPress[b] && macroButton[b] == macroDoublePress[b]) {
if (dur > WLED_DEBOUNCE_THRESHOLD) buttonPressedBefore[b] = false; // debounce, blocks button for 50 ms once it has been released
return;
}
if (dur < WLED_DEBOUNCE_THRESHOLD) {buttonPressedBefore[b] = false; continue;} // too short "press", debounce if (dur < WLED_DEBOUNCE_THRESHOLD) {buttonPressedBefore[b] = false; continue;} // too short "press", debounce
bool doublePress = buttonWaitTime[b]; //did we have a short press before? bool doublePress = buttonWaitTime[b]; //did we have a short press before?
buttonWaitTime[b] = 0; buttonWaitTime[b] = 0;

View File

@ -196,11 +196,11 @@
<h3>Ethernet Type</h3> <h3>Ethernet Type</h3>
<select name="ETH"> <select name="ETH">
<option value="0">None</option> <option value="0">None</option>
<option value="9">ABC! WLED V43 Controller & compatible</option> <option value="9">ABC! WLED V43 & compatible</option>
<option value="2">ESP32-POE</option> <option value="2">ESP32-POE</option>
<option value="6">ESP32Deux</option> <option value="6">ESP32Deux</option>
<option value="7">KIT-VE</option> <option value="7">KIT-VE</option>
<option value="8">QuinLED-Dig-Octa</option> <option value="8">QuinLED-Dig-Octa & T-ETH-POE</option>
<option value="4">QuinLED-ESP32</option> <option value="4">QuinLED-ESP32</option>
<option value="10">Serg74-ETH32</option> <option value="10">Serg74-ETH32</option>
<option value="5">TwilightLord-ESP32</option> <option value="5">TwilightLord-ESP32</option>

View File

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