quick fix 2d config hor/ver/panel issues + battery usermod

- Add battery usermod
- set segexp default true
- quick fix 2d config hor/ver/panel issues
This commit is contained in:
Ewoud
2023-01-03 14:45:01 +01:00
parent 9bc6451145
commit 545a4c820c
9 changed files with 1368 additions and 1354 deletions

View File

@@ -625,7 +625,7 @@ lib_deps_min =
; monitor_filters = esp32_exception_decoder ; used to show crash details
build_flags_max =
-D WLED_MAX_USERMODS=9 ; default only 4-6
-D WLED_MAX_USERMODS=10 ; default only 4-6
;; -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4 ewowi to softhack: move to build_flags_min? - We need a different solution
-D WLED_USE_MY_CONFIG ; include custom my_config.h ewowi to softhack: redundant as also in build_flags_min?
-D USERMOD_DALLASTEMPERATURE
@@ -636,6 +636,7 @@ build_flags_max =
-D USERMOD_WEATHER ; WLEDMM usermod
-D USERMOD_MPU6050_IMU ; gyro/accelero for USERMOD_GAMES (ONLY WORKS IF USERMOD_FOUR_LINE_DISPLAY NOT INCLUDED - I2C SHARING BUG)
-D USERMOD_GAMES ; WLEDMM usermod
-D USERMOD_BATTERY
lib_deps_max =
OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE

View File

@@ -818,7 +818,9 @@ class WS2812FX { // 96 bytes
#ifndef WLED_DISABLE_2D
#define WLED_MAX_PANELS 64
uint8_t
panels;
panels,
panelsH, //WLEDMM quick fix
panelsV; //WLEDMM quick fix
struct {
bool bottomStart : 1;

View File

@@ -101,6 +101,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
if (!matrix.isNull()) {
strip.isMatrix = true;
CJSON(strip.panels, matrix[F("mpc")]);
CJSON(strip.panelsV, matrix[F("mpv")]); //WLEDMM quick fix
CJSON(strip.panelsH, matrix[F("mph")]); //WLEDMM quick fix
CJSON(strip.matrix.bottomStart, matrix[F("pb")]);
CJSON(strip.matrix.rightStart, matrix[F("pr")]);
CJSON(strip.matrix.vertical, matrix[F("pv")]);
@@ -710,6 +712,8 @@ void serializeConfig() {
if (strip.isMatrix) {
JsonObject matrix = hw_led.createNestedObject(F("matrix"));
matrix[F("mpc")] = strip.panels;
matrix[F("mph")] = strip.panelsH; //WLEDMM quick fix
matrix[F("mpv")] = strip.panelsV; //WLEDMM quick fix
matrix[F("pb")] = strip.matrix.bottomStart;
matrix[F("pr")] = strip.matrix.rightStart;
matrix[F("pv")] = strip.matrix.vertical;

View File

@@ -25,7 +25,7 @@ var ws, cpick, ranges;
var cfg = {
theme:{base:"dark", bg:{url:""}, alpha:{bg:0.6,tab:0.8}, color:{bg:""}},
comp :{colors:{picker: true, rgb: false, quick: true, hex: false},
labels:true, pcmbot:false, pid:true, seglen:false, segpwr:false, segexp:false, css:true, hdays:false}
labels:true, pcmbot:false, pid:true, seglen:false, segpwr:false, segexp:true, css:true, hdays:false} //WLEDMM segexp true as default
};
var hol = [
[0,11,24,4,"https://aircoookie.github.io/xmas.png"], // christmas

View File

@@ -44,7 +44,7 @@
loadJS(url, false); // If we set async false, file is loaded and executed, then next statement is processed
}
function UI(panels=1)
function UI(panels=-1) //WLEDM quick fix
{
gId("mpdiv").style.display = "block";
@@ -54,9 +54,11 @@
return;
}
let i = gId("panels").children.length;
if (i<panels) for (let j=i; j<panels; j++) addPanel(j);
if (i>panels) for (let j=i; j>panels; j--) remPanel();
if (panels != -1) { //WLEDM quick fix
let i = gId("panels").children.length;
if (i<panels) for (let j=i; j<panels; j++) addPanel(j);
if (i>panels) for (let j=i; j>panels; j--) remPanel();
}
}
function addPanels() {

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -651,6 +651,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
strip.panel.clear(); // release memory if allocated
if (strip.isMatrix) {
strip.panels = MAX(1,MIN(WLED_MAX_PANELS,request->arg(F("MPC")).toInt()));
strip.panelsH = request->arg(F("MPH")).toInt(); //WLEDM quick fix
strip.panelsV = request->arg(F("MPV")).toInt(); //WLEDM quick fix
strip.matrix.bottomStart = request->arg(F("PB")).toInt();
strip.matrix.rightStart = request->arg(F("PR")).toInt();
strip.matrix.vertical = request->arg(F("PV")).toInt();

View File

@@ -776,6 +776,8 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
sappend('v',SET_F("PH"),strip.panel[0].height);
}
sappend('v',SET_F("MPC"),strip.panels);
sappend('v',SET_F("MPH"),strip.panelsH); //WLEDM quick fix
sappend('v',SET_F("MPV"),strip.panelsV); //WLEDM quick fix
sappend('v',SET_F("PB"),strip.matrix.bottomStart);
sappend('v',SET_F("PR"),strip.matrix.rightStart);
sappend('v',SET_F("PV"),strip.matrix.vertical);