Cleanup and small issues

pio.ini: cleanup debug directives (build_flags_min move to _debug), remove blynks

index.htm/js: 
- visualization in div to turn of if 1D
- scale visualizations if height>width

json.cpp, util.cpp: USER/DEBUG_PRINT changes
This commit is contained in:
Ewoud
2023-02-23 15:23:35 +01:00
parent 1ce3d2fa08
commit 6fbce9b326
11 changed files with 2402 additions and 2391 deletions

View File

@@ -750,18 +750,12 @@ board_build.partitions = ${esp32.default_partitions}
build_flags_min =
-Wall -Wformat -Woverflow -Wuninitialized -Winit-self -Warray-bounds ; enables more warnings
-Wno-attributes -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations ;disables some stupid warnings
-D WLED_DISABLE_BLYNK ; BLYNK is only provided for backwards compatibility (no new users accepted)
;-D WLED_DISABLE_BROWNOUT_DET ; enable if you get "brownout detected" errors at startup
-D WLED_USE_MY_CONFIG
; -D WLED_USE_CIE_BRIGHTNESS_TABLE ;; experimental: use different color / brightness lookup table
-D USERMOD_AUDIOREACTIVE
-D UM_AUDIOREACTIVE_USE_NEW_FFT ; use latest (upstream) FFTLib, instead of older library modified by blazoncek. Slightly faster, more accurate, needs 2KB RAM extra
-D USERMOD_CUSTOMEFFECTS ; WLEDMM usermod
; -D WLED_DEBUG_HOST='"192.168.xxx.xxx"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
; -D WLED_DEBUG_NET_PORT=1768 ;; port for network debugging. default = 7868
; -D WLED_DEBUG ; lots of generic debug messages
; -D SR_DEBUG ; some extra debug messages from audioreactive
; -D MIC_LOGGER ; for sound input monitoring & debugging (use arduino serial plotter)
; -D WLED_DISABLE_LOXONE
; -D WLED_DISABLE_ALEXA
; -D WLED_DISABLE_HUESYNC
@@ -917,13 +911,6 @@ build_flags = ${esp32_4MB_max_base.build_flags}
; RAM: [== ] 24.4% (used 79804 bytes from 327680 bytes)
; Flash: [========= ] 88.7% (used 1394813 bytes from 1572864 bytes)
[env:esp32_4MB_max_debug]
extends = esp32_4MB_max_base
build_flags = ${esp32_4MB_max_base.build_flags}
-D WLED_RELEASE_NAME=esp32_4MB_max_debug
-D WLED_DEBUG -D SR_DEBUG
monitor_filters = esp32_exception_decoder
[env:esp32_4MB_all]
extends = esp32_4MB_all_base
build_flags = ${esp32_4MB_all_base.build_flags}
@@ -941,13 +928,27 @@ board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
; Flash: [======= ] 67.0% (used 1405701 bytes from 2097152 bytes)
;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
[env:esp32_4MB_max_debug]
extends = esp32_4MB_max_base
build_flags = ${esp32_4MB_max_base.build_flags}
-D WLED_RELEASE_NAME=esp32_4MB_max_debug
-D WLED_DEBUG ; lots of generic debug messages
-D SR_DEBUG ; some extra debug messages from audioreactive
; -D WLED_DEBUG_HOST='"192.168.xxx.xxx"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
; -D WLED_DEBUG_NET_PORT=1768 ;; port for network debugging. default = 7868
; -D MIC_LOGGER ; for sound input monitoring & debugging (use arduino serial plotter)
monitor_filters = esp32_exception_decoder
[env:esp32_16MB_max_debug]
extends = esp32_4MB_max_base
build_unflags = ${common.build_unflags}
-D CORE_DEBUG_LEVEL=0
build_flags = ${esp32_4MB_max_base.build_flags}
-D WLED_RELEASE_NAME=esp32_16MB_max_debug
-D WLED_DEBUG -D SR_DEBUG
-D WLED_DEBUG ; lots of generic debug messages
-D SR_DEBUG ; some extra debug messages from audioreactive
; -D WLED_DEBUG_HOST='"192.168.xxx.xxx"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
; -D WLED_DEBUG_NET_PORT=1768 ;; port for network debugging. default = 7868
; -D MIC_LOGGER
-D CORE_DEBUG_LEVEL=4 ;; 0=none, 1=error, 2=warning, 3=info, 4=debug, 5=verbose
board = ${Board_ESP32_16MB.board}
@@ -971,7 +972,6 @@ board_build.f_cpu = 160000000L ;; we want 160Mhz (default = 80Mhz)
build_flags = ${common.build_flags_esp8266}
-D WLED_RELEASE_NAME=esp8266_4MB_min
-D WLED_DISABLE_ALEXA
-D WLED_DISABLE_BLYNK
-D WLED_DISABLE_HUESYNC
; -D WLED_DISABLE_2D
; -UWLED_USE_MY_CONFIG
@@ -988,7 +988,6 @@ build_flags = ${common.build_flags_esp8266}
-D WLED_RELEASE_NAME=esp8266_4MB_max
-D WLED_MAX_USERMODS=5 ; default only 4-6
-D WLED_DISABLE_ALEXA
-D WLED_DISABLE_BLYNK
-D WLED_DISABLE_HUESYNC
-D WLED_DISABLE_LOXONE
; -D USERMOD_AUDIOREACTIVE
@@ -1016,7 +1015,6 @@ extends = env:d1_mini
board_build.filesystem = littlefs
build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266
-D WLED_DISABLE_ALEXA
-D WLED_DISABLE_BLYNK
-D WLED_DISABLE_HUESYNC
-D WLED_DISABLE_LOXONE
-D WLED_DISABLE_AUDIO ;WLEDMM not used anywhere
@@ -1054,7 +1052,6 @@ build_flags = ${common.build_flags_esp8266}
-D WLED_RELEASE_NAME=esp8266pro_16MB_min
-D WLED_WATCHDOG_TIMEOUT=0
-D WLED_DISABLE_ALEXA
-D WLED_DISABLE_BLYNK
-D WLED_DISABLE_HUESYNC
; -D WLED_DEBUG
; -D WLED_DISABLE_2D
@@ -1071,7 +1068,7 @@ platform = ${common.platform_wled_default}
platform_packages = ${common.platform_packages}
board_build.ldscript = ${common.ldscript_1m128k}
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_DISABLE_BLYNK
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
-D WLED_RELEASE_NAME=esp01_1MB_min
-D WLED_DISABLE_ALEXA
-D WLED_DISABLE_HUESYNC
@@ -1190,7 +1187,6 @@ build_flags = ${esp32_4MB_V4_max_base.build_flags}
-D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=0 -D ARDUINO_USB_MSC_ON_BOOT=0 -D ARDUINO_USB_DFU_ON_BOOT=0
-D WLED_WATCHDOG_TIMEOUT=0
; -D U8X8_HAVE_2ND_HW_I2C ;; experimental - tells U8g2 lib that a second HW I2C unit exists
-D WLED_DISABLE_BLYNK ;; seems that BLYNK does not work on -S3
-D WLED_DISABLE_LOXONE ; FLASH 1272 bytes
-D WLED_DISABLE_ALEXA ; RAM 116 bytes; FLASH 13524 bytes
; -D WLED_DISABLE_MQTT ; RAM 216 bytes; FLASH 16496 bytes

View File

@@ -826,7 +826,7 @@ class WS2812FX { // 96 bytes
//WLEDMM: keep storing basic 2d setup
bool
bOrA; //WLEDMM basic or advanced
bOrA = false; //WLEDMM basic or advanced, default basic
struct {
bool bottomStart : 1;
bool rightStart : 1;

View File

@@ -313,11 +313,13 @@
<button class="btn btn-s" id="rsbtn" onclick="rSegs()">Reset segments</button>
</div>
<!--WLEDMM Segment graphics-->
<br>
<canvas id="canvasSegments" hidden=true></canvas><br>
<br>
<canvas id="canvasPeek"></canvas><br>
<div id="MD"></div> <!-- Matrix dimensions -->
<div id="segvis">
<br>
<canvas id="canvasSegments"></canvas><br>
<br>
<canvas id="canvasPeek"></canvas><br>
<div id="MD"></div> <!-- Matrix dimensions -->
</div>
<br>
<p>Transition: <input id="tt" class="noslide" type="number" min="0" max="65.5" step="0.1" value="0.7">&nbsp;s</p>
<p id="ledmap" class="hide"></p>

View File

@@ -1154,6 +1154,7 @@ function updateLen(s, draw=true) //WLEDMM conditonally draw segment visualisatio
gId(`seg${s}len`).innerHTML = out;
if (draw && isM) drawSegments(); //WLEDMM draw new segment visualization if something changes in a segment
gId("segvis").style.display = isM? "block":"none";
}
//WLEDMM
@@ -1188,16 +1189,16 @@ function drawSegments() {
if (!ctx) {
//WLEDMM: add canvas, initialize and set UI
var canvas = gId("canvasSegments");
canvas.hidden = false;
ctx = canvas.getContext('2d');
peek(canvasPeek);
}
let windowWidth = Math.min(window.innerWidth*0.98, maxWidth*30);
ctx.canvas.width = ctx.canvas.parentElement.offsetWidth > 800?windowWidth:300; //Mobile and non pc mode gets 300, pc 800
let windowWidthFactor = maxWidth > maxHeight?1:maxWidth/maxHeight;
ctx.canvas.width = (ctx.canvas.parentElement.offsetWidth > 640?windowWidth:300) * windowWidthFactor; //Mobile and non pc mode gets 300, pc 800
ctx.canvas.height = ctx.canvas.width / maxWidth * maxHeight;
canvasPeek.width = canvasPeek.parentElement.offsetWidth > 800?windowWidth:300;
canvasPeek.height = canvasPeek.width / maxWidth * maxHeight;
canvasPeek.width = ctx.canvas.width;
canvasPeek.height = ctx.canvas.height;
ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
var ppL = ctx.canvas.width / maxWidth; //pixels per led

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -51,8 +51,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
//WLEDMM add USER_PRINT
String temp;
serializeJson(elem, temp);
USER_PRINT("deserializeSegment ");
USER_PRINTLN(temp);
USER_PRINTF("deserializeSegment %s\n", temp.c_str());
byte id = elem["id"] | it;
if (id >= strip.getMaxSegments()) return;
@@ -339,8 +338,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
//WLEDMM add USER_PRINT
String temp;
serializeJson(root, temp);
USER_PRINT("deserializeState ");
USER_PRINTLN(temp);
USER_PRINTF("deserializeState %s\n", temp.c_str());
bool stateResponse = root[F("v")] | false;
@@ -512,6 +510,11 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset, bool segmentBounds)
{
//WLEDMM add USER_PRINT
String temp;
serializeJson(root, temp);
DEBUG_PRINTF("serializeSegment %s\n", temp.c_str());
root["id"] = id;
if (segmentBounds) {
root["start"] = seg.start;
@@ -577,6 +580,11 @@ void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset, b
void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segmentBounds, bool selectedSegmentsOnly)
{
//WLEDMM add USER_PRINT
String temp;
serializeJson(root, temp);
DEBUG_PRINTF("serializeState %s\n", temp.c_str());
if (includeBri) {
root["on"] = (bri > 0);
root["bri"] = briLast;
@@ -1254,7 +1262,7 @@ void serveJson(AsyncWebServerRequest* request)
//lDoc["m"] = lDoc.memoryUsage(); // JSON buffer usage, for remote debugging
}
DEBUG_PRINTF("JSON buffer size: %u for request: %d\n", lDoc.memoryUsage(), subJson);
DEBUG_PRINTF("JSON buffer size: %u for request: %d (%s)\n", lDoc.memoryUsage(), subJson, url.c_str());
response->setLength();
request->send(response);

View File

@@ -228,6 +228,7 @@ void WLED::loop()
avgUsermodMillis = 0;
avgStripMillis = 0;
debugTime = millis();
DEBUG_PRINTLN(F("---END OF DEBUG INFO---"));
}
loops++;
#endif // WLED_DEBUG

View File

@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2302220
#define VERSION 2302230
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG

View File

@@ -380,7 +380,7 @@ void initServer()
//called when the url is not defined here, ajax-in; get-settings
server.onNotFound([](AsyncWebServerRequest *request){
DEBUG_PRINTLN("Not-Found HTTP call:");
DEBUG_PRINT("Not-Found HTTP call: ");
DEBUG_PRINTLN("URI: " + request->url());
if (captivePortal(request)) return;