From f1a1b89d13e557d66ff3790b5bf0f6f550e23bbc Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Fri, 3 Jun 2022 22:22:18 +0200 Subject: [PATCH] Fixes. - correct preset cycling - updated rotary encoder preset selection --- .../usermod_v2_rotary_encoder_ui_ALT.h | 12 +- wled00/fcn_declare.h | 2 +- wled00/html_ui.h | 406 +++++++++--------- wled00/json.cpp | 45 +- wled00/presets.cpp | 4 +- wled00/set.cpp | 32 +- wled00/util.cpp | 10 +- wled00/wled.h | 2 +- 8 files changed, 260 insertions(+), 253 deletions(-) diff --git a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h index a39c24b2..0f918484 100644 --- a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h +++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h @@ -741,6 +741,12 @@ public: display->updateRedrawTime(); #endif if (presetHigh && presetLow && presetHigh > presetLow) { + StaticJsonDocument<64> root; + char str[64]; + sprintf_P(str, PSTR("%d~%d~%s"), presetLow, presetHigh, increase?"":"-"); + root[F("ps")] = str; + deserializeState(root.as(), CALL_MODE_BUTTON_PRESET); +/* String apireq = F("win&PL=~"); if (!increase) apireq += '-'; apireq += F("&P1="); @@ -748,11 +754,11 @@ public: apireq += F("&P2="); apireq += presetHigh; handleSet(nullptr, apireq, false); +*/ lampUdated(); #ifdef USERMOD_FOUR_LINE_DISPLAY - char lineBuffer[64]; - sprintf(lineBuffer, "%d", currentPreset); - display->overlay(lineBuffer, 500, 11); // use heart + sprintf(str, "%d", currentPreset); + display->overlay(str, 500, 11); // use heart #endif } } diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h index ccc819d2..ae6ca96b 100644 --- a/wled00/fcn_declare.h +++ b/wled00/fcn_declare.h @@ -268,7 +268,7 @@ void userLoop(); int getNumVal(const String* req, uint16_t pos); void parseNumber(const char* str, byte* val, byte minv=0, byte maxv=255); bool getVal(JsonVariant elem, byte* val, byte minv=0, byte maxv=255); -bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255); +bool updateVal(const char* req, const char* key, byte* val, byte minv=0, byte maxv=255); bool oappend(const char* txt); // append new c string to temp buffer efficiently bool oappendi(int i); // append new number to temp buffer efficiently void sappend(char stype, const char* key, int val); diff --git a/wled00/html_ui.h b/wled00/html_ui.h index c2bd4eca..e1916255 100644 --- a/wled00/html_ui.h +++ b/wled00/html_ui.h @@ -7,7 +7,7 @@ */ // Autogenerated from wled00/data/index.htm, do not edit!! -const uint16_t PAGE_index_L = 28189; +const uint16_t PAGE_index_L = 28179; const uint8_t PAGE_index[] PROGMEM = { 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xdc, 0xbd, 0x79, 0x7f, 0xa3, 0x3a, 0xd2, 0x28, 0xfc, 0x7f, 0x3e, 0x05, 0xa1, 0xcf, 0x74, 0x9b, 0x31, 0xb1, 0xf1, 0x1a, 0xc7, 0x6e, @@ -1569,206 +1569,206 @@ const uint8_t PAGE_index[] PROGMEM = { 0xee, 0xdc, 0xa0, 0x2d, 0xb4, 0xb1, 0x1d, 0xab, 0x86, 0x74, 0x3e, 0xaa, 0x8f, 0x49, 0x41, 0x9a, 0xed, 0xa8, 0x23, 0xd3, 0xfb, 0x18, 0x14, 0x34, 0xf3, 0x97, 0xbe, 0x9d, 0xfe, 0x0e, 0x2d, 0x3d, 0xcc, 0xf3, 0x4f, 0xa2, 0xd0, 0x1f, 0x77, 0x85, 0xd3, 0xa9, 0x00, 0xc2, 0x2f, 0x03, 0xf9, 0x8e, - 0xaf, 0x7d, 0xb0, 0x7e, 0x4f, 0xf4, 0xf7, 0x34, 0x80, 0xed, 0x64, 0x09, 0x72, 0x16, 0xb7, 0xdc, - 0x59, 0x82, 0xb8, 0xfe, 0x37, 0xd0, 0x26, 0x7f, 0x80, 0x1e, 0xa4, 0x90, 0x1c, 0x17, 0xd2, 0x77, - 0x13, 0x48, 0x25, 0xc9, 0x9c, 0xa5, 0x78, 0xe9, 0x31, 0x30, 0xf4, 0x8d, 0x9f, 0xb2, 0x09, 0xba, - 0x17, 0x0b, 0x4b, 0x53, 0xc7, 0xdb, 0x97, 0xa7, 0xa4, 0x22, 0x5a, 0x3c, 0x05, 0x8a, 0x6f, 0x97, - 0xc6, 0x74, 0x10, 0x23, 0x41, 0xfd, 0x60, 0x1c, 0xf3, 0x33, 0xd7, 0x97, 0x8b, 0x1f, 0x24, 0x69, - 0x2c, 0x6b, 0xe8, 0x89, 0xb3, 0x93, 0x1e, 0x92, 0x03, 0x79, 0xdb, 0xce, 0x87, 0x40, 0x93, 0x3f, - 0x1b, 0xf5, 0x5f, 0x84, 0x3e, 0xcc, 0xfc, 0x25, 0x50, 0x29, 0x1c, 0x69, 0xcf, 0xde, 0x80, 0x3a, - 0x04, 0x73, 0x70, 0xca, 0x3a, 0x78, 0xd6, 0x94, 0x81, 0x32, 0xcb, 0x8a, 0x02, 0x2f, 0xdb, 0x91, - 0x76, 0x8b, 0xd0, 0x2e, 0xdd, 0xfc, 0xad, 0x61, 0x3b, 0xa0, 0x6d, 0xb9, 0xa8, 0x19, 0x6b, 0x7c, - 0x1b, 0x75, 0x61, 0xcf, 0xaf, 0x3c, 0x5a, 0x3d, 0xed, 0xa2, 0xeb, 0xef, 0xe7, 0x67, 0x12, 0xd2, - 0x6b, 0xa5, 0xb7, 0x2a, 0x4d, 0x16, 0x08, 0xbf, 0x1c, 0x77, 0x0b, 0xe5, 0xac, 0xab, 0xfd, 0xc8, - 0x82, 0x82, 0xf7, 0x2f, 0x7e, 0xd2, 0xdd, 0x52, 0xc8, 0x15, 0x4f, 0x0d, 0x6a, 0xc8, 0xaf, 0xc3, - 0xd8, 0xb1, 0x15, 0x87, 0x85, 0xf9, 0xb8, 0xa8, 0x3f, 0x9e, 0x59, 0x8f, 0x67, 0x8b, 0x8f, 0xc6, - 0x63, 0x8f, 0x70, 0xeb, 0xd5, 0xe3, 0xe4, 0x56, 0x29, 0xba, 0x88, 0x08, 0x26, 0xcf, 0xe9, 0x1b, - 0x46, 0xc3, 0xc8, 0x89, 0x28, 0x07, 0x6a, 0x63, 0x90, 0x1a, 0xa5, 0x4d, 0x72, 0xa5, 0x10, 0x0c, - 0xcb, 0xe5, 0xe7, 0x55, 0x61, 0xa2, 0xf4, 0xa5, 0x7e, 0xc5, 0x6f, 0xc5, 0xf2, 0x61, 0x2f, 0x90, - 0xa5, 0xa3, 0x34, 0x48, 0x95, 0x83, 0xa7, 0x44, 0xf1, 0x42, 0xa0, 0x2e, 0xa3, 0x62, 0x3c, 0x80, - 0xb2, 0x50, 0xbb, 0xbd, 0xdd, 0x67, 0xaf, 0x5e, 0xbe, 0x7c, 0x39, 0xec, 0xf0, 0x69, 0xd0, 0x21, - 0x53, 0x5e, 0xe7, 0x33, 0xde, 0x38, 0x35, 0x4e, 0x4d, 0x3b, 0xe4, 0x8a, 0xcc, 0xaf, 0x89, 0x1b, - 0x53, 0x67, 0xe5, 0xf9, 0xa3, 0x83, 0xde, 0x93, 0xab, 0x3a, 0xff, 0x0c, 0x3a, 0xd4, 0x83, 0x80, - 0x66, 0x8a, 0xd3, 0xce, 0x8c, 0x44, 0x51, 0x07, 0x9b, 0x67, 0x56, 0xca, 0xab, 0xc3, 0xbd, 0x55, - 0x7d, 0xb2, 0x7e, 0x69, 0xf3, 0x84, 0x8d, 0x93, 0x2e, 0x8f, 0xe6, 0x93, 0x1b, 0x06, 0x7c, 0x3c, - 0x47, 0x87, 0xa9, 0xdb, 0xec, 0x3a, 0x9e, 0x7f, 0xc6, 0x59, 0x48, 0x37, 0x50, 0xf9, 0x54, 0x44, - 0xf0, 0x15, 0xe2, 0x23, 0xf8, 0xc8, 0x71, 0x9e, 0x45, 0xf9, 0x19, 0xb0, 0x04, 0xec, 0x11, 0xdf, - 0x0e, 0x0d, 0x0b, 0x82, 0xf0, 0x1c, 0x50, 0x83, 0x95, 0x18, 0xd8, 0x09, 0x30, 0x32, 0xbf, 0x27, - 0x51, 0x62, 0xcd, 0xf7, 0xf3, 0x09, 0x01, 0x7d, 0xe2, 0x3c, 0xe7, 0x33, 0x3c, 0x3f, 0xab, 0x4f, - 0x71, 0x44, 0x35, 0x3c, 0xcc, 0xc6, 0xdc, 0xeb, 0xfd, 0x22, 0x3f, 0xbb, 0x04, 0xb9, 0x69, 0xb9, - 0xca, 0x43, 0x12, 0x27, 0xaa, 0x9e, 0x9c, 0xd5, 0x93, 0x3e, 0xd5, 0x93, 0xd0, 0xfd, 0x0d, 0x26, - 0x88, 0xae, 0x60, 0x95, 0x0e, 0xf2, 0xb7, 0x01, 0x30, 0xd2, 0xc0, 0x6b, 0xeb, 0x2d, 0xc4, 0xf0, - 0x62, 0x8c, 0xf7, 0x51, 0xca, 0xee, 0x93, 0xcf, 0x24, 0x7e, 0xae, 0xe5, 0x88, 0x1d, 0x7a, 0xb0, - 0x58, 0x20, 0x2b, 0xe2, 0x44, 0x57, 0x15, 0x21, 0x6b, 0x52, 0x2a, 0x36, 0xe9, 0xf7, 0xc4, 0x7a, - 0x06, 0x9d, 0x83, 0x69, 0xbe, 0x8e, 0x56, 0x21, 0x2f, 0x97, 0x63, 0x77, 0x68, 0xcb, 0xb0, 0x79, - 0xcf, 0x9b, 0x7b, 0x9b, 0x49, 0x89, 0x47, 0xb1, 0x9b, 0xa4, 0x07, 0x37, 0x3e, 0x93, 0xac, 0x61, - 0xa7, 0xe2, 0xd5, 0x47, 0x93, 0x2f, 0xb6, 0xf7, 0x4f, 0xf3, 0x38, 0xd8, 0x1d, 0x59, 0x07, 0xf1, - 0xaa, 0x94, 0x53, 0x6e, 0xef, 0x29, 0xe5, 0x1e, 0xbf, 0x9c, 0xf3, 0x53, 0x70, 0xb4, 0x63, 0x6b, - 0x51, 0xb7, 0x56, 0x94, 0xd9, 0x5c, 0x61, 0x08, 0x7e, 0x41, 0x90, 0xbd, 0x56, 0xca, 0x82, 0x70, - 0xe1, 0x76, 0xfc, 0xc1, 0x9b, 0x2c, 0xbb, 0xd7, 0x68, 0xbf, 0x1a, 0x5a, 0x7d, 0x38, 0x4b, 0xe7, - 0xe3, 0xae, 0x5d, 0xe6, 0x35, 0x5a, 0x2e, 0x2b, 0xdf, 0xe6, 0x21, 0x20, 0xb1, 0x36, 0x66, 0xe4, - 0x76, 0xcc, 0x0d, 0xbc, 0xb3, 0x3a, 0xf6, 0xe5, 0x13, 0x3a, 0xca, 0x3e, 0xb2, 0xdf, 0xc1, 0x77, - 0x0d, 0xfa, 0x40, 0x67, 0xb1, 0x4c, 0x94, 0x12, 0x66, 0x07, 0xe3, 0x02, 0x21, 0xfa, 0x0e, 0x1b, - 0x1a, 0x57, 0x2d, 0xda, 0xf0, 0x08, 0xd1, 0x07, 0xab, 0xf4, 0x9b, 0x0e, 0x07, 0x1e, 0x1e, 0x08, - 0x88, 0x7b, 0x88, 0xd1, 0xba, 0x5c, 0xa5, 0x52, 0x3c, 0x43, 0x5c, 0x84, 0x77, 0x84, 0x37, 0xde, - 0x5d, 0xde, 0x4c, 0xcf, 0xcb, 0x65, 0xb7, 0x34, 0xd0, 0x06, 0x81, 0x9d, 0x41, 0x6c, 0xcd, 0x10, - 0x90, 0x9c, 0xf7, 0x83, 0x5c, 0x14, 0x5c, 0x88, 0xee, 0xc0, 0x46, 0x82, 0x17, 0x97, 0x15, 0xd4, - 0x82, 0x51, 0x5a, 0x08, 0x86, 0xad, 0x50, 0xf3, 0x84, 0x21, 0xef, 0x40, 0xcf, 0xd1, 0xfd, 0x1d, - 0xdc, 0xdd, 0x2d, 0xa2, 0x50, 0xdf, 0xc2, 0xc9, 0x4f, 0x45, 0x44, 0x0e, 0x6f, 0x09, 0xf2, 0x15, - 0x23, 0xb9, 0xac, 0x40, 0x03, 0x5c, 0x2d, 0x06, 0xb0, 0x62, 0xc2, 0xdf, 0xa7, 0x01, 0x1a, 0xd2, - 0xfd, 0xc3, 0xc2, 0xf4, 0x76, 0x7f, 0x11, 0xda, 0xd1, 0xc2, 0xf6, 0x41, 0x27, 0x18, 0x5e, 0x67, - 0x2b, 0x76, 0xb8, 0x30, 0xb3, 0x1d, 0x7f, 0xe7, 0xe4, 0xf3, 0xab, 0x7b, 0xe8, 0x73, 0xd6, 0xa5, - 0xc4, 0xc9, 0xb4, 0xe8, 0xc2, 0x0b, 0x07, 0x44, 0x91, 0x7f, 0x82, 0x45, 0x70, 0xe2, 0x20, 0xb1, - 0xd2, 0x7d, 0xc9, 0x01, 0x27, 0x08, 0xed, 0x02, 0x5d, 0x0c, 0xdc, 0x78, 0x12, 0xaa, 0xdf, 0xc4, - 0x75, 0x66, 0xb3, 0x87, 0x61, 0x18, 0x86, 0x36, 0x6c, 0xbf, 0x02, 0x3a, 0x5d, 0x06, 0x36, 0x66, - 0xbf, 0x7a, 0x70, 0x13, 0xd8, 0x80, 0xfd, 0x1a, 0x1a, 0x95, 0x33, 0x10, 0x68, 0xbe, 0x66, 0x15, - 0x0b, 0xf6, 0x70, 0x4e, 0x10, 0x26, 0x06, 0x4a, 0x50, 0xaf, 0x66, 0x33, 0x74, 0x18, 0xee, 0x02, - 0x39, 0xd2, 0x1c, 0xc5, 0x61, 0xca, 0x17, 0x86, 0x7d, 0x58, 0xd7, 0xca, 0xec, 0x5c, 0x14, 0xf3, - 0x9d, 0x0c, 0x03, 0x00, 0x95, 0xcc, 0x14, 0x25, 0x85, 0x4e, 0x4b, 0xe7, 0x9b, 0x71, 0x41, 0x8e, - 0x7d, 0x6f, 0xc8, 0x61, 0xef, 0x2c, 0xb2, 0xef, 0x58, 0x30, 0xb1, 0x52, 0x8a, 0x49, 0x29, 0x0e, - 0xba, 0x83, 0xac, 0xce, 0xa6, 0x66, 0x37, 0xfe, 0xa0, 0x48, 0x49, 0x2c, 0x78, 0x4b, 0x8d, 0x2c, - 0x69, 0x26, 0xff, 0xaa, 0x92, 0xb3, 0xa0, 0x8c, 0xe2, 0x65, 0x76, 0x78, 0xca, 0x29, 0x28, 0x3e, - 0xbd, 0xcf, 0x7e, 0xb9, 0x99, 0x76, 0x81, 0xd3, 0x12, 0xe0, 0x34, 0x8c, 0x69, 0x27, 0x78, 0xcd, - 0x2d, 0x35, 0x65, 0x0f, 0xf2, 0x22, 0xd0, 0x79, 0x3c, 0x4d, 0xa8, 0xb3, 0x1b, 0xc3, 0xe8, 0x78, - 0x2d, 0xa1, 0x79, 0x9e, 0x4d, 0x26, 0x93, 0xce, 0x41, 0xef, 0xc5, 0xb7, 0x41, 0x07, 0xc3, 0xc6, - 0x79, 0xfb, 0x30, 0xaf, 0xf7, 0xbd, 0x00, 0x3f, 0x6f, 0xc4, 0xe7, 0x14, 0x96, 0x5b, 0x14, 0x47, - 0x6b, 0x28, 0x9c, 0x34, 0xd1, 0xf7, 0xeb, 0x1f, 0x42, 0x5f, 0x18, 0x86, 0xdb, 0xd1, 0x67, 0xd4, - 0xfc, 0xa3, 0xea, 0x58, 0x73, 0xb4, 0x3e, 0xb2, 0x04, 0x34, 0x09, 0x3d, 0x4b, 0x80, 0x4d, 0xf8, - 0xc5, 0x4f, 0x7f, 0xd5, 0x83, 0x0d, 0x19, 0x3f, 0xd5, 0xfa, 0xc8, 0x3e, 0x23, 0x4c, 0xf7, 0xee, - 0x2e, 0x22, 0x91, 0x13, 0x32, 0x94, 0x29, 0x3a, 0xc5, 0x4d, 0x51, 0xd6, 0xf8, 0x86, 0x32, 0xaa, - 0xeb, 0x37, 0x54, 0x21, 0x26, 0xde, 0xbd, 0xc9, 0xb2, 0x22, 0x26, 0x94, 0xb6, 0x6a, 0x18, 0x73, - 0xe5, 0x3b, 0x3f, 0x00, 0x3e, 0xe7, 0xca, 0xac, 0x9a, 0xf2, 0xde, 0x33, 0x44, 0xdf, 0x34, 0x61, - 0xb7, 0x60, 0x2a, 0x08, 0xe5, 0x96, 0x4c, 0xb4, 0x3a, 0xe3, 0x7c, 0x3e, 0x99, 0x84, 0xa1, 0xa7, - 0x71, 0xd1, 0xd6, 0x4c, 0xb3, 0x88, 0x43, 0x55, 0x95, 0x3e, 0xc6, 0xe9, 0xd1, 0x42, 0xa5, 0xef, - 0xec, 0x22, 0xa5, 0xd8, 0x11, 0x0b, 0x23, 0x82, 0xf4, 0x28, 0xa6, 0x40, 0x93, 0x7d, 0xc9, 0x5b, - 0x05, 0x7b, 0x24, 0x6b, 0xfe, 0xc0, 0xce, 0xb3, 0xf4, 0x07, 0x4e, 0xd2, 0xe9, 0x62, 0x02, 0xcb, - 0x5b, 0x02, 0xfd, 0x51, 0x7c, 0x82, 0x81, 0x84, 0xbf, 0xb0, 0x55, 0x64, 0x7f, 0x4d, 0x54, 0x11, - 0x67, 0x34, 0x60, 0x2c, 0xd6, 0x13, 0xb2, 0xb0, 0x58, 0xe9, 0x07, 0x6d, 0x11, 0xb0, 0xca, 0x39, - 0xdf, 0x58, 0x4e, 0xe1, 0x35, 0x8a, 0x00, 0xa7, 0x9c, 0x5f, 0x37, 0x96, 0xf3, 0xc9, 0x6b, 0x94, - 0x19, 0x4e, 0x39, 0x3f, 0xd6, 0xcb, 0xe9, 0xae, 0x38, 0xc7, 0x0f, 0x9a, 0x66, 0x46, 0xe5, 0xbc, - 0x8f, 0x93, 0xd9, 0xe2, 0x52, 0x67, 0x5d, 0x08, 0xca, 0xa8, 0x69, 0x55, 0x00, 0x91, 0xdf, 0xb4, - 0x26, 0x0c, 0x35, 0xb3, 0x88, 0x68, 0x94, 0xd2, 0x65, 0x06, 0x3d, 0x3d, 0xfd, 0x2b, 0xee, 0x93, - 0xd0, 0x1c, 0x31, 0xd3, 0xe5, 0xcd, 0x65, 0xc4, 0x02, 0x37, 0xed, 0x06, 0xb1, 0xa5, 0x9d, 0xb4, - 0x69, 0x54, 0x48, 0x9c, 0x62, 0xf1, 0xc8, 0x69, 0xe2, 0x07, 0xdb, 0x07, 0x50, 0x29, 0x03, 0x41, - 0xb3, 0xe6, 0x53, 0xd6, 0xe6, 0x08, 0x93, 0x6d, 0xe6, 0xb5, 0x88, 0x0c, 0x36, 0xf3, 0x31, 0xc7, - 0x6c, 0x24, 0x66, 0xc6, 0xaa, 0x5d, 0xc3, 0xa2, 0x73, 0x68, 0x8c, 0x9b, 0x09, 0xab, 0x8e, 0x53, - 0x27, 0xa2, 0xcb, 0xa2, 0xb6, 0xc9, 0x10, 0x82, 0x10, 0x46, 0xe8, 0x2f, 0x09, 0x48, 0xcd, 0x2e, - 0x42, 0xdb, 0x6e, 0x64, 0x19, 0x0a, 0x69, 0xd7, 0xdf, 0xc1, 0x57, 0x4d, 0x8c, 0xe7, 0x46, 0xd3, - 0x94, 0x52, 0xa5, 0x7c, 0x19, 0xf9, 0xca, 0xd5, 0x14, 0x26, 0x30, 0x0a, 0x85, 0x84, 0x39, 0x8c, - 0x0f, 0x97, 0x83, 0x2c, 0x98, 0xc0, 0x20, 0xa4, 0x3a, 0xe9, 0x86, 0x92, 0xa6, 0x51, 0xa2, 0x93, - 0xa6, 0x94, 0x74, 0x0f, 0x8b, 0x9b, 0xd3, 0x61, 0x54, 0x89, 0x3c, 0xce, 0x85, 0x4a, 0x06, 0x17, - 0x17, 0x97, 0x01, 0xfd, 0xbb, 0xac, 0x2a, 0x71, 0xdc, 0x89, 0xe0, 0xd3, 0x94, 0x3b, 0xba, 0xe0, - 0x9d, 0x93, 0x5d, 0xba, 0xc7, 0x99, 0x96, 0x29, 0x72, 0x92, 0xa0, 0xcf, 0x69, 0xf3, 0x49, 0xc2, - 0x6c, 0x56, 0xba, 0x76, 0x63, 0xc2, 0x97, 0x9d, 0x99, 0xba, 0x1e, 0x62, 0xc8, 0xff, 0x1d, 0xa5, - 0x83, 0x88, 0x29, 0x80, 0xbf, 0x65, 0x7c, 0x82, 0xa3, 0xa3, 0x9b, 0xb8, 0x5c, 0xdc, 0x4d, 0xf1, - 0x7c, 0xef, 0xe8, 0x75, 0xbc, 0x9c, 0x65, 0x59, 0xf6, 0x31, 0x66, 0x47, 0x18, 0x8e, 0xe2, 0xe8, - 0x3e, 0xfe, 0x18, 0xe3, 0xd6, 0x97, 0x9b, 0x1e, 0x97, 0xd0, 0x91, 0x1c, 0xe9, 0x4b, 0xa2, 0xe0, - 0x74, 0xbb, 0x8b, 0xd9, 0x7e, 0xd4, 0x7b, 0xe9, 0x8f, 0x8e, 0x43, 0xd4, 0x64, 0xb0, 0x5a, 0x3f, - 0x58, 0xcc, 0x46, 0x7d, 0xf9, 0xf3, 0x38, 0x44, 0x51, 0xff, 0xfc, 0x79, 0x14, 0x2d, 0x66, 0x94, - 0xb2, 0x1f, 0x1d, 0x63, 0x4a, 0xf8, 0xd2, 0x48, 0x81, 0x02, 0xa4, 0x76, 0x83, 0x68, 0x2e, 0xbe, - 0xb5, 0x6f, 0xb8, 0x5a, 0x14, 0xe8, 0x1a, 0xb6, 0x98, 0x55, 0x41, 0x07, 0x51, 0x70, 0x82, 0xce, - 0x8b, 0xf0, 0x5b, 0x8c, 0x40, 0x16, 0xbc, 0xea, 0x89, 0x48, 0x28, 0xa0, 0x11, 0x2d, 0x2d, 0x64, - 0x40, 0x48, 0xf8, 0x85, 0x8c, 0x82, 0xdc, 0xa0, 0x89, 0xcf, 0x2d, 0x01, 0x40, 0x9b, 0x14, 0x0a, - 0x15, 0x3e, 0x94, 0x31, 0x2f, 0xda, 0xf7, 0x2a, 0xa6, 0x67, 0x10, 0x02, 0xcc, 0xcd, 0xe3, 0xe5, - 0x6d, 0xe7, 0x17, 0x36, 0xcd, 0x32, 0xb1, 0x21, 0xec, 0xf2, 0xfa, 0x41, 0x4b, 0xad, 0xc5, 0x6c, - 0x80, 0x6d, 0x73, 0xe4, 0x1d, 0x71, 0x13, 0x42, 0x25, 0x49, 0x3d, 0xb7, 0x51, 0x0c, 0x31, 0x9a, - 0xba, 0x2d, 0x9f, 0x44, 0x18, 0xf3, 0xa1, 0xa4, 0xfd, 0xdc, 0xff, 0x42, 0x2a, 0x79, 0xc5, 0x9a, - 0xc8, 0x73, 0x0a, 0x1e, 0x23, 0x69, 0x08, 0x5a, 0x8a, 0x9b, 0xbb, 0xc5, 0x51, 0x5f, 0xaa, 0x23, - 0x4f, 0xcf, 0xf2, 0x38, 0x59, 0xf1, 0x03, 0xeb, 0x90, 0x1f, 0x6a, 0x4a, 0x7c, 0x08, 0xf2, 0x32, - 0xd8, 0x09, 0x2b, 0xc3, 0x1f, 0x85, 0x45, 0xbd, 0x21, 0x13, 0xfe, 0x28, 0xcc, 0xf1, 0x47, 0x11, - 0x07, 0xa2, 0xed, 0x8e, 0x30, 0x84, 0x35, 0x67, 0x84, 0x71, 0x36, 0xf1, 0x1e, 0xad, 0x90, 0xcf, - 0x22, 0x1c, 0x25, 0xa7, 0x90, 0x62, 0x7f, 0xc0, 0x06, 0x7b, 0x09, 0x5a, 0x18, 0x5e, 0x2b, 0xc7, - 0x78, 0xbe, 0x5d, 0xef, 0x3e, 0x21, 0x60, 0xca, 0x07, 0x4f, 0xdc, 0xb9, 0x47, 0x25, 0x84, 0xef, - 0xbf, 0x0d, 0xab, 0x5a, 0xc9, 0xb1, 0xe0, 0x31, 0x86, 0xce, 0x27, 0x44, 0xff, 0xa7, 0x0f, 0x39, - 0x0c, 0x66, 0x8d, 0xf0, 0x24, 0xe7, 0x1d, 0x0c, 0x42, 0x88, 0x75, 0x4d, 0x85, 0xa5, 0xb2, 0xf2, - 0xad, 0xaa, 0xe0, 0x46, 0x1d, 0xe4, 0xf0, 0x46, 0x84, 0x81, 0x00, 0xd2, 0x33, 0xc8, 0x2c, 0x6a, - 0x64, 0x06, 0x0e, 0x62, 0xe2, 0x2a, 0x1f, 0x98, 0x05, 0x07, 0x9f, 0x4c, 0xe0, 0x39, 0x0c, 0xad, - 0x5a, 0xdf, 0x02, 0x06, 0x5c, 0x85, 0x93, 0xf0, 0x7d, 0x2c, 0x78, 0xf5, 0xca, 0x3a, 0xaa, 0x70, - 0x09, 0x23, 0x8b, 0xca, 0x76, 0x31, 0x4d, 0x81, 0x94, 0x87, 0x71, 0x4e, 0x6a, 0xee, 0x3e, 0xb3, - 0x43, 0x9b, 0x7e, 0x05, 0x2e, 0x63, 0x73, 0x54, 0xd4, 0xb5, 0x28, 0x8b, 0x05, 0xf4, 0xa4, 0xd5, - 0xe1, 0xb6, 0xfd, 0x1e, 0xba, 0xdf, 0xea, 0x35, 0x18, 0x36, 0x28, 0xe3, 0xa4, 0x38, 0xbc, 0x1d, - 0xbb, 0xc0, 0x86, 0xb5, 0xde, 0xd8, 0xef, 0x41, 0x7f, 0x54, 0x01, 0x6c, 0x55, 0x07, 0x88, 0xe6, - 0xb9, 0x65, 0xcc, 0x54, 0x04, 0x6d, 0xee, 0xbf, 0xf9, 0x59, 0x00, 0x87, 0x35, 0x04, 0x85, 0x6a, - 0x88, 0xa6, 0x6e, 0x06, 0x51, 0x37, 0xc2, 0x1a, 0xae, 0x9a, 0x43, 0xa7, 0xd3, 0x4d, 0x1f, 0x61, - 0xe3, 0x7c, 0x0f, 0xbb, 0x11, 0x6d, 0x1c, 0xed, 0xbf, 0xe9, 0x78, 0x3e, 0xc7, 0x2c, 0x2c, 0x9b, - 0x6f, 0x85, 0x5b, 0x67, 0x2d, 0x93, 0x25, 0x36, 0x27, 0x28, 0xf5, 0xa4, 0x62, 0xed, 0xdb, 0x1b, - 0x55, 0x10, 0x9a, 0xbc, 0x85, 0xde, 0xe0, 0x3a, 0xfa, 0xa9, 0x6b, 0xde, 0xd8, 0xe0, 0x72, 0x53, - 0x4b, 0xe3, 0xc8, 0xcb, 0xf1, 0x34, 0x1d, 0x41, 0xb6, 0x4b, 0xd0, 0xd2, 0x7b, 0xc3, 0x58, 0xc3, - 0x7a, 0xc4, 0x12, 0xd6, 0x23, 0x8d, 0x8a, 0x8b, 0xf8, 0x32, 0x48, 0x60, 0xb3, 0xbc, 0x55, 0x67, - 0x94, 0xd9, 0x3f, 0xf3, 0x9c, 0x2d, 0x4f, 0x27, 0x88, 0xcd, 0x3a, 0x4c, 0x1d, 0xea, 0x13, 0xd5, - 0x59, 0xa2, 0x09, 0x76, 0x7e, 0x1f, 0xc3, 0xfa, 0xec, 0x50, 0xe8, 0x50, 0x39, 0x5e, 0x48, 0xdc, - 0xee, 0x6e, 0x62, 0x76, 0x32, 0xf5, 0xb1, 0x72, 0x5b, 0x04, 0xb6, 0x35, 0x02, 0x2c, 0x25, 0x6c, - 0x92, 0x72, 0x1c, 0xd6, 0xa6, 0xfe, 0x17, 0x12, 0x8a, 0x91, 0x07, 0x62, 0x9c, 0xdd, 0x15, 0x76, - 0x57, 0xcb, 0xdd, 0x06, 0xe2, 0x6d, 0x97, 0x87, 0xf3, 0x6c, 0x76, 0x87, 0x26, 0xa2, 0x92, 0x0a, - 0x41, 0xde, 0xfb, 0x2b, 0x6e, 0xcf, 0xba, 0xb8, 0x47, 0xe1, 0xdf, 0x3c, 0x3a, 0xa1, 0xb5, 0x77, - 0x04, 0xd9, 0xf2, 0x76, 0x52, 0xbe, 0x5e, 0x6a, 0x15, 0x2d, 0xc0, 0x18, 0x55, 0x1a, 0x18, 0x04, - 0x57, 0x17, 0xfb, 0xa2, 0x24, 0x43, 0xdf, 0x74, 0x5f, 0xf6, 0x36, 0xfd, 0x1a, 0xf2, 0xcd, 0x53, - 0xea, 0x13, 0x32, 0x2b, 0x69, 0x5e, 0x94, 0x1e, 0x5d, 0xa4, 0x97, 0xe8, 0xff, 0xd3, 0x2d, 0x79, - 0x3e, 0x51, 0xa8, 0x7f, 0x52, 0xf8, 0x12, 0xa1, 0x83, 0x23, 0xee, 0x17, 0x07, 0x25, 0x61, 0xee, - 0xf3, 0x5c, 0x24, 0xee, 0x19, 0x77, 0x81, 0x3f, 0xe8, 0xf1, 0x80, 0x1b, 0x35, 0x22, 0x0c, 0x8c, - 0x59, 0x7f, 0x95, 0x5a, 0xa0, 0xb3, 0x36, 0x39, 0xe5, 0x12, 0xa9, 0x31, 0x10, 0x66, 0x4d, 0xa2, - 0x0c, 0x5c, 0x0a, 0x9b, 0x36, 0x97, 0x2e, 0x23, 0xa3, 0x20, 0xcf, 0xf4, 0x70, 0x47, 0x2a, 0x75, - 0xa7, 0x2a, 0xff, 0x33, 0x43, 0xe9, 0xe5, 0x8e, 0xa8, 0x1c, 0xc4, 0x84, 0x19, 0x5e, 0xa8, 0x99, - 0xd8, 0x0a, 0x88, 0x6d, 0x04, 0xe7, 0x70, 0x43, 0x39, 0xc6, 0x59, 0x36, 0xc2, 0x1e, 0xb5, 0xec, - 0x90, 0x45, 0xa3, 0x1d, 0xd2, 0x0c, 0x7d, 0xb7, 0x43, 0x7c, 0xd8, 0x94, 0x4b, 0x39, 0x7a, 0xf3, - 0x95, 0xad, 0xc1, 0xf9, 0x55, 0xe7, 0x08, 0xd8, 0x88, 0x86, 0x53, 0x0e, 0x36, 0x92, 0xec, 0xbe, - 0xa5, 0x3d, 0x5c, 0xf4, 0x7b, 0x08, 0x81, 0xa8, 0x0e, 0x32, 0x53, 0x7f, 0x2c, 0x7d, 0xdb, 0xd3, - 0xcb, 0x28, 0x17, 0x5f, 0x94, 0x09, 0x3b, 0xd0, 0x3c, 0xa8, 0x72, 0x21, 0x08, 0x2d, 0x0e, 0xa1, - 0x4a, 0x10, 0xf8, 0x0e, 0xbe, 0x76, 0x93, 0x57, 0x69, 0x91, 0x46, 0x4f, 0x49, 0x09, 0x5b, 0xc1, - 0xcc, 0x81, 0xd8, 0x41, 0xb5, 0xb2, 0x10, 0xaa, 0xd3, 0x2a, 0x08, 0xf1, 0x2c, 0x42, 0x69, 0xba, - 0xa1, 0x11, 0x32, 0xcf, 0x84, 0xb8, 0x07, 0x7c, 0x4a, 0x71, 0x6c, 0x0c, 0x9f, 0x77, 0xe0, 0xbb, - 0xc1, 0xfa, 0x37, 0x64, 0xb4, 0xdf, 0x7c, 0x92, 0xc7, 0xbf, 0x82, 0x56, 0x0c, 0x09, 0xd2, 0x92, - 0x9e, 0x9a, 0xc7, 0x75, 0x51, 0x82, 0xe6, 0xdf, 0xa4, 0x7e, 0x6a, 0x25, 0x62, 0x29, 0xf0, 0x17, - 0x9c, 0x23, 0x4d, 0x6a, 0x19, 0xf7, 0xc0, 0x4e, 0xa5, 0x23, 0xbd, 0xc0, 0xaf, 0x5a, 0x73, 0x2f, - 0x80, 0x5f, 0x96, 0x37, 0x82, 0x40, 0xb6, 0xb4, 0x40, 0x46, 0x82, 0xad, 0x17, 0x69, 0x3b, 0xcb, - 0x57, 0xe5, 0x17, 0xb8, 0xfd, 0x1b, 0x76, 0xda, 0x94, 0xa4, 0x96, 0xb6, 0xd3, 0xd6, 0x3c, 0x26, - 0xa6, 0xc9, 0xdd, 0xb2, 0xdb, 0x18, 0x2a, 0xa7, 0xfe, 0xc4, 0x74, 0x62, 0xe0, 0x4f, 0x2b, 0x7e, - 0x7f, 0xfa, 0xdf, 0xa7, 0x75, 0x2f, 0x13, 0xc9, 0xb7, 0x18, 0xee, 0x2f, 0x78, 0x1b, 0x3d, 0xa7, - 0x59, 0x18, 0x13, 0x25, 0x51, 0x18, 0x3c, 0x84, 0x02, 0x81, 0x9b, 0x1a, 0x77, 0x0e, 0x29, 0xd8, - 0x06, 0xee, 0x4a, 0x6d, 0x50, 0xcf, 0xb1, 0xa9, 0x57, 0x4a, 0xf1, 0xe6, 0x37, 0xbb, 0xae, 0xdf, - 0x67, 0x77, 0x30, 0x4a, 0xc5, 0xd8, 0x4d, 0x40, 0xe8, 0x77, 0x66, 0xac, 0xfd, 0x93, 0xe2, 0x6c, - 0x99, 0x11, 0x78, 0x11, 0x96, 0x22, 0x45, 0x22, 0x0f, 0x3b, 0xc5, 0xcc, 0x60, 0x53, 0xb4, 0xd8, - 0x52, 0x04, 0x29, 0xd4, 0xa3, 0x8b, 0x0f, 0xb0, 0x19, 0xeb, 0x7a, 0xf0, 0xae, 0x3a, 0xd8, 0x04, - 0x2d, 0x5a, 0x86, 0xf2, 0x32, 0xf5, 0x61, 0xd8, 0x2c, 0x73, 0xfb, 0xfd, 0x4e, 0x3e, 0x43, 0x1d, - 0x43, 0x4a, 0x24, 0x15, 0xdf, 0x5b, 0x8d, 0x2b, 0x89, 0x7d, 0x2b, 0xe8, 0xb7, 0x58, 0x6b, 0x74, - 0x96, 0xa1, 0x39, 0xd7, 0xe5, 0xd5, 0x53, 0xff, 0xf1, 0xd1, 0x6c, 0x46, 0xe9, 0xfc, 0x2e, 0xe0, - 0x77, 0x17, 0x3a, 0x53, 0x76, 0x15, 0x94, 0x86, 0xc6, 0xcd, 0x7f, 0xa9, 0x8e, 0x15, 0x81, 0x9a, - 0xcb, 0xc9, 0x74, 0xc6, 0xb5, 0x3f, 0xcf, 0xbf, 0xe0, 0xa3, 0x70, 0x29, 0x38, 0xeb, 0x7d, 0x96, - 0x07, 0xff, 0x3e, 0x6d, 0xf2, 0xd1, 0x17, 0xec, 0xb5, 0xd3, 0x95, 0x63, 0x13, 0xfa, 0x16, 0xf6, - 0x12, 0xf1, 0x3e, 0x6f, 0x3f, 0xcf, 0xb1, 0xbb, 0xeb, 0xf4, 0x43, 0x9d, 0xac, 0xa8, 0x3c, 0x78, - 0x08, 0x65, 0xd8, 0x77, 0xd2, 0x09, 0x0b, 0x04, 0x02, 0xdd, 0xef, 0xa6, 0x7f, 0x2e, 0x8e, 0xee, - 0x3f, 0x80, 0x1a, 0x99, 0xfd, 0x2d, 0x7e, 0x60, 0xd7, 0xdd, 0xbe, 0x3f, 0x0c, 0x77, 0x50, 0xc6, - 0x76, 0x39, 0xb9, 0xa3, 0x90, 0x50, 0x5d, 0x7c, 0x95, 0x70, 0x42, 0xa1, 0x08, 0x31, 0x21, 0x19, - 0x1d, 0xf6, 0xfa, 0xbb, 0xbb, 0x5b, 0x35, 0x15, 0x36, 0x11, 0xbc, 0x67, 0xa0, 0x1c, 0x68, 0x35, - 0xd7, 0x0a, 0x0a, 0x1d, 0xd6, 0x1e, 0x23, 0xda, 0xc7, 0x5e, 0xc0, 0xdf, 0x3b, 0x88, 0x52, 0x24, - 0xae, 0x77, 0x90, 0x48, 0x13, 0xcc, 0x04, 0x15, 0x83, 0x8f, 0x85, 0x20, 0x01, 0x74, 0xfc, 0xb6, - 0x32, 0xe6, 0x5e, 0x90, 0xf8, 0xdb, 0xf6, 0x6b, 0x0f, 0x0a, 0x12, 0x33, 0xc2, 0xd4, 0x08, 0x75, - 0x14, 0xbd, 0x55, 0x03, 0xe4, 0xac, 0xa3, 0x49, 0xc9, 0xbd, 0x47, 0x7a, 0x3d, 0xa3, 0xf3, 0x8c, - 0xfb, 0x0f, 0xa3, 0xef, 0x5f, 0x7d, 0xff, 0xf8, 0x08, 0x9f, 0x2f, 0x8e, 0x5f, 0xed, 0xee, 0xde, - 0x7f, 0x38, 0xf9, 0xbe, 0x1f, 0xfa, 0xad, 0xb1, 0x28, 0x39, 0x64, 0xf0, 0xea, 0xfe, 0x83, 0x8c, - 0x94, 0x48, 0xc2, 0x8a, 0x70, 0x46, 0xcd, 0x78, 0x7e, 0x43, 0x43, 0x85, 0xa6, 0xcb, 0x3f, 0x62, - 0x68, 0x39, 0x54, 0xe4, 0xb0, 0x38, 0xcd, 0x12, 0x6c, 0x3e, 0xb6, 0x8f, 0xed, 0x7b, 0x18, 0xff, - 0x24, 0x90, 0x69, 0x53, 0x69, 0xf8, 0x24, 0xc9, 0x66, 0xbd, 0x27, 0x72, 0x72, 0xe0, 0xe3, 0x2e, - 0xf4, 0xfb, 0x73, 0xfd, 0x5a, 0x99, 0xeb, 0xa2, 0x04, 0xa6, 0x38, 0xf1, 0x58, 0x1d, 0xdf, 0x58, - 0xa4, 0x73, 0x40, 0x3b, 0xb4, 0x46, 0x71, 0x66, 0x7c, 0x1d, 0x09, 0xae, 0x7c, 0x1d, 0x34, 0x6f, - 0xf2, 0xf2, 0xd9, 0xad, 0x17, 0x88, 0x2c, 0xbe, 0xf8, 0x12, 0xa9, 0xdf, 0xd0, 0x71, 0xbd, 0xfe, - 0x8b, 0x50, 0xf1, 0x36, 0x68, 0xa4, 0x8c, 0xfa, 0x57, 0x24, 0x63, 0xcf, 0xdf, 0xd3, 0x77, 0xea, - 0xec, 0xc8, 0x48, 0xe5, 0x3f, 0x70, 0x8a, 0xa2, 0xb1, 0x07, 0x98, 0x87, 0xdf, 0xf3, 0x92, 0x45, - 0x8e, 0x45, 0x55, 0x3b, 0xbd, 0x81, 0xa8, 0x0d, 0xe3, 0x26, 0x2b, 0xba, 0x35, 0x09, 0x0e, 0xf3, - 0xc9, 0xa5, 0x54, 0x84, 0x27, 0x07, 0xea, 0x4d, 0x00, 0x62, 0xfe, 0x56, 0x43, 0xd0, 0xf1, 0xac, - 0x74, 0x63, 0xcc, 0xf0, 0xac, 0x50, 0xa9, 0x72, 0x2d, 0x87, 0xae, 0x80, 0x7c, 0x63, 0x2f, 0xc4, - 0xfd, 0xe1, 0x5d, 0x99, 0x79, 0x4f, 0x18, 0x3d, 0x35, 0x15, 0xf8, 0xbd, 0x49, 0x49, 0x07, 0x9a, - 0x8b, 0xa0, 0xb4, 0xe7, 0xf8, 0x41, 0xee, 0xaf, 0xf7, 0x11, 0xcc, 0x73, 0x43, 0x8a, 0x30, 0x10, - 0x8a, 0x6f, 0x18, 0xcb, 0x61, 0xef, 0x73, 0x78, 0x78, 0x28, 0x82, 0xa1, 0x96, 0x52, 0x5f, 0x94, - 0xb2, 0x5f, 0x85, 0x41, 0x85, 0x15, 0x71, 0x11, 0xcf, 0x61, 0x0b, 0xc8, 0xdd, 0xef, 0x61, 0x83, - 0x49, 0xae, 0x5c, 0xfc, 0x5b, 0xe1, 0xfb, 0x26, 0xac, 0x47, 0x0c, 0x7c, 0xed, 0x8b, 0x27, 0x08, - 0xcf, 0x36, 0x26, 0x29, 0xff, 0xf8, 0x68, 0xef, 0x4a, 0x61, 0xc7, 0x0c, 0xa9, 0x74, 0x42, 0x1f, - 0x18, 0xd4, 0x40, 0x5a, 0x40, 0x6f, 0xf9, 0x83, 0xc6, 0xfc, 0x74, 0x61, 0x58, 0xd9, 0xae, 0x6a, - 0xcd, 0xa8, 0xf8, 0x8c, 0x6a, 0x95, 0x10, 0xa9, 0x17, 0x00, 0x97, 0x8b, 0xc9, 0x06, 0xab, 0x3e, - 0xed, 0x21, 0x50, 0x50, 0xb0, 0x14, 0x4f, 0x57, 0xf0, 0xa6, 0xf7, 0x7f, 0x60, 0x13, 0x87, 0xff, - 0x63, 0xf0, 0x19, 0x2c, 0xa7, 0x9e, 0xeb, 0x36, 0x43, 0xf7, 0xb0, 0xec, 0x1e, 0x0a, 0xc3, 0x69, - 0xdd, 0x9e, 0xb1, 0xc4, 0x15, 0x92, 0xe3, 0x34, 0x6f, 0xc8, 0x49, 0x45, 0xc2, 0x36, 0xdc, 0x0b, - 0x50, 0xbe, 0x6f, 0xc8, 0x77, 0x97, 0x6f, 0xca, 0x46, 0x15, 0x83, 0x02, 0xa8, 0xf3, 0xfd, 0xe9, - 0xe4, 0x08, 0x64, 0x70, 0x9c, 0x97, 0xa3, 0xce, 0xc9, 0x11, 0x86, 0x7e, 0xc0, 0xcf, 0x45, 0x79, - 0x9b, 0x8c, 0x3a, 0xff, 0x05, 0x5b, 0x7a, 0x27, 0x81, 0x5c, 0x58, 0x01, 0x00 + 0xaf, 0x7d, 0xb0, 0x7e, 0x4f, 0xf4, 0xf7, 0x34, 0x80, 0xed, 0x64, 0x19, 0xc1, 0x3c, 0x42, 0x97, + 0x51, 0x90, 0xb7, 0x71, 0x21, 0x9d, 0x35, 0x81, 0x36, 0x12, 0xc5, 0x59, 0x8a, 0xb7, 0x1c, 0x03, + 0x43, 0xc1, 0xf8, 0x29, 0x9b, 0xa0, 0x3f, 0xb1, 0x30, 0x2d, 0x75, 0xbc, 0x7d, 0x79, 0x2c, 0x2a, + 0xc2, 0xc3, 0x53, 0x64, 0xf8, 0x76, 0xf1, 0x4b, 0x27, 0x2f, 0x12, 0xc5, 0x0f, 0x06, 0x2e, 0x3f, + 0x73, 0x9d, 0xb7, 0xf8, 0xc9, 0x91, 0x06, 0xaf, 0x86, 0xa6, 0x9f, 0x9d, 0xf4, 0x90, 0x1c, 0xc8, + 0xdb, 0x76, 0x20, 0x04, 0xaa, 0xfb, 0xd9, 0xa8, 0xff, 0x22, 0xf4, 0x61, 0xaa, 0x2f, 0x81, 0x4a, + 0xe1, 0x39, 0x7b, 0xf6, 0x06, 0xf4, 0x1f, 0x98, 0x74, 0x53, 0xd6, 0xc1, 0xc3, 0xa5, 0x0c, 0xb4, + 0x57, 0x56, 0x14, 0x78, 0xbb, 0x8e, 0xd4, 0x59, 0xc4, 0x72, 0xe9, 0xe6, 0x6f, 0x0d, 0x63, 0x01, + 0xed, 0xc3, 0x45, 0xcd, 0x58, 0xe3, 0xdb, 0xa8, 0x0b, 0x9b, 0x7c, 0xe5, 0xc2, 0xea, 0x69, 0x9f, + 0x5c, 0x7f, 0x3f, 0x3f, 0x93, 0x18, 0x5e, 0x2b, 0xbd, 0x37, 0x69, 0x32, 0x39, 0xf8, 0xe5, 0xb8, + 0x5b, 0x28, 0xef, 0x5c, 0xed, 0x38, 0x16, 0x14, 0xbc, 0x7f, 0xf1, 0x93, 0x2e, 0x93, 0x42, 0xae, + 0x78, 0x6a, 0x50, 0x43, 0x8e, 0x1c, 0xc6, 0x16, 0xad, 0x38, 0x2c, 0xcc, 0xc7, 0x45, 0xfd, 0xf1, + 0xcc, 0x7a, 0x3c, 0x5b, 0x7c, 0x34, 0x1e, 0x7b, 0x04, 0x54, 0xaf, 0x1e, 0x27, 0xb7, 0x4a, 0xb3, + 0x45, 0x08, 0x30, 0x79, 0x30, 0xdf, 0x30, 0x1a, 0x46, 0x4e, 0x84, 0x35, 0x50, 0x3b, 0x81, 0xd4, + 0x28, 0x6d, 0x92, 0x2b, 0x0d, 0x60, 0x58, 0x2e, 0x3f, 0xaf, 0x0a, 0x13, 0x96, 0x2f, 0xf5, 0x2b, + 0x7e, 0x0d, 0x96, 0x0f, 0x7b, 0x81, 0x3c, 0x1c, 0xa5, 0x41, 0xaa, 0x3c, 0x3a, 0x25, 0x6c, 0x17, + 0x22, 0x73, 0x19, 0x15, 0xe3, 0x89, 0x93, 0x05, 0xd3, 0xed, 0xed, 0x3e, 0x7b, 0xf5, 0xf2, 0xe5, + 0xcb, 0x61, 0x87, 0xf3, 0x7d, 0x87, 0x6c, 0x77, 0x9d, 0xcf, 0x78, 0xc5, 0xd4, 0x38, 0x26, 0xed, + 0x90, 0xef, 0x31, 0xbf, 0x17, 0x6e, 0xcc, 0x95, 0x95, 0xe7, 0x8f, 0x0e, 0x7a, 0x4f, 0xae, 0xea, + 0xfc, 0x33, 0x28, 0x4d, 0x0f, 0x02, 0x8b, 0x29, 0x4e, 0x3b, 0x33, 0x92, 0x3d, 0x1d, 0x6c, 0x9e, + 0x59, 0x29, 0xaf, 0x0e, 0x37, 0x53, 0xf5, 0xd9, 0xf9, 0xa5, 0xcd, 0x13, 0x46, 0x4d, 0xba, 0x2d, + 0x9a, 0x4f, 0x6e, 0x18, 0xf0, 0xf1, 0x1c, 0x3d, 0xa4, 0x6e, 0xb3, 0xeb, 0x78, 0xfe, 0x19, 0x67, + 0x21, 0x5d, 0x39, 0xe5, 0x53, 0x11, 0xd1, 0x56, 0x88, 0x8f, 0xe0, 0x23, 0xc7, 0x79, 0x16, 0xe5, + 0x67, 0xc0, 0x12, 0xb0, 0x29, 0x7c, 0x3b, 0x34, 0x4c, 0x06, 0xc2, 0x55, 0x40, 0x0d, 0x56, 0x62, + 0x80, 0x25, 0xc0, 0xc8, 0xfc, 0x9e, 0x44, 0x89, 0x35, 0xdf, 0xcf, 0x27, 0x84, 0xec, 0x89, 0xf3, + 0x9c, 0xcf, 0xf0, 0xfc, 0xac, 0x3e, 0xc5, 0x11, 0xc6, 0xf0, 0x30, 0x1b, 0x73, 0x37, 0xf7, 0x8b, + 0xfc, 0xec, 0x12, 0x04, 0xa5, 0xe5, 0x1b, 0x0f, 0x49, 0x9c, 0xa8, 0x7a, 0x72, 0x56, 0x4f, 0xfa, + 0x54, 0x4f, 0x42, 0x7f, 0x37, 0x98, 0x20, 0xba, 0x82, 0x55, 0x3a, 0xc8, 0xdf, 0x06, 0xc0, 0x48, + 0x03, 0xaf, 0xad, 0xb7, 0x10, 0xb4, 0x8b, 0x31, 0xde, 0x47, 0x29, 0xbb, 0x4f, 0x3e, 0x93, 0xf8, + 0xb9, 0x96, 0x23, 0x76, 0xe8, 0xc1, 0xea, 0x80, 0xac, 0x88, 0x13, 0x5d, 0x55, 0x84, 0xac, 0x49, + 0xa9, 0xd8, 0xa4, 0xdf, 0x13, 0xeb, 0x19, 0x74, 0x0e, 0xa6, 0xf9, 0x3a, 0x3c, 0x85, 0xbc, 0x4d, + 0x8e, 0xdd, 0xa1, 0x4d, 0xc1, 0xe6, 0xc5, 0x6e, 0xee, 0x5e, 0x26, 0x25, 0x1e, 0x05, 0x6b, 0x92, + 0x2e, 0xdb, 0xf8, 0x4c, 0xb2, 0x86, 0x9d, 0x8a, 0x77, 0x1d, 0x4d, 0xbe, 0xd8, 0xde, 0x21, 0xcd, + 0xe3, 0xe8, 0x76, 0x64, 0x0e, 0xc4, 0xbb, 0x51, 0x4e, 0xb9, 0xbd, 0xa7, 0x94, 0x7b, 0xfc, 0x72, + 0xce, 0x8f, 0xbd, 0xd1, 0x70, 0xad, 0x45, 0xdd, 0x5a, 0x51, 0x66, 0x73, 0x85, 0x21, 0xf8, 0x05, + 0x41, 0xf6, 0xe2, 0x28, 0x0b, 0xc2, 0x95, 0xda, 0x71, 0x00, 0x6f, 0x32, 0xe5, 0x5e, 0xa3, 0xc1, + 0x6a, 0x68, 0xf5, 0xe1, 0x2c, 0x9d, 0x8f, 0xbb, 0x76, 0x99, 0xd7, 0x68, 0xaa, 0xac, 0x7c, 0x9b, + 0x87, 0x80, 0xc4, 0xda, 0x98, 0x91, 0x9f, 0x31, 0xb7, 0xe8, 0xce, 0xea, 0x60, 0x97, 0x4f, 0xe8, + 0x28, 0xfb, 0x8c, 0x7e, 0x07, 0xdf, 0x35, 0xe8, 0x03, 0x25, 0xc5, 0xb2, 0x49, 0x4a, 0x5c, 0x1d, + 0x0c, 0x04, 0x84, 0x70, 0x3b, 0x6c, 0x68, 0xdc, 0xad, 0x68, 0x03, 0x20, 0x44, 0xa7, 0xab, 0xd2, + 0x6f, 0x3a, 0x0d, 0x78, 0x78, 0x20, 0xe4, 0xed, 0x21, 0x86, 0xe7, 0x72, 0xb5, 0x48, 0xf1, 0x0c, + 0x81, 0x10, 0xde, 0x11, 0xc0, 0x78, 0x77, 0x79, 0x33, 0x3d, 0x2f, 0x97, 0xdd, 0xd2, 0x80, 0x17, + 0x04, 0x76, 0x06, 0xb1, 0x35, 0x43, 0x04, 0x72, 0xde, 0x0f, 0x72, 0x51, 0x70, 0x31, 0xb9, 0x03, + 0x1b, 0xfa, 0x5d, 0xdc, 0x4e, 0x50, 0x0b, 0x46, 0x69, 0x41, 0x16, 0xb6, 0x62, 0xcb, 0x13, 0x68, + 0xbc, 0x83, 0x35, 0x47, 0x17, 0x76, 0x70, 0x3b, 0xb7, 0x88, 0x42, 0x7d, 0xed, 0x26, 0x3f, 0x15, + 0x21, 0x38, 0xbc, 0x25, 0xc8, 0x57, 0x0c, 0xdd, 0xb2, 0x02, 0x95, 0x6f, 0xb5, 0x18, 0xc0, 0x8a, + 0x09, 0x7f, 0x9f, 0x06, 0x68, 0x39, 0xf7, 0x0f, 0x0b, 0xd3, 0xbd, 0xfd, 0x45, 0x68, 0x87, 0x07, + 0xdb, 0x07, 0x9d, 0x60, 0x78, 0x9d, 0xad, 0xd8, 0xe1, 0xc2, 0xcc, 0x76, 0xfc, 0x9d, 0x93, 0xcf, + 0xaf, 0xee, 0xa1, 0xcf, 0x59, 0x97, 0x12, 0x27, 0xd3, 0xa2, 0x0b, 0x2f, 0x1c, 0x10, 0x45, 0xfe, + 0x09, 0x16, 0xc1, 0x89, 0x83, 0xc4, 0x4a, 0xf7, 0x25, 0x47, 0x98, 0x20, 0x78, 0x0b, 0xf4, 0x29, + 0x70, 0x03, 0x48, 0xa8, 0x7e, 0x13, 0xf7, 0x97, 0xcd, 0x1e, 0x86, 0x61, 0x18, 0xda, 0x38, 0xfd, + 0x0a, 0xd9, 0x74, 0x19, 0xd8, 0x20, 0xfd, 0xea, 0xc1, 0x4d, 0x60, 0x23, 0xf4, 0x6b, 0x2c, 0x54, + 0xce, 0x40, 0xa0, 0xea, 0x9a, 0x55, 0x2c, 0xd8, 0xc3, 0x39, 0x61, 0x96, 0x18, 0xb0, 0x40, 0xbd, + 0x9a, 0x91, 0xd0, 0x61, 0xb8, 0x0b, 0xe4, 0x48, 0x73, 0x14, 0x87, 0x29, 0x5f, 0x18, 0xf6, 0x61, + 0x5d, 0x2b, 0xb3, 0x73, 0x51, 0xcc, 0x77, 0x12, 0xf7, 0x1f, 0x2a, 0x99, 0x29, 0x4a, 0x0a, 0x9d, + 0x96, 0xce, 0x37, 0x03, 0x81, 0x1c, 0xfb, 0xde, 0x90, 0xe3, 0xdc, 0x59, 0x64, 0xdf, 0xb1, 0x60, + 0x62, 0xa5, 0x14, 0x93, 0x52, 0x9c, 0x6c, 0x07, 0x59, 0x9d, 0x4d, 0xcd, 0x6e, 0xfc, 0x41, 0x91, + 0x92, 0x58, 0x78, 0x96, 0x1a, 0x4a, 0xd2, 0x4c, 0xfe, 0x55, 0x25, 0x67, 0x41, 0x19, 0xc5, 0xcb, + 0xec, 0xf0, 0x94, 0x53, 0x50, 0x7c, 0x7a, 0x9f, 0xfd, 0x72, 0x33, 0xed, 0x02, 0xa7, 0x25, 0xc0, + 0x69, 0x18, 0xc4, 0x4e, 0xf0, 0x9a, 0x5b, 0x6a, 0xca, 0x1e, 0xe4, 0xcd, 0x9f, 0xf3, 0x78, 0x9a, + 0x50, 0x67, 0x37, 0xc6, 0xcd, 0xf1, 0x5a, 0x62, 0xf1, 0x3c, 0x9b, 0x4c, 0x26, 0x9d, 0x83, 0xde, + 0x8b, 0x6f, 0x83, 0x0e, 0xc6, 0x89, 0xf3, 0xf6, 0x61, 0x5e, 0xef, 0x7b, 0x01, 0x7e, 0xde, 0x88, + 0xcf, 0x29, 0x2c, 0xb7, 0x28, 0x8e, 0xd6, 0x50, 0x38, 0x69, 0xa2, 0xef, 0xd7, 0x3f, 0x84, 0xbe, + 0x30, 0x0c, 0xb7, 0xa3, 0xcf, 0xa8, 0xf9, 0x47, 0xd5, 0xb1, 0xe6, 0x68, 0x7d, 0x64, 0x09, 0x68, + 0x12, 0x7a, 0x96, 0x00, 0x9b, 0xf0, 0x9b, 0x9e, 0xfe, 0xaa, 0x07, 0x3b, 0x30, 0x7e, 0x8c, 0xf5, + 0x91, 0x7d, 0x46, 0x5c, 0xee, 0xdd, 0x5d, 0x84, 0x1e, 0x27, 0x28, 0x28, 0x53, 0x74, 0x8a, 0xab, + 0xa1, 0xac, 0xf1, 0x0d, 0x65, 0x45, 0xd7, 0x6f, 0xa8, 0x42, 0x4c, 0x80, 0x7b, 0x93, 0x65, 0x45, + 0x10, 0x28, 0x6d, 0xc6, 0x30, 0xe6, 0xca, 0x77, 0x7e, 0x00, 0x7c, 0xce, 0x95, 0x59, 0x35, 0xe5, + 0xbd, 0x67, 0x08, 0xb7, 0x69, 0xe2, 0x6c, 0xc1, 0x54, 0x10, 0xca, 0x2d, 0xd9, 0x64, 0x75, 0xc6, + 0xf9, 0x7c, 0x32, 0x09, 0x43, 0x4f, 0x03, 0xa1, 0xad, 0x99, 0x66, 0x11, 0xc7, 0xa6, 0x2a, 0x7d, + 0x0c, 0xcc, 0xa3, 0x85, 0x4a, 0xdf, 0xd9, 0x36, 0x4a, 0xb1, 0x23, 0x16, 0x46, 0x44, 0xe5, 0x51, + 0x4c, 0x81, 0x36, 0xfa, 0x92, 0xb7, 0x0a, 0xf6, 0x48, 0xd6, 0xfc, 0x81, 0xad, 0x66, 0xe9, 0x0f, + 0x9c, 0xa4, 0xd3, 0xc5, 0x04, 0x96, 0xb7, 0x04, 0xfa, 0xa3, 0xf8, 0x04, 0x03, 0x09, 0x7f, 0x61, + 0xab, 0xc8, 0xfe, 0x9a, 0x30, 0x22, 0xce, 0x68, 0xc0, 0x58, 0xac, 0x27, 0x64, 0x61, 0xb1, 0xd2, + 0x0f, 0xda, 0x04, 0x60, 0x95, 0x73, 0xbe, 0xb1, 0x9c, 0xc2, 0x6b, 0x14, 0x01, 0x4e, 0x39, 0xbf, + 0x6e, 0x2c, 0xe7, 0x93, 0xd7, 0x28, 0x33, 0x9c, 0x72, 0x7e, 0xac, 0x97, 0xd3, 0x5d, 0x71, 0x8e, + 0x1f, 0x34, 0xcd, 0x8c, 0xca, 0x79, 0x1f, 0x27, 0xb3, 0xc5, 0xa5, 0xce, 0xba, 0x10, 0x94, 0x51, + 0xd3, 0xaa, 0x00, 0x22, 0xbf, 0x69, 0x4d, 0x18, 0x6a, 0x66, 0x11, 0xe1, 0x27, 0xa5, 0x8f, 0x0c, + 0xba, 0x76, 0xfa, 0x57, 0xdc, 0x09, 0xa1, 0x39, 0x44, 0xa6, 0xcb, 0x9b, 0xcb, 0x88, 0x05, 0x6e, + 0xda, 0x0d, 0x82, 0x49, 0x3b, 0x69, 0xd3, 0xa8, 0x90, 0xc0, 0xc4, 0xe2, 0x91, 0xd3, 0xc4, 0x0f, + 0xb6, 0xd3, 0x9f, 0x52, 0x06, 0x82, 0x66, 0xcd, 0xa7, 0xac, 0xcd, 0x11, 0x26, 0xdb, 0xcc, 0x6b, + 0x11, 0x19, 0x6c, 0xe6, 0x63, 0x8e, 0x9d, 0x48, 0xcc, 0x8c, 0x55, 0xbb, 0x86, 0x45, 0x07, 0xcf, + 0x18, 0x28, 0x13, 0x56, 0x1d, 0xa7, 0x4e, 0x84, 0x93, 0x45, 0x6d, 0x93, 0x21, 0xe6, 0x20, 0x8c, + 0xd0, 0x5f, 0x12, 0x90, 0x9a, 0x5d, 0xc4, 0xb2, 0xdd, 0xc8, 0x32, 0x14, 0xc3, 0xae, 0xbf, 0x83, + 0xaf, 0x9a, 0xa0, 0xce, 0x8d, 0xb6, 0x28, 0xa5, 0x4a, 0xf9, 0x32, 0xd4, 0x95, 0xab, 0x29, 0x4c, + 0x60, 0x14, 0x0a, 0x89, 0x6b, 0x18, 0x1f, 0x2e, 0x07, 0x59, 0x30, 0x81, 0x41, 0x48, 0x75, 0xd2, + 0x0d, 0x25, 0x4d, 0xa3, 0x44, 0x27, 0x4d, 0x29, 0xe9, 0x1e, 0x16, 0x37, 0xa7, 0xc3, 0xa8, 0x12, + 0x79, 0x7e, 0x0b, 0x95, 0x0c, 0x2e, 0x2e, 0x2e, 0x03, 0xfa, 0x77, 0x59, 0x55, 0xe2, 0x7c, 0x13, + 0xd1, 0xa6, 0x29, 0x77, 0x74, 0xc1, 0x3b, 0x27, 0xbb, 0x74, 0xcf, 0x2f, 0x2d, 0xdb, 0xe3, 0x24, + 0x41, 0x27, 0xd3, 0xe6, 0xa3, 0x83, 0xd9, 0xac, 0x74, 0x0d, 0xc5, 0x04, 0x28, 0x3b, 0x33, 0x75, + 0x3d, 0x04, 0x8d, 0xff, 0x3b, 0x4a, 0x07, 0x11, 0x44, 0x00, 0x7f, 0xcb, 0x80, 0x04, 0x47, 0x47, + 0x37, 0x71, 0xb9, 0xb8, 0x9b, 0xe2, 0x81, 0xde, 0xd1, 0xeb, 0x78, 0x39, 0xcb, 0xb2, 0xec, 0x63, + 0xcc, 0x8e, 0x30, 0xfe, 0xc4, 0xd1, 0x7d, 0xfc, 0x31, 0xc6, 0xad, 0x2f, 0xb7, 0x35, 0x2e, 0xa1, + 0x23, 0x39, 0xb4, 0x97, 0x84, 0xbd, 0xe9, 0x76, 0x17, 0xb3, 0xfd, 0xa8, 0xf7, 0xd2, 0x1f, 0x1d, + 0x87, 0xa8, 0xc9, 0x60, 0xb5, 0x7e, 0xb0, 0x98, 0x8d, 0xfa, 0xf2, 0xe7, 0x71, 0x88, 0xa2, 0xfe, + 0xf9, 0xf3, 0x28, 0x5a, 0xcc, 0x28, 0x65, 0x3f, 0x3a, 0xc6, 0x94, 0xf0, 0xa5, 0x91, 0x02, 0x05, + 0x48, 0xed, 0x06, 0xe1, 0x5b, 0x7c, 0x6b, 0xdf, 0x70, 0xb5, 0x28, 0xd0, 0x17, 0x6c, 0x31, 0xab, + 0x82, 0x0e, 0xc2, 0xde, 0x04, 0x9d, 0x17, 0xe1, 0xb7, 0x18, 0x72, 0x2c, 0x78, 0xd5, 0x13, 0xa1, + 0x4f, 0x40, 0x23, 0x5a, 0x5a, 0x50, 0x80, 0x90, 0xf0, 0x0b, 0x59, 0x01, 0xb9, 0x05, 0x13, 0x9f, + 0x5b, 0x02, 0x80, 0x36, 0x29, 0x14, 0x1b, 0x7c, 0x28, 0x83, 0x5c, 0xb4, 0xef, 0x55, 0x4c, 0x57, + 0x20, 0x44, 0x94, 0x9b, 0xc7, 0xcb, 0xdb, 0xce, 0x2f, 0x6c, 0x9a, 0x65, 0x62, 0x43, 0xd8, 0xe5, + 0xf5, 0x83, 0x96, 0x5a, 0x0b, 0xd2, 0x00, 0xdb, 0xe6, 0xc8, 0x3b, 0xe2, 0x26, 0x84, 0x4a, 0x92, + 0x7a, 0x6e, 0xc3, 0x16, 0x62, 0xf8, 0x74, 0x5b, 0x3e, 0x89, 0xb8, 0xe5, 0x43, 0x49, 0xfb, 0xb9, + 0xff, 0x85, 0x54, 0xf2, 0x8a, 0x35, 0x91, 0xe7, 0x14, 0x2d, 0x46, 0xd2, 0x10, 0xb4, 0x14, 0x37, + 0x77, 0x8b, 0xa3, 0xbe, 0x54, 0x67, 0x9c, 0x9e, 0xe5, 0x62, 0xb2, 0xe2, 0x27, 0xd4, 0x21, 0x3f, + 0xc5, 0x94, 0x80, 0x10, 0xe4, 0x56, 0xb0, 0x13, 0x56, 0x86, 0x03, 0x0a, 0x8b, 0x7a, 0x43, 0x26, + 0x1c, 0x50, 0x98, 0xe3, 0x80, 0x22, 0x4e, 0x40, 0xdb, 0x3d, 0x5f, 0x08, 0x5c, 0xce, 0x88, 0xdb, + 0x6c, 0x02, 0x3c, 0x5a, 0x31, 0x9e, 0x45, 0xfc, 0x49, 0x4e, 0x21, 0x05, 0xfb, 0x80, 0x0d, 0xf6, + 0x12, 0xb4, 0x30, 0xbc, 0x47, 0x8e, 0x01, 0x7c, 0xbb, 0xde, 0x7d, 0x42, 0x48, 0x94, 0x0f, 0x9e, + 0xb8, 0x64, 0x8f, 0x4a, 0x08, 0xdf, 0x7f, 0x1b, 0x56, 0xb5, 0x92, 0x83, 0xbf, 0x63, 0xd0, 0x9c, + 0x4f, 0x08, 0xf7, 0x4f, 0x1f, 0x72, 0x18, 0xcc, 0x1a, 0xe1, 0x49, 0xce, 0x3b, 0x18, 0x84, 0x10, + 0xeb, 0x9a, 0x0a, 0x4b, 0x65, 0xe5, 0x5b, 0x55, 0xc1, 0x8d, 0x3a, 0xb9, 0xe1, 0x8d, 0x08, 0x03, + 0x81, 0x9c, 0x67, 0x90, 0x59, 0xd4, 0xc8, 0x0c, 0x1c, 0x88, 0xc4, 0x55, 0x3e, 0x30, 0x0b, 0x0e, + 0x3e, 0x99, 0x48, 0x73, 0x18, 0x4b, 0xb5, 0xbe, 0x05, 0x0c, 0xb8, 0x0a, 0x27, 0xf1, 0xfa, 0x58, + 0xf0, 0xea, 0x95, 0x75, 0x36, 0xe1, 0x12, 0x46, 0x16, 0x95, 0xed, 0x82, 0x98, 0x02, 0x29, 0x0f, + 0xe3, 0x9c, 0xd4, 0xdc, 0x7d, 0x66, 0xc7, 0x32, 0xfd, 0x0a, 0x20, 0xc6, 0xe6, 0x30, 0xa8, 0x6b, + 0x61, 0x15, 0x0b, 0xe8, 0x49, 0xab, 0xc3, 0x6d, 0x83, 0x3d, 0x74, 0xbf, 0xd5, 0x6b, 0x30, 0x6c, + 0x50, 0xc6, 0x49, 0x71, 0x78, 0x3b, 0x76, 0x91, 0x0c, 0x6b, 0xbd, 0xb1, 0xdf, 0x83, 0xfe, 0xa8, + 0x02, 0xd8, 0xaa, 0x0e, 0x10, 0xbe, 0x73, 0xcb, 0x20, 0xa9, 0x88, 0xd2, 0xdc, 0x7f, 0xf3, 0xb3, + 0x40, 0x0a, 0x6b, 0x88, 0x02, 0xd5, 0x10, 0x3e, 0xdd, 0x8c, 0x9a, 0x6e, 0xc4, 0x31, 0x5c, 0x35, + 0xc7, 0x4a, 0xa7, 0xab, 0x3d, 0xc2, 0xc6, 0xf9, 0x1e, 0x76, 0x23, 0xda, 0x38, 0xda, 0x7f, 0xd3, + 0xf1, 0x7c, 0x0e, 0x52, 0x58, 0x36, 0x5f, 0x03, 0xb7, 0x0e, 0x57, 0x26, 0x4b, 0x6c, 0x4e, 0x50, + 0xea, 0x49, 0xc5, 0xda, 0xb7, 0x37, 0xaa, 0x20, 0x34, 0x79, 0x0b, 0xbd, 0xc1, 0xf5, 0xec, 0x53, + 0xf7, 0xba, 0xb1, 0xc1, 0xe5, 0xa6, 0x96, 0xc6, 0x91, 0x97, 0xe3, 0xf1, 0x39, 0xa2, 0x6a, 0x97, + 0xa0, 0xa5, 0xf7, 0x86, 0xb1, 0xc6, 0xf1, 0x88, 0x25, 0x8e, 0x47, 0x1a, 0x15, 0x17, 0xf1, 0x65, + 0x90, 0xc0, 0x66, 0x79, 0xab, 0xce, 0x28, 0xb3, 0x7f, 0xe6, 0x39, 0x5b, 0x9e, 0x4e, 0x10, 0x8c, + 0x75, 0x98, 0x3a, 0xd4, 0x27, 0xaa, 0xb3, 0x44, 0x13, 0xec, 0xfc, 0x3e, 0xc6, 0xf1, 0xd9, 0xa1, + 0x58, 0xa1, 0x72, 0xbc, 0x90, 0xb8, 0xdd, 0xdd, 0xc4, 0xec, 0x64, 0xea, 0x63, 0xe5, 0xa7, 0x08, + 0x6c, 0x6b, 0x44, 0x54, 0x4a, 0xd8, 0x24, 0xe5, 0xc0, 0xab, 0x4d, 0xfd, 0x2f, 0x24, 0x14, 0x23, + 0x97, 0xc3, 0x38, 0xbb, 0x2b, 0xec, 0xae, 0x96, 0xbb, 0x0d, 0x04, 0xd8, 0x2e, 0x0f, 0xe7, 0xd9, + 0xec, 0x0e, 0x4d, 0x44, 0x25, 0x15, 0x82, 0xbc, 0xf7, 0x57, 0xdc, 0x9e, 0x75, 0x71, 0x8f, 0xc2, + 0xbf, 0x79, 0x74, 0x24, 0x6b, 0xef, 0x08, 0xb2, 0xe5, 0xed, 0xa4, 0x7c, 0xbd, 0xd4, 0x2a, 0x5a, + 0x80, 0x41, 0xa9, 0x34, 0x12, 0x08, 0xae, 0x2e, 0xf6, 0xcd, 0x48, 0x86, 0xce, 0xe8, 0xbe, 0xec, + 0x6d, 0xfa, 0x35, 0xe4, 0x9b, 0xa7, 0xd4, 0x27, 0x28, 0x56, 0xd2, 0xbc, 0x28, 0x3d, 0xba, 0x48, + 0x2f, 0xd1, 0xe1, 0xa7, 0x5b, 0xf2, 0x7c, 0xa2, 0x50, 0xff, 0xa4, 0xf0, 0x25, 0x24, 0x07, 0x87, + 0xd8, 0x2f, 0x0e, 0x4a, 0x02, 0xd9, 0xe7, 0xb9, 0x48, 0xdc, 0x33, 0xee, 0xf3, 0x7e, 0xd0, 0xe3, + 0x11, 0x36, 0x6a, 0x44, 0x18, 0xa0, 0xb2, 0xfe, 0x2a, 0xb5, 0x50, 0x66, 0x6d, 0x72, 0xca, 0x25, + 0x52, 0x63, 0x40, 0xca, 0x9a, 0x44, 0x19, 0x40, 0x14, 0x36, 0x6d, 0x2e, 0x5d, 0x46, 0x46, 0x41, + 0x9e, 0xe9, 0xd2, 0x8e, 0x54, 0xea, 0x4e, 0x55, 0x0e, 0x67, 0x86, 0xd2, 0xcb, 0x3d, 0x4f, 0x39, + 0x6a, 0x09, 0x33, 0xdc, 0x4e, 0x33, 0xb1, 0x15, 0x10, 0xdb, 0x08, 0xce, 0xe1, 0x86, 0x72, 0x8c, + 0xb3, 0x6c, 0x84, 0x3d, 0x6a, 0xd9, 0x21, 0x8b, 0x46, 0x3b, 0xa4, 0x19, 0xeb, 0x6e, 0x87, 0xf8, + 0xb0, 0x29, 0x97, 0xf2, 0xec, 0xe6, 0x2b, 0x5b, 0x83, 0xb7, 0xab, 0xce, 0x11, 0xb0, 0x11, 0x0d, + 0xa7, 0x1c, 0x6c, 0x24, 0xd9, 0x7d, 0x4b, 0xbb, 0xb4, 0xe8, 0xf7, 0x10, 0xf3, 0x50, 0x1d, 0x64, + 0xa6, 0xfe, 0x58, 0x3a, 0xb3, 0xa7, 0x97, 0x51, 0x2e, 0xbe, 0x28, 0x13, 0x76, 0xa0, 0x79, 0x50, + 0xe5, 0x42, 0xd4, 0x59, 0x1c, 0x42, 0x95, 0x20, 0x00, 0x1d, 0x7c, 0xed, 0x17, 0xaf, 0xd2, 0x22, + 0x0d, 0x97, 0x92, 0x12, 0x98, 0x82, 0x99, 0x03, 0xc1, 0x82, 0x6a, 0x65, 0x21, 0x36, 0xa7, 0x55, + 0x10, 0x02, 0x58, 0x84, 0xd2, 0x74, 0x43, 0x23, 0x64, 0x9e, 0x09, 0x71, 0x97, 0xf7, 0x94, 0x02, + 0xd7, 0x18, 0x4e, 0xee, 0xc0, 0x77, 0x83, 0xf5, 0x6f, 0xc8, 0xf0, 0xbe, 0xf9, 0x24, 0x8f, 0x7f, + 0x05, 0xad, 0x18, 0x12, 0xa4, 0x25, 0x3d, 0x35, 0x8f, 0xeb, 0xa2, 0x04, 0xcd, 0xbf, 0x49, 0xfd, + 0xd4, 0x4a, 0x04, 0x4f, 0xe0, 0x2f, 0x38, 0x47, 0x9a, 0xd4, 0x32, 0xee, 0x72, 0x9d, 0x4a, 0xcf, + 0x79, 0x01, 0x58, 0xb5, 0xe6, 0x22, 0x00, 0xbf, 0x1d, 0x6f, 0x44, 0x7d, 0x6c, 0x69, 0x81, 0x0c, + 0xfd, 0x5a, 0x2f, 0xd2, 0xf6, 0x8e, 0xaf, 0xca, 0x2f, 0xf0, 0xf3, 0x37, 0xec, 0xb4, 0x29, 0x49, + 0x2d, 0x6d, 0xa7, 0xad, 0xb9, 0x48, 0x4c, 0x93, 0xbb, 0x65, 0xb7, 0x31, 0x36, 0x4e, 0xfd, 0x89, + 0xe9, 0xb5, 0xc0, 0x9f, 0x56, 0xfc, 0xc2, 0xf4, 0xbf, 0x4f, 0xeb, 0x6e, 0x25, 0x92, 0x6f, 0x31, + 0xbe, 0x5f, 0xf0, 0x36, 0x7a, 0x4e, 0xb3, 0x30, 0x26, 0x4a, 0xa2, 0x30, 0x78, 0x08, 0x05, 0xe4, + 0x36, 0x35, 0xee, 0x1c, 0x52, 0xb0, 0x0d, 0xdc, 0x77, 0xda, 0xa0, 0x9e, 0x83, 0x51, 0xaf, 0x94, + 0xe2, 0xcd, 0xaf, 0x72, 0x5d, 0xbf, 0xcf, 0xee, 0x60, 0x94, 0x8a, 0xb1, 0x9b, 0x80, 0x58, 0xef, + 0xcc, 0x58, 0xfb, 0x27, 0xc5, 0xd9, 0x32, 0x23, 0xb4, 0x22, 0x2c, 0x45, 0x8a, 0x44, 0x1e, 0x67, + 0x8a, 0x99, 0xd1, 0xa5, 0x68, 0xb1, 0xa5, 0x90, 0x51, 0xa8, 0x47, 0x17, 0x1f, 0x60, 0x33, 0xd6, + 0xf5, 0xe0, 0x5d, 0x75, 0xb0, 0x09, 0x5a, 0xb4, 0x8c, 0xdd, 0x65, 0xea, 0xc3, 0xb0, 0x59, 0xe6, + 0xf6, 0xfb, 0x9d, 0x7c, 0x86, 0x3a, 0x86, 0x94, 0x48, 0x2a, 0xa0, 0xb7, 0x1a, 0x57, 0x12, 0xfb, + 0x56, 0x94, 0x6f, 0xb1, 0xd6, 0xe8, 0x2c, 0x43, 0x73, 0xae, 0xcb, 0xbb, 0xa6, 0xfe, 0xe3, 0xa3, + 0xd9, 0x8c, 0xd2, 0xf9, 0x5d, 0xc0, 0xef, 0x2e, 0x74, 0xa6, 0xec, 0x2a, 0x28, 0x0d, 0x8d, 0x9b, + 0xff, 0x52, 0x1d, 0x2b, 0x22, 0x33, 0x97, 0x93, 0xe9, 0x8c, 0x6b, 0x7f, 0x9e, 0x7f, 0xc1, 0x47, + 0xe1, 0x52, 0x70, 0xd6, 0xfb, 0x2c, 0x0f, 0xfe, 0x7d, 0xda, 0xe4, 0x94, 0x2f, 0xd8, 0x6b, 0xa7, + 0x2b, 0xc7, 0x26, 0xf4, 0x2d, 0xb0, 0x25, 0xe2, 0x7d, 0xde, 0x7e, 0x9e, 0x63, 0x77, 0xd7, 0xe9, + 0x87, 0x3a, 0x59, 0x51, 0x79, 0xf0, 0x10, 0xca, 0x38, 0xef, 0xa4, 0x13, 0x16, 0x88, 0xfc, 0xb9, + 0xdf, 0x4d, 0xff, 0x5c, 0x1c, 0xdd, 0x7f, 0x00, 0x35, 0x32, 0xfb, 0x5b, 0xfc, 0xc0, 0xae, 0xbb, + 0x7d, 0x7f, 0x18, 0xee, 0xa0, 0x8c, 0xed, 0x72, 0x72, 0x47, 0x21, 0xc1, 0xb8, 0xf8, 0x2a, 0xe1, + 0x84, 0x62, 0x0f, 0x62, 0x42, 0x32, 0x3a, 0xec, 0xf5, 0x77, 0x77, 0xb7, 0x6a, 0x2a, 0x6c, 0x22, + 0x78, 0xcf, 0x40, 0x39, 0xd0, 0x6a, 0xae, 0x15, 0x14, 0x3a, 0x8e, 0x3d, 0x86, 0xb0, 0x8f, 0xbd, + 0x80, 0xbf, 0x77, 0x10, 0xa5, 0x48, 0x5c, 0xef, 0x20, 0x91, 0x26, 0x98, 0x09, 0x2a, 0x06, 0x1f, + 0x0b, 0x41, 0x02, 0xe8, 0xf8, 0x6d, 0x65, 0xcc, 0xbd, 0x20, 0xf1, 0xb7, 0xed, 0xd7, 0x1e, 0x14, + 0x24, 0x66, 0x84, 0xa9, 0x11, 0xea, 0xb0, 0x79, 0xab, 0x06, 0x8c, 0x59, 0x47, 0x93, 0x92, 0x7b, + 0x8f, 0xf4, 0x7a, 0x46, 0xe7, 0x19, 0xf7, 0x1f, 0x46, 0xdf, 0xbf, 0xfa, 0xfe, 0xf1, 0x11, 0x3e, + 0x5f, 0x1c, 0xbf, 0xda, 0xdd, 0xbd, 0xff, 0x70, 0xf2, 0x7d, 0x3f, 0xf4, 0x5b, 0x83, 0x4f, 0x72, + 0x8c, 0xe0, 0xd5, 0xfd, 0x07, 0x19, 0x1a, 0x91, 0x84, 0x15, 0x01, 0x8b, 0x9a, 0x01, 0xfc, 0x86, + 0x86, 0x0a, 0x4d, 0xb7, 0x7d, 0xc4, 0xd0, 0x72, 0x6c, 0xc8, 0x61, 0x71, 0x9a, 0x25, 0xd8, 0x7c, + 0x6c, 0x1f, 0xdb, 0xf7, 0x30, 0xe0, 0x49, 0x20, 0xd3, 0xa6, 0xd2, 0xf0, 0x49, 0x92, 0xcd, 0x7a, + 0x4f, 0xe4, 0xe4, 0x48, 0xc7, 0x5d, 0xe8, 0xf7, 0xe7, 0xfa, 0xb5, 0x32, 0xd7, 0x45, 0x09, 0x10, + 0x71, 0xe2, 0xb1, 0x3a, 0xa0, 0xb1, 0x48, 0xe7, 0x08, 0x76, 0x68, 0x8d, 0xe2, 0xcc, 0xf8, 0x3a, + 0x12, 0x5c, 0xf9, 0x3a, 0x68, 0xde, 0xe4, 0xe5, 0xb3, 0x5b, 0x2f, 0x10, 0x59, 0x7c, 0xf1, 0x25, + 0x52, 0xbf, 0xa1, 0xe3, 0x7a, 0xfd, 0x17, 0xa1, 0xe2, 0x6d, 0xd0, 0x48, 0x19, 0xf5, 0xaf, 0x48, + 0xc6, 0x9e, 0xbf, 0xa7, 0xef, 0xd4, 0xd9, 0x91, 0x91, 0xca, 0x7f, 0xe0, 0x14, 0x45, 0x63, 0x0f, + 0x30, 0x0f, 0xbf, 0xd8, 0x25, 0x8b, 0x1c, 0x8b, 0xaa, 0x76, 0x7a, 0x03, 0x51, 0x1b, 0x06, 0x4a, + 0x56, 0x74, 0x6b, 0x12, 0x1c, 0xe6, 0x93, 0x4b, 0xa9, 0x88, 0x47, 0x0e, 0xd4, 0x9b, 0x88, 0xc3, + 0xfc, 0xad, 0x86, 0x28, 0xe3, 0x59, 0xe9, 0x06, 0x95, 0xe1, 0x59, 0xa1, 0x52, 0xe5, 0x4b, 0x0e, + 0x5d, 0x01, 0xf9, 0xc6, 0x5e, 0x88, 0xfb, 0xc3, 0xbb, 0x32, 0xf3, 0x9e, 0x30, 0x7a, 0x6a, 0x2a, + 0xf0, 0x8b, 0x92, 0x92, 0x0e, 0x34, 0x17, 0x41, 0x69, 0xcf, 0xf1, 0x83, 0xfc, 0x5d, 0xef, 0x23, + 0x98, 0xe7, 0x86, 0x14, 0x61, 0x20, 0x14, 0xdf, 0x30, 0x96, 0xc3, 0xde, 0xe7, 0xf0, 0xf0, 0x50, + 0x44, 0x3f, 0x2d, 0xa5, 0xbe, 0x28, 0x65, 0xbf, 0x8a, 0x7b, 0x0a, 0x2b, 0xe2, 0x22, 0x9e, 0xc3, + 0x16, 0x90, 0xfb, 0xdb, 0xc3, 0x06, 0x93, 0x5c, 0xb9, 0xf8, 0xb7, 0xc2, 0xf7, 0x4d, 0x1c, 0x8f, + 0x18, 0xf8, 0xda, 0x17, 0x4f, 0x10, 0x8f, 0x6d, 0x4c, 0x52, 0xfe, 0xf1, 0xd1, 0xde, 0x95, 0xc2, + 0x8e, 0x19, 0x52, 0xe9, 0x84, 0x3e, 0x30, 0xa8, 0x81, 0xb4, 0x80, 0xde, 0xf2, 0x07, 0x8d, 0xf9, + 0xe9, 0x86, 0xb0, 0xb2, 0x5d, 0xd5, 0x9a, 0x51, 0xf1, 0x19, 0xd5, 0x2a, 0x21, 0x52, 0x2f, 0x00, + 0x2e, 0x17, 0x93, 0x0d, 0x56, 0x7d, 0xda, 0x43, 0xa0, 0xa0, 0x60, 0x29, 0x9e, 0xae, 0xe0, 0xd5, + 0xee, 0xff, 0xc0, 0x26, 0x0e, 0xff, 0xc7, 0x68, 0x33, 0x58, 0x4e, 0x3d, 0xd7, 0x6d, 0x86, 0xee, + 0x61, 0xd9, 0x3d, 0x14, 0x86, 0xd3, 0xba, 0x3d, 0x63, 0x89, 0x2b, 0x24, 0x07, 0x66, 0xde, 0x90, + 0x93, 0x8a, 0x84, 0x6d, 0xb8, 0x17, 0xa0, 0x7c, 0xdf, 0x90, 0xef, 0x2e, 0xdf, 0x94, 0x8d, 0x2a, + 0x06, 0x05, 0x50, 0xe7, 0xfb, 0xd3, 0xc9, 0x11, 0xc8, 0xe0, 0x38, 0x2f, 0x47, 0x9d, 0x93, 0x23, + 0x8c, 0xf5, 0x80, 0x9f, 0x8b, 0xf2, 0x36, 0x19, 0x75, 0xfe, 0x0b, 0x74, 0xcc, 0xce, 0x4a, 0x4d, + 0x58, 0x01, 0x00 }; diff --git a/wled00/json.cpp b/wled00/json.cpp index 1fb0937c..022dca80 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -354,33 +354,32 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId) byte ps = root[F("psave")]; if (ps > 0) { savePreset(ps, nullptr, root); - } else { - ps = root[F("pdel")]; //deletion - if (ps > 0) { - deletePreset(ps); - } + } - // TODO: this may require some additiona checks - if (!root[F("pt")].isNull()) { - currentPreset = root[F("pt")] | currentPreset; - stateChanged = false; // cancel state change update (preset was set directly by applying values stored in UI JSON array) - } + ps = root[F("pdel")]; //deletion + if (ps > 0) { + deletePreset(ps); + } - if (!root["ps"].isNull()) { - ps = currentPreset; - if (getVal(root["ps"], &ps, 0, 0) && ps > 0 && ps < 251 && ps != currentPreset) { // get preset ID (use embedded cycling limits if they exist) - applyPreset(ps, callMode); // async load - return stateResponse; - } + if (!root["ps"].isNull()) { + ps = presetCycCurr; + if (getVal(root["ps"], &ps, 0, 0) && ps > 0 && ps < 251 && ps != currentPreset) { // get preset ID (use embedded cycling limits if they exist) + presetCycCurr = ps; + applyPreset(ps, callMode); // async load + return stateResponse; } + } else if (!root[F("pt")].isNull()) { + currentPreset = root[F("pt")] | currentPreset; + if (root["win"].isNull()) presetCycCurr = currentPreset; + stateChanged = false; // cancel state change update (preset was set directly by applying values stored in UI JSON array) + } - //HTTP API commands - const char* httpwin = root["win"]; - if (httpwin) { - String apireq = "win"; apireq += '&'; // reduce flash string usage - apireq += httpwin; - handleSet(nullptr, apireq, false); - } + //HTTP API commands + const char* httpwin = root["win"]; + if (httpwin) { + String apireq = "win"; apireq += '&'; // reduce flash string usage + apireq += httpwin; + handleSet(nullptr, apireq, false); } JsonObject playlist = root[F("playlist")]; diff --git a/wled00/presets.cpp b/wled00/presets.cpp index 5a38abf4..bae34454 100644 --- a/wled00/presets.cpp +++ b/wled00/presets.cpp @@ -70,7 +70,7 @@ void handlePresets(bool force) deserializeState(fdo, tmpMode, tmpPreset); // may call applyPreset() which will overwrite presetToApply } - if (!errorFlag && changePreset) currentPreset = tmpPreset; + if (!errorFlag && changePreset) presetCycCurr = currentPreset = tmpPreset; colorUpdated(tmpMode); return; @@ -112,7 +112,7 @@ void handlePresets(bool force) fdo.remove("ps"); //remove load request for presets to prevent recursive crash deserializeState(fdo, CALL_MODE_NO_NOTIFY, tmpPreset); // may change presetToApply by calling applyPreset() } - if (!errorFlag && tmpPreset < 255 && changePreset) currentPreset = tmpPreset; + if (!errorFlag && tmpPreset < 255 && changePreset) presetCycCurr = currentPreset = tmpPreset; #if defined(ARDUINO_ARCH_ESP32) //Aircoookie recommended not to delete buffer diff --git a/wled00/set.cpp b/wled00/set.cpp index bf46720d..aa400194 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -625,6 +625,8 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply) uint16_t startI = selseg.start; uint16_t stopI = selseg.stop; + uint16_t startY = selseg.startY; + uint16_t stopY = selseg.stopY; uint8_t grpI = selseg.grouping; uint16_t spcI = selseg.spacing; pos = req.indexOf(F("&S=")); //segment start @@ -644,7 +646,7 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply) if (pos > 0) { spcI = getNumVal(&req, pos); } - strip.setSegment(selectedSeg, startI, stopI, grpI, spcI); + strip.setSegment(selectedSeg, startI, stopI, grpI, spcI, UINT16_MAX, startY, stopY); pos = req.indexOf(F("RV=")); //Segment reverse if (pos > 0) selseg.setOption(SEG_OPTION_REVERSED, req.charAt(pos+3) != '0'); @@ -680,25 +682,25 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply) if (pos > 0) presetCycMax = getNumVal(&req, pos); //apply preset - if (updateVal(&req, "PL=", &presetCycCurr, presetCycMin, presetCycMax)) { + if (updateVal(req.c_str(), "PL=", &presetCycCurr, presetCycMin, presetCycMax)) { unloadPlaylist(); applyPreset(presetCycCurr); } //set brightness - updateVal(&req, "&A=", &bri); + updateVal(req.c_str(), "&A=", &bri); bool col0Changed = false, col1Changed = false; //set colors - col0Changed |= updateVal(&req, "&R=", &colIn[0]); - col0Changed |= updateVal(&req, "&G=", &colIn[1]); - col0Changed |= updateVal(&req, "&B=", &colIn[2]); - col0Changed |= updateVal(&req, "&W=", &colIn[3]); + col0Changed |= updateVal(req.c_str(), "&R=", &colIn[0]); + col0Changed |= updateVal(req.c_str(), "&G=", &colIn[1]); + col0Changed |= updateVal(req.c_str(), "&B=", &colIn[2]); + col0Changed |= updateVal(req.c_str(), "&W=", &colIn[3]); - col1Changed |= updateVal(&req, "R2=", &colInSec[0]); - col1Changed |= updateVal(&req, "G2=", &colInSec[1]); - col1Changed |= updateVal(&req, "B2=", &colInSec[2]); - col1Changed |= updateVal(&req, "W2=", &colInSec[3]); + col1Changed |= updateVal(req.c_str(), "R2=", &colInSec[0]); + col1Changed |= updateVal(req.c_str(), "G2=", &colInSec[1]); + col1Changed |= updateVal(req.c_str(), "B2=", &colInSec[2]); + col1Changed |= updateVal(req.c_str(), "W2=", &colInSec[3]); #ifdef WLED_ENABLE_LOXONE //lox parser @@ -802,13 +804,13 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply) bool fxModeChanged = false, speedChanged = false, intensityChanged = false, paletteChanged = false; // set effect parameters - if (updateVal(&req, "FX=", &effectIn, 0, strip.getModeCount()-1)) { + if (updateVal(req.c_str(), "FX=", &effectIn, 0, strip.getModeCount()-1)) { if (request != nullptr) unloadPlaylist(); // unload playlist if changing FX using web request fxModeChanged = true; } - speedChanged = updateVal(&req, "SX=", &speedIn); - intensityChanged = updateVal(&req, "IX=", &intensityIn); - paletteChanged = updateVal(&req, "FP=", &paletteIn, 0, strip.getPaletteCount()-1); + speedChanged = updateVal(req.c_str(), "SX=", &speedIn); + intensityChanged = updateVal(req.c_str(), "IX=", &intensityIn); + paletteChanged = updateVal(req.c_str(), "FP=", &paletteIn, 0, strip.getPaletteCount()-1); stateChanged |= (fxModeChanged || speedChanged || intensityChanged || paletteChanged); diff --git a/wled00/util.cpp b/wled00/util.cpp index 48456645..8b132672 100644 --- a/wled00/util.cpp +++ b/wled00/util.cpp @@ -69,12 +69,12 @@ bool getVal(JsonVariant elem, byte* val, byte vmin, byte vmax) { } -bool updateVal(const String* req, const char* key, byte* val, byte minv, byte maxv) +bool updateVal(const char* req, const char* key, byte* val, byte minv, byte maxv) { - int pos = req->indexOf(key); - if (pos < 1) return false; - if (req->length() < (unsigned int)(pos + 4)) return false; - parseNumber(req->c_str() + pos +3, val, minv, maxv); + const char *v = strstr(req, key); + if (v) v += strlen(key); + else return false; + parseNumber(v, val, minv, maxv); return true; } diff --git a/wled00/wled.h b/wled00/wled.h index 07cca673..96a02e80 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2206011 +#define VERSION 2206031 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG