From 026a53f3ff4f75e47fd08fd96c466d43b075b585 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Fri, 28 Jan 2022 16:31:28 +0100 Subject: [PATCH] Bugfix for expanding timed presets. Removed AsyncWebServer callbacks (string replace). --- tools/cdata.js | 12 +- wled00/data/settings.htm | 12 +- wled00/data/settings_time.htm | 4 +- wled00/html_settings.h | 356 ++++++++++++++++++---------------- wled00/wled.h | 2 +- wled00/wled_server.cpp | 32 +-- wled00/xml.cpp | 9 +- 7 files changed, 227 insertions(+), 200 deletions(-) diff --git a/tools/cdata.js b/tools/cdata.js index ac4a632f..71fafdcb 100644 --- a/tools/cdata.js +++ b/tools/cdata.js @@ -261,10 +261,14 @@ writeChunks( { file: "settings.htm", name: "PAGE_settings", - prepend: "=====(", - append: ")=====", - method: "plaintext", - filter: "html-minify" + method: "gzip", + filter: "html-minify", + mangle: (str) => + str + .replace( + /function GetV().*\<\/script\>/gms, + "" + ) }, { file: "settings_wifi.htm", diff --git a/wled00/data/settings.htm b/wled00/data/settings.htm index 1d0969de..8fecc521 100644 --- a/wled00/data/settings.htm +++ b/wled00/data/settings.htm @@ -4,6 +4,12 @@ WLED Settings + - +
-%DMXMENU% +
diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm index 5a54ea81..1591476c 100644 --- a/wled00/data/settings_time.htm +++ b/wled00/data/settings_time.htm @@ -75,7 +75,7 @@ Sunrise -
🗓
`; +
🗓
`; ih+=`"; @@ -83,7 +83,7 @@ Sunset -
🗓
`; +
🗓
`; ih+=`"; diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 94d346e6..92ff761e 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -63,19 +63,51 @@ const uint8_t PAGE_settingsCss[] PROGMEM = { // Autogenerated from wled00/data/settings.htm, do not edit!! -const char PAGE_settings[] PROGMEM = R"=====(WLED Settings
-
-
%DMXMENU%
)====="; +const uint16_t PAGE_settings_length = 670; +const uint8_t PAGE_settings[] PROGMEM = { + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x8d, 0x54, 0xdb, 0x6e, 0xdb, 0x30, + 0x0c, 0x7d, 0xf7, 0x57, 0x68, 0x2e, 0x36, 0x24, 0x40, 0xdc, 0xb4, 0xe9, 0x30, 0x0c, 0xbe, 0x64, + 0x40, 0xd7, 0x6e, 0x2b, 0xb0, 0xa2, 0x05, 0x7a, 0xdb, 0x1e, 0x65, 0x89, 0x76, 0xb8, 0x5a, 0x92, + 0x21, 0xd1, 0x69, 0xb2, 0x20, 0xff, 0x3e, 0xd9, 0x49, 0xd3, 0xae, 0x5d, 0xb0, 0xbc, 0x18, 0x26, + 0x45, 0x1f, 0xf2, 0x9c, 0x43, 0x39, 0x7d, 0x73, 0x72, 0xf1, 0xf9, 0xfa, 0xe7, 0xe5, 0x29, 0x9b, + 0x90, 0xaa, 0xc6, 0x69, 0xfb, 0x64, 0x15, 0xd7, 0x65, 0x16, 0x82, 0x0e, 0x7d, 0x0c, 0x5c, 0x8e, + 0x53, 0x05, 0xc4, 0x99, 0x98, 0x70, 0xeb, 0x80, 0xb2, 0xf0, 0xe6, 0xfa, 0x4b, 0xf4, 0x31, 0x5c, + 0x67, 0x03, 0x61, 0x34, 0x81, 0xf6, 0xe9, 0x07, 0x94, 0x34, 0xc9, 0x24, 0x4c, 0x51, 0x40, 0xd4, + 0x05, 0x03, 0xd4, 0x48, 0xc8, 0xab, 0xc8, 0x09, 0x5e, 0x41, 0x76, 0x38, 0x50, 0x7c, 0x86, 0xaa, + 0x51, 0x9b, 0xb8, 0x71, 0x60, 0xbb, 0x80, 0xe7, 0x3e, 0xd6, 0x26, 0x64, 0x81, 0xe6, 0x0a, 0xb2, + 0x70, 0x8a, 0xf0, 0x50, 0x1b, 0x4b, 0xbe, 0x0b, 0x21, 0x55, 0x30, 0xbe, 0xfb, 0x7e, 0x7a, 0xc2, + 0xae, 0x80, 0x08, 0x75, 0xe9, 0xd2, 0xe1, 0x2a, 0x99, 0x3a, 0x61, 0xb1, 0xa6, 0x71, 0x30, 0xe5, + 0x96, 0xc9, 0x4c, 0x1a, 0xd1, 0x28, 0x3f, 0x4a, 0x52, 0x34, 0x5a, 0x10, 0x1a, 0xcd, 0xca, 0x33, + 0xd9, 0xd3, 0xfd, 0x85, 0x05, 0x6a, 0xac, 0x66, 0x72, 0xbf, 0x04, 0x3a, 0xad, 0xa0, 0xad, 0x39, + 0x9e, 0x77, 0x47, 0xcb, 0x4d, 0xe9, 0x55, 0xaf, 0xbf, 0xf8, 0x0a, 0x74, 0xdb, 0xeb, 0x2f, 0x83, + 0x74, 0xb8, 0x06, 0x5e, 0x37, 0x60, 0xce, 0x8a, 0x2c, 0x74, 0xeb, 0xee, 0xc3, 0xc7, 0x97, 0xfd, + 0x5f, 0xee, 0x53, 0x9d, 0x1d, 0xf8, 0x19, 0x9f, 0xea, 0x69, 0xee, 0xe7, 0x0a, 0x72, 0x23, 0xe7, + 0x0b, 0x82, 0x19, 0x45, 0xbc, 0xc2, 0x52, 0xc7, 0xc2, 0x77, 0x04, 0x9b, 0xe4, 0x5c, 0xdc, 0x97, + 0xd6, 0x34, 0x5a, 0xc6, 0x7b, 0xa3, 0xd1, 0x28, 0x99, 0x00, 0x96, 0x13, 0x8a, 0x0f, 0x0f, 0x0e, + 0xea, 0x59, 0xa2, 0xb8, 0x2d, 0x51, 0xc7, 0x07, 0xcb, 0xd6, 0x82, 0x45, 0x14, 0x4d, 0x7c, 0x7e, + 0x7f, 0x34, 0x9d, 0x2c, 0xf3, 0x86, 0xc8, 0xe8, 0xc5, 0xf3, 0x8f, 0x8f, 0x8e, 0x8e, 0x12, 0x61, + 0x2a, 0x63, 0xe3, 0xbd, 0xa2, 0x28, 0x92, 0xc2, 0x5b, 0x10, 0x15, 0x5c, 0x61, 0x35, 0x8f, 0x6f, + 0xc1, 0x4a, 0xae, 0xf9, 0xe0, 0x1b, 0x54, 0x53, 0x20, 0x14, 0x7c, 0xe0, 0xb8, 0x76, 0x91, 0x17, + 0x1a, 0x8b, 0x44, 0xa2, 0xab, 0x2b, 0x3e, 0x8f, 0x51, 0x57, 0xa8, 0x21, 0xca, 0x2b, 0x23, 0xee, + 0x93, 0xdc, 0x58, 0x09, 0x36, 0x3e, 0xac, 0x67, 0xcc, 0x99, 0x0a, 0x25, 0xeb, 0xe0, 0x57, 0xd9, + 0xc8, 0x72, 0x89, 0x8d, 0x8b, 0xbd, 0xc0, 0x3d, 0x3f, 0x52, 0x7f, 0xd5, 0xca, 0xe1, 0x6f, 0x88, + 0x3f, 0x4c, 0x15, 0xea, 0x47, 0x0a, 0x9b, 0xf3, 0xce, 0xf7, 0xd8, 0x3b, 0x2a, 0x7a, 0x9e, 0xd6, + 0x5b, 0x16, 0xb1, 0xf7, 0x9e, 0x5c, 0x7f, 0xcd, 0x2e, 0x22, 0x53, 0xc7, 0x2d, 0xa7, 0x56, 0xe2, + 0x4e, 0xaa, 0x74, 0xb8, 0xda, 0xb0, 0x56, 0x31, 0x66, 0x74, 0x65, 0xb8, 0xcc, 0x42, 0xef, 0x85, + 0x17, 0xb5, 0x30, 0x56, 0x31, 0xde, 0xb9, 0x93, 0x85, 0x43, 0x9f, 0x58, 0x09, 0xc1, 0x68, 0x5e, + 0xfb, 0x0d, 0x71, 0x4d, 0xae, 0x90, 0x42, 0x86, 0xbe, 0x3e, 0x0f, 0xc7, 0xc1, 0xb1, 0x97, 0x27, + 0x1d, 0xae, 0x4a, 0x3c, 0x6a, 0xfb, 0xf1, 0x4b, 0x88, 0x8d, 0x81, 0x0f, 0x58, 0xe0, 0x16, 0xbc, + 0x71, 0x70, 0x87, 0x5f, 0xb0, 0xdd, 0xb4, 0xa6, 0xde, 0x15, 0xae, 0x02, 0xe9, 0xb6, 0xc2, 0xb5, + 0x7b, 0x7b, 0x69, 0xa1, 0x00, 0x0b, 0x5a, 0x80, 0xdb, 0x15, 0xb3, 0x79, 0x36, 0x60, 0xf0, 0x37, + 0xe4, 0x8d, 0xf7, 0x92, 0x9d, 0xb5, 0x0b, 0x55, 0x70, 0x01, 0xbb, 0x02, 0x4a, 0x35, 0xdb, 0x20, + 0x06, 0x9d, 0x6a, 0x3e, 0x93, 0x93, 0x0e, 0x59, 0x67, 0x84, 0x0f, 0xd7, 0xbb, 0xa1, 0x8d, 0x86, + 0xf0, 0x05, 0x8b, 0x93, 0xf3, 0x1f, 0xec, 0xa2, 0xa1, 0xba, 0xa1, 0x7f, 0xb7, 0x0b, 0x5e, 0xf7, + 0x73, 0x73, 0x2d, 0xb6, 0x89, 0x72, 0xe5, 0xcf, 0x9e, 0x18, 0xbc, 0xd2, 0x24, 0xd8, 0xc6, 0x81, + 0x50, 0xc1, 0x36, 0xcc, 0x6b, 0x7f, 0xc6, 0xde, 0xb1, 0x73, 0x2e, 0xac, 0x79, 0x42, 0x0c, 0xfe, + 0x27, 0xb3, 0xda, 0x86, 0xd7, 0xaa, 0xac, 0x8c, 0xdc, 0x1d, 0xca, 0xc1, 0x76, 0xbe, 0x20, 0x1a, + 0x8b, 0x34, 0xf7, 0xf3, 0xdd, 0xd4, 0x92, 0x13, 0xb8, 0xe0, 0x95, 0x8e, 0xc3, 0xf6, 0x06, 0xb4, + 0xd7, 0xa1, 0xfd, 0x0d, 0xff, 0x01, 0x66, 0xcb, 0x4e, 0x11, 0x96, 0x05, 0x00, 0x00 +}; // Autogenerated from wled00/data/settings_wifi.htm, do not edit!! @@ -1041,14 +1073,14 @@ const uint8_t PAGE_settings_sync[] PROGMEM = { // Autogenerated from wled00/data/settings_time.htm, do not edit!! -const uint16_t PAGE_settings_time_length = 2950; +const uint16_t PAGE_settings_time_length = 2954; const uint8_t PAGE_settings_time[] PROGMEM = { 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x1a, 0x6b, 0x73, 0xda, 0xb8, - 0xf6, 0xbb, 0x7f, 0x85, 0xea, 0x76, 0x52, 0xd8, 0xf0, 0x4e, 0x49, 0x09, 0x60, 0x77, 0x09, 0xd0, - 0xa6, 0x6d, 0x20, 0x99, 0x85, 0x6e, 0x76, 0xfb, 0x98, 0xad, 0xb0, 0x05, 0x38, 0x31, 0x12, 0xd7, - 0x92, 0x43, 0x72, 0xd3, 0xfc, 0xf7, 0x7b, 0x64, 0xd9, 0x06, 0x13, 0x0c, 0x49, 0x6f, 0xef, 0xcc, + 0xf6, 0xbb, 0x7f, 0x85, 0xea, 0x76, 0xb2, 0xb0, 0xe1, 0x9d, 0x92, 0x12, 0xc0, 0xee, 0x25, 0x40, + 0x9b, 0xb6, 0x81, 0x64, 0x0a, 0xdd, 0xec, 0xf6, 0x31, 0x5b, 0x61, 0x0b, 0x70, 0x62, 0x24, 0xae, + 0x25, 0x87, 0xe4, 0xa6, 0xf9, 0xef, 0xf7, 0xc8, 0xb2, 0x0d, 0x26, 0x18, 0x92, 0x6e, 0xef, 0xcc, 0x9d, 0x4c, 0x8c, 0x2d, 0x9d, 0x97, 0x8e, 0xce, 0x53, 0x76, 0xf3, 0x59, 0xe7, 0xac, 0x3d, 0xfc, - 0xfb, 0xbc, 0x8b, 0xa6, 0x62, 0xe6, 0x9a, 0x4d, 0x79, 0x45, 0x2e, 0xa6, 0x13, 0x43, 0x27, 0x54, + 0xeb, 0xbc, 0x8b, 0xa6, 0x62, 0xe6, 0x9a, 0x4d, 0x79, 0x45, 0x2e, 0xa6, 0x13, 0x43, 0x27, 0x54, 0x87, 0x67, 0x82, 0x6d, 0xb3, 0x39, 0x23, 0x02, 0x23, 0x8a, 0x67, 0xc4, 0xd0, 0xaf, 0x1d, 0xb2, 0x98, 0x33, 0x4f, 0xe8, 0xc8, 0x62, 0x54, 0x10, 0x2a, 0x0c, 0x7d, 0xe1, 0xd8, 0x62, 0x6a, 0x54, 0x4b, 0x25, 0xdd, 0xd4, 0x14, 0xa8, 0xb6, 0x36, 0x67, 0x93, 0x6b, 0xc7, 0x22, 0xf9, 0xe0, 0x21, @@ -1057,23 +1089,23 @@ const uint8_t PAGE_settings_time[] PROGMEM = { 0x3a, 0x14, 0xc8, 0x9a, 0x62, 0x8f, 0x13, 0x60, 0xe2, 0x8b, 0x71, 0xbe, 0x06, 0xa3, 0xc2, 0x11, 0x2e, 0x31, 0x87, 0xce, 0x8c, 0xa0, 0x01, 0x11, 0xc2, 0xa1, 0x13, 0xde, 0x2c, 0xaa, 0xc1, 0x26, 0xb7, 0x3c, 0x67, 0x2e, 0x4c, 0xed, 0x1a, 0x7b, 0xc8, 0x36, 0x6c, 0x66, 0xf9, 0x33, 0x10, 0x30, - 0x37, 0xe3, 0xc6, 0x17, 0xfd, 0x03, 0xa6, 0x7a, 0x4e, 0x7f, 0x4b, 0x46, 0x70, 0xed, 0x61, 0x0f, - 0xae, 0xad, 0xb9, 0x17, 0xdc, 0xdf, 0xc2, 0xf5, 0x83, 0x4f, 0x83, 0xab, 0x2b, 0xc7, 0xfd, 0x09, + 0x37, 0xe3, 0xc6, 0x17, 0xfd, 0x3d, 0xa6, 0x7a, 0x4e, 0x7f, 0x43, 0x46, 0x70, 0xed, 0x61, 0x0f, + 0xae, 0xad, 0xb9, 0x17, 0xdc, 0xdf, 0xc2, 0xf5, 0xbd, 0x4f, 0x83, 0xab, 0x2b, 0xc7, 0xfd, 0x09, 0x5c, 0x07, 0x64, 0x0e, 0xd7, 0x33, 0x4b, 0xc0, 0xb5, 0xcf, 0xae, 0xe1, 0xda, 0x21, 0x96, 0xfe, 0xad, 0x31, 0xf6, 0xa9, 0x25, 0x1c, 0x46, 0xd1, 0x49, 0x26, 0x7b, 0xb7, 0x70, 0xa8, 0xcd, 0x16, 0x05, 0x36, 0x27, 0x34, 0xa3, 0x4f, 0x85, 0x98, 0xf3, 0x7a, 0xb1, 0x78, 0x45, 0x59, 0x61, 0xe1, 0x12, 0xbb, 0x30, 0x21, 0xc5, 0x31, 0xc1, 0xc2, 0xf7, 0x08, 0x2f, 0xf2, 0x50, 0xd6, 0xe2, 0x73, 0x01, 0xa2, 0xe7, 0xa3, 0x47, 0x3d, 0x7b, 0x1f, 0x13, 0x3c, 0x5e, 0x27, 0x18, 0x23, 0x01, 0xf3, - 0x7f, 0x38, 0x71, 0xc7, 0xab, 0xd0, 0x03, 0x80, 0x3e, 0x1e, 0xe2, 0x4c, 0x36, 0xf7, 0x8e, 0x88, - 0x3f, 0xe1, 0xc7, 0x9f, 0xdb, 0xa7, 0xcc, 0x82, 0x9b, 0x36, 0x87, 0xcb, 0xdb, 0x76, 0x66, 0x05, - 0x78, 0xf2, 0xde, 0xce, 0x88, 0xec, 0x9d, 0x47, 0x40, 0x18, 0x8a, 0xa4, 0x64, 0xa2, 0xeb, 0x12, + 0xbf, 0x39, 0x71, 0xc7, 0xab, 0xd0, 0x03, 0x80, 0x3e, 0x1e, 0xe2, 0x4c, 0x36, 0xf7, 0x96, 0x88, + 0x3f, 0xe0, 0xc7, 0x9f, 0xdb, 0xa7, 0xcc, 0x82, 0x9b, 0x36, 0x87, 0xcb, 0x9b, 0x76, 0x66, 0x05, + 0x78, 0xf2, 0xce, 0xce, 0x88, 0xec, 0x9d, 0x47, 0x40, 0x18, 0x8a, 0xa4, 0x64, 0xa2, 0xeb, 0x12, 0xa9, 0x9c, 0xe3, 0xdb, 0x60, 0x6a, 0x05, 0xb4, 0x9f, 0x02, 0xc9, 0x8f, 0x6f, 0xfb, 0xb0, 0x45, 0x30, 0xfb, 0xa5, 0xf4, 0x6d, 0x09, 0x4f, 0x6e, 0xe6, 0x98, 0x02, 0x89, 0x1c, 0xc9, 0xde, 0x49, 0xbd, 0x53, 0x43, 0x32, 0xd3, 0x2f, 0x3a, 0xfa, 0x3e, 0xc9, 0x36, 0x68, 0x81, 0x8b, 0x5b, 0x97, 0x14, 0x6c, 0x87, 0xcf, 0x5d, 0x7c, 0x6b, 0xe8, 0x94, 0x51, 0xa2, 0x3f, 0x33, 0x8c, 0xb5, 0x89, - 0x37, 0x6a, 0xa2, 0xae, 0xeb, 0x39, 0x51, 0x70, 0x28, 0x25, 0xde, 0xc9, 0xb0, 0x77, 0x1a, 0x82, - 0x1b, 0x1b, 0xc0, 0xf7, 0x9e, 0x97, 0x2b, 0xb5, 0x57, 0x87, 0xaf, 0x1b, 0x80, 0xb3, 0xf7, 0xfc, - 0xa6, 0xf2, 0xba, 0x5c, 0x6d, 0xe8, 0x4b, 0xa9, 0xa4, 0x0e, 0xee, 0x02, 0x41, 0x2c, 0x6c, 0xe9, + 0xd7, 0x6a, 0xa2, 0xae, 0xeb, 0x39, 0x51, 0x70, 0x28, 0x25, 0xde, 0xc9, 0xb0, 0x77, 0x1a, 0x82, + 0x1b, 0x1b, 0xc0, 0xf7, 0x9e, 0x97, 0x2b, 0xb5, 0x97, 0x87, 0xaf, 0x1a, 0x80, 0xb3, 0xf7, 0xfc, + 0xa6, 0xf2, 0xaa, 0x5c, 0x6d, 0xe8, 0x4b, 0xa9, 0xa4, 0x0e, 0xee, 0x02, 0x41, 0x2c, 0x6c, 0xe9, 0xd9, 0x8d, 0x52, 0xe4, 0xd4, 0x3c, 0xdb, 0x30, 0x3f, 0x72, 0x99, 0x75, 0x15, 0x01, 0x58, 0x3b, 0x08, 0x60, 0x39, 0x4d, 0x5c, 0x62, 0x09, 0x62, 0xef, 0xed, 0x65, 0xd2, 0xb9, 0x2a, 0xaa, 0xd9, 0x88, 0xec, 0x26, 0x34, 0xb6, 0x83, 0x97, 0xb5, 0x93, 0x2c, 0x7d, 0x12, 0xd9, 0x55, 0xf3, 0x93, @@ -1085,149 +1117,149 @@ const uint8_t PAGE_settings_time[] PROGMEM = { 0x75, 0xe4, 0xd8, 0xf1, 0xad, 0xb8, 0x9d, 0xc3, 0xf8, 0xd4, 0xb1, 0xed, 0x20, 0x76, 0x29, 0xe0, 0x78, 0xbe, 0x14, 0x01, 0x58, 0x53, 0x62, 0x5d, 0x8d, 0xd8, 0x8d, 0x2e, 0x59, 0xdb, 0xe6, 0x57, 0xfa, 0x80, 0xf4, 0x89, 0xa2, 0x67, 0xb9, 0x98, 0x73, 0x43, 0xbf, 0xe1, 0x11, 0x26, 0xf5, 0x67, - 0x23, 0xe2, 0xe9, 0x68, 0xe6, 0x50, 0x43, 0x07, 0x7a, 0x10, 0xba, 0x0c, 0xbd, 0xf2, 0x2a, 0x9d, + 0x23, 0xe2, 0xe9, 0x68, 0xe6, 0x50, 0x43, 0x07, 0x7a, 0x10, 0xba, 0x0c, 0xbd, 0xf2, 0x32, 0x9d, 0x50, 0xff, 0x29, 0x84, 0xaa, 0x47, 0xe9, 0x84, 0x86, 0x09, 0x42, 0x3b, 0x04, 0xaa, 0x96, 0x92, 0x84, 0x6c, 0xe7, 0x3a, 0x50, 0x43, 0xfb, 0x58, 0x51, 0x61, 0xd4, 0x72, 0x1d, 0xeb, 0x0a, 0x42, 0x7c, 0xe8, 0xa0, 0x53, 0x87, 0xe7, 0xe4, 0x54, 0x36, 0xe6, 0x00, 0xe1, 0x57, 0x37, 0x63, 0x47, 0x6a, 0x16, 0x81, 0x84, 0x22, 0x19, 0x6c, 0xd9, 0xf7, 0xdc, 0xca, 0xae, 0x40, 0x22, 0x70, 0x39, 0xd0, 0x31, 0xaa, 0x4b, 0x4e, 0x17, 0x1d, 0xc5, 0x29, 0xb0, 0x2b, 0x43, 0x0f, 0x0d, 0xab, 0x2e, - 0xed, 0xaa, 0x21, 0xb3, 0x8a, 0x67, 0xfe, 0xe1, 0x53, 0x90, 0x03, 0x2d, 0x08, 0xb9, 0xb2, 0xf1, - 0x2d, 0x0f, 0x28, 0x82, 0x69, 0xc9, 0x98, 0x1f, 0x9b, 0x56, 0x2f, 0xb6, 0x96, 0x61, 0x7c, 0x77, - 0xb1, 0x61, 0xec, 0x6d, 0x7c, 0x37, 0x58, 0xbf, 0x0b, 0x0c, 0x0c, 0xfe, 0xf5, 0xdc, 0xa5, 0x51, - 0x6e, 0x5c, 0x82, 0x61, 0x5d, 0x82, 0x61, 0x29, 0xe9, 0xed, 0x07, 0x26, 0xf2, 0xe2, 0xee, 0xf2, - 0x3e, 0xc5, 0x4a, 0xbe, 0x37, 0x62, 0x63, 0x0c, 0x8d, 0x36, 0x10, 0x75, 0xec, 0xb1, 0x19, 0x6a, - 0x2a, 0xa7, 0x0a, 0xb7, 0xaa, 0x17, 0x2c, 0x1d, 0x74, 0x74, 0x09, 0xa6, 0x7c, 0xd9, 0x2c, 0x57, - 0x96, 0x2c, 0xd9, 0x3c, 0x70, 0xa7, 0x6b, 0xec, 0xfa, 0x00, 0x08, 0xdc, 0xf6, 0xcb, 0x00, 0xf9, - 0xe2, 0x6e, 0xc6, 0xbf, 0x5c, 0x7e, 0xbb, 0x6f, 0x16, 0xd5, 0x7c, 0x82, 0x97, 0x22, 0x9d, 0x34, - 0x86, 0xce, 0x63, 0xac, 0xaa, 0x1c, 0x5a, 0xc3, 0x41, 0x59, 0xae, 0x20, 0x40, 0x37, 0x91, 0x60, - 0x6b, 0xc2, 0x9e, 0xff, 0x02, 0x61, 0xd3, 0x05, 0xed, 0xfe, 0xac, 0xa0, 0x5f, 0xe9, 0x57, 0xf1, - 0x55, 0x48, 0x3b, 0x79, 0x60, 0x7a, 0xf7, 0xa1, 0x6e, 0x5e, 0x6e, 0x0e, 0x0a, 0xb5, 0x30, 0x22, + 0xed, 0xaa, 0x21, 0xb3, 0x8a, 0x67, 0x7e, 0xf4, 0x29, 0xc8, 0x81, 0x16, 0x84, 0x5c, 0xd9, 0xf8, + 0x96, 0x07, 0x14, 0xc1, 0xb4, 0x64, 0xcc, 0x8f, 0x4d, 0xab, 0x17, 0x5b, 0xcb, 0x30, 0xbe, 0xbb, + 0xd8, 0x30, 0xf6, 0x26, 0xbe, 0x1b, 0xac, 0xdf, 0x05, 0x06, 0x06, 0xff, 0x7a, 0xee, 0xd2, 0x28, + 0x37, 0x2e, 0xc1, 0xb0, 0x2e, 0xc1, 0xb0, 0x94, 0xf4, 0xf6, 0x03, 0x13, 0x79, 0x71, 0x77, 0x79, + 0x9f, 0x62, 0x25, 0xdf, 0x1b, 0xb1, 0x31, 0x86, 0x46, 0x1b, 0x88, 0x3a, 0xf6, 0xd8, 0x0c, 0x35, + 0x95, 0x53, 0x85, 0x5b, 0xd5, 0x0b, 0x96, 0x0e, 0x3a, 0xba, 0x04, 0x53, 0xbe, 0x6c, 0x96, 0x2b, + 0x4b, 0x96, 0x6c, 0x1e, 0xb8, 0xd3, 0x35, 0x76, 0x7d, 0x00, 0x04, 0x6e, 0xfb, 0x65, 0x80, 0x7c, + 0x71, 0x37, 0xe3, 0x5f, 0x2e, 0xbf, 0xdd, 0x37, 0x8b, 0x6a, 0x3e, 0xc1, 0x4b, 0x91, 0x4e, 0x1a, + 0x43, 0xe7, 0x31, 0x56, 0x55, 0x0e, 0xad, 0xe1, 0xa0, 0x2c, 0x57, 0x10, 0xa0, 0x9b, 0x48, 0xb0, + 0x35, 0x61, 0xcf, 0x7f, 0x81, 0xb0, 0xe9, 0x82, 0x76, 0x7f, 0x56, 0xd0, 0xaf, 0xf4, 0xab, 0xf8, + 0x2a, 0xa4, 0x9d, 0x3c, 0x30, 0xbd, 0xfb, 0x50, 0x37, 0xbf, 0x6d, 0x0e, 0x0a, 0xb5, 0x30, 0x22, 0xd4, 0xb6, 0x85, 0x83, 0xda, 0xf6, 0x58, 0x30, 0xf0, 0xa9, 0xe7, 0x70, 0x92, 0x0c, 0x09, 0x40, 0x30, 0x54, 0x45, 0xa5, 0x5a, 0x7d, 0x40, 0x3c, 0xcd, 0xff, 0x6b, 0xbb, 0x56, 0x9f, 0x07, 0xaf, - 0x7f, 0x84, 0xfb, 0xd7, 0xfe, 0x1b, 0xdf, 0xdf, 0xe8, 0xef, 0xb5, 0xc7, 0x3a, 0xfb, 0x43, 0x37, - 0x7f, 0x99, 0x0b, 0xf4, 0xbf, 0x74, 0xf6, 0xda, 0x36, 0x4f, 0xff, 0xdf, 0x39, 0xf5, 0xcb, 0x9d, - 0x4e, 0x5d, 0x7b, 0x8c, 0x47, 0xeb, 0x09, 0x8f, 0xde, 0x64, 0x74, 0x7a, 0x2e, 0xdd, 0xe0, 0x8e, - 0x42, 0x83, 0x3b, 0xda, 0x66, 0x70, 0x47, 0x3b, 0x0d, 0x4e, 0xe6, 0xc6, 0x84, 0xbd, 0x1d, 0xfd, - 0x94, 0xbd, 0x1d, 0xfd, 0x22, 0x7b, 0x3b, 0xfa, 0xe5, 0xf6, 0x76, 0xf4, 0x0b, 0xed, 0xed, 0xe8, - 0xff, 0xd5, 0xde, 0x8e, 0xb6, 0xda, 0xdb, 0x23, 0x6d, 0x2d, 0xa8, 0xcb, 0x86, 0xbd, 0x21, 0xd4, - 0x65, 0xcb, 0x72, 0x57, 0x2c, 0xab, 0x31, 0x59, 0xbf, 0xdf, 0x2d, 0x6b, 0xa5, 0x72, 0x49, 0x15, - 0x4b, 0x2e, 0x11, 0x50, 0x9e, 0xa9, 0x0a, 0x5b, 0xdf, 0x77, 0xb2, 0x85, 0xc0, 0x7c, 0x02, 0x23, - 0x57, 0xc1, 0x5d, 0x89, 0x1d, 0x03, 0xec, 0x5f, 0x66, 0x0b, 0x81, 0x88, 0xc4, 0x36, 0x84, 0x69, - 0x5e, 0xee, 0x95, 0x1b, 0x99, 0x72, 0xe5, 0xf5, 0x33, 0x43, 0x5e, 0xf7, 0x44, 0xf6, 0xc7, 0x0f, - 0xa8, 0xc3, 0xa0, 0x4c, 0x2c, 0x3f, 0x33, 0xa0, 0xf0, 0xd7, 0x7b, 0x4b, 0x9a, 0x3f, 0x7e, 0x84, - 0x63, 0x9d, 0xc4, 0x58, 0x45, 0x0d, 0x9e, 0xaf, 0x0e, 0x1e, 0x84, 0x90, 0xdd, 0xe5, 0x60, 0x36, - 0xbb, 0xb7, 0x17, 0x1a, 0x46, 0x20, 0x4b, 0xfb, 0x58, 0xce, 0xe5, 0x9c, 0xec, 0xfd, 0x72, 0x89, - 0x17, 0x76, 0xb8, 0x44, 0x6c, 0x7c, 0x29, 0xe5, 0x1e, 0xfc, 0x7d, 0xcb, 0x25, 0x97, 0x2e, 0x21, - 0x67, 0xd0, 0x3a, 0xae, 0xae, 0x13, 0x7f, 0x71, 0xbe, 0xed, 0x1b, 0x9b, 0x56, 0xfb, 0xdb, 0x2c, - 0x37, 0xfb, 0xcd, 0xa8, 0x34, 0xd6, 0x55, 0x65, 0x48, 0x94, 0x7b, 0x7d, 0x20, 0x9b, 0x0a, 0xbb, - 0x30, 0x18, 0x17, 0x4e, 0x87, 0x7f, 0xa8, 0x19, 0xd0, 0x42, 0x38, 0x10, 0x42, 0xe6, 0xcb, 0xbf, - 0xcd, 0x65, 0xf3, 0xf9, 0xd6, 0x65, 0x58, 0x24, 0xe7, 0xb2, 0xd9, 0x1c, 0x10, 0x8d, 0x49, 0xf4, - 0xd7, 0x49, 0xf4, 0xb7, 0x90, 0xe8, 0x47, 0x24, 0x96, 0x9a, 0xc0, 0xb6, 0xfd, 0x07, 0x5b, 0xc8, - 0x1e, 0x2a, 0x47, 0x41, 0x47, 0x77, 0xaa, 0x7f, 0x0d, 0x44, 0x9f, 0x61, 0xcb, 0x63, 0xd0, 0x26, - 0xe6, 0x30, 0xf0, 0xf2, 0xd8, 0x82, 0x17, 0x5c, 0x42, 0x27, 0xd0, 0x61, 0xbb, 0xf0, 0xec, 0x40, - 0x44, 0xf1, 0x84, 0x44, 0xc5, 0xd9, 0x1c, 0x37, 0x06, 0xc2, 0x83, 0x6e, 0xb1, 0x20, 0xcb, 0x95, - 0x36, 0xb4, 0xcd, 0x6d, 0x66, 0x93, 0x4c, 0x46, 0x80, 0x02, 0xdf, 0xbc, 0xaa, 0xd5, 0xab, 0xd5, - 0xec, 0xbe, 0xc8, 0x36, 0xa2, 0xa6, 0xb8, 0x60, 0x79, 0xd0, 0x9a, 0x92, 0xb0, 0xb7, 0xcb, 0xe8, - 0xc2, 0xd6, 0xb3, 0x0d, 0x37, 0xa4, 0xd8, 0x26, 0xae, 0x9b, 0x29, 0xad, 0x5a, 0xe6, 0xf7, 0x63, - 0x5f, 0x08, 0x90, 0xf4, 0xc5, 0x9d, 0xb8, 0xaf, 0x7f, 0xcf, 0x25, 0x00, 0xcb, 0x09, 0xc0, 0x44, - 0x88, 0xe9, 0x41, 0xe9, 0xc1, 0xef, 0xd7, 0x83, 0xcb, 0x32, 0xe8, 0x3c, 0x08, 0x33, 0xcb, 0x4a, - 0x84, 0x00, 0x9a, 0x47, 0xfe, 0xe5, 0x3b, 0x1e, 0x01, 0xb7, 0x4a, 0x72, 0xac, 0x6c, 0xe1, 0x78, - 0xfa, 0xd3, 0x1c, 0xe9, 0x16, 0x8e, 0x07, 0x5b, 0x38, 0x76, 0x7e, 0x9a, 0xa3, 0x93, 0xe0, 0xb8, - 0xb4, 0x87, 0xb0, 0x95, 0x87, 0x3e, 0x3c, 0xd5, 0x00, 0x9b, 0xa5, 0x37, 0x99, 0xa4, 0xfd, 0x1a, - 0x60, 0xd4, 0xb9, 0x27, 0x58, 0x70, 0x7d, 0x1d, 0xbd, 0xaf, 0xe7, 0x52, 0x8d, 0x75, 0xc9, 0xae, - 0x1f, 0xc3, 0x5f, 0x44, 0xec, 0x1e, 0x65, 0xed, 0xf5, 0x75, 0xf4, 0xae, 0x7e, 0xaf, 0x41, 0x45, - 0xa9, 0x8e, 0x6c, 0xc2, 0xa3, 0x1b, 0xc4, 0x3d, 0x0b, 0x94, 0x16, 0x1e, 0x7b, 0x14, 0x2e, 0xf9, - 0x9b, 0xb9, 0x51, 0x95, 0xa1, 0x35, 0x06, 0x93, 0x19, 0xc1, 0xfc, 0xdd, 0x99, 0xc9, 0x33, 0x22, - 0xe4, 0x7b, 0x6e, 0x46, 0x57, 0x6d, 0xad, 0xc5, 0xc1, 0x49, 0x1a, 0x92, 0x60, 0x00, 0xd1, 0x2c, - 0xaa, 0xfe, 0x75, 0xc4, 0xec, 0x5b, 0x48, 0x55, 0x20, 0x10, 0x44, 0xee, 0x41, 0x26, 0x0b, 0xb4, - 0x20, 0x8e, 0xcc, 0x82, 0x40, 0x2e, 0x6f, 0xfe, 0x81, 0x0d, 0x52, 0xdb, 0x38, 0x18, 0xc3, 0x16, - 0x11, 0x31, 0x65, 0x30, 0x33, 0x67, 0x5c, 0xe8, 0x48, 0x63, 0x94, 0xfb, 0xa3, 0x99, 0x03, 0xed, - 0xb0, 0x0c, 0x55, 0xba, 0xca, 0x7b, 0xe1, 0xc6, 0x0a, 0x36, 0x07, 0x6f, 0x4c, 0x8e, 0x4d, 0x89, - 0x3b, 0x3f, 0x86, 0xa1, 0x91, 0xf2, 0x15, 0x65, 0x10, 0xea, 0x21, 0xa0, 0x16, 0x26, 0xcc, 0x13, - 0x49, 0xeb, 0x4d, 0xb3, 0xa8, 0x66, 0xa2, 0xdc, 0xb0, 0x11, 0x29, 0xc6, 0x39, 0x96, 0x38, 0xc7, - 0xd8, 0xba, 0x8a, 0xd1, 0xb4, 0x24, 0x86, 0x92, 0x54, 0x37, 0x07, 0xf8, 0x9a, 0x2c, 0x49, 0x2f, - 0x53, 0xcf, 0xb4, 0xa2, 0xce, 0xcc, 0x40, 0xb7, 0xfe, 0x1c, 0xb4, 0x53, 0x31, 0xb5, 0x77, 0x32, - 0x97, 0xc8, 0xb1, 0xa0, 0xbf, 0xe9, 0x0f, 0xcf, 0x61, 0xd2, 0xbb, 0x26, 0x5e, 0x1d, 0x85, 0xf6, - 0xbd, 0x96, 0xe1, 0xa2, 0xf2, 0x63, 0x28, 0x97, 0xe8, 0x45, 0x29, 0x51, 0x53, 0x50, 0x82, 0xdc, - 0x88, 0x18, 0x62, 0x10, 0x58, 0xbb, 0x0a, 0x54, 0x50, 0xf3, 0x57, 0x14, 0xc2, 0x27, 0x4e, 0x50, - 0xe5, 0xd5, 0x14, 0x49, 0xbd, 0x63, 0x91, 0xca, 0x25, 0x3c, 0x08, 0x6c, 0xbf, 0x55, 0x58, 0x81, - 0xd4, 0xff, 0x86, 0xcc, 0x5f, 0x5f, 0xeb, 0x6a, 0x86, 0x9f, 0x01, 0x20, 0xd9, 0xbf, 0x80, 0x6f, - 0x69, 0xd1, 0xd9, 0x87, 0x34, 0x23, 0x75, 0xa7, 0x9b, 0xef, 0x7a, 0xc3, 0xcc, 0xa7, 0x61, 0x3b, - 0x1b, 0xf7, 0x33, 0x6b, 0x78, 0xe5, 0x00, 0xa4, 0x78, 0x3c, 0x18, 0x3e, 0x80, 0xd0, 0xa2, 0xfa, - 0x4c, 0x37, 0xdb, 0xdd, 0x61, 0xb1, 0xdd, 0xdd, 0x00, 0x13, 0x82, 0x1c, 0xe8, 0x66, 0x17, 0x40, - 0xba, 0x5b, 0x40, 0x5e, 0xe9, 0xa6, 0xf6, 0x69, 0x90, 0x07, 0x88, 0x62, 0xb7, 0x93, 0x0a, 0x05, - 0x16, 0x0f, 0x40, 0x6d, 0x00, 0x6a, 0xa7, 0x03, 0x1d, 0x2a, 0x52, 0x3d, 0x80, 0xea, 0xa5, 0x43, - 0xbd, 0x0e, 0x48, 0xb5, 0x3e, 0xa7, 0xcd, 0xd7, 0x82, 0xf9, 0x73, 0x20, 0x72, 0xde, 0x19, 0x6a, - 0x69, 0x50, 0x50, 0x44, 0x82, 0x34, 0x99, 0xd6, 0xc5, 0x60, 0x98, 0xae, 0x43, 0xa8, 0x11, 0x3f, - 0x00, 0xd0, 0x47, 0x80, 0x49, 0x25, 0x54, 0x06, 0x4d, 0xb7, 0xe4, 0xea, 0x5b, 0x5b, 0x96, 0x5f, - 0x06, 0x5d, 0xf7, 0x3f, 0x03, 0x50, 0xff, 0xf3, 0x16, 0x99, 0xca, 0xa0, 0xee, 0x3e, 0x04, 0x81, - 0x29, 0xfa, 0xc8, 0x20, 0x95, 0xa5, 0x82, 0x81, 0xca, 0xdf, 0x0f, 0x86, 0x28, 0xf3, 0x9e, 0xda, - 0x0e, 0xde, 0x22, 0x19, 0x28, 0xbd, 0xdd, 0xca, 0x0f, 0x30, 0xbf, 0xc2, 0x02, 0x8c, 0x71, 0x81, - 0x69, 0x2a, 0x28, 0xa8, 0xbe, 0x05, 0xfa, 0x48, 0xa7, 0xf5, 0x5a, 0x01, 0x14, 0x5b, 0x5b, 0xf6, - 0xaf, 0x0c, 0xaa, 0x3f, 0x91, 0x82, 0x9d, 0xe0, 0x05, 0x76, 0x9c, 0x2d, 0x92, 0x81, 0xf6, 0xfb, - 0x67, 0x7f, 0x02, 0x64, 0x9f, 0x5d, 0x33, 0xee, 0x8c, 0x1c, 0x8f, 0x5f, 0xa5, 0x6e, 0x43, 0x45, - 0x1e, 0xd0, 0xb7, 0x3e, 0x4a, 0xe6, 0x1f, 0x3b, 0x80, 0xd3, 0xa2, 0xd6, 0x94, 0x79, 0x78, 0x42, - 0xd2, 0x31, 0x60, 0x4f, 0x7a, 0x7f, 0x3d, 0x34, 0xb7, 0xa8, 0xd9, 0xd7, 0x02, 0xdf, 0x1d, 0xb6, - 0x11, 0x1b, 0x8f, 0x21, 0x7a, 0xc4, 0x7e, 0xab, 0xbc, 0xf0, 0xd3, 0xd9, 0xe6, 0x0e, 0xe4, 0xb0, - 0x2a, 0xdf, 0x15, 0xa8, 0xa4, 0x17, 0xde, 0x6b, 0x71, 0xaa, 0x83, 0x40, 0x63, 0x31, 0x6a, 0x73, - 0x94, 0x81, 0xf9, 0x02, 0x2a, 0xd7, 0xd0, 0x94, 0xf9, 0x1e, 0xcf, 0x4a, 0x4e, 0x6d, 0xdf, 0xf3, - 0xa0, 0x22, 0x41, 0x2e, 0x83, 0x0e, 0x42, 0xc5, 0x27, 0x87, 0x83, 0xeb, 0x43, 0x2d, 0x19, 0xc7, - 0x5e, 0x18, 0xe4, 0xb0, 0x4c, 0x9f, 0x5e, 0x51, 0xb6, 0x80, 0x7d, 0x92, 0x93, 0x66, 0x41, 0x62, - 0x9f, 0x62, 0xe1, 0x08, 0xdf, 0x7e, 0x10, 0x2c, 0x20, 0xcd, 0x3d, 0x88, 0x16, 0x7d, 0xd0, 0x6b, - 0xbc, 0x5c, 0x6d, 0x6d, 0x72, 0xa0, 0xcb, 0xc6, 0x60, 0x5d, 0x17, 0x89, 0xa5, 0x9f, 0x0e, 0x53, - 0x92, 0xfe, 0x8d, 0x0b, 0x8b, 0x4d, 0xa4, 0xfd, 0xc3, 0xc3, 0xc2, 0xa1, 0x6c, 0x67, 0xc8, 0x1c, - 0xc6, 0x0a, 0xa5, 0xb2, 0x0a, 0x6d, 0xa7, 0x8c, 0x4e, 0x36, 0x4b, 0xdb, 0x5f, 0x91, 0x56, 0x8b, - 0xf3, 0xa5, 0xd9, 0x4d, 0xdb, 0xc3, 0x0b, 0x5d, 0xb6, 0x3b, 0xdb, 0xa5, 0xed, 0xeb, 0x51, 0xac, - 0xde, 0x20, 0x6e, 0x42, 0xda, 0xb2, 0x3c, 0x3a, 0x49, 0x08, 0x1b, 0x75, 0x65, 0xdc, 0x97, 0x99, - 0x2c, 0xb9, 0x0d, 0x51, 0x82, 0x39, 0x30, 0xdb, 0xf2, 0x20, 0x1a, 0x72, 0x4b, 0x78, 0x87, 0xce, - 0x20, 0x99, 0xc8, 0xbe, 0x6d, 0x6d, 0x75, 0x67, 0xa7, 0x2a, 0x1b, 0x4e, 0x31, 0x9d, 0xc8, 0x40, - 0xcf, 0x83, 0xdc, 0xfa, 0x20, 0x92, 0x4b, 0x7e, 0x16, 0xb0, 0xdb, 0x14, 0xd0, 0xfb, 0x90, 0x0f, - 0x52, 0xb7, 0xae, 0x1c, 0xe2, 0x62, 0xf0, 0x42, 0x8a, 0x5d, 0x36, 0x41, 0xa1, 0x60, 0x29, 0xf6, - 0x0f, 0x96, 0x34, 0x80, 0x72, 0xc3, 0x25, 0xa8, 0xe3, 0xc0, 0x7e, 0x6c, 0x87, 0x3e, 0x08, 0x89, - 0x5b, 0x10, 0x2e, 0x3c, 0x46, 0x9d, 0x1b, 0x87, 0xac, 0x21, 0x68, 0x4b, 0xfd, 0xcb, 0x2c, 0x19, - 0xa9, 0x4e, 0x9e, 0xc1, 0x9b, 0x6f, 0xc1, 0x77, 0x05, 0x3a, 0xed, 0x76, 0xd6, 0xbc, 0xe8, 0xac, - 0x9c, 0xd6, 0x80, 0x6b, 0x61, 0xd9, 0x58, 0x5d, 0xa9, 0x14, 0xd1, 0x29, 0xde, 0x4c, 0xa5, 0xb2, - 0xa3, 0x8d, 0xaf, 0xae, 0x3a, 0x61, 0x52, 0x3a, 0x0c, 0xd2, 0x95, 0x2b, 0xd3, 0x4d, 0x54, 0x7b, - 0x4f, 0x91, 0x4d, 0x52, 0x1d, 0x4c, 0xd9, 0x02, 0x55, 0x01, 0x0a, 0xf8, 0x7a, 0x57, 0x7c, 0x47, - 0x3d, 0x71, 0x56, 0x55, 0xde, 0xa0, 0x29, 0x43, 0x1a, 0x44, 0xa1, 0x01, 0x73, 0x24, 0x3c, 0xec, - 0xb8, 0xd9, 0x5d, 0xf8, 0x83, 0xb0, 0x1e, 0x51, 0x76, 0x28, 0x57, 0xa4, 0xa9, 0x2d, 0x5a, 0xdd, - 0xa3, 0x4e, 0x78, 0x86, 0x90, 0x5c, 0x5b, 0xfb, 0xaf, 0x44, 0xa5, 0x72, 0x18, 0x4a, 0x12, 0x63, - 0xc9, 0x8a, 0xcb, 0x75, 0x26, 0x53, 0xb1, 0x43, 0x86, 0xf6, 0xf1, 0xaa, 0x0c, 0x6d, 0xe6, 0x53, - 0x61, 0x43, 0x64, 0x42, 0x3d, 0x26, 0x9d, 0x5b, 0xdb, 0x8e, 0xdb, 0x55, 0xb8, 0x4b, 0xac, 0x77, - 0x0c, 0xbb, 0x75, 0x39, 0xd4, 0x81, 0x0e, 0xad, 0xbe, 0x47, 0x47, 0x7c, 0xde, 0x68, 0x42, 0xa4, - 0xf3, 0xf0, 0xdc, 0xac, 0x94, 0xb4, 0xe4, 0x0a, 0xfe, 0x7e, 0xec, 0x9b, 0x87, 0xa3, 0xa3, 0x95, - 0x6d, 0xca, 0x47, 0xd5, 0x5b, 0x48, 0xe5, 0xfd, 0x63, 0x0f, 0x70, 0x21, 0x39, 0x3f, 0xa4, 0x12, - 0x12, 0xe9, 0x2c, 0x63, 0xc3, 0xee, 0x63, 0xe0, 0x15, 0x93, 0x29, 0x86, 0x6b, 0x8b, 0xca, 0xbd, - 0x70, 0xc9, 0x5a, 0xb4, 0xe6, 0x24, 0x97, 0x93, 0x47, 0xbf, 0xb3, 0x39, 0x58, 0x61, 0x52, 0x5f, - 0x53, 0x5b, 0xef, 0x09, 0x2f, 0x6c, 0x56, 0xa8, 0xac, 0xa9, 0x6d, 0xf0, 0x53, 0x54, 0x12, 0x0b, - 0x96, 0x81, 0x53, 0xeb, 0xc9, 0x2e, 0x1f, 0xcd, 0x83, 0xb7, 0x67, 0x3c, 0x88, 0xa0, 0xcd, 0x91, - 0x19, 0x0c, 0x72, 0x34, 0x85, 0x8a, 0x1e, 0xcd, 0xd8, 0x35, 0xb1, 0x9f, 0x41, 0x61, 0x1f, 0x96, - 0xde, 0xa6, 0xa6, 0x5e, 0xb5, 0x71, 0x04, 0xa4, 0x10, 0x76, 0x39, 0x43, 0x16, 0x24, 0xc8, 0x11, - 0x41, 0x3e, 0x27, 0x36, 0x02, 0xdf, 0x51, 0x07, 0x07, 0xf2, 0x65, 0x00, 0x97, 0x04, 0x46, 0x0c, - 0x2a, 0xa5, 0x0f, 0x83, 0xb3, 0x3e, 0xc2, 0xd4, 0x46, 0x27, 0x43, 0xa8, 0xf6, 0x5b, 0xe7, 0xef, - 0x91, 0xc5, 0x66, 0x33, 0x18, 0xe0, 0x85, 0x20, 0xcb, 0x7f, 0xf0, 0x21, 0xae, 0x40, 0xf2, 0x25, - 0x1e, 0x12, 0x53, 0x12, 0xca, 0x83, 0xde, 0x77, 0x80, 0xae, 0xcb, 0x16, 0xc0, 0xde, 0x31, 0x91, - 0xe4, 0x2d, 0x2b, 0xf9, 0x92, 0xac, 0xe3, 0x03, 0x30, 0x9b, 0x8c, 0xb1, 0xef, 0x0a, 0x84, 0x55, - 0xf3, 0x0a, 0x5d, 0xb3, 0x80, 0xde, 0x0b, 0xca, 0x05, 0x84, 0x43, 0x12, 0x12, 0x51, 0xd2, 0x6f, - 0xb9, 0xe4, 0x06, 0xa3, 0x33, 0x5a, 0x3c, 0x1b, 0x8f, 0x91, 0x5a, 0xc0, 0xd2, 0x3b, 0x94, 0x4a, - 0x5b, 0xa5, 0x58, 0xa5, 0xb3, 0x9d, 0x87, 0x92, 0x2b, 0x21, 0x31, 0xb9, 0x31, 0xad, 0xf2, 0x4f, - 0x51, 0x51, 0xce, 0x1f, 0xf9, 0x61, 0x5e, 0xe6, 0xaf, 0x58, 0xcc, 0x64, 0xcf, 0xdf, 0xde, 0x4d, - 0x5f, 0x4b, 0x61, 0x20, 0x2d, 0xdc, 0xce, 0x9f, 0xca, 0xa8, 0xb2, 0xca, 0x81, 0xaf, 0xb3, 0xe8, - 0xaf, 0xb2, 0xd0, 0x9e, 0xb4, 0x06, 0x69, 0x53, 0xe1, 0x81, 0x8d, 0xda, 0x94, 0xd0, 0xa6, 0x82, - 0x03, 0x49, 0x68, 0x91, 0xd4, 0xb1, 0x2a, 0x04, 0xe7, 0x89, 0x43, 0xeb, 0x25, 0x84, 0x7d, 0xc1, - 0x54, 0x5a, 0x0b, 0x4f, 0x9b, 0xcc, 0xc4, 0xeb, 0x5f, 0xdb, 0x9c, 0xfb, 0x7c, 0x2a, 0xe9, 0xf2, - 0x85, 0x03, 0xb5, 0xb1, 0x3a, 0xc6, 0x84, 0x7f, 0x0e, 0x95, 0xa5, 0x08, 0x0c, 0x87, 0xd1, 0xfc, - 0xde, 0x44, 0x34, 0xa0, 0x42, 0x8c, 0x27, 0x5d, 0x28, 0x6e, 0x82, 0xa9, 0xf1, 0x58, 0xcd, 0xd1, - 0x78, 0xca, 0x66, 0x3e, 0xc8, 0x21, 0x27, 0xfb, 0xc5, 0xd6, 0xf2, 0x50, 0x54, 0x8b, 0x5e, 0x12, - 0x37, 0x85, 0x6c, 0xdb, 0xe5, 0x60, 0xf4, 0xab, 0x0e, 0x52, 0x31, 0xd2, 0xa6, 0x1e, 0x19, 0x1b, - 0xdb, 0xbf, 0xb4, 0x50, 0x6b, 0x28, 0x3e, 0xc7, 0x41, 0xee, 0xcf, 0x47, 0xad, 0xb4, 0x80, 0xd5, - 0xca, 0xef, 0x48, 0xfe, 0x19, 0xb9, 0x98, 0x5e, 0xc9, 0x22, 0x59, 0xd5, 0x06, 0xa1, 0x9e, 0xc2, - 0xbe, 0x18, 0x07, 0xba, 0x93, 0x5b, 0x94, 0x97, 0x9f, 0xb7, 0x78, 0xcc, 0x05, 0xf2, 0x49, 0xc7, - 0x0c, 0x12, 0xcc, 0xda, 0xc9, 0xb4, 0x43, 0x5d, 0x87, 0x92, 0xbc, 0x7a, 0x13, 0x1f, 0xe9, 0x59, - 0x2a, 0x54, 0x9e, 0xf0, 0x46, 0xc7, 0xd8, 0xb0, 0x69, 0xea, 0xeb, 0x98, 0xfa, 0xc1, 0x41, 0x69, - 0xae, 0x4e, 0x8c, 0x83, 0x85, 0x69, 0x51, 0x09, 0xe5, 0x3d, 0xfd, 0x18, 0x20, 0x42, 0xd0, 0xb6, - 0x1d, 0x03, 0x14, 0x65, 0xcb, 0x0d, 0x3f, 0xa1, 0x3a, 0x83, 0xaf, 0x80, 0xfe, 0x03, 0x1c, 0x8b, - 0x80, 0x0a, 0x15, 0x24, 0x00, 0x00 + 0x7f, 0x84, 0xfb, 0xd7, 0xfe, 0xb9, 0xef, 0xd7, 0x52, 0x1c, 0xbf, 0xf6, 0x58, 0xaf, 0x7f, 0xe8, + 0xef, 0xbf, 0xe5, 0x82, 0x8d, 0x58, 0x7a, 0x7d, 0x6d, 0x9b, 0xcb, 0xff, 0xef, 0xbc, 0xfb, 0xb7, + 0x9d, 0xde, 0x5d, 0x7b, 0x8c, 0x6b, 0xeb, 0x09, 0xd7, 0xde, 0x64, 0x7d, 0x7a, 0x2e, 0xdd, 0xf2, + 0x8e, 0x42, 0xcb, 0x3b, 0xda, 0x66, 0x79, 0x47, 0x3b, 0x2d, 0x4f, 0x26, 0xc9, 0x84, 0xe1, 0x1d, + 0xfd, 0x94, 0xe1, 0x1d, 0xfd, 0x22, 0xc3, 0x3b, 0xfa, 0xe7, 0x86, 0x77, 0x94, 0x62, 0x78, 0x47, + 0xbf, 0xd0, 0xf0, 0x8e, 0xfe, 0x5f, 0x0d, 0xef, 0x68, 0xab, 0xe1, 0x3d, 0xd2, 0xe8, 0x82, 0x4a, + 0x6d, 0xd8, 0x1b, 0x42, 0xa5, 0xb6, 0x2c, 0x80, 0xc5, 0xb2, 0x3e, 0x93, 0x15, 0xfd, 0xdd, 0xb2, + 0x7a, 0x2a, 0x97, 0x54, 0xf9, 0xe4, 0x12, 0x01, 0x05, 0x9b, 0xaa, 0xb9, 0xf5, 0x7d, 0x27, 0x5b, + 0x08, 0xec, 0x28, 0xb0, 0x76, 0x15, 0xee, 0x95, 0xd8, 0x31, 0xc0, 0xfe, 0x65, 0xb6, 0x10, 0x88, + 0x48, 0x6c, 0x43, 0x98, 0xe6, 0xe5, 0x5e, 0xb9, 0x91, 0x29, 0x57, 0x5e, 0x3d, 0x33, 0xe4, 0x75, + 0x4f, 0x64, 0x7f, 0xfc, 0x80, 0xca, 0x0c, 0x0a, 0xc7, 0xf2, 0x33, 0x03, 0x5a, 0x01, 0xbd, 0xb7, + 0xa4, 0xf9, 0xe3, 0x47, 0x38, 0xd6, 0x49, 0x8c, 0x55, 0xd4, 0xe0, 0xf9, 0xea, 0xe0, 0x41, 0x08, + 0xd9, 0x5d, 0x0e, 0x66, 0xb3, 0x7b, 0x7b, 0xa1, 0x61, 0x04, 0xb2, 0xb4, 0x8f, 0xe5, 0x5c, 0xce, + 0xc9, 0xde, 0x2f, 0x97, 0x78, 0x61, 0x87, 0x4b, 0xc4, 0xc6, 0x97, 0x52, 0xee, 0xc1, 0xdf, 0xb7, + 0x5c, 0x72, 0xe9, 0x12, 0x72, 0x06, 0xcd, 0xe4, 0xea, 0x3a, 0xf1, 0x17, 0xe7, 0xdb, 0xbe, 0xb1, + 0x69, 0xb5, 0xbf, 0xcf, 0x72, 0xb3, 0xdf, 0x8d, 0x4a, 0x63, 0x5d, 0x55, 0x86, 0x44, 0xb9, 0xd7, + 0x07, 0xb2, 0xcd, 0xb0, 0x0b, 0x83, 0x71, 0xe1, 0x74, 0xf8, 0x51, 0xcd, 0x80, 0x16, 0xc2, 0x81, + 0x10, 0x32, 0x5f, 0xfe, 0x7d, 0x2e, 0xdb, 0xd1, 0x37, 0x2e, 0xc3, 0x22, 0x39, 0x97, 0xcd, 0xe6, + 0x80, 0x68, 0x4c, 0xa2, 0xbf, 0x4e, 0xa2, 0xbf, 0x85, 0x44, 0x3f, 0x22, 0xb1, 0xd4, 0x04, 0xb6, + 0xed, 0x8f, 0x6c, 0x21, 0xbb, 0xaa, 0x1c, 0x05, 0x1d, 0xdd, 0xa9, 0x8e, 0x36, 0x10, 0x7d, 0x86, + 0x2d, 0x8f, 0x41, 0xe3, 0x98, 0xc3, 0xc0, 0xcb, 0x63, 0x0b, 0x5e, 0x70, 0x09, 0x9d, 0x40, 0xcf, + 0xed, 0xc2, 0xb3, 0x03, 0xa1, 0xc5, 0x13, 0x12, 0x15, 0x67, 0x73, 0xdc, 0x18, 0x08, 0x0f, 0xfa, + 0xc7, 0x82, 0x2c, 0x60, 0xda, 0xd0, 0x48, 0xb7, 0x99, 0x4d, 0x32, 0x19, 0x01, 0x0a, 0x7c, 0xfd, + 0xb2, 0x56, 0xaf, 0x56, 0xb3, 0xfb, 0x22, 0xdb, 0x88, 0xda, 0xe4, 0x82, 0xe5, 0x41, 0xb3, 0x4a, + 0xc2, 0x6e, 0x2f, 0xa3, 0x0b, 0x5b, 0xcf, 0x36, 0xdc, 0x90, 0x62, 0x9b, 0xb8, 0x6e, 0xa6, 0xb4, + 0x6a, 0x99, 0xdf, 0x8f, 0x7d, 0x21, 0x40, 0xd2, 0x17, 0x77, 0xe2, 0xbe, 0xfe, 0x3d, 0x97, 0x00, + 0x2c, 0x27, 0x00, 0x13, 0xb1, 0xa6, 0x07, 0xc5, 0x08, 0xbf, 0x5f, 0x8f, 0x32, 0xcb, 0xe8, 0xf3, + 0x20, 0xde, 0x2c, 0x6b, 0x13, 0x02, 0x68, 0x1e, 0xf9, 0xb7, 0xef, 0x78, 0x04, 0xdc, 0x2a, 0xc9, + 0xb1, 0xb2, 0x85, 0xe3, 0xe9, 0x4f, 0x73, 0xa4, 0x5b, 0x38, 0x1e, 0x6c, 0xe1, 0xd8, 0xf9, 0x69, + 0x8e, 0x4e, 0x82, 0xe3, 0xd2, 0x1e, 0xc2, 0xe6, 0x1e, 0x3a, 0xf3, 0x54, 0x03, 0x6c, 0x96, 0x5e, + 0x67, 0x92, 0xf6, 0x6b, 0x80, 0x51, 0xe7, 0x9e, 0x60, 0xc1, 0xf5, 0x75, 0xf4, 0xbe, 0x9e, 0x4b, + 0x35, 0xd6, 0x25, 0xbb, 0x7e, 0x0c, 0x7f, 0x11, 0xb1, 0x7b, 0x94, 0xb5, 0xd7, 0xd7, 0xd1, 0xbb, + 0xfa, 0xbd, 0x06, 0x35, 0xa6, 0x3a, 0xc4, 0x09, 0x0f, 0x73, 0x10, 0xf7, 0x2c, 0x50, 0x5a, 0x78, + 0x10, 0x52, 0xb8, 0xe4, 0xaf, 0xe7, 0x46, 0x55, 0x86, 0xd6, 0x18, 0x4c, 0x66, 0x04, 0xf3, 0x5f, + 0xce, 0x4c, 0x9e, 0x1a, 0x21, 0xdf, 0x73, 0x33, 0xba, 0x6a, 0x74, 0x2d, 0x0e, 0x4e, 0xd2, 0x90, + 0x04, 0x03, 0x88, 0x66, 0x51, 0x75, 0xb4, 0x23, 0x66, 0xdf, 0x42, 0xaa, 0x02, 0x81, 0x20, 0x72, + 0x0f, 0x32, 0x59, 0xa0, 0x05, 0x71, 0x64, 0x16, 0x04, 0x72, 0x79, 0xf3, 0x37, 0x6c, 0x90, 0xda, + 0xc6, 0xc1, 0x18, 0xb6, 0x88, 0x88, 0x29, 0x83, 0x99, 0x39, 0xe3, 0x42, 0x47, 0x1a, 0xa3, 0xdc, + 0x1f, 0xcd, 0x1c, 0x68, 0x90, 0x65, 0xa8, 0xd2, 0x55, 0x02, 0x0c, 0x37, 0x56, 0xb0, 0x39, 0x78, + 0x63, 0x72, 0x6c, 0x4a, 0xdc, 0xf9, 0x31, 0x0c, 0x8d, 0x94, 0xaf, 0x28, 0x83, 0x50, 0x0f, 0x01, + 0xb5, 0x30, 0x61, 0x9e, 0x48, 0x5a, 0xaf, 0x9b, 0x45, 0x35, 0x13, 0xe5, 0x86, 0x8d, 0x48, 0x31, + 0xce, 0xb1, 0xc4, 0x39, 0xc6, 0xd6, 0x55, 0x8c, 0xa6, 0x25, 0x31, 0x94, 0xa4, 0xba, 0x39, 0xc0, + 0xd7, 0x64, 0x49, 0x7a, 0x99, 0x7a, 0xa6, 0x15, 0x75, 0x8a, 0x06, 0xba, 0xf5, 0xe7, 0xa0, 0x9d, + 0x8a, 0xa9, 0xbd, 0x95, 0xb9, 0x44, 0x8e, 0x05, 0x1d, 0x4f, 0x7f, 0x78, 0x0e, 0x93, 0xde, 0x35, + 0xf1, 0xea, 0x28, 0xb4, 0xef, 0xb5, 0x0c, 0x17, 0xd5, 0x21, 0x43, 0xb9, 0x44, 0x2f, 0x4a, 0x89, + 0x9a, 0x82, 0x12, 0xe4, 0x46, 0xc4, 0x10, 0x83, 0xc0, 0xda, 0x55, 0xa0, 0x82, 0x2e, 0xa0, 0xa2, + 0x10, 0x3e, 0x71, 0x82, 0x2a, 0x2f, 0xa7, 0x48, 0xea, 0x1d, 0x8b, 0x54, 0x2e, 0xe1, 0xd1, 0x60, + 0xfb, 0x8d, 0xc2, 0x0a, 0xa4, 0xfe, 0x0f, 0x64, 0xfe, 0xfa, 0x5a, 0x9f, 0x33, 0xfc, 0x0c, 0x00, + 0xc9, 0x8e, 0x06, 0x7c, 0x4b, 0x8b, 0x4e, 0x43, 0xa4, 0x19, 0xa9, 0x3b, 0xdd, 0x7c, 0xdb, 0x1b, + 0x66, 0x3e, 0x0d, 0xdb, 0xd9, 0xb8, 0xc3, 0x59, 0xc3, 0x2b, 0x07, 0x20, 0xc5, 0xe3, 0xc1, 0xf0, + 0x01, 0x84, 0x16, 0x15, 0x6a, 0xba, 0xd9, 0xee, 0x0e, 0x8b, 0xed, 0xee, 0x06, 0x98, 0x10, 0xe4, + 0x40, 0x37, 0xbb, 0x00, 0xd2, 0xdd, 0x02, 0xf2, 0x52, 0x37, 0xb5, 0x4f, 0x83, 0x3c, 0x40, 0x14, + 0xbb, 0x9d, 0x54, 0x28, 0xb0, 0x78, 0x00, 0x6a, 0x03, 0x50, 0x3b, 0x1d, 0xe8, 0x50, 0x91, 0xea, + 0x01, 0x54, 0x2f, 0x1d, 0xea, 0x55, 0x40, 0xaa, 0xf5, 0x39, 0x6d, 0xbe, 0x16, 0xcc, 0x9f, 0x03, + 0x91, 0xf3, 0xce, 0x50, 0x4b, 0x83, 0x82, 0x6a, 0x12, 0xa4, 0xc9, 0xb4, 0x2e, 0x06, 0xc3, 0x74, + 0x1d, 0x42, 0xb1, 0xf8, 0x1e, 0x80, 0x3e, 0x00, 0x4c, 0x2a, 0xa1, 0x32, 0x68, 0xba, 0x25, 0x57, + 0xdf, 0xda, 0xb2, 0xfc, 0x32, 0xe8, 0xba, 0xff, 0x19, 0x80, 0xfa, 0x9f, 0xb7, 0xc8, 0x54, 0x06, + 0x75, 0xf7, 0x21, 0x08, 0x4c, 0xd1, 0x07, 0x06, 0xa9, 0x2c, 0x15, 0x0c, 0x54, 0xfe, 0x6e, 0x30, + 0x44, 0x99, 0x77, 0xd4, 0x76, 0xf0, 0x16, 0xc9, 0x40, 0xe9, 0xed, 0x56, 0x7e, 0x80, 0xf9, 0x15, + 0x16, 0x60, 0x8c, 0x0b, 0x4c, 0x53, 0x41, 0x41, 0xf5, 0x2d, 0xd0, 0x47, 0x3a, 0xad, 0x57, 0x0a, + 0xa0, 0xd8, 0xda, 0xb2, 0x7f, 0x65, 0x50, 0xfd, 0x89, 0x14, 0xec, 0x04, 0x2f, 0xb0, 0xe3, 0x6c, + 0x91, 0x0c, 0xb4, 0xdf, 0x3f, 0xfb, 0x03, 0x20, 0xfb, 0xec, 0x9a, 0x71, 0x67, 0xe4, 0x78, 0xfc, + 0x2a, 0x75, 0x1b, 0x2a, 0xf2, 0xc8, 0xbe, 0xf5, 0x41, 0x32, 0xff, 0xd0, 0x01, 0x9c, 0x16, 0xb5, + 0xa6, 0xcc, 0xc3, 0x13, 0x92, 0x8e, 0x01, 0x7b, 0xd2, 0xfb, 0xf3, 0xa1, 0xb9, 0x45, 0xed, 0xbf, + 0x16, 0xf8, 0xee, 0xb0, 0x8d, 0xd8, 0x78, 0x0c, 0xd1, 0x23, 0xf6, 0x5b, 0xe5, 0x85, 0x9f, 0xce, + 0x36, 0xb7, 0x22, 0x87, 0x55, 0xf9, 0xf6, 0x40, 0x25, 0xbd, 0xf0, 0x5e, 0x8b, 0x53, 0x1d, 0x04, + 0x1a, 0x8b, 0x51, 0x9b, 0xa3, 0x0c, 0xcc, 0x17, 0x50, 0xb9, 0x86, 0xa6, 0xcc, 0xf7, 0x78, 0x56, + 0x72, 0x6a, 0xfb, 0x9e, 0x07, 0x15, 0x09, 0x72, 0x19, 0x74, 0x10, 0x2a, 0x3e, 0x39, 0x1c, 0x5c, + 0x1f, 0x6a, 0xc9, 0x38, 0xf6, 0xc2, 0x20, 0x87, 0x65, 0xfa, 0xf4, 0x8a, 0xb2, 0x05, 0xec, 0x93, + 0x9c, 0x34, 0x0b, 0x12, 0xfb, 0x14, 0x0b, 0x47, 0xf8, 0xf6, 0x83, 0x60, 0x01, 0x69, 0xee, 0x41, + 0xb4, 0xe8, 0x83, 0x5e, 0xe3, 0xe5, 0x6a, 0x6b, 0x93, 0x03, 0x5d, 0x36, 0x06, 0xeb, 0xba, 0x48, + 0x2c, 0xfd, 0x74, 0x98, 0x92, 0xf4, 0x6f, 0x5c, 0x58, 0x6c, 0x22, 0xed, 0x1f, 0x1e, 0x16, 0x0e, + 0x65, 0x3b, 0x43, 0xe6, 0x30, 0x56, 0x28, 0x95, 0x55, 0x68, 0x3b, 0x65, 0x74, 0xb2, 0x59, 0xda, + 0xfe, 0x8a, 0xb4, 0x5a, 0x9c, 0x2f, 0xcd, 0x6e, 0xda, 0x1e, 0x5e, 0xe8, 0xb2, 0xdd, 0xd9, 0x2e, + 0x6d, 0x5f, 0x8f, 0x62, 0xf5, 0x06, 0x71, 0x13, 0xd2, 0x96, 0xe5, 0x61, 0x4a, 0x42, 0xd8, 0xa8, + 0x2b, 0xe3, 0xbe, 0xcc, 0x64, 0xc9, 0x6d, 0x88, 0x12, 0xcc, 0x81, 0xd9, 0x96, 0x47, 0xd3, 0x90, + 0x5b, 0xc2, 0x3b, 0x74, 0x06, 0xc9, 0x44, 0xf6, 0x6d, 0x6b, 0xab, 0x3b, 0x3b, 0x55, 0xd9, 0x70, + 0x8a, 0xe9, 0x44, 0x06, 0x7a, 0x1e, 0xe4, 0xd6, 0x07, 0x91, 0x5c, 0xf2, 0xb3, 0x80, 0xdd, 0xa6, + 0x80, 0xde, 0x87, 0x7c, 0x90, 0xba, 0x75, 0xe5, 0x10, 0x17, 0x83, 0x17, 0x52, 0xec, 0xb2, 0x09, + 0x0a, 0x05, 0x4b, 0xb1, 0x7f, 0xb0, 0xa4, 0x01, 0x94, 0x1b, 0x2e, 0x41, 0x1d, 0x07, 0xf6, 0x63, + 0x3b, 0xf4, 0x41, 0x48, 0xdc, 0x82, 0x70, 0xe1, 0x31, 0xea, 0xdc, 0x38, 0x64, 0x0d, 0x41, 0x5b, + 0xea, 0x5f, 0x66, 0xc9, 0x48, 0x75, 0xf2, 0x54, 0xde, 0x7c, 0x03, 0xbe, 0x2b, 0xd0, 0x69, 0xb7, + 0xb3, 0xe6, 0x45, 0x67, 0xe5, 0xb4, 0x4e, 0x5c, 0x0b, 0xcb, 0xc6, 0xea, 0x4a, 0xa5, 0x88, 0x4e, + 0xf1, 0x66, 0x2a, 0x95, 0x1d, 0xfd, 0x7c, 0x75, 0xd5, 0x09, 0x93, 0xd2, 0x61, 0x90, 0xae, 0x5c, + 0x99, 0x6e, 0xa2, 0xda, 0x7b, 0x8a, 0x6c, 0x92, 0xea, 0x60, 0xca, 0x16, 0xa8, 0x0a, 0x50, 0xc0, + 0xd7, 0xbb, 0xe2, 0x3b, 0xea, 0x89, 0xb3, 0xaa, 0xf2, 0x06, 0x4d, 0x19, 0xd2, 0x20, 0x0a, 0x0d, + 0x98, 0x23, 0xe1, 0x61, 0xc7, 0xcd, 0xee, 0xc2, 0x1f, 0x84, 0xf5, 0x88, 0xb2, 0x43, 0xb9, 0x22, + 0x4d, 0x6d, 0xd1, 0xea, 0x1e, 0x75, 0xc2, 0x33, 0x84, 0xe4, 0xda, 0xda, 0x7f, 0x26, 0x2a, 0x95, + 0xc3, 0x50, 0x92, 0x18, 0x4b, 0x56, 0x5c, 0xae, 0x33, 0x99, 0x8a, 0x1d, 0x32, 0xb4, 0x8f, 0x57, + 0x65, 0x68, 0x33, 0x9f, 0x0a, 0x1b, 0x22, 0x13, 0xea, 0x31, 0xe9, 0xdc, 0xda, 0x76, 0xdc, 0xae, + 0xc2, 0x5d, 0x62, 0xbd, 0x65, 0xd8, 0xad, 0xcb, 0xa1, 0x0e, 0x74, 0x68, 0xf5, 0x3d, 0x3a, 0xe2, + 0xf3, 0x46, 0x13, 0x22, 0x9d, 0x87, 0xe7, 0x66, 0xa5, 0xa4, 0x25, 0x57, 0xf0, 0xd7, 0x63, 0xdf, + 0x45, 0x1c, 0x1d, 0xad, 0x6c, 0x53, 0x3e, 0xaa, 0xde, 0x42, 0x2a, 0xef, 0x1e, 0x7b, 0xa4, 0x0b, + 0xc9, 0xf9, 0x21, 0x95, 0x90, 0x48, 0x67, 0x19, 0x1b, 0x76, 0x1f, 0x0c, 0xaf, 0x98, 0x4c, 0x31, + 0x5c, 0x5b, 0x54, 0xee, 0x85, 0x4b, 0xd6, 0xa2, 0x35, 0x27, 0xb9, 0x9c, 0x3c, 0xfa, 0x2d, 0xce, + 0xc1, 0x0a, 0x93, 0xfa, 0x9a, 0xda, 0x7a, 0x4f, 0x78, 0x85, 0xb3, 0x42, 0x65, 0x4d, 0x6d, 0x83, + 0x9f, 0xa2, 0x92, 0x58, 0xb0, 0x0c, 0x9c, 0x5a, 0x4f, 0x76, 0xf9, 0x68, 0x1e, 0xbc, 0x4f, 0xe3, + 0x41, 0x04, 0x6d, 0x8e, 0xcc, 0x60, 0x90, 0xa3, 0x29, 0x54, 0xf4, 0x68, 0xc6, 0xae, 0x89, 0xfd, + 0x0c, 0x0a, 0xfb, 0xb0, 0xf4, 0x36, 0x35, 0xf5, 0xf2, 0x8d, 0x23, 0x20, 0x85, 0xb0, 0xcb, 0x19, + 0xb2, 0x20, 0x41, 0x8e, 0x08, 0xf2, 0x39, 0xb1, 0x11, 0xf8, 0x8e, 0x3a, 0x38, 0x90, 0xaf, 0x07, + 0xb8, 0x24, 0x30, 0x62, 0x50, 0x29, 0xbd, 0x1f, 0x9c, 0xf5, 0x11, 0xa6, 0x36, 0x3a, 0x19, 0x42, + 0xb5, 0xdf, 0x3a, 0x7f, 0x87, 0x2c, 0x36, 0x9b, 0xc1, 0x00, 0x2f, 0x04, 0x59, 0xfe, 0xbd, 0x0f, + 0x71, 0x05, 0x92, 0x2f, 0xf1, 0x90, 0x98, 0x92, 0x50, 0x1e, 0xf4, 0xae, 0x03, 0x74, 0x5d, 0xb6, + 0x00, 0xf6, 0x8e, 0x89, 0x24, 0x6f, 0x59, 0xc9, 0x97, 0x64, 0x1d, 0x1f, 0x80, 0xd9, 0x64, 0x8c, + 0x7d, 0x57, 0x20, 0xac, 0x9a, 0x57, 0xe8, 0x9a, 0x05, 0xf4, 0x5e, 0x50, 0x2e, 0x20, 0x1c, 0x92, + 0x90, 0x88, 0x92, 0x7e, 0xcb, 0x25, 0x37, 0x18, 0x9d, 0xd1, 0xe2, 0xd9, 0x78, 0x8c, 0xd4, 0x02, + 0x96, 0xde, 0xa1, 0x54, 0xda, 0x2a, 0xc5, 0x2a, 0x9d, 0xed, 0x3c, 0x9d, 0x5c, 0x09, 0x89, 0xc9, + 0x8d, 0x69, 0x95, 0x7f, 0x8a, 0x8a, 0x72, 0xfe, 0xc8, 0x0f, 0xf3, 0x32, 0x7f, 0xc5, 0x62, 0x26, + 0x7b, 0xfe, 0xf6, 0x6e, 0xfa, 0x5a, 0x0a, 0x03, 0x69, 0xe1, 0x76, 0xfe, 0x54, 0x46, 0x95, 0x55, + 0x0e, 0x7c, 0x9d, 0x45, 0x7f, 0x95, 0x85, 0xf6, 0xa4, 0x35, 0x48, 0x9b, 0x0a, 0x0f, 0x6c, 0xd4, + 0xa6, 0x84, 0x36, 0x15, 0x1c, 0x48, 0x42, 0x8b, 0xa4, 0x8e, 0x55, 0x21, 0x38, 0x4f, 0x1c, 0x5a, + 0x2f, 0x21, 0xec, 0x0b, 0xa6, 0xd2, 0x5a, 0x78, 0xda, 0x64, 0x26, 0x5e, 0x08, 0xdb, 0xe6, 0xdc, + 0xe7, 0x53, 0x49, 0x97, 0x2f, 0x1c, 0xa8, 0x8d, 0xd5, 0x31, 0x26, 0xfc, 0x73, 0xa8, 0x2c, 0x45, + 0x60, 0x38, 0x8c, 0xe6, 0xf7, 0x26, 0xa2, 0x01, 0x15, 0x62, 0x3c, 0xe9, 0x42, 0x71, 0x13, 0x4c, + 0x8d, 0xc7, 0x6a, 0x8e, 0xc6, 0x53, 0x36, 0xf3, 0x41, 0x0e, 0x39, 0xd9, 0x2f, 0xb6, 0x96, 0x87, + 0xa2, 0x5a, 0xf4, 0xda, 0xb8, 0x29, 0x64, 0xdb, 0x2e, 0x07, 0xa3, 0x5f, 0x75, 0x90, 0x8a, 0x91, + 0x36, 0xf5, 0xc8, 0xd8, 0xd8, 0xfe, 0xed, 0x85, 0x5a, 0x43, 0xf1, 0x39, 0x0e, 0x72, 0x7f, 0x3e, + 0x6a, 0xa5, 0x05, 0xac, 0x56, 0x7e, 0x59, 0xf2, 0xf7, 0xc8, 0xc5, 0xf4, 0x4a, 0x16, 0xc9, 0xaa, + 0x36, 0x08, 0xf5, 0x14, 0xf6, 0xc5, 0x38, 0xd0, 0x9d, 0xdc, 0xa2, 0xbc, 0xfc, 0xe0, 0xc5, 0x63, + 0x2e, 0x90, 0x4f, 0x3a, 0x66, 0x90, 0x60, 0xd6, 0x4e, 0xa6, 0x1d, 0xea, 0x3a, 0x94, 0xe4, 0xd5, + 0xbb, 0xf9, 0x48, 0xcf, 0x52, 0xa1, 0xf2, 0x84, 0x37, 0x3a, 0xc6, 0x86, 0x4d, 0x53, 0xdf, 0xcb, + 0xd4, 0x0f, 0x0e, 0x4a, 0x73, 0x75, 0x62, 0x1c, 0x2c, 0x4c, 0x8b, 0x4a, 0x28, 0xef, 0xe9, 0xc7, + 0x00, 0x11, 0x82, 0xb6, 0xed, 0x18, 0xa0, 0x28, 0x5b, 0x6e, 0xf8, 0x09, 0xd5, 0x19, 0x7c, 0x17, + 0xf4, 0x5f, 0xf6, 0x7d, 0xb0, 0xb8, 0x27, 0x24, 0x00, 0x00 }; diff --git a/wled00/wled.h b/wled00/wled.h index 8d2288c1..e9d2ef1d 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2201271 +#define VERSION 2201281 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp index 3bee5e95..936a9941 100644 --- a/wled00/wled_server.cpp +++ b/wled00/wled_server.cpp @@ -420,27 +420,7 @@ void serveMessage(AsyncWebServerRequest* request, uint16_t code, const String& h } -String settingsProcessor(const String& var) -{ - /* - if (var == "CSS") { - char buf[SETTINGS_STACK_BUF_SIZE]; - buf[0] = 0; - getSettingsJS(optionType, buf); - obuf = buf; - oappend(SET_F("}")); - return String(buf); - } -*/ - #ifdef WLED_ENABLE_DMX - if (var == "DMXMENU") { - return String(F("
")); - } - #endif - //if (var == "SCSS") return String(FPSTR(PAGE_settingsCss)); - return String(); -} - +#ifdef WLED_ENABLE_DMX String dmxProcessor(const String& var) { String mapJS; @@ -460,6 +440,7 @@ String dmxProcessor(const String& var) return mapJS; } +#endif void serveSettingsJS(AsyncWebServerRequest* request) @@ -467,7 +448,7 @@ void serveSettingsJS(AsyncWebServerRequest* request) char buf[SETTINGS_STACK_BUF_SIZE+37]; buf[0] = 0; byte subPage = request->arg(F("p")).toInt(); - if (!subPage || subPage>8) { + if (subPage<0 || subPage>8) { strcpy_P(buf, PSTR("alert('Settings for this request are not implemented.');")); request->send(501, "application/javascript", buf); return; @@ -493,10 +474,8 @@ void serveSettings(AsyncWebServerRequest* request, bool post) else if (url.indexOf("sync") > 0) subPage = 4; else if (url.indexOf("time") > 0) subPage = 5; else if (url.indexOf("sec") > 0) subPage = 6; - #ifdef WLED_ENABLE_DMX // include only if DMX is enabled else if (url.indexOf("dmx") > 0) subPage = 7; - #endif - else if (url.indexOf("um") > 0) subPage = 8; + else if (url.indexOf("um") > 0) subPage = 8; } else subPage = 255; //welcome page if (subPage == 1 && wifiLock && otaLock) @@ -550,8 +529,7 @@ void serveSettings(AsyncWebServerRequest* request, bool post) case 253: response = request->beginResponse_P(200, "text/css", PAGE_settingsCss, PAGE_settingsCss_length); break; case 254: serveSettingsJS(request); return; case 255: response = request->beginResponse_P(200, "text/html", PAGE_welcome, PAGE_welcome_length); break; - default: request->send_P(200, "text/html", PAGE_settings, settingsProcessor); return; - //default: response = request->beginResponse_P(200, "text/html", PAGE_settings, PAGE_settings_length); break; + default: response = request->beginResponse_P(200, "text/html", PAGE_settings, PAGE_settings_length); break; } response->addHeader(F("Content-Encoding"),"gzip"); setStaticContentCacheHeaders(response); diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 49c36b98..be25c2ff 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -176,7 +176,14 @@ void getSettingsJS(byte subPage, char* dest) obuf = dest; olen = 0; - if (subPage <1 || subPage >8) return; + if (subPage <0 || subPage >8) return; + + if (subPage == 0) + { + #ifdef WLED_ENABLE_DMX // include only if DMX is enabled + oappend(PSTR("gId('dmxbtn').style.display='';")); + #endif + } if (subPage == 1) {