diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h index 8ea181b40e..d5bba9b0cd 100644 --- a/usermods/audioreactive/audio_reactive.h +++ b/usermods/audioreactive/audio_reactive.h @@ -2059,20 +2059,19 @@ class AudioReactive : public Usermod { oappend(SET_F("addOption(dd,'Send',1);")); oappend(SET_F("addOption(dd,'Receive',2);")); oappend(SET_F("addInfo('AudioReactive:digitalmic:type',1,'requires reboot!');")); // 0 is field type, 1 is actual field - #ifdef I2S_SDPIN - oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',0,'sd/data/dout, ⎌ ")); oappendi(I2S_SDPIN); oappend("','I2S SD');"); - #else oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',0,'sd/data/dout','I2S SD');")); + #ifdef I2S_SDPIN + oappend(SET_F("replaceOption('AudioReactive:digitalmic:pin[]',0,'")); oappendi(I2S_SDPIN); oappend(" ⎌',"); oappendi(I2S_SDPIN); oappend(");"); #endif + oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',1,'ws/clk/lrck','I2S WS');")); #ifdef I2S_WSPIN - oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',1,'ws/clk/lrck, ⎌ ")); oappendi(I2S_WSPIN); oappend("','I2S WS');"); + oappend(SET_F("replaceOption('AudioReactive:digitalmic:pin[]',1,'")); oappendi(I2S_WSPIN); oappend(" ⎌',"); oappendi(I2S_WSPIN); oappend(");"); #else - oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',1,'ws/clk/lrck','I2S WS');")); #endif + oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',2,'sck/bclk','I2S SCK');")); #ifdef I2S_CKPIN - oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',2,'sck/bclk, ⎌ ")); oappendi(I2S_CKPIN); oappend("','I2S SCK');"); + oappend(SET_F("replaceOption('AudioReactive:digitalmic:pin[]',2,'")); oappendi(I2S_CKPIN); oappend(" ⎌',"); oappendi(I2S_CKPIN); oappend(");"); #else - oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',2,'sck/bclk','I2S SCK');")); #endif #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'only use -1, 0, 1 or 3','I2S MCLK');")); @@ -2080,7 +2079,9 @@ class AudioReactive : public Usermod { oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'master clock','I2S MCLK');")); #endif oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',4,'','I2C SDA');")); + oappend(SET_F("replaceOption('AudioReactive:digitalmic:pin[]',4,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',5,'','I2C SCL');")); + oappend(SET_F("replaceOption('AudioReactive:digitalmic:pin[]',5,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); } diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h index b012d91970..9e1a15625e 100644 --- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h +++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h @@ -1048,16 +1048,16 @@ class FourLineDisplayUsermod : public Usermod { oappend(SET_F("addOption(dd,'SSD1306 SPI',6);")); oappend(SET_F("addOption(dd,'SSD1306 SPI 128x64',7);")); // WLEDMM add defaults + oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'','I2C/SPI CLK');")); #ifdef FLD_PIN_SCL - oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'-1 use global, ⎌ ")); oappendi(FLD_PIN_SCL); oappend("','I2C/SPI CLK');"); - #else - oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'-1 use global','I2C/SPI CLK');")); + oappend(SET_F("replaceOption('4LineDisplay:pin[]',0,'")); oappendi(FLD_PIN_SCL); oappend(" ⎌',"); oappendi(FLD_PIN_SCL); oappend(");"); #endif + oappend(SET_F("replaceOption('4LineDisplay:pin[]',0,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); + oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'','I2C/SPI DTA');")); #ifdef FLD_PIN_SDA - oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'-1 use global, ⎌ ")); oappendi(FLD_PIN_SDA); oappend("','I2C/SPI DTA');"); - #else - oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'-1 use global','I2C/SPI DTA');")); + oappend(SET_F("replaceOption('4LineDisplay:pin[]',1,'")); oappendi(FLD_PIN_SDA); oappend(" ⎌',"); oappendi(FLD_PIN_SDA); oappend(");"); #endif + oappend(SET_F("replaceOption('4LineDisplay:pin[]',1,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); oappend(SET_F("addInfo('4LineDisplay:pin[]',2,'','SPI CS');")); oappend(SET_F("addInfo('4LineDisplay:pin[]',3,'','SPI DC');")); oappend(SET_F("addInfo('4LineDisplay:pin[]',4,'','SPI RST');")); diff --git a/wled00/data/settings_um.htm b/wled00/data/settings_um.htm index 73c7d1c6a4..d507e68afb 100644 --- a/wled00/data/settings_um.htm +++ b/wled00/data/settings_um.htm @@ -33,11 +33,11 @@ GetV(); for (let k=0; k { @@ -62,6 +62,7 @@ function isI(n) { return n === +n && n === (n|0); } function check(o,k) { // input object, pin owner key var n = o.name.replace("[]","").substr(-3); + // console.log("check", o, k, n, pins, pinO); if (o.type=="number" && n.substr(0,3)=="pin") { for (var i=0; il.toUpperCase()); // replace - and _ with space, capitalize every 1st letter } function addField(k,f,o,a=false) { //key, field, (sub)object, isArray + // console.log("addField", k, f, o, a); if (isO(o)) { urows += '
'; if (f!=='unknown' && !k.includes(":")) urows += `

${initCap(f)}

`; //WLEDMM show group title @@ -131,8 +133,10 @@ break; case "number": c = `value="${o}"`; + // console.log("addField nr", c); if (f.substr(-3)==="pin") { c += ` max="${d.max_gpio}" min="-1" class="s"`; + // console.log("addField nr pin should not happen", c); t = "int"; } else { c += ' step="any" class="xxl"'; @@ -146,7 +150,37 @@ // https://stackoverflow.com/questions/11657123/posting-both-checked-and-unchecked-checkboxes if (t=="checkbox") urows += ``; else if (!a) urows += ``; - urows += `
`; + // make a dropdown for pin variables + if (f.includes("pin")) { //} || f == "SDApin" || f == "SCLpin" || f == "MOSIpin" || f == "SCLKpin" || f == "MISOpin") { + var n = this.name.replace("[]","").substr(-3); + // console.log("addPin", k, f, o, a, n, pins, pinO); + urows += ``; + } + else + urows += ``; + urows += `
`; } } // https://stackoverflow.com/questions/39729741/javascript-change-input-text-to-select-option @@ -184,6 +218,17 @@ if (c.value == sel.dataset.val) sel.selectedIndex = i; } } + //WLEDMM: replaceOption to set build flag defaults and globals + function replaceOption(name,el,txt,val) { + let obj = d.getElementsByName(name); + if (obj[el]) { + let sel = obj[el]; + for (let i=0; i

${k}

`; @@ -222,7 +271,7 @@ if (userMod != null && urows==="") urows = "Usermods configuration not found.
Press Save to initialize defaults."; } //WLEDMM: only show globalGPIOs if no usermod info is shown (url without um parameter) - gId("globalGPIOs").style.display = urows===""?"block":"none"; + gId("globalGPIOs").style.display = (userMod == null)?"block":"none"; gId("um").innerHTML = urows; var url = (loc?`http://${locip}`:'') + '/settings/s.js?p=8'; @@ -254,14 +303,14 @@

Usermod Setup

Global I2C GPIOs (HW)
(only changable on ESP32, change requires reboot!)
- SDA:
- SCL: + SDA:
+ SCL:
Global SPI GPIOs (HW)
(only changable on ESP32, change requires reboot!)
- MOSI:
- MISO:
- SCLK: + MOSI:
+ MISO:
+ SCLK:
Loading settings...

diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 83be8a7f78..7f22ccb3c7 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -1671,186 +1671,200 @@ const uint8_t PAGE_settings_sec[] PROGMEM = { // Autogenerated from wled00/data/settings_um.htm, do not edit!! -const uint16_t PAGE_settings_um_length = 2838; +const uint16_t PAGE_settings_um_length = 3063; const uint8_t PAGE_settings_um[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x59, 0x6d, 0x73, 0xdb, 0x36, - 0x12, 0xfe, 0xae, 0x5f, 0x41, 0x23, 0x1e, 0x9b, 0x1c, 0xd1, 0x94, 0x9c, 0xb4, 0x33, 0xa9, 0x24, - 0xd2, 0x97, 0x38, 0x69, 0xa3, 0x8b, 0x53, 0x7b, 0xce, 0x4d, 0x3b, 0x37, 0x8e, 0x2f, 0xa6, 0x44, - 0x48, 0x42, 0x4c, 0x01, 0x3c, 0x02, 0xf4, 0xcb, 0xc9, 0xfa, 0xef, 0xf7, 0x2c, 0x48, 0x4a, 0x94, - 0xdf, 0xa6, 0xcd, 0xdc, 0x87, 0xfb, 0x62, 0x91, 0xe0, 0xee, 0x62, 0xb1, 0xfb, 0xec, 0x1b, 0x3c, - 0xd8, 0x7a, 0x77, 0x7c, 0xf8, 0xdb, 0x3f, 0x4f, 0xde, 0x3b, 0x33, 0x33, 0x4f, 0xa3, 0x41, 0xf5, - 0x97, 0xc7, 0x89, 0x93, 0xc6, 0x72, 0x1a, 0x32, 0x2e, 0x59, 0x34, 0x98, 0x73, 0x13, 0x3b, 0xe3, - 0x59, 0x9c, 0x6b, 0x6e, 0x42, 0x56, 0x98, 0xc9, 0xde, 0xeb, 0x7a, 0xb5, 0x25, 0xe3, 0x39, 0x0f, - 0xd9, 0x95, 0xe0, 0xd7, 0x99, 0xca, 0x0d, 0x73, 0xc6, 0x4a, 0x1a, 0x2e, 0x41, 0x76, 0x2d, 0x12, - 0x33, 0x0b, 0x7f, 0xec, 0x76, 0x57, 0xa4, 0xf7, 0x3e, 0x25, 0xfc, 0x4a, 0x8c, 0xf9, 0x9e, 0x7d, - 0xf1, 0x85, 0x14, 0x46, 0xc4, 0xe9, 0x9e, 0x1e, 0xc7, 0x29, 0x0f, 0xf7, 0xfd, 0x79, 0x7c, 0x23, - 0xe6, 0xc5, 0x7c, 0xf5, 0x5e, 0x68, 0x9e, 0xdb, 0x97, 0x78, 0x84, 0x77, 0xa9, 0xd8, 0x83, 0x9d, - 0xa3, 0x81, 0x11, 0x26, 0xe5, 0xd1, 0x67, 0x50, 0xce, 0x55, 0xe2, 0x9c, 0x72, 0x63, 0x84, 0x9c, - 0xea, 0x41, 0xa7, 0x5c, 0x1f, 0xe8, 0x71, 0x2e, 0x32, 0x13, 0xb5, 0xae, 0xe2, 0xdc, 0x51, 0xd7, - 0x92, 0xe7, 0x7e, 0xaa, 0xc6, 0x22, 0xf3, 0x8b, 0x5c, 0x5d, 0x6b, 0x3f, 0x09, 0x13, 0x35, 0x2e, - 0xe6, 0xd0, 0xcf, 0x2f, 0xe6, 0x87, 0x93, 0x69, 0xb8, 0x58, 0xfa, 0x99, 0x90, 0x3a, 0x3c, 0x3b, - 0xa7, 0xdf, 0x63, 0xfa, 0x05, 0x7d, 0xb8, 0xb5, 0xef, 0xcb, 0x62, 0xfe, 0x29, 0xec, 0xf6, 0x27, - 0x85, 0x1c, 0x1b, 0xa1, 0xa4, 0x33, 0x1d, 0x26, 0x2e, 0xf7, 0x16, 0x39, 0x37, 0x45, 0x2e, 0x9d, - 0x24, 0x98, 0x72, 0xf3, 0x3e, 0xe5, 0x24, 0xea, 0xed, 0xad, 0xfd, 0xb4, 0x5c, 0x91, 0x0a, 0x7d, - 0xdc, 0x20, 0xe5, 0x3b, 0x3b, 0x4c, 0x8d, 0xbe, 0xf1, 0xb1, 0x61, 0x61, 0x68, 0x6e, 0x33, 0xae, - 0x26, 0xb4, 0xb6, 0xf5, 0x26, 0xcf, 0xe3, 0xdb, 0x40, 0x68, 0xfb, 0xbb, 0xc1, 0xff, 0xc1, 0xf5, - 0x16, 0xd7, 0x42, 0x26, 0xea, 0x3a, 0x50, 0x19, 0x97, 0x2e, 0x9b, 0x19, 0x93, 0xe9, 0x5e, 0xa7, - 0x33, 0x15, 0x66, 0x56, 0x8c, 0x82, 0xb1, 0x9a, 0x77, 0xde, 0x88, 0x7c, 0xac, 0x94, 0xba, 0x14, - 0xbc, 0xf3, 0xc7, 0xd1, 0xfb, 0x77, 0x9d, 0x6b, 0x71, 0x29, 0x3a, 0xb5, 0x35, 0x5e, 0x14, 0xa5, - 0x79, 0xf6, 0x74, 0xb5, 0xc0, 0x1a, 0xd2, 0xdf, 0xde, 0x97, 0xde, 0x59, 0x51, 0xf9, 0xec, 0xab, - 0xe6, 0xe9, 0xa4, 0x49, 0x9d, 0xaa, 0x38, 0xf9, 0xfb, 0xa9, 0xcb, 0x7d, 0x13, 0x6e, 0x75, 0xbd, - 0x45, 0xca, 0x8d, 0x23, 0xc3, 0x24, 0x18, 0xe7, 0x3c, 0x36, 0xbc, 0x32, 0x80, 0xcb, 0x4a, 0xab, - 0x33, 0xaf, 0x2f, 0x03, 0x08, 0x7b, 0x63, 0x4c, 0x2e, 0x46, 0x85, 0xe1, 0xf8, 0x90, 0x8f, 0x99, - 0xcf, 0x3d, 0xff, 0xfe, 0x3a, 0xd9, 0x01, 0xdb, 0x19, 0x7e, 0x63, 0x3a, 0xdf, 0xe2, 0xab, 0xb8, - 0x16, 0xf0, 0x80, 0x30, 0xd6, 0xb7, 0x12, 0x22, 0x8c, 0xe7, 0x27, 0xc1, 0x48, 0x25, 0xb7, 0x41, - 0x9c, 0x41, 0xe9, 0xe4, 0x70, 0x26, 0xd2, 0xc4, 0x95, 0x44, 0x1f, 0x27, 0xc9, 0xfb, 0x2b, 0x68, - 0x71, 0x24, 0x34, 0x80, 0xc7, 0x73, 0x97, 0x91, 0xce, 0xcc, 0x77, 0xbd, 0x30, 0x5a, 0x24, 0x41, - 0x31, 0xff, 0x9a, 0x91, 0x5b, 0x93, 0x20, 0xd7, 0x57, 0x49, 0xf5, 0xa4, 0xbe, 0xd6, 0x5e, 0x4f, - 0x02, 0x80, 0xf0, 0xeb, 0x34, 0x13, 0x2a, 0x7c, 0xf5, 0x93, 0xff, 0x0b, 0x37, 0xbf, 0xbb, 0x5e, - 0x7f, 0xa2, 0x72, 0x97, 0x4e, 0xca, 0x01, 0x00, 0x3e, 0x28, 0x39, 0x83, 0x94, 0xcb, 0xa9, 0x99, - 0xf5, 0x79, 0xbb, 0xed, 0x11, 0x73, 0x90, 0x15, 0x7a, 0xe6, 0x96, 0xdf, 0xce, 0xf8, 0xb9, 0x67, - 0xf1, 0x53, 0x2e, 0x32, 0x5a, 0x83, 0x31, 0xf6, 0xf6, 0xc3, 0xb0, 0x54, 0xe0, 0xac, 0x7b, 0xbe, - 0xb3, 0x53, 0x3e, 0x06, 0x7a, 0x26, 0x26, 0xc6, 0xa5, 0xf3, 0x9c, 0x4e, 0x82, 0xd3, 0x77, 0x6f, - 0x48, 0x81, 0x70, 0xad, 0x46, 0xb5, 0x7e, 0x78, 0xf4, 0xe8, 0xfa, 0xa7, 0xe3, 0xd3, 0xe1, 0x53, - 0x0c, 0x1f, 0x1f, 0xe7, 0x18, 0x9e, 0x1e, 0xdf, 0xfb, 0xb0, 0x7c, 0xdc, 0x6c, 0x3c, 0xcf, 0x55, - 0x0e, 0x6f, 0xc1, 0x6c, 0x08, 0x62, 0xad, 0x52, 0x1e, 0xa4, 0x6a, 0xea, 0xb2, 0xf7, 0xb4, 0xee, - 0x54, 0x58, 0x00, 0x4e, 0x9c, 0x89, 0x48, 0xb9, 0xf5, 0x2a, 0xa2, 0x36, 0x87, 0xf7, 0x8f, 0xaa, - 0x75, 0x00, 0x1b, 0x8c, 0x13, 0x31, 0x2d, 0xf2, 0xd8, 0x82, 0xa7, 0xf4, 0xaa, 0x33, 0x89, 0xc1, - 0x90, 0x04, 0x5f, 0xe4, 0x50, 0x02, 0xba, 0x19, 0x2c, 0xcb, 0x9d, 0x2c, 0x9e, 0x72, 0x27, 0x89, - 0x4d, 0xbc, 0x05, 0xb4, 0x35, 0xf0, 0x76, 0x0a, 0x74, 0x32, 0xda, 0xa0, 0x87, 0x68, 0xa9, 0x60, - 0x8a, 0x88, 0xb4, 0xf2, 0x82, 0x2c, 0x57, 0x46, 0x8d, 0x55, 0xba, 0xb3, 0xe3, 0xda, 0x28, 0xed, - 0xfa, 0xae, 0x8d, 0xee, 0x90, 0x28, 0xd2, 0x53, 0xa3, 0x72, 0x48, 0xa5, 0xc8, 0x1c, 0x1a, 0x3e, - 0x27, 0x1c, 0x8c, 0x87, 0x19, 0xf3, 0xbc, 0xbb, 0xbb, 0x8a, 0x0c, 0xfc, 0xf3, 0x0c, 0x0a, 0xff, - 0x0c, 0xf9, 0xce, 0x27, 0x95, 0xf0, 0xc0, 0x39, 0x49, 0x79, 0xac, 0xb9, 0x03, 0x43, 0xf0, 0xdc, - 0xa1, 0x48, 0x72, 0x86, 0x27, 0x50, 0xc9, 0xdf, 0x90, 0xa8, 0x37, 0x25, 0x96, 0x29, 0xc5, 0xf3, - 0x40, 0x95, 0x40, 0x5f, 0x9b, 0x2a, 0xb0, 0x07, 0x65, 0x08, 0x56, 0xcc, 0x99, 0x17, 0x08, 0x09, - 0x83, 0x7e, 0xf8, 0xed, 0xd3, 0x51, 0xc8, 0xd8, 0x46, 0x5e, 0xf8, 0xb9, 0x99, 0x17, 0xc2, 0x30, - 0x6c, 0x23, 0x11, 0xf0, 0xad, 0x30, 0x74, 0xbb, 0x77, 0x9b, 0x09, 0x64, 0xf8, 0x18, 0x61, 0xf8, - 0x80, 0x70, 0x3c, 0xe3, 0xe3, 0x4b, 0x0a, 0x4e, 0x6f, 0x41, 0x09, 0x4f, 0x86, 0x3c, 0xa0, 0x84, - 0x19, 0xe4, 0x3c, 0x4b, 0xe3, 0x31, 0xc2, 0xe7, 0xec, 0x1c, 0x51, 0x06, 0x8d, 0x74, 0x31, 0xd2, - 0x26, 0x77, 0xf7, 0x5e, 0x79, 0x7d, 0x31, 0x71, 0x19, 0x34, 0x1e, 0xf1, 0x1c, 0x16, 0xe6, 0x01, - 0x45, 0x22, 0x32, 0x14, 0xd0, 0x8b, 0x57, 0x59, 0x13, 0x76, 0xfd, 0x57, 0x9e, 0xb7, 0xa0, 0x38, - 0x20, 0xb9, 0x02, 0x71, 0x20, 0x06, 0x16, 0xf5, 0x55, 0x14, 0x08, 0x44, 0x01, 0x04, 0x99, 0xad, - 0x90, 0x60, 0x7f, 0x26, 0xce, 0xbd, 0x05, 0x5e, 0x79, 0x70, 0x15, 0xa7, 0x05, 0xf4, 0x24, 0x52, - 0x2c, 0x42, 0xae, 0x98, 0x40, 0xec, 0x9a, 0x08, 0xb6, 0x34, 0xb7, 0x00, 0x16, 0x9c, 0xa8, 0xf2, - 0x90, 0xa5, 0x62, 0xce, 0x59, 0x7f, 0x84, 0x64, 0x72, 0xb9, 0x7c, 0x84, 0xff, 0xee, 0xae, 0x5a, - 0x19, 0xec, 0xed, 0xaf, 0x9e, 0xa3, 0x35, 0x90, 0x1f, 0xc8, 0xcb, 0x79, 0x52, 0x8b, 0xdb, 0xfc, - 0x62, 0x63, 0x9e, 0x58, 0x02, 0xad, 0xe6, 0xdc, 0x35, 0x61, 0x64, 0xb0, 0x0b, 0xd5, 0xba, 0x21, - 0xf2, 0x57, 0x25, 0xd9, 0xdf, 0xef, 0x7a, 0xde, 0x01, 0x83, 0xcf, 0xe5, 0x94, 0xb3, 0x1e, 0x7b, - 0x31, 0x99, 0x4c, 0xd8, 0x72, 0xc9, 0x53, 0xcd, 0x17, 0xfa, 0x5a, 0x98, 0xf1, 0xcc, 0x2d, 0xed, - 0xeb, 0x2d, 0xc6, 0x00, 0x0d, 0x43, 0xf0, 0xb2, 0x5e, 0xf9, 0x74, 0x78, 0x54, 0x3d, 0x51, 0x80, - 0xae, 0x17, 0x3f, 0xd6, 0xab, 0x08, 0x42, 0xd6, 0xb3, 0x8a, 0xf5, 0x13, 0x3e, 0x89, 0x8b, 0xd4, - 0xf4, 0x4a, 0xef, 0x2e, 0xc9, 0xc6, 0x8f, 0xdb, 0xf7, 0xbb, 0x2c, 0x6a, 0xd4, 0x3c, 0x36, 0xea, - 0xff, 0xde, 0xa6, 0x6b, 0x08, 0x23, 0x5a, 0x4f, 0xa0, 0x19, 0xe1, 0x1d, 0xda, 0x96, 0xa5, 0xd3, - 0x23, 0xa3, 0x50, 0x0e, 0x32, 0x67, 0xd2, 0x17, 0xe7, 0xc8, 0x2b, 0xc7, 0xb6, 0x80, 0x06, 0x08, - 0xd3, 0x5c, 0x70, 0x22, 0xf6, 0x2a, 0x62, 0xe1, 0x79, 0xb6, 0xcc, 0x87, 0xd2, 0xaf, 0x25, 0x09, - 0xaf, 0x4f, 0x2e, 0x73, 0x08, 0xe8, 0x35, 0xac, 0x9f, 0x09, 0x08, 0x92, 0xb4, 0x59, 0x8b, 0x45, - 0xa9, 0x00, 0x21, 0xdf, 0xc0, 0x33, 0x66, 0x20, 0x6a, 0xb7, 0x18, 0x82, 0xfd, 0x99, 0x39, 0x8f, - 0xc2, 0x2e, 0x72, 0xd0, 0xba, 0x0c, 0xd0, 0x5a, 0xb3, 0x02, 0x58, 0x95, 0xbc, 0x5a, 0x8f, 0x07, - 0xd4, 0x4f, 0x93, 0x3e, 0xa1, 0xca, 0x23, 0x6a, 0xac, 0x4e, 0x4b, 0x5b, 0x37, 0x52, 0x07, 0x5a, - 0xac, 0xc3, 0x38, 0x5b, 0xa7, 0x0f, 0x86, 0x63, 0x22, 0x39, 0xb3, 0xad, 0x55, 0xef, 0x71, 0xc0, - 0x58, 0x6f, 0x9d, 0x22, 0x3a, 0x67, 0x5f, 0xfe, 0xf8, 0x7a, 0xde, 0x99, 0xfa, 0xcc, 0x81, 0x59, - 0x56, 0xab, 0xee, 0xbf, 0xbe, 0x5c, 0x2f, 0xf6, 0x97, 0xde, 0x9d, 0xfb, 0x45, 0xb7, 0xcb, 0x47, - 0xd0, 0xa0, 0x36, 0x20, 0x63, 0xa8, 0xcf, 0xa8, 0xc1, 0xf9, 0x21, 0x80, 0xed, 0x7a, 0x8d, 0xad, - 0x51, 0x51, 0x7e, 0x16, 0x1c, 0x65, 0x19, 0xf9, 0xc8, 0x87, 0xdf, 0xd0, 0x45, 0xad, 0x7c, 0x2a, - 0x91, 0x4d, 0x6c, 0x0b, 0xd6, 0x0e, 0x77, 0x07, 0xb3, 0xdc, 0x19, 0xa7, 0xb1, 0xd6, 0x21, 0xd3, - 0xf3, 0x94, 0x45, 0xbb, 0x3e, 0x2b, 0xe4, 0xa5, 0x84, 0x21, 0x08, 0xd8, 0x86, 0x40, 0x29, 0xe4, - 0x38, 0x2d, 0x12, 0x38, 0x1a, 0x88, 0xa1, 0xf4, 0x5d, 0xb1, 0x5e, 0x0c, 0xb2, 0x68, 0x50, 0x44, - 0xdb, 0x8b, 0xfa, 0x94, 0xc6, 0x5b, 0x0e, 0x3a, 0x45, 0x34, 0xe8, 0x64, 0xd1, 0x45, 0x59, 0xb6, - 0x4b, 0xd4, 0x08, 0x5f, 0x3d, 0x82, 0x1a, 0x28, 0xf1, 0xfc, 0x4e, 0x07, 0x8d, 0x23, 0x40, 0x84, - 0xd7, 0x5b, 0xbf, 0xb7, 0xf1, 0xbd, 0x6d, 0xec, 0xea, 0xf2, 0x71, 0x57, 0xc9, 0x35, 0x6a, 0x14, - 0xdc, 0xa5, 0x06, 0xb2, 0x76, 0x97, 0x82, 0xbb, 0x36, 0x8d, 0x73, 0xa6, 0xce, 0x7d, 0xb4, 0x53, - 0xd6, 0xe9, 0x36, 0x73, 0x6b, 0x3f, 0xaf, 0xfd, 0x23, 0xfb, 0x55, 0xae, 0xc9, 0xab, 0x34, 0x33, - 0x52, 0x28, 0xc5, 0xb1, 0x64, 0x3d, 0x04, 0xa3, 0x4d, 0xf8, 0x23, 0x75, 0xc3, 0x7c, 0x1d, 0xee, - 0x96, 0x81, 0xcd, 0x4c, 0x5e, 0x70, 0xb6, 0xdb, 0x76, 0xe5, 0x01, 0x2b, 0x0b, 0x02, 0x02, 0xb6, - 0x07, 0x8c, 0x97, 0x41, 0xdb, 0xb7, 0x32, 0xaa, 0x84, 0xdf, 0xd3, 0xe1, 0x45, 0xc5, 0xb5, 0xbd, - 0x90, 0x4b, 0x76, 0xe1, 0x57, 0x11, 0x12, 0x9a, 0x46, 0x44, 0x1c, 0xb8, 0x64, 0x6b, 0x87, 0x9a, - 0x06, 0x90, 0x35, 0xfa, 0x06, 0xe6, 0xcc, 0x85, 0x0c, 0xd9, 0xde, 0x3e, 0x5b, 0x39, 0x10, 0x22, - 0xa0, 0x96, 0x90, 0xe8, 0xdd, 0x7a, 0xe4, 0x5c, 0x07, 0xdd, 0x44, 0x16, 0xb2, 0x58, 0xde, 0xae, - 0x68, 0x6e, 0x6e, 0x52, 0xb6, 0xdb, 0xbf, 0x97, 0xfc, 0x42, 0xdb, 0xfb, 0xd1, 0x31, 0x36, 0x14, - 0x72, 0x6c, 0x82, 0xa9, 0x86, 0x87, 0xde, 0xcb, 0x1f, 0xbb, 0xd9, 0x4d, 0x9f, 0x5d, 0x2c, 0x6b, - 0xff, 0x3b, 0x1b, 0xae, 0x77, 0xa0, 0xfe, 0xca, 0x20, 0x61, 0x98, 0x1f, 0xac, 0x60, 0x22, 0x64, - 0x56, 0x18, 0x87, 0x0c, 0x1a, 0xb2, 0x99, 0x48, 0x12, 0x0c, 0x38, 0x4e, 0x39, 0x49, 0x6c, 0x2f, - 0xf8, 0xb2, 0xb7, 0xbd, 0x30, 0x4b, 0x48, 0x3a, 0xa0, 0x6c, 0x00, 0x4b, 0x61, 0xdb, 0x4a, 0x87, - 0x49, 0x0c, 0x87, 0xb0, 0xe8, 0xa2, 0x27, 0x9a, 0xa0, 0xfb, 0x5e, 0x69, 0xdb, 0x8b, 0x7c, 0x09, - 0x61, 0x9e, 0xff, 0xa8, 0xa4, 0xed, 0x85, 0x35, 0x5b, 0x48, 0x8a, 0xaf, 0xfc, 0x03, 0x86, 0xe7, - 0x45, 0x6f, 0x2f, 0xf4, 0x12, 0xbd, 0x98, 0x15, 0x54, 0xc1, 0xc1, 0x35, 0x33, 0xa1, 0xfd, 0xdd, - 0x6d, 0x4a, 0xdc, 0xa5, 0x0f, 0x09, 0xd6, 0x09, 0xbf, 0x39, 0x9e, 0x58, 0x54, 0xb7, 0xf7, 0xbd, - 0xe5, 0xae, 0x87, 0xd1, 0x69, 0x94, 0x47, 0x17, 0xcb, 0x8d, 0x78, 0x7d, 0x97, 0xab, 0x0c, 0x1d, - 0x96, 0x2c, 0x5b, 0x88, 0xa7, 0x9a, 0x7b, 0x9e, 0xd2, 0xf0, 0xe2, 0x21, 0xa2, 0x9b, 0x63, 0x8f, - 0x7e, 0x7b, 0xfb, 0x2b, 0x34, 0xad, 0x43, 0xc3, 0x3b, 0xdb, 0x3f, 0xa7, 0xde, 0x42, 0xa0, 0x44, - 0x0d, 0x7f, 0x3d, 0xf9, 0xfc, 0x1b, 0x9d, 0x4c, 0x04, 0x26, 0x9e, 0x12, 0x15, 0xf2, 0x5f, 0xe9, - 0xf0, 0x72, 0x11, 0x06, 0xb8, 0xbb, 0x5b, 0x77, 0x21, 0xd5, 0x92, 0x57, 0xaa, 0xc0, 0xf1, 0x6a, - 0x2d, 0xd8, 0x17, 0xb6, 0xda, 0xf6, 0x37, 0xc3, 0x4a, 0x04, 0x71, 0x3d, 0x1e, 0xac, 0xca, 0x65, - 0xbb, 0xad, 0xca, 0x0e, 0x48, 0x87, 0xcd, 0xcf, 0x08, 0xb3, 0x7e, 0x39, 0x6a, 0x6c, 0x85, 0xda, - 0xca, 0x82, 0x72, 0x56, 0x74, 0x73, 0xc1, 0xc2, 0xb4, 0xb9, 0x60, 0x31, 0xd8, 0x58, 0xb8, 0x37, - 0x93, 0x94, 0xcb, 0xbe, 0x2e, 0x95, 0xf4, 0x96, 0x55, 0x9b, 0x76, 0x7f, 0x72, 0xa1, 0xe6, 0x76, - 0x0f, 0x24, 0xb6, 0x53, 0x16, 0x01, 0x0a, 0x23, 0x8c, 0x56, 0xd9, 0xae, 0xce, 0xb3, 0xd5, 0x18, - 0xe3, 0xa3, 0x22, 0xc8, 0x95, 0x9c, 0x22, 0x4d, 0x37, 0x9c, 0x74, 0x9c, 0xd1, 0x53, 0x99, 0x38, - 0x6c, 0x42, 0x25, 0x0a, 0x18, 0x8d, 0x7b, 0x25, 0x47, 0x9f, 0x8c, 0x26, 0x1e, 0xfa, 0x4d, 0x59, - 0x3e, 0xe4, 0x81, 0xca, 0x9c, 0x28, 0x91, 0xb0, 0x33, 0x9c, 0x10, 0x1a, 0x9f, 0x6f, 0xcc, 0x51, - 0x62, 0x3d, 0xf2, 0x94, 0x95, 0x06, 0x25, 0x9e, 0x3e, 0xfc, 0x8a, 0x16, 0x59, 0x37, 0x8b, 0xce, - 0xa2, 0xf9, 0x01, 0x85, 0xa7, 0xee, 0x2d, 0x78, 0x40, 0xa7, 0xc5, 0xf9, 0x69, 0x01, 0xbe, 0xa6, - 0x96, 0x99, 0x40, 0xc3, 0x93, 0x21, 0x01, 0x31, 0x44, 0xb0, 0x6e, 0x1c, 0x69, 0x28, 0x27, 0x6a, - 0x55, 0x26, 0x90, 0xaa, 0xac, 0xdf, 0xd5, 0xe3, 0xf0, 0xf2, 0xfa, 0xaa, 0x52, 0x81, 0x40, 0x54, - 0x55, 0xb3, 0xd5, 0x24, 0x6d, 0x76, 0x76, 0x14, 0xa6, 0xab, 0x03, 0xfa, 0x13, 0x58, 0x9b, 0xce, - 0x54, 0x9a, 0xa0, 0x1f, 0x30, 0x3d, 0x05, 0x05, 0x89, 0x05, 0x9e, 0x94, 0x44, 0x05, 0x75, 0x51, - 0x30, 0x31, 0xb1, 0xbc, 0x49, 0xbe, 0x81, 0x4e, 0x1a, 0xea, 0xd0, 0x31, 0x61, 0x4e, 0xd0, 0xfa, - 0xc3, 0x14, 0xe8, 0x0b, 0x76, 0xe4, 0x48, 0x67, 0x7d, 0xd6, 0xc6, 0x5c, 0x49, 0x5c, 0xe2, 0x19, - 0xae, 0x11, 0x87, 0xc5, 0xf8, 0x88, 0x4f, 0x91, 0x3e, 0x7d, 0xd1, 0xae, 0x59, 0xbd, 0x66, 0x41, - 0xb4, 0xd3, 0xc1, 0x62, 0xc2, 0x29, 0x99, 0xd3, 0x04, 0x72, 0x60, 0x07, 0x79, 0xcc, 0xf1, 0xac, - 0x6d, 0x27, 0x08, 0x4a, 0xd2, 0x6d, 0xd6, 0x19, 0x4f, 0xa6, 0xc1, 0x37, 0x0d, 0x4f, 0xf9, 0x8b, - 0x39, 0x37, 0x33, 0x95, 0xf4, 0x18, 0xcc, 0xc0, 0x96, 0x5e, 0x60, 0x66, 0x98, 0xcf, 0x51, 0x73, - 0x61, 0x4f, 0x75, 0x59, 0x4f, 0x18, 0xc8, 0x50, 0x79, 0x4e, 0x1d, 0x8c, 0x6d, 0xc5, 0x12, 0xa1, - 0x71, 0xea, 0x5b, 0x4a, 0xc1, 0xa9, 0x90, 0x1c, 0x51, 0xca, 0xad, 0x30, 0x54, 0xe6, 0x35, 0x3f, - 0x81, 0xa6, 0xbc, 0xef, 0xe0, 0x98, 0x41, 0xfd, 0x75, 0xcb, 0x55, 0x66, 0x26, 0x78, 0xc0, 0xa7, - 0x22, 0x6d, 0x49, 0x10, 0x84, 0xb6, 0x86, 0x22, 0x0c, 0xef, 0x8f, 0x5f, 0x9a, 0xc7, 0xf9, 0x78, - 0xe6, 0x9b, 0x50, 0xf2, 0x6b, 0xe7, 0xf3, 0x3f, 0x8e, 0x4e, 0xed, 0xfb, 0x49, 0x9c, 0xc7, 0x73, - 0x12, 0x46, 0xce, 0x2b, 0x07, 0xa0, 0x46, 0x25, 0xe6, 0xbe, 0x7c, 0xa4, 0x12, 0x57, 0x3b, 0xa1, - 0x5f, 0xa4, 0xcc, 0xb0, 0x4a, 0x8f, 0xb3, 0x3c, 0x1a, 0xcc, 0x5e, 0x45, 0x94, 0xfa, 0x06, 0x1d, - 0x3c, 0x0c, 0x12, 0x71, 0xd5, 0x4c, 0x87, 0x33, 0x9e, 0x66, 0xc8, 0x63, 0x1d, 0x2c, 0x47, 0x17, - 0x7e, 0xa3, 0xa4, 0xae, 0xca, 0x3a, 0x22, 0xc4, 0xeb, 0x53, 0x7c, 0xa0, 0xdd, 0x41, 0x24, 0x53, - 0x6e, 0xb1, 0xd2, 0xeb, 0x5d, 0x42, 0x56, 0xdd, 0x1c, 0xe9, 0x7b, 0xa3, 0xaa, 0x54, 0x98, 0x53, - 0x55, 0x21, 0x93, 0x80, 0xd2, 0xe4, 0x49, 0xce, 0xb5, 0x76, 0x06, 0x22, 0x3a, 0x8d, 0xaf, 0xf8, - 0xa0, 0x23, 0x22, 0xc7, 0x28, 0xa7, 0xba, 0xbd, 0x12, 0xff, 0xc1, 0xe0, 0x5a, 0x96, 0x31, 0x1d, - 0x60, 0xbc, 0xb3, 0x4e, 0x99, 0xa6, 0x6a, 0x14, 0xa7, 0xbf, 0x9c, 0x0c, 0x8f, 0xf5, 0x43, 0xd7, - 0xac, 0xb4, 0x38, 0x60, 0x23, 0x18, 0xf3, 0x12, 0xf9, 0x52, 0x2a, 0xf8, 0xca, 0x7f, 0x6c, 0x62, - 0x2c, 0x2f, 0xaa, 0xaa, 0x6b, 0x97, 0x67, 0x50, 0x53, 0x5f, 0xda, 0x74, 0x34, 0xfc, 0x7d, 0x90, - 0x85, 0xaf, 0x99, 0x8f, 0x7e, 0x0b, 0xa0, 0x81, 0xb3, 0x68, 0x50, 0x81, 0xd7, 0xff, 0x04, 0x5c, - 0xfc, 0xe6, 0xa4, 0xcf, 0x37, 0x26, 0x71, 0x7d, 0x75, 0x4a, 0x5d, 0x24, 0xc7, 0xd4, 0xcd, 0xe9, - 0xa2, 0xe0, 0x5d, 0x79, 0xe6, 0xfa, 0xe6, 0xc2, 0x96, 0x9e, 0xdf, 0x61, 0x8e, 0x44, 0x98, 0x5b, - 0xd7, 0xa3, 0xeb, 0x0d, 0xac, 0xa2, 0x00, 0xcd, 0x05, 0x68, 0x96, 0xad, 0x41, 0xa7, 0xba, 0x8a, - 0x1b, 0xd8, 0x9d, 0xa3, 0xbf, 0x89, 0x39, 0xdd, 0xe0, 0x39, 0x45, 0x9e, 0xba, 0xac, 0x1a, 0x23, - 0x90, 0x76, 0xbd, 0x3e, 0x08, 0x2d, 0x01, 0x3c, 0xce, 0xe3, 0x04, 0x55, 0x4a, 0x25, 0xb7, 0xa8, - 0x70, 0x64, 0x81, 0x90, 0x21, 0x80, 0xe0, 0x70, 0xc0, 0x69, 0xde, 0x72, 0x04, 0xde, 0xe9, 0xe9, - 0xab, 0xae, 0x6b, 0xe4, 0xe9, 0x04, 0x1d, 0x89, 0x0d, 0x99, 0x90, 0x65, 0x4a, 0x1b, 0x06, 0xbe, - 0x52, 0x03, 0x74, 0x26, 0xa4, 0x3e, 0xe9, 0x4d, 0x02, 0x08, 0x47, 0x55, 0x37, 0x62, 0x54, 0x06, - 0x0b, 0xb3, 0xa8, 0xd5, 0x5c, 0x24, 0x60, 0xbd, 0xa5, 0x0a, 0x59, 0x18, 0x83, 0xa3, 0x97, 0x05, - 0xba, 0x7c, 0x21, 0x99, 0xe3, 0x54, 0x8c, 0x2f, 0x43, 0xf6, 0x81, 0x94, 0x39, 0x18, 0x74, 0xca, - 0x0f, 0x15, 0x0e, 0x6b, 0x9e, 0xd6, 0x13, 0x4c, 0x6f, 0x89, 0xe9, 0x6d, 0x3c, 0xbe, 0x5c, 0xf3, - 0x6d, 0xec, 0x52, 0xea, 0xcb, 0x2a, 0xa4, 0xad, 0x48, 0x72, 0x28, 0xa8, 0xb3, 0x58, 0xda, 0x53, - 0xa7, 0x5a, 0x17, 0xe3, 0x55, 0x6f, 0x64, 0xa7, 0xaf, 0xde, 0x34, 0xe7, 0x5c, 0xf6, 0x2b, 0x7f, - 0xf6, 0x2c, 0x9e, 0xa2, 0x9d, 0x17, 0xfb, 0xdd, 0x6e, 0xf7, 0x87, 0xbe, 0x73, 0xb8, 0x79, 0x0d, - 0x03, 0xd1, 0xc9, 0x16, 0x79, 0x04, 0x02, 0x23, 0xa7, 0x29, 0x97, 0xb0, 0xb1, 0x29, 0x17, 0xe3, - 0xde, 0x3d, 0xa9, 0xad, 0x9d, 0x17, 0x3f, 0xbd, 0x7e, 0xfd, 0x9a, 0xa4, 0x16, 0x69, 0x62, 0x23, - 0x85, 0x9c, 0xb3, 0x19, 0x40, 0x41, 0x25, 0xbd, 0x32, 0x0a, 0xd9, 0x96, 0x76, 0x68, 0xc6, 0x85, - 0xd3, 0xaa, 0x36, 0xda, 0x14, 0x5f, 0x46, 0xfd, 0xcb, 0xe6, 0x95, 0x6e, 0x91, 0x01, 0x0c, 0x2f, - 0xa3, 0x5f, 0x2c, 0xb3, 0x33, 0x1c, 0xe8, 0x22, 0x8b, 0x5e, 0x62, 0x03, 0xfc, 0x1c, 0x3a, 0x56, - 0x98, 0xe3, 0x7e, 0xf8, 0xc3, 0x6b, 0x91, 0x99, 0x06, 0x62, 0x53, 0xff, 0x6a, 0xd2, 0x8c, 0x5c, - 0x40, 0xe8, 0x96, 0xee, 0xb3, 0xe5, 0x94, 0x6e, 0x93, 0xe9, 0xfe, 0xea, 0xfd, 0xe9, 0xc9, 0xab, - 0x97, 0x7e, 0xb9, 0xc6, 0x9d, 0x9c, 0xff, 0xbb, 0x10, 0x88, 0x73, 0x3c, 0xa0, 0xc3, 0x36, 0x5b, - 0x10, 0x87, 0x40, 0x27, 0x91, 0x98, 0xeb, 0x7b, 0x1b, 0xad, 0x5a, 0xd5, 0xa8, 0xac, 0xbb, 0x5f, - 0xdb, 0x1a, 0xff, 0xf0, 0x7a, 0x85, 0xc3, 0x77, 0x6f, 0x70, 0x3a, 0xb8, 0xdc, 0x4a, 0x0e, 0x77, - 0x1b, 0x6d, 0x19, 0x8d, 0xeb, 0xde, 0xee, 0xba, 0x5d, 0x76, 0x9a, 0x35, 0xca, 0x32, 0x96, 0x5b, - 0x1e, 0x1e, 0xd5, 0x5b, 0xb6, 0xfe, 0xe4, 0x9e, 0x87, 0x47, 0x16, 0x65, 0x4f, 0x6e, 0xd9, 0x7a, - 0x6a, 0x4f, 0x30, 0x46, 0xf7, 0x67, 0xb0, 0xca, 0xd4, 0xa7, 0x27, 0xc3, 0x86, 0x7d, 0x2b, 0xf3, - 0xb6, 0xfe, 0x47, 0xf6, 0xad, 0xcd, 0xdb, 0xa2, 0x3b, 0x92, 0xbf, 0x66, 0x60, 0x7b, 0xab, 0xf2, - 0x5d, 0x16, 0xb6, 0x9c, 0x76, 0x5b, 0xba, 0x83, 0xf9, 0x8b, 0x36, 0xb6, 0xd7, 0x36, 0xdf, 0x65, - 0x64, 0xcb, 0x59, 0x7b, 0xf6, 0xe3, 0x9f, 0x3d, 0x6c, 0x6b, 0xe5, 0xda, 0x8f, 0xcf, 0x6f, 0xfb, - 0xb4, 0x6b, 0x3f, 0xb2, 0x66, 0x08, 0xb6, 0x28, 0x06, 0x51, 0x60, 0xa2, 0xfa, 0x8a, 0xb6, 0xae, - 0x1a, 0x41, 0x10, 0x54, 0x64, 0x14, 0x7d, 0xcf, 0xa7, 0xbd, 0x55, 0x06, 0x6b, 0xfd, 0xa5, 0x14, - 0xd6, 0xa1, 0x5c, 0x8d, 0x1f, 0xca, 0xe7, 0x94, 0xdc, 0xe9, 0x9f, 0x4e, 0xff, 0x05, 0xe5, 0x5f, - 0xd1, 0x4f, 0x8a, 0x1a, 0x00, 0x00 + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x59, 0xdb, 0x72, 0xdb, 0xc8, + 0x11, 0x7d, 0xe7, 0x57, 0x40, 0x63, 0x95, 0x04, 0x14, 0x21, 0x90, 0xb2, 0x77, 0xab, 0xbc, 0x24, + 0x07, 0x8a, 0x2d, 0x7b, 0xd7, 0x8a, 0xed, 0x95, 0x2a, 0x5a, 0xef, 0x56, 0x4a, 0x56, 0x2c, 0x90, + 0x18, 0x92, 0x63, 0x81, 0x00, 0x82, 0x19, 0xe8, 0x12, 0x8a, 0x55, 0xf9, 0x88, 0x3c, 0xa4, 0x2a, + 0x0f, 0xf9, 0xb7, 0x7c, 0x41, 0x3e, 0x21, 0xa7, 0x67, 0x00, 0x12, 0xd4, 0x6d, 0xbd, 0x4e, 0x1e, + 0xf2, 0x22, 0x02, 0x83, 0xee, 0x9e, 0x9e, 0xee, 0xd3, 0xb7, 0xd1, 0x60, 0xe3, 0xd5, 0xe1, 0xfe, + 0x4f, 0x7f, 0x3c, 0x7a, 0xed, 0x4c, 0xf5, 0x2c, 0x09, 0x07, 0xd5, 0x5f, 0x11, 0xc5, 0x4e, 0x12, + 0xa5, 0x13, 0xce, 0x44, 0xca, 0xc2, 0xc1, 0x4c, 0xe8, 0xc8, 0x19, 0x4d, 0xa3, 0x42, 0x09, 0xcd, + 0x59, 0xa9, 0xc7, 0x3b, 0xcf, 0xeb, 0xd5, 0x56, 0x1a, 0xcd, 0x04, 0x67, 0x17, 0x52, 0x5c, 0xe6, + 0x59, 0xa1, 0x99, 0x33, 0xca, 0x52, 0x2d, 0x52, 0x90, 0x5d, 0xca, 0x58, 0x4f, 0xf9, 0xb7, 0xdd, + 0xee, 0x92, 0xf4, 0xd6, 0xa7, 0x58, 0x5c, 0xc8, 0x91, 0xd8, 0x31, 0x2f, 0xbe, 0x4c, 0xa5, 0x96, + 0x51, 0xb2, 0xa3, 0x46, 0x51, 0x22, 0xf8, 0xae, 0x3f, 0x8b, 0xae, 0xe4, 0xac, 0x9c, 0x2d, 0xdf, + 0x4b, 0x25, 0x0a, 0xf3, 0x12, 0x0d, 0xf1, 0x9e, 0x66, 0xec, 0xce, 0xce, 0xe1, 0x40, 0x4b, 0x9d, + 0x88, 0xf0, 0x03, 0x28, 0x67, 0x59, 0xec, 0x1c, 0x0b, 0xad, 0x65, 0x3a, 0x51, 0x83, 0x8e, 0x5d, + 0x1f, 0xa8, 0x51, 0x21, 0x73, 0x1d, 0xb6, 0x2e, 0xa2, 0xc2, 0xc9, 0x2e, 0x53, 0x51, 0xf8, 0x49, + 0x36, 0x92, 0xb9, 0x5f, 0x16, 0xd9, 0xa5, 0xf2, 0x63, 0x1e, 0x67, 0xa3, 0x72, 0x06, 0xfd, 0xfc, + 0x72, 0xb6, 0x3f, 0x9e, 0xf0, 0xf9, 0xc2, 0xcf, 0x65, 0xaa, 0xf8, 0xc9, 0x29, 0xfd, 0x1e, 0xd2, + 0x2f, 0xe8, 0xf9, 0xc6, 0xae, 0x9f, 0x96, 0xb3, 0xf7, 0xbc, 0xdb, 0x1f, 0x97, 0xe9, 0x48, 0xcb, + 0x2c, 0x75, 0x26, 0x07, 0xb1, 0x2b, 0xbc, 0x79, 0x21, 0x74, 0x59, 0xa4, 0x4e, 0x1c, 0x4c, 0x84, + 0x7e, 0x9d, 0x08, 0x12, 0xf5, 0xf2, 0xda, 0x7c, 0x5a, 0x2c, 0x49, 0xa5, 0x3a, 0x6c, 0x90, 0x8a, + 0xad, 0x2d, 0x96, 0x0d, 0x3f, 0x8b, 0x91, 0x66, 0x9c, 0xeb, 0xeb, 0x5c, 0x64, 0x63, 0x5a, 0xdb, + 0x78, 0x51, 0x14, 0xd1, 0x75, 0x20, 0x95, 0xf9, 0x5d, 0xe3, 0x7f, 0xe3, 0x7a, 0xf3, 0x4b, 0x99, + 0xc6, 0xd9, 0x65, 0x90, 0xe5, 0x22, 0x75, 0xd9, 0x54, 0xeb, 0x5c, 0xf5, 0x3a, 0x9d, 0x89, 0xd4, + 0xd3, 0x72, 0x18, 0x8c, 0xb2, 0x59, 0xe7, 0x85, 0x2c, 0x46, 0x59, 0x96, 0x9d, 0x4b, 0xd1, 0xf9, + 0xe5, 0xdd, 0xeb, 0x57, 0x9d, 0x4b, 0x79, 0x2e, 0x3b, 0xb5, 0x35, 0x9e, 0x94, 0xd6, 0x3c, 0x3b, + 0xaa, 0x5a, 0x60, 0x0d, 0xe9, 0x2f, 0x6f, 0x4b, 0xef, 0x2c, 0xa9, 0x7c, 0xf6, 0x49, 0x89, 0x64, + 0xdc, 0xa4, 0x4e, 0xb2, 0x28, 0xfe, 0xfd, 0xb1, 0x2b, 0xfc, 0x94, 0x6f, 0x74, 0xbd, 0x79, 0x22, + 0xb4, 0xa3, 0x79, 0x1c, 0x8c, 0x0a, 0x11, 0x69, 0x51, 0x19, 0xc0, 0x65, 0xd6, 0xea, 0xcc, 0xeb, + 0xeb, 0x00, 0xc2, 0x5e, 0x68, 0x5d, 0xc8, 0x61, 0xa9, 0x05, 0x3e, 0x14, 0x23, 0xe6, 0x0b, 0xcf, + 0xbf, 0xbd, 0x4e, 0x76, 0xc0, 0x76, 0x5a, 0x5c, 0xe9, 0xce, 0xe7, 0xe8, 0x22, 0xaa, 0x05, 0xdc, + 0x21, 0x8c, 0xd4, 0x75, 0x0a, 0x11, 0xa9, 0xe7, 0xc7, 0xc1, 0x30, 0x8b, 0xaf, 0x83, 0x28, 0x87, + 0xd2, 0xf1, 0xfe, 0x54, 0x26, 0xb1, 0xab, 0x89, 0x3e, 0x8a, 0xe3, 0xd7, 0x17, 0xd0, 0xe2, 0x9d, + 0x54, 0x00, 0x9e, 0x28, 0x5c, 0x46, 0x3a, 0x33, 0xdf, 0xf5, 0x78, 0x38, 0x8f, 0x83, 0x72, 0xf6, + 0x29, 0x27, 0xb7, 0xc6, 0x41, 0xa1, 0x2e, 0xe2, 0xea, 0x29, 0xfb, 0x54, 0x7b, 0x3d, 0x0e, 0x00, + 0xc2, 0x4f, 0x93, 0x5c, 0x66, 0xfc, 0xd9, 0x77, 0xfe, 0x0f, 0x42, 0xff, 0xec, 0x7a, 0xfd, 0x71, + 0x56, 0xb8, 0x74, 0x52, 0x01, 0x00, 0x88, 0x81, 0xe5, 0x0c, 0x12, 0x91, 0x4e, 0xf4, 0xb4, 0x2f, + 0xda, 0x6d, 0x8f, 0x98, 0x83, 0xbc, 0x54, 0x53, 0xd7, 0x7e, 0x3b, 0x11, 0xa7, 0x9e, 0xc1, 0x8f, + 0x5d, 0x64, 0xb4, 0x06, 0x63, 0xec, 0xec, 0x72, 0x6e, 0x15, 0x38, 0xe9, 0x9e, 0x6e, 0x6d, 0xd9, + 0xc7, 0x40, 0x4d, 0xe5, 0x58, 0xbb, 0x74, 0x9e, 0xe3, 0x71, 0x70, 0xfc, 0xea, 0x05, 0xf8, 0x48, + 0x07, 0xbe, 0xd2, 0xa4, 0xfa, 0xb4, 0xff, 0xee, 0xa1, 0x4f, 0xef, 0x0f, 0x8f, 0x0f, 0x1e, 0x61, + 0x7b, 0xfb, 0x20, 0xdf, 0xc1, 0xf1, 0xe1, 0xdd, 0x6f, 0x8b, 0xfb, 0xad, 0x28, 0x8a, 0x22, 0x2b, + 0xe0, 0x3c, 0x58, 0x11, 0x31, 0xad, 0xb2, 0x44, 0x04, 0x49, 0x36, 0x71, 0xd9, 0x6b, 0x5a, 0x77, + 0x2a, 0x68, 0x00, 0x36, 0xce, 0x58, 0x26, 0xc2, 0x38, 0x19, 0x41, 0x5c, 0x00, 0x0c, 0xef, 0xaa, + 0x75, 0xe0, 0x1c, 0x8c, 0x63, 0x39, 0x29, 0x8b, 0xc8, 0x60, 0xc9, 0x3a, 0xd9, 0x19, 0x47, 0x60, + 0x88, 0x83, 0x8f, 0xe9, 0x41, 0x0a, 0x24, 0xe7, 0x30, 0xb4, 0x70, 0xf2, 0x68, 0x22, 0x9c, 0x38, + 0xd2, 0xd1, 0x06, 0xc0, 0xd7, 0x80, 0xdf, 0x31, 0xc0, 0xca, 0x68, 0x83, 0x1e, 0x82, 0xa7, 0x42, + 0x2d, 0x02, 0xd4, 0xc8, 0x0b, 0xf2, 0x22, 0xd3, 0xd9, 0x28, 0x4b, 0xb6, 0xb6, 0x5c, 0x13, 0xb4, + 0x5d, 0xdf, 0x35, 0xc1, 0xce, 0x89, 0x22, 0x39, 0xd6, 0x59, 0x01, 0xa9, 0x14, 0xa8, 0x07, 0x5a, + 0xcc, 0x08, 0x16, 0xa3, 0x83, 0x9c, 0x79, 0xde, 0xcd, 0x4d, 0x45, 0x06, 0xfe, 0x59, 0x0e, 0x85, + 0xbf, 0x87, 0x7c, 0xe7, 0x7d, 0x16, 0x8b, 0xc0, 0x39, 0x4a, 0x44, 0xa4, 0x84, 0x03, 0x43, 0x88, + 0xc2, 0xa1, 0xc0, 0x72, 0x0e, 0x8e, 0xa0, 0x92, 0xbf, 0x26, 0x51, 0xad, 0x4b, 0xb4, 0x19, 0xc6, + 0xf3, 0x40, 0x15, 0x43, 0x5f, 0x93, 0x39, 0xb0, 0x07, 0x25, 0x0c, 0x56, 0xce, 0x98, 0x17, 0xc8, + 0x14, 0x06, 0x7d, 0xf3, 0xd3, 0xfb, 0x77, 0x9c, 0xb1, 0xb5, 0x34, 0xf1, 0x7d, 0x33, 0x4d, 0x70, + 0xce, 0xdb, 0xc8, 0x0b, 0x62, 0x83, 0x73, 0xb7, 0x7b, 0xb3, 0x9e, 0x4f, 0x0e, 0xee, 0x23, 0xe4, + 0x77, 0x08, 0x47, 0x53, 0x31, 0x3a, 0xa7, 0x58, 0xf5, 0xe6, 0x94, 0xff, 0x34, 0x17, 0x01, 0xe5, + 0xcf, 0xa0, 0x10, 0x79, 0x12, 0x8d, 0x10, 0x4d, 0x27, 0xa7, 0x08, 0x3a, 0x68, 0xa4, 0xca, 0xa1, + 0xd2, 0x85, 0xbb, 0xf3, 0xcc, 0xeb, 0xcb, 0xb1, 0xcb, 0xa0, 0xf1, 0x50, 0x14, 0xb0, 0xb0, 0x08, + 0x28, 0x30, 0x91, 0xb0, 0x80, 0x12, 0xca, 0x56, 0x35, 0x61, 0xd7, 0x7f, 0xe6, 0x79, 0x73, 0x0a, + 0x0b, 0x92, 0x2b, 0x11, 0x16, 0x72, 0x60, 0x82, 0xa0, 0x0a, 0x0a, 0x89, 0xa0, 0x80, 0xa0, 0x74, + 0x83, 0x53, 0x14, 0x9c, 0xc8, 0x53, 0x6f, 0x8e, 0x57, 0x11, 0x5c, 0x44, 0x49, 0x09, 0x3d, 0x89, + 0x14, 0x8b, 0x90, 0x2b, 0xc7, 0x10, 0xbb, 0x22, 0x82, 0x2d, 0xf5, 0x35, 0x80, 0x05, 0x27, 0x66, + 0x05, 0x67, 0x89, 0x9c, 0x09, 0xd6, 0x1f, 0x22, 0xb7, 0x9c, 0x2f, 0xee, 0xe1, 0xbf, 0xb9, 0xa9, + 0x56, 0x06, 0x3b, 0xbb, 0xcb, 0xe7, 0x70, 0x05, 0xe4, 0x3b, 0xf2, 0x0a, 0x11, 0xd7, 0xe2, 0xd6, + 0xbf, 0x98, 0x14, 0x40, 0x2c, 0x81, 0xca, 0x66, 0xc2, 0x4d, 0x79, 0x98, 0x62, 0x17, 0x2a, 0x7d, + 0x07, 0x48, 0x67, 0x95, 0x64, 0x7f, 0xb7, 0xeb, 0x79, 0x7b, 0x0c, 0x3e, 0x4f, 0x27, 0x82, 0xf5, + 0xd8, 0x93, 0xf1, 0x78, 0xcc, 0x16, 0x0b, 0x91, 0x28, 0x31, 0x57, 0x97, 0x52, 0x8f, 0xa6, 0xae, + 0xb5, 0xaf, 0x37, 0x1f, 0x01, 0x34, 0xcc, 0xc6, 0x32, 0xeb, 0xd9, 0x17, 0x13, 0xbd, 0xd5, 0x4b, + 0x15, 0xaf, 0xab, 0x4f, 0x6f, 0x1b, 0xdf, 0x6c, 0x4c, 0xb2, 0x9e, 0xd1, 0xb3, 0x1f, 0x8b, 0x71, + 0x54, 0x26, 0xba, 0x67, 0x9d, 0xbd, 0x20, 0x93, 0xdf, 0x6f, 0xee, 0xaf, 0x32, 0xb0, 0xce, 0x66, + 0x91, 0xce, 0xfe, 0xef, 0x4d, 0xbc, 0x42, 0x34, 0x82, 0xf7, 0x08, 0x9a, 0x11, 0xfc, 0xa1, 0xad, + 0x2d, 0xac, 0x1e, 0x19, 0x85, 0x52, 0x92, 0x3e, 0xd1, 0xbe, 0x3c, 0x45, 0x9a, 0x39, 0x34, 0xe5, + 0x35, 0x40, 0xd4, 0x16, 0x52, 0x10, 0xb1, 0x57, 0x11, 0x4b, 0xcf, 0x33, 0x4d, 0x00, 0xd7, 0x7e, + 0x2d, 0x49, 0x7a, 0x7d, 0xf2, 0xa0, 0x43, 0xb8, 0xaf, 0x51, 0xfe, 0x48, 0x7c, 0x90, 0xa4, 0xf5, + 0x4a, 0x2d, 0xad, 0x02, 0x14, 0x08, 0x29, 0x3c, 0x93, 0x0e, 0x64, 0xed, 0x96, 0x94, 0xa2, 0xe0, + 0x24, 0x3d, 0x0d, 0x79, 0x17, 0x29, 0x69, 0x55, 0x24, 0x68, 0xad, 0x59, 0x1f, 0x8c, 0x4a, 0x5e, + 0xad, 0xc7, 0x1d, 0xea, 0x87, 0x49, 0x1f, 0x50, 0xe5, 0x1e, 0x35, 0x96, 0xa7, 0xa5, 0xad, 0x1b, + 0x99, 0x04, 0x0d, 0xd8, 0x7e, 0x94, 0xaf, 0xb2, 0x09, 0xc3, 0x31, 0x91, 0xab, 0xd9, 0xc6, 0xb2, + 0x33, 0xd9, 0x63, 0xac, 0xb7, 0xca, 0x18, 0x9d, 0x93, 0x8f, 0xbf, 0x7c, 0x3a, 0xed, 0x4c, 0x7c, + 0xe6, 0xc0, 0x2c, 0xcb, 0x55, 0xf7, 0x4f, 0x1f, 0x2f, 0xe7, 0xbb, 0x0b, 0xef, 0xc6, 0xfd, 0xa8, + 0xda, 0xf6, 0x11, 0x34, 0x28, 0x15, 0x48, 0x20, 0xd9, 0x07, 0x54, 0xe8, 0x62, 0x1f, 0xd8, 0x76, + 0xbd, 0xc6, 0xd6, 0x28, 0x30, 0xdf, 0x4b, 0x81, 0xa2, 0x8d, 0xf4, 0xe4, 0xc3, 0x6f, 0xe8, 0xb1, + 0x96, 0x3e, 0xd5, 0x48, 0x2e, 0xa6, 0x41, 0x6b, 0xf3, 0xed, 0xc1, 0xb4, 0x70, 0x46, 0x49, 0xa4, + 0x14, 0x67, 0x6a, 0x96, 0xb0, 0x70, 0xdb, 0x67, 0x65, 0x7a, 0x9e, 0xc2, 0x10, 0x04, 0xec, 0x94, + 0x40, 0x29, 0xd3, 0x51, 0x52, 0xc6, 0x70, 0x34, 0x10, 0x43, 0xd9, 0xbc, 0x62, 0x3d, 0x1b, 0xe4, + 0xe1, 0xa0, 0x0c, 0x37, 0xe7, 0xf5, 0x29, 0x53, 0x6f, 0x31, 0xe8, 0x94, 0xe1, 0xa0, 0x93, 0x87, + 0x67, 0xb6, 0xa8, 0x5b, 0xd4, 0x48, 0x5f, 0xdd, 0x83, 0x1a, 0x28, 0xf1, 0xf8, 0x4e, 0x7b, 0x8d, + 0x23, 0x40, 0x84, 0xd7, 0x5b, 0xbd, 0xb7, 0xf1, 0xbd, 0x9d, 0x9a, 0xd5, 0xc5, 0xfd, 0xae, 0xd2, + 0x2b, 0xd4, 0x28, 0xb8, 0x4b, 0x0d, 0x74, 0xed, 0x2e, 0x05, 0x77, 0xad, 0x1b, 0xe7, 0x44, 0x9d, + 0xfa, 0x68, 0xb6, 0x8c, 0xd3, 0x4d, 0x22, 0xcf, 0xfc, 0xa2, 0xf6, 0x8f, 0xee, 0x57, 0xa9, 0xa7, + 0xa8, 0xb2, 0xce, 0x30, 0x43, 0x65, 0x8e, 0x90, 0x3f, 0x10, 0x8c, 0x26, 0xff, 0x0f, 0xb3, 0x2b, + 0xe6, 0x67, 0x7c, 0xdb, 0x06, 0x36, 0xd3, 0x45, 0x29, 0xd8, 0x76, 0xdb, 0xd5, 0x7b, 0xcc, 0xd6, + 0x07, 0x04, 0x6c, 0x0f, 0x18, 0xb7, 0x41, 0xdb, 0x37, 0x32, 0xaa, 0xfc, 0xdf, 0xcb, 0xf8, 0x59, + 0xc5, 0xb5, 0x39, 0xd7, 0x0b, 0x76, 0xe6, 0x57, 0x11, 0xc2, 0xd3, 0x46, 0x44, 0xec, 0xb9, 0x19, + 0x6c, 0xed, 0x50, 0x0f, 0x01, 0xb2, 0x46, 0x1b, 0xc1, 0x9c, 0x99, 0x4c, 0x39, 0xdb, 0xd9, 0x65, + 0x4b, 0x07, 0x42, 0x04, 0xd4, 0x92, 0x29, 0x3a, 0xbb, 0x1e, 0xb8, 0xb6, 0x1d, 0x34, 0x17, 0x39, + 0x67, 0x51, 0x7a, 0xbd, 0xa4, 0xb9, 0xba, 0x4a, 0xd8, 0x76, 0xff, 0x56, 0xf2, 0xe3, 0xa6, 0x33, + 0xa4, 0x63, 0xac, 0x29, 0xe4, 0x98, 0x04, 0x53, 0x8d, 0x16, 0xbd, 0xa7, 0xdf, 0x76, 0xf3, 0xab, + 0x3e, 0x3b, 0xa3, 0x3c, 0x56, 0x43, 0xc0, 0x59, 0xf3, 0xbe, 0x83, 0x13, 0x2c, 0x6d, 0xc2, 0x79, + 0xb1, 0xb7, 0x44, 0x8a, 0x4c, 0xf3, 0x12, 0x9d, 0x2c, 0x6c, 0xca, 0xd9, 0x54, 0xc6, 0x31, 0x26, + 0x20, 0xc7, 0x8e, 0x1a, 0x9b, 0x73, 0xb1, 0xe8, 0x6d, 0xce, 0xd3, 0x05, 0x24, 0xed, 0x51, 0x42, + 0x80, 0xb1, 0xb0, 0x73, 0xa5, 0xc6, 0x38, 0x82, 0x4f, 0x58, 0x78, 0xd6, 0x93, 0x4d, 0xdc, 0x7d, + 0xad, 0xb4, 0xcd, 0x79, 0xb1, 0x80, 0x30, 0xb4, 0x0c, 0x0d, 0xa4, 0x91, 0xc9, 0x11, 0x0f, 0x7a, + 0x2a, 0xd5, 0xaf, 0x57, 0xef, 0xa5, 0x0a, 0xe8, 0xdb, 0x01, 0xe6, 0x47, 0x77, 0x0d, 0xcf, 0x4c, + 0x0c, 0x28, 0xbe, 0xb3, 0x0b, 0xfc, 0xa1, 0xdd, 0x35, 0xd0, 0x33, 0x2d, 0x7d, 0x4a, 0x6b, 0x35, + 0x3e, 0x13, 0xe0, 0x33, 0x59, 0xab, 0x37, 0x49, 0xd5, 0xf3, 0x9e, 0x24, 0xa7, 0x9c, 0x2b, 0x64, + 0xab, 0x94, 0x27, 0x8d, 0xbd, 0xb3, 0xdc, 0x44, 0xf8, 0xf2, 0x50, 0x8a, 0xa0, 0xa3, 0x90, 0x58, + 0x41, 0x59, 0x11, 0xc1, 0x75, 0x46, 0x41, 0x80, 0x0f, 0xa7, 0xb5, 0x29, 0xaf, 0x11, 0x5e, 0xa6, + 0x5e, 0x21, 0x53, 0xdd, 0xdc, 0xd8, 0x02, 0x56, 0xbd, 0xaf, 0x6c, 0xcc, 0x9c, 0x58, 0x2a, 0x9a, + 0x0a, 0xc1, 0xef, 0xf9, 0xd5, 0x22, 0xf5, 0xd7, 0x6a, 0x8f, 0x85, 0x65, 0x0a, 0xe0, 0xc8, 0xd4, + 0x00, 0x3b, 0x64, 0x6d, 0x55, 0x6f, 0xb0, 0xe4, 0x65, 0xed, 0x4a, 0xa0, 0xff, 0xeb, 0x7b, 0xee, + 0x2d, 0xb9, 0xfe, 0xfd, 0xcf, 0xbf, 0xff, 0x95, 0xf5, 0x96, 0xaf, 0xff, 0xfa, 0xc7, 0xdf, 0xd8, + 0x72, 0x6b, 0x36, 0xe8, 0xd8, 0x53, 0x87, 0x6c, 0xb1, 0x5a, 0xb2, 0x67, 0xc4, 0x92, 0xc9, 0x01, + 0xf7, 0xc2, 0x63, 0x73, 0x6e, 0xc2, 0x81, 0x13, 0x1a, 0x97, 0x71, 0x07, 0x14, 0x3c, 0x8e, 0x97, + 0xcd, 0x79, 0xb6, 0x40, 0xcb, 0x6d, 0x04, 0x55, 0x61, 0xee, 0x12, 0x40, 0xfc, 0xed, 0x4d, 0x2a, + 0xc8, 0x16, 0x0f, 0x74, 0xb6, 0x58, 0x5c, 0x1d, 0x8e, 0x4d, 0xb6, 0x6a, 0xef, 0x7a, 0x8b, 0x6d, + 0x8f, 0x9c, 0xbe, 0xd4, 0x6f, 0x58, 0x40, 0xb5, 0xb5, 0x8c, 0xfc, 0xaa, 0xc8, 0x72, 0xb4, 0xd4, + 0xa9, 0xed, 0x19, 0x1f, 0x1a, 0xee, 0xcc, 0xa9, 0x70, 0x76, 0xc9, 0x9b, 0x63, 0xaf, 0x7a, 0x79, + 0xfd, 0x23, 0x74, 0xae, 0x93, 0x9f, 0x77, 0xb2, 0x7b, 0x4a, 0xcd, 0xa4, 0x44, 0x13, 0x72, 0xf0, + 0xe3, 0xd1, 0x87, 0x9f, 0xe8, 0x8c, 0x32, 0xd0, 0xd1, 0x84, 0xa8, 0xe0, 0x0d, 0x1b, 0xd2, 0x76, + 0x11, 0xa6, 0x80, 0xd9, 0x97, 0x6d, 0x67, 0xb5, 0xe4, 0x59, 0x15, 0x04, 0x5e, 0x0d, 0x96, 0xfa, + 0xd2, 0x04, 0x40, 0x7f, 0x3d, 0x71, 0xca, 0x20, 0xaa, 0xc7, 0xc3, 0x25, 0x40, 0xdb, 0x6d, 0x65, + 0x5b, 0xde, 0x8c, 0x37, 0x3f, 0x23, 0x91, 0xf6, 0xed, 0xa8, 0xb9, 0xc1, 0x33, 0x23, 0x0b, 0xca, + 0x19, 0xd1, 0xcd, 0x05, 0x93, 0x88, 0x9a, 0x0b, 0x26, 0xcb, 0x34, 0x16, 0x6e, 0xcd, 0xa4, 0x76, + 0xd9, 0xcf, 0xac, 0x92, 0xde, 0xa2, 0xea, 0xcb, 0x6f, 0x4f, 0xae, 0x34, 0xcd, 0xec, 0x80, 0xc4, + 0x8c, 0x46, 0x32, 0x40, 0xeb, 0x03, 0xa3, 0x55, 0xb6, 0xab, 0x63, 0xba, 0x1a, 0x63, 0x7d, 0xd4, + 0x7c, 0x5d, 0xcb, 0x49, 0xcb, 0x24, 0x59, 0x73, 0xd2, 0xa1, 0x01, 0x9a, 0x2d, 0x0d, 0xa6, 0x64, + 0x12, 0x05, 0x8c, 0x26, 0x3c, 0xcb, 0xd1, 0x27, 0xa3, 0xc9, 0xbb, 0x7e, 0xb3, 0x00, 0x45, 0xa6, + 0xaf, 0xcc, 0x89, 0x26, 0x08, 0x76, 0x86, 0x13, 0x78, 0x8a, 0x38, 0x68, 0xce, 0xd1, 0x72, 0x35, + 0xf2, 0xda, 0x5e, 0x02, 0x4d, 0x1c, 0x7d, 0xf8, 0x11, 0x33, 0x91, 0x6a, 0xb6, 0x15, 0xf3, 0xe6, + 0x07, 0x04, 0x4b, 0xdd, 0x3d, 0x8a, 0x80, 0x4e, 0x8b, 0xf3, 0xd3, 0x82, 0x09, 0xed, 0x3a, 0xdc, + 0x0f, 0x08, 0x92, 0x1c, 0xb9, 0x78, 0x75, 0xa4, 0xea, 0xec, 0xcd, 0x63, 0xc1, 0x00, 0xc6, 0xf5, + 0xea, 0x7e, 0x84, 0x99, 0x29, 0x85, 0xf6, 0xab, 0x01, 0x42, 0xcf, 0x5f, 0xaa, 0xb2, 0x95, 0x7b, + 0x4b, 0xf1, 0xbe, 0xaa, 0x55, 0x07, 0x5e, 0x5d, 0x65, 0xcd, 0xa2, 0xbd, 0xc5, 0x7a, 0x78, 0x1c, + 0xa4, 0xe3, 0x6c, 0xd9, 0xaf, 0x20, 0xf3, 0x3e, 0xae, 0x63, 0xbd, 0x2d, 0x61, 0xbd, 0x6a, 0xab, + 0x96, 0x17, 0x3e, 0xe9, 0xd6, 0x96, 0x3a, 0xe9, 0x9e, 0xee, 0xd1, 0x9f, 0xc0, 0x1c, 0x7f, 0x9a, + 0x25, 0x31, 0x1a, 0xd3, 0xb4, 0x47, 0xea, 0x10, 0x0b, 0xf5, 0x60, 0x44, 0x05, 0xab, 0x22, 0xd5, + 0x62, 0x92, 0x7e, 0x11, 0x7f, 0x06, 0x5d, 0xaa, 0x69, 0x72, 0x74, 0x59, 0x34, 0xc6, 0x48, 0x0a, + 0x8f, 0xa1, 0x04, 0x6c, 0xa5, 0x43, 0x95, 0xf7, 0x59, 0x5b, 0x7b, 0x3e, 0x71, 0xc9, 0x47, 0xb8, + 0x86, 0x02, 0x56, 0x12, 0x43, 0x31, 0x41, 0x51, 0xf1, 0x65, 0xbb, 0x66, 0xf5, 0x9a, 0x9d, 0x99, + 0x99, 0x5a, 0xe7, 0x63, 0x41, 0x5d, 0x05, 0x4d, 0xc6, 0x7b, 0xe6, 0xbe, 0xa9, 0xd7, 0xe9, 0xb0, + 0xb6, 0x99, 0x6c, 0xa9, 0x5b, 0x68, 0xb3, 0xce, 0x68, 0x3c, 0x09, 0x3e, 0x2b, 0x00, 0xca, 0x9f, + 0xcf, 0x84, 0x9e, 0x66, 0x71, 0x8f, 0xc1, 0x0c, 0x6c, 0xe1, 0x05, 0x7a, 0x2a, 0xe0, 0x47, 0x1e, + 0xc2, 0xed, 0xd9, 0x79, 0x3d, 0xf9, 0x22, 0x03, 0x16, 0x05, 0x15, 0x2b, 0x33, 0x13, 0x20, 0x7b, + 0xe3, 0xd4, 0xd7, 0xd4, 0x0b, 0x24, 0xc8, 0xd4, 0x48, 0x26, 0xc2, 0x08, 0x43, 0x8b, 0xb8, 0xe2, + 0x9f, 0xdb, 0x3b, 0x39, 0x11, 0x94, 0x33, 0x7f, 0xd5, 0xf8, 0xdb, 0x94, 0x0b, 0xf3, 0xf7, 0x4d, + 0xf7, 0x06, 0x77, 0xdf, 0xbe, 0x07, 0x50, 0x22, 0x2a, 0x46, 0x53, 0x1f, 0xb8, 0x16, 0x97, 0xce, + 0x87, 0x3f, 0xbc, 0x3b, 0x36, 0xef, 0x47, 0x51, 0x11, 0xcd, 0x14, 0xda, 0x00, 0xf2, 0x96, 0x9d, + 0xc4, 0xfb, 0x55, 0xbf, 0x69, 0xf6, 0xa9, 0x06, 0x5a, 0xdb, 0x12, 0xc2, 0xc9, 0xf7, 0xb4, 0x84, + 0x15, 0x9d, 0x06, 0xc0, 0x57, 0xe5, 0xe4, 0x0c, 0x1d, 0x6a, 0x38, 0x98, 0x3e, 0x0b, 0x29, 0x57, + 0x0f, 0x3a, 0x78, 0x18, 0xc4, 0xf2, 0xa2, 0x99, 0xbf, 0xa7, 0x22, 0xc9, 0x19, 0xda, 0x4e, 0x2c, + 0x87, 0x67, 0x7e, 0xa3, 0xb7, 0x5b, 0xf6, 0x97, 0xc8, 0xb6, 0x5e, 0x9f, 0xc2, 0xd8, 0xf8, 0x9c, + 0x51, 0x0a, 0x34, 0xd2, 0xeb, 0x5d, 0x38, 0xab, 0x2e, 0x38, 0xd5, 0xad, 0x2b, 0x94, 0x34, 0xd3, + 0xce, 0x38, 0x43, 0xc1, 0x0b, 0x28, 0x9b, 0x1f, 0x15, 0x42, 0x29, 0x67, 0x20, 0xc3, 0xe3, 0xe8, + 0x42, 0x0c, 0x3a, 0x32, 0x74, 0x74, 0xe6, 0x54, 0x97, 0xac, 0xf2, 0x2f, 0xc2, 0xa9, 0xfa, 0x29, + 0x15, 0x30, 0x6f, 0x61, 0x9c, 0x32, 0x49, 0xb2, 0x61, 0x94, 0xfc, 0x70, 0x74, 0x70, 0xa8, 0xee, + 0xb8, 0xc6, 0x66, 0x15, 0xb4, 0x89, 0x43, 0x18, 0xf6, 0x1c, 0x39, 0x3d, 0xcd, 0xe0, 0x28, 0xff, + 0xbe, 0x6b, 0x0c, 0x7b, 0x99, 0x5a, 0x5d, 0x0d, 0x3e, 0x02, 0x99, 0xfa, 0x62, 0xb1, 0xa3, 0xe0, + 0xec, 0xbd, 0x9c, 0x3f, 0x67, 0x3e, 0xba, 0x7e, 0x20, 0x06, 0x8e, 0xa3, 0xe9, 0x19, 0x2e, 0xff, + 0x02, 0xac, 0xf8, 0xcd, 0xeb, 0x27, 0xb1, 0x76, 0x3d, 0xa4, 0x2e, 0x8e, 0x69, 0x96, 0x11, 0x41, + 0x5e, 0x08, 0xba, 0xbd, 0x7a, 0x65, 0x0f, 0x5c, 0xdf, 0xae, 0x99, 0x42, 0xf9, 0x33, 0x6c, 0x11, + 0x4b, 0x7d, 0xed, 0x7a, 0x74, 0x05, 0x87, 0x55, 0x94, 0xcb, 0x99, 0x04, 0xcd, 0xa2, 0x85, 0x8a, + 0x6d, 0xaf, 0x8b, 0x07, 0x66, 0xe7, 0xf0, 0x77, 0x72, 0x46, 0xb7, 0xcc, 0xa8, 0xdc, 0x89, 0xcb, + 0xaa, 0x61, 0x16, 0xa5, 0xc1, 0xeb, 0x83, 0xd0, 0x10, 0xc0, 0xdd, 0x22, 0x8a, 0xc3, 0x01, 0xdd, + 0x44, 0xa2, 0x1e, 0x93, 0x05, 0x38, 0x43, 0xf4, 0xc0, 0xdb, 0xc0, 0xd2, 0xac, 0xe5, 0x48, 0xbc, + 0xd3, 0xd3, 0x27, 0x55, 0x57, 0xf4, 0xe3, 0x31, 0xfa, 0x62, 0x13, 0x2f, 0x9c, 0xe5, 0x99, 0xd2, + 0x0c, 0x7c, 0x56, 0x03, 0xf4, 0xc7, 0xa4, 0x3e, 0xe9, 0x4d, 0x02, 0x08, 0x44, 0x55, 0x4f, 0xac, + 0xb3, 0x1c, 0x16, 0x66, 0x61, 0xab, 0xb9, 0x48, 0xa8, 0x7a, 0x09, 0x3a, 0x54, 0x17, 0x8d, 0xa3, + 0xdb, 0x76, 0xc2, 0xbe, 0x90, 0xcc, 0x51, 0x22, 0x47, 0xe7, 0x9c, 0xbd, 0x21, 0x65, 0xf6, 0x06, + 0x1d, 0xfb, 0xa1, 0x02, 0x61, 0xcd, 0xd3, 0x7a, 0x80, 0xe9, 0x25, 0x31, 0xbd, 0x8c, 0x46, 0xe7, + 0x2b, 0xbe, 0xb5, 0x5d, 0xac, 0xbe, 0xac, 0x82, 0xd9, 0x92, 0xa4, 0x80, 0x82, 0x2a, 0x8f, 0x52, + 0x73, 0xea, 0x44, 0xa9, 0x72, 0xb4, 0xec, 0xd0, 0xcd, 0x1d, 0x40, 0x6f, 0x52, 0x08, 0x91, 0xf6, + 0x2b, 0x7f, 0xf6, 0x0c, 0x9e, 0xc2, 0xad, 0x27, 0xbb, 0xdd, 0x6e, 0xf7, 0x9b, 0xbe, 0xb3, 0xbf, + 0x7e, 0x37, 0x08, 0xd1, 0xf1, 0x06, 0x79, 0x04, 0x02, 0x43, 0xa7, 0x29, 0x97, 0xb0, 0xb1, 0x2e, + 0xb7, 0x10, 0xf1, 0x2d, 0xa9, 0xad, 0xad, 0x27, 0xdf, 0x3d, 0x7f, 0xfe, 0x9c, 0xa4, 0x96, 0x49, + 0x6c, 0xc2, 0x84, 0x9c, 0xb3, 0x1e, 0x3d, 0x41, 0x25, 0xbd, 0x32, 0x0a, 0xd9, 0x96, 0x76, 0x68, + 0x06, 0x85, 0xd3, 0xaa, 0x36, 0x5a, 0x17, 0x6f, 0x43, 0xfe, 0x69, 0xf3, 0xdf, 0x0e, 0x65, 0x0e, + 0x30, 0x3c, 0x0d, 0x7f, 0x30, 0xcc, 0xce, 0xc1, 0x40, 0x95, 0x79, 0xf8, 0x14, 0x1b, 0xe0, 0x67, + 0xdf, 0x31, 0xc2, 0x1c, 0xf7, 0xcd, 0x2f, 0x5e, 0x8b, 0xcc, 0x34, 0x90, 0xeb, 0xfa, 0x57, 0xf7, + 0x1d, 0xa1, 0x0b, 0x08, 0x5d, 0xd3, 0xff, 0x5c, 0xd2, 0x09, 0xf5, 0xb6, 0x74, 0xa9, 0xfa, 0xfa, + 0xf8, 0xe8, 0xd9, 0x53, 0xdf, 0xae, 0x09, 0x94, 0xca, 0x3f, 0x97, 0x12, 0x41, 0x8e, 0x07, 0xcc, + 0x79, 0x7a, 0x03, 0xe2, 0x10, 0xe5, 0x24, 0xf2, 0xf8, 0xd5, 0x8b, 0xde, 0x5a, 0x63, 0x59, 0x35, + 0x53, 0xab, 0x19, 0xcc, 0x0c, 0x68, 0xdf, 0x3c, 0x5f, 0xe2, 0xd0, 0xde, 0x4e, 0x39, 0x2d, 0x78, + 0xdd, 0x08, 0xe7, 0xdb, 0x8d, 0x3e, 0x92, 0x5a, 0x60, 0x6f, 0x7b, 0x35, 0xb7, 0x39, 0xcd, 0x1a, + 0x55, 0xf3, 0xda, 0x8d, 0xf7, 0xdf, 0xd5, 0x1b, 0xb7, 0xbe, 0x70, 0x67, 0x7b, 0x15, 0xe6, 0x3c, + 0xb6, 0x71, 0xeb, 0xa1, 0x9d, 0x2d, 0x6f, 0x78, 0xfb, 0x56, 0xa0, 0x32, 0xfb, 0xf1, 0xd1, 0x41, + 0xc3, 0xd6, 0x95, 0xa9, 0x5b, 0xff, 0x23, 0x5b, 0xd7, 0xa6, 0x6e, 0xd1, 0xf5, 0xdd, 0x6f, 0x33, + 0x76, 0x7d, 0xe1, 0xf7, 0x55, 0xd6, 0xae, 0x99, 0xcd, 0xe6, 0x74, 0x3d, 0xf8, 0x1b, 0xed, 0x5d, + 0xdf, 0x28, 0x7e, 0x95, 0xc1, 0x6b, 0xe6, 0xda, 0xd7, 0x6f, 0xbf, 0xf4, 0xe0, 0xad, 0xa5, 0xb3, + 0xdf, 0xfe, 0xea, 0xe6, 0x0f, 0x3b, 0xdb, 0xf0, 0x22, 0xad, 0xac, 0x47, 0x28, 0xca, 0x4f, 0x58, + 0xff, 0x57, 0xa1, 0xae, 0x29, 0x41, 0x10, 0x54, 0x54, 0x14, 0x9b, 0xf7, 0x26, 0xc5, 0xd6, 0x7f, + 0x99, 0xe0, 0x3a, 0x94, 0xc9, 0xf1, 0x43, 0xd9, 0x9e, 0x74, 0x32, 0xff, 0x37, 0xfd, 0x0f, 0x9e, + 0x59, 0xe7, 0xd6, 0x4d, 0x1d, 0x00, 0x00 }; diff --git a/wled00/set.cpp b/wled00/set.cpp index 397dd09655..f91fddcd46 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -508,8 +508,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) if (!requestJSONBufferLock(5)) return; // global I2C & SPI pins - int8_t hw_sda_pin = !request->arg(F("SDA")).length() ? -1 : (int)request->arg(F("SDA")).toInt(); - int8_t hw_scl_pin = !request->arg(F("SCL")).length() ? -1 : (int)request->arg(F("SCL")).toInt(); + int8_t hw_sda_pin = !request->arg(F("SDApin")).length() ? -1 : (int)request->arg(F("SDApin")).toInt(); + int8_t hw_scl_pin = !request->arg(F("SCLpin")).length() ? -1 : (int)request->arg(F("SCLpin")).toInt(); #ifdef ESP8266 // cannot change pins on ESP8266 if (hw_sda_pin >= 0 && hw_sda_pin != HW_PIN_SDA) hw_sda_pin = HW_PIN_SDA; @@ -531,9 +531,9 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) i2c_sda = -1; i2c_scl = -1; } - int8_t hw_mosi_pin = !request->arg(F("MOSI")).length() ? -1 : (int)request->arg(F("MOSI")).toInt(); - int8_t hw_miso_pin = !request->arg(F("MISO")).length() ? -1 : (int)request->arg(F("MISO")).toInt(); - int8_t hw_sclk_pin = !request->arg(F("SCLK")).length() ? -1 : (int)request->arg(F("SCLK")).toInt(); + int8_t hw_mosi_pin = !request->arg(F("MOSIpin")).length() ? -1 : (int)request->arg(F("MOSIpin")).toInt(); + int8_t hw_miso_pin = !request->arg(F("MISOpin")).length() ? -1 : (int)request->arg(F("MISOpin")).toInt(); + int8_t hw_sclk_pin = !request->arg(F("SCLKpin")).length() ? -1 : (int)request->arg(F("SCLKpin")).toInt(); #ifdef ESP8266 // cannot change pins on ESP8266 if (hw_mosi_pin >= 0 && hw_mosi_pin != HW_PIN_DATASPI) hw_mosi_pin = HW_PIN_DATASPI; diff --git a/wled00/xml.cpp b/wled00/xml.cpp index b17c7d86cb..13095dd4e1 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -702,34 +702,34 @@ void getSettingsJS(byte subPage, char* dest) oappend(SET_F("numM=")); oappendi(usermods.getModCount()); oappend(";"); - sappend('v',SET_F("SDA"),i2c_sda); - sappend('v',SET_F("SCL"),i2c_scl); - sappend('v',SET_F("MOSI"),spi_mosi); - sappend('v',SET_F("MISO"),spi_miso); - sappend('v',SET_F("SCLK"),spi_sclk); + sappend('v',SET_F("SDApin"),i2c_sda); + sappend('v',SET_F("SCLpin"),i2c_scl); + sappend('v',SET_F("MOSIpin"),spi_mosi); + sappend('v',SET_F("MISOpin"),spi_miso); + sappend('v',SET_F("SCLKpin"),spi_sclk); //WLEDMM: add help info showing defaults #ifdef HW_PIN_SDA - oappend(SET_F("addInfo('SDA',0,'⎌ ")); oappendi(HW_PIN_SDA); oappend("');"); + oappend(SET_F("addInfo('SDApin',0,'⎌ ")); oappendi(HW_PIN_SDA); oappend("');"); #endif #ifdef HW_PIN_SCL - oappend(SET_F("addInfo('SCL',0,'⎌ ")); oappendi(HW_PIN_SCL); oappend("');"); + oappend(SET_F("addInfo('SCLpin',0,'⎌ ")); oappendi(HW_PIN_SCL); oappend("');"); #endif #ifdef HW_PIN_DATASPI - oappend(SET_F("addInfo('MOSI',0,'⎌ ")); oappendi(HW_PIN_DATASPI); oappend("');"); + oappend(SET_F("addInfo('MOSIpin',0,'⎌ ")); oappendi(HW_PIN_DATASPI); oappend("');"); #endif #ifdef HW_PIN_MISOSPI - oappend(SET_F("addInfo('MISO',0,'⎌ ")); oappendi(HW_PIN_MISOSPI); oappend("');"); + oappend(SET_F("addInfo('MISOpin',0,'⎌ ")); oappendi(HW_PIN_MISOSPI); oappend("');"); #endif #ifdef HW_PIN_CLOCKSPI - oappend(SET_F("addInfo('SCLK',0,'⎌ ")); oappendi(HW_PIN_CLOCKSPI); oappend("');"); + oappend(SET_F("addInfo('SCLKpin',0,'⎌ ")); oappendi(HW_PIN_CLOCKSPI); oappend("');"); #endif //WLEDMM: this puts info in the placeholder of the field, not intuitive - // oappend(SET_F("addInfo('SDA','")); oappendi(HW_PIN_SDA); oappend(SET_F("');")); - // oappend(SET_F("addInfo('SCL','")); oappendi(HW_PIN_SCL); oappend(SET_F("');")); - // oappend(SET_F("addInfo('MOSI','")); oappendi(HW_PIN_DATASPI); oappend(SET_F("');")); - // oappend(SET_F("addInfo('MISO','")); oappendi(HW_PIN_MISOSPI); oappend(SET_F("');")); - // oappend(SET_F("addInfo('SCLK','")); oappendi(HW_PIN_CLOCKSPI); oappend(SET_F("');")); + // oappend(SET_F("addInfo('SDApin','")); oappendi(HW_PIN_SDA); oappend(SET_F("');")); + // oappend(SET_F("addInfo('SCLpin','")); oappendi(HW_PIN_SCL); oappend(SET_F("');")); + // oappend(SET_F("addInfo('MOSIpin','")); oappendi(HW_PIN_DATASPI); oappend(SET_F("');")); + // oappend(SET_F("addInfo('MISOpin','")); oappendi(HW_PIN_MISOSPI); oappend(SET_F("');")); + // oappend(SET_F("addInfo('SCLKpin','")); oappendi(HW_PIN_CLOCKSPI); oappend(SET_F("');")); usermods.appendConfigData(); }