From 998f2f942175d823ff80d6410e02e28010a105ea Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Sun, 7 Aug 2022 16:43:29 +0200 Subject: [PATCH] Global I2C & SPI pin allocation. --- wled00/cfg.cpp | 39 +++++ wled00/const.h | 10 ++ wled00/data/settings_um.htm | 12 ++ wled00/html_settings.h | 296 +++++++++++++++++++----------------- wled00/pin_manager.h | 3 +- wled00/set.cpp | 47 ++++++ wled00/wled.h | 8 + wled00/xml.cpp | 15 ++ 8 files changed, 287 insertions(+), 143 deletions(-) diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 4a3888212..6f243d909 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -267,6 +267,36 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { if (serialBaud < 96 || serialBaud > 15000) serialBaud = 1152; updateBaudRate(serialBaud *100); + JsonArray hw_if_i2c = hw[F("if")][F("i2c-pin")]; + CJSON(i2c_sda, hw_if_i2c[0]); + CJSON(i2c_scl, hw_if_i2c[1]); + PinManagerPinType i2c[2] = { { i2c_sda, true }, { i2c_scl, true } }; + if (pinManager.allocateMultiplePins(i2c, 2, PinOwner::HW_I2C)) { + #ifdef ESP32 + Wire.setPins(i2c_sda, i2c_scl); // this will fail if Wire is initilised (Wire.begin() called prior) + #endif + Wire.begin(); + } else { + i2c_sda = -1; + i2c_scl = -1; + } + JsonArray hw_if_spi = hw[F("if")][F("spi-pin")]; + CJSON(spi_mosi, hw_if_spi[0]); + CJSON(spi_sclk, hw_if_spi[1]); + CJSON(spi_cs, hw_if_spi[2]); + PinManagerPinType spi[3] = { { spi_mosi, true }, { spi_sclk, true }, { spi_cs, true } }; + if (pinManager.allocateMultiplePins(spi, 3, PinOwner::HW_SPI)) { + #ifdef ESP8266 + SPI.begin(); + #else + SPI.begin(spi_sclk, (int8_t)-1, spi_mosi, spi_cs); + #endif + } else { + spi_mosi = -1; + spi_sclk = -1; + spi_cs = -1; + } + //int hw_status_pin = hw[F("status")]["pin"]; // -1 JsonObject light = doc[F("light")]; @@ -715,6 +745,15 @@ void serializeConfig() { hw[F("baud")] = serialBaud; + JsonObject hw_if = hw.createNestedObject(F("if")); + JsonArray hw_if_i2c = hw_if.createNestedArray("i2c-pin"); + hw_if_i2c.add(i2c_sda); + hw_if_i2c.add(i2c_scl); + JsonArray hw_if_spi = hw_if.createNestedArray("spi-pin"); + hw_if_spi.add(spi_mosi); + hw_if_spi.add(spi_sclk); + hw_if_spi.add(spi_cs); + //JsonObject hw_status = hw.createNestedObject("status"); //hw_status["pin"] = -1; diff --git a/wled00/const.h b/wled00/const.h index 499724c4c..b89ea7c06 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -389,6 +389,9 @@ #if defined(ESP8266) && defined(HW_PIN_DATASPI) #undef HW_PIN_DATASPI #endif +#if defined(ESP8266) && defined(HW_PIN_CSSPI) + #undef HW_PIN_CSSPI +#endif #ifndef HW_PIN_CLOCKSPI #ifdef ESP8266 #define HW_PIN_CLOCKSPI 14 @@ -403,5 +406,12 @@ #define HW_PIN_DATASPI 23 #endif #endif +#ifndef HW_PIN_CSSPI + #ifdef ESP8266 + #define HW_PIN_CSSPI 15 + #else + #define HW_PIN_CSSPI 5 + #endif +#endif #endif diff --git a/wled00/data/settings_um.htm b/wled00/data/settings_um.htm index 4b9d47cc4..e23285660 100644 --- a/wled00/data/settings_um.htm +++ b/wled00/data/settings_um.htm @@ -55,6 +55,7 @@ if (o.type=="number" && n.substr(0,3)=="pin") { for (var i=0; i39) { o.style.color="red"; break; } else o.style.color=o.value>33?"orange":"#fff"; } } @@ -79,6 +80,7 @@ } } } + function updPins() {} function addField(k,f,o,a=false) { //key, field, (sub)object, isArray if (isO(o)) { urows += '
'; @@ -205,6 +207,16 @@

Usermod Setup

+ Global I2C GPIOs (HW)
+ (only changable on ESP32, change requires reboot!)
+ SDA: + SCL: +
+ Global SPI GPIOs (HW)
+ (only changable on ESP32, change requires reboot!)
+ MOSI: + SCLK: + CS:
Loading settings...
diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 99f3ab863..b10412975 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -1582,148 +1582,162 @@ const uint8_t PAGE_settings_sec[] PROGMEM = { // Autogenerated from wled00/data/settings_um.htm, do not edit!! -const uint16_t PAGE_settings_um_length = 2230; +const uint16_t PAGE_settings_um_length = 2451; const uint8_t PAGE_settings_um[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48, - 0x12, 0xfe, 0xce, 0xaf, 0x10, 0x13, 0x0a, 0xa4, 0xb2, 0x90, 0x4d, 0xb8, 0xdd, 0x4b, 0x6c, 0x8f, - 0xd9, 0x90, 0x97, 0x0b, 0x57, 0x49, 0xa0, 0x8a, 0xec, 0x5e, 0x5d, 0x71, 0xd4, 0x22, 0x4b, 0x63, - 0x7b, 0x82, 0x3c, 0xa3, 0x9a, 0x19, 0xf1, 0x72, 0xc6, 0xff, 0xfd, 0x9e, 0x1e, 0x49, 0xc6, 0x26, - 0x64, 0xf7, 0xae, 0xee, 0x0b, 0xa0, 0x51, 0x4f, 0xab, 0xe7, 0xe9, 0xa7, 0x9f, 0xee, 0x61, 0xb8, - 0xfd, 0xee, 0xf4, 0xed, 0xd7, 0x7f, 0x9e, 0xbd, 0x0f, 0x66, 0x6e, 0x5e, 0x8c, 0x86, 0xcd, 0x4f, - 0x91, 0xe6, 0x41, 0x91, 0xaa, 0x29, 0x67, 0x42, 0xb1, 0xd1, 0x70, 0x2e, 0x5c, 0x1a, 0x64, 0xb3, - 0xd4, 0x58, 0xe1, 0x38, 0xab, 0xdc, 0x64, 0xff, 0x55, 0xbb, 0xba, 0xa5, 0xd2, 0xb9, 0xe0, 0xec, - 0x46, 0x8a, 0xdb, 0x52, 0x1b, 0xc7, 0x82, 0x4c, 0x2b, 0x27, 0x14, 0xcc, 0x6e, 0x65, 0xee, 0x66, - 0xfc, 0xa7, 0x5e, 0x6f, 0x65, 0xfa, 0xe4, 0x55, 0x2e, 0x6e, 0x64, 0x26, 0xf6, 0xfd, 0x43, 0x2c, - 0x95, 0x74, 0x32, 0x2d, 0xf6, 0x6d, 0x96, 0x16, 0x82, 0x1f, 0xc4, 0xf3, 0xf4, 0x4e, 0xce, 0xab, - 0xf9, 0xea, 0xb9, 0xb2, 0xc2, 0xf8, 0x87, 0x74, 0x8c, 0x67, 0xa5, 0xd9, 0x77, 0x5f, 0x1e, 0x0d, - 0x9d, 0x74, 0x85, 0x18, 0xfd, 0x0a, 0xcb, 0xb9, 0xce, 0x83, 0x73, 0xe1, 0x9c, 0x54, 0x53, 0x3b, - 0xec, 0xd6, 0xeb, 0x43, 0x9b, 0x19, 0x59, 0xba, 0xd1, 0xd6, 0x4d, 0x6a, 0x02, 0x7d, 0xab, 0x84, - 0x89, 0x0b, 0x9d, 0xc9, 0x32, 0xae, 0x8c, 0xbe, 0xb5, 0x71, 0xce, 0x73, 0x9d, 0x55, 0x73, 0xc4, - 0x17, 0x57, 0xf3, 0xb7, 0x93, 0x29, 0x5f, 0x2c, 0xe3, 0x52, 0x2a, 0xcb, 0x2f, 0x7e, 0x8e, 0xff, - 0x1a, 0xbf, 0x8a, 0x5f, 0xc7, 0x07, 0xbd, 0xf8, 0xe0, 0xe0, 0x92, 0x16, 0x4f, 0xf9, 0x05, 0x33, - 0xf6, 0x26, 0x67, 0xf1, 0x9f, 0xff, 0xba, 0xa4, 0xaf, 0xf0, 0xed, 0x83, 0x58, 0x55, 0xf3, 0xcf, - 0xbc, 0x37, 0x98, 0x54, 0x2a, 0x73, 0x52, 0xab, 0x60, 0x7a, 0x92, 0x87, 0x22, 0x5a, 0x18, 0xe1, - 0x2a, 0xa3, 0x82, 0x3c, 0x99, 0x0a, 0xf7, 0xbe, 0x10, 0x14, 0xc0, 0xf1, 0xbd, 0x7f, 0xb5, 0x5c, - 0x99, 0x4a, 0x7b, 0xba, 0x66, 0x2a, 0x76, 0x77, 0x99, 0x1e, 0x7f, 0x13, 0x99, 0x63, 0x9c, 0xbb, - 0xfb, 0x52, 0xe8, 0x09, 0xad, 0x6d, 0xbf, 0x31, 0x26, 0xbd, 0x4f, 0xa4, 0xf5, 0xbf, 0x37, 0xf6, - 0x7f, 0x0c, 0xa3, 0xc5, 0xad, 0x54, 0xb9, 0xbe, 0x4d, 0x74, 0x29, 0x54, 0xc8, 0x66, 0xce, 0x95, - 0xb6, 0xdf, 0xed, 0x4e, 0xa5, 0x9b, 0x55, 0xe3, 0x24, 0xd3, 0xf3, 0xee, 0x1b, 0x69, 0x32, 0xad, - 0xf5, 0xb5, 0x14, 0xdd, 0x7f, 0x7c, 0x7a, 0xff, 0xae, 0x7b, 0x2b, 0xaf, 0x65, 0xb7, 0xc5, 0xf0, - 0x45, 0x55, 0x83, 0xba, 0x6f, 0x9b, 0x05, 0xb6, 0xe6, 0xfd, 0xf8, 0xa9, 0xf7, 0xee, 0xca, 0x2a, - 0x66, 0xbf, 0x5b, 0x51, 0x4c, 0xd6, 0xad, 0x0b, 0x9d, 0xe6, 0x7f, 0x3f, 0x0f, 0x45, 0xec, 0xf8, - 0x76, 0x2f, 0x5a, 0x14, 0xc2, 0x05, 0x8a, 0xe7, 0x49, 0x66, 0x44, 0xea, 0x44, 0x03, 0x40, 0xc8, - 0xea, 0x5c, 0xb1, 0x68, 0xa0, 0x12, 0x38, 0x7b, 0xe3, 0x9c, 0x91, 0xe3, 0xca, 0x09, 0xbc, 0x30, - 0x19, 0x8b, 0x45, 0x14, 0x3f, 0x5d, 0x27, 0x1c, 0xf0, 0x39, 0x27, 0xee, 0x5c, 0xf7, 0x5b, 0x7a, - 0x93, 0xb6, 0x0e, 0xbe, 0x33, 0x4c, 0xed, 0xbd, 0x82, 0x0b, 0x17, 0xc5, 0x79, 0x32, 0xd6, 0xf9, - 0x7d, 0x92, 0x96, 0x08, 0x3a, 0x7f, 0x3b, 0x93, 0x45, 0x1e, 0x2a, 0xb2, 0x4f, 0xf3, 0xfc, 0xfd, - 0x0d, 0xa2, 0xf8, 0x24, 0x2d, 0xe8, 0x2a, 0x4c, 0xc8, 0x28, 0x66, 0x16, 0x87, 0x11, 0x1f, 0x2d, - 0xfe, 0x26, 0xdc, 0x6f, 0x61, 0xb4, 0x7c, 0xde, 0x4e, 0x18, 0xa3, 0x0d, 0xc2, 0x83, 0x1d, 0xb8, - 0x6e, 0x75, 0x21, 0x92, 0x42, 0x4f, 0x43, 0xf6, 0x9e, 0xd6, 0x83, 0xe6, 0xf0, 0x00, 0x26, 0x98, - 0xc8, 0x42, 0xf8, 0x63, 0x80, 0xdc, 0x06, 0xc7, 0xfd, 0xd4, 0xac, 0x23, 0x93, 0xd8, 0x38, 0x91, - 0xd3, 0xca, 0xa4, 0x1e, 0xad, 0xfa, 0x18, 0xc1, 0x24, 0xc5, 0x86, 0x3c, 0xf9, 0x97, 0x3a, 0x51, - 0xc8, 0x55, 0x09, 0xd0, 0x44, 0x50, 0xa6, 0x53, 0x11, 0xe4, 0xa9, 0x4b, 0xb7, 0x01, 0xef, 0x1a, - 0xc0, 0xe7, 0x48, 0x07, 0xa3, 0x0f, 0xf4, 0x41, 0x8f, 0x26, 0x2f, 0xa0, 0xa0, 0xf7, 0x97, 0x94, - 0x46, 0x3b, 0x9d, 0xe9, 0x62, 0x77, 0x37, 0xf4, 0xb4, 0xec, 0xc5, 0xa1, 0x2f, 0x02, 0x4e, 0x16, - 0xc5, 0xb9, 0xd3, 0x06, 0x5e, 0x89, 0x8a, 0x27, 0x4e, 0xcc, 0xe9, 0xe0, 0xd9, 0x49, 0xc9, 0xa2, - 0xe8, 0xe1, 0xa1, 0x31, 0xc3, 0xfe, 0x79, 0x89, 0x80, 0x3f, 0xc0, 0x7f, 0xf0, 0x59, 0xe7, 0x22, - 0x09, 0xce, 0x0a, 0x91, 0x5a, 0x11, 0x00, 0x08, 0x61, 0x02, 0xa2, 0x4e, 0x70, 0x72, 0x86, 0x90, - 0xe2, 0x0d, 0x8f, 0x76, 0xd3, 0x63, 0x5d, 0x79, 0x51, 0x04, 0xab, 0x1c, 0xf1, 0xfa, 0xda, 0xc0, - 0x37, 0xa8, 0x24, 0x58, 0x35, 0x67, 0x51, 0x22, 0x15, 0x00, 0xfd, 0xf8, 0xf5, 0xf3, 0x27, 0xce, - 0xbe, 0xe8, 0xa0, 0x29, 0x69, 0x1b, 0xa0, 0x1e, 0x5d, 0x5a, 0x10, 0x14, 0x6c, 0xa3, 0x3c, 0x3e, - 0xac, 0x97, 0x07, 0xe7, 0xbc, 0x83, 0x7a, 0x10, 0xdb, 0x9c, 0x87, 0xbd, 0x87, 0xcd, 0x3a, 0x3a, - 0x79, 0xce, 0x90, 0x7f, 0x67, 0x98, 0xcd, 0x44, 0x76, 0x4d, 0x1c, 0x8d, 0x16, 0xa4, 0x16, 0x8a, - 0x8b, 0x84, 0xd4, 0x26, 0x31, 0xa2, 0x2c, 0xd2, 0x0c, 0x2c, 0xba, 0xb8, 0x04, 0xd9, 0x10, 0xa7, - 0xad, 0xc6, 0xd6, 0x99, 0x70, 0xff, 0x30, 0x1a, 0xc8, 0x49, 0xc8, 0x70, 0x8e, 0xb1, 0x30, 0xc0, - 0x5d, 0x24, 0x44, 0x48, 0x14, 0x2a, 0xd4, 0x02, 0x8f, 0xaa, 0x35, 0xec, 0xc5, 0x87, 0x51, 0x34, - 0xd1, 0x26, 0x24, 0xb7, 0x12, 0x72, 0x20, 0x87, 0x24, 0x32, 0x49, 0x21, 0xd4, 0xd4, 0xcd, 0x06, - 0xb2, 0xd3, 0x89, 0xe0, 0xc7, 0x6d, 0x73, 0x52, 0x99, 0x0b, 0x79, 0x19, 0x2d, 0xf0, 0x28, 0x92, - 0x9b, 0xb4, 0xa8, 0x10, 0x26, 0x99, 0x62, 0xf1, 0xe1, 0xa1, 0x59, 0x19, 0xee, 0x1f, 0xac, 0xfe, - 0x1e, 0x1d, 0xbe, 0x8e, 0x16, 0x00, 0xda, 0xdd, 0x83, 0x75, 0xc8, 0xb0, 0x36, 0x9c, 0x19, 0x91, - 0xb3, 0xc1, 0x18, 0x95, 0x75, 0xbd, 0xdc, 0x7c, 0xb3, 0xda, 0x73, 0x78, 0xc4, 0x90, 0x20, 0x35, - 0x15, 0xac, 0xcf, 0x5e, 0x4c, 0x26, 0x13, 0xb6, 0x7c, 0x04, 0x01, 0x2c, 0x38, 0xc3, 0x07, 0x09, - 0x31, 0x04, 0x51, 0x6b, 0x90, 0x8f, 0x9d, 0xb8, 0xed, 0x2e, 0x54, 0x2c, 0x2f, 0xc1, 0xd7, 0x53, - 0xaf, 0x44, 0x09, 0xd2, 0x6f, 0xa4, 0x20, 0xe3, 0xa8, 0x31, 0x96, 0x51, 0xe4, 0x55, 0x96, 0xab, - 0xb8, 0xf5, 0x24, 0xa3, 0x81, 0x28, 0xc0, 0x15, 0x82, 0xaa, 0x05, 0xe6, 0x0f, 0x20, 0x25, 0x4f, - 0x9b, 0xa2, 0x26, 0x1f, 0xc1, 0x73, 0x00, 0xcf, 0x0d, 0x65, 0x8b, 0x9c, 0x23, 0xe4, 0x2e, 0xdc, - 0xe5, 0x88, 0xf7, 0xc0, 0x6d, 0x8f, 0x69, 0x59, 0xd9, 0x59, 0x48, 0x6b, 0x91, 0xd7, 0xec, 0xfa, - 0xd9, 0x87, 0x14, 0xb5, 0x71, 0x7c, 0x67, 0xfd, 0x63, 0xd3, 0x1f, 0x84, 0xf2, 0x4c, 0x18, 0xab, - 0xd3, 0xd2, 0xa7, 0x1f, 0xe1, 0x84, 0x5c, 0x7c, 0x90, 0x02, 0x22, 0x03, 0x5a, 0xc5, 0x00, 0x0f, - 0x3d, 0x61, 0x05, 0xac, 0x8a, 0xa2, 0x85, 0x6f, 0x43, 0x1d, 0xbe, 0x37, 0x9c, 0x99, 0xc0, 0xe7, - 0xaa, 0xe9, 0x93, 0xfd, 0x97, 0x3f, 0xf7, 0xca, 0x3b, 0x36, 0xda, 0x1b, 0x3c, 0x62, 0x2f, 0x63, - 0xf3, 0x0c, 0xf6, 0xf0, 0xc2, 0x2a, 0x75, 0xad, 0x10, 0x38, 0xa0, 0xe5, 0x8e, 0xb8, 0x21, 0x55, - 0x56, 0x54, 0x39, 0x5e, 0x22, 0xc1, 0xd1, 0xd1, 0x5a, 0x0c, 0x70, 0x11, 0xf5, 0x1f, 0x9f, 0x3b, - 0x78, 0xdf, 0x71, 0x7e, 0x75, 0xf9, 0xfc, 0x81, 0xd5, 0x23, 0xf6, 0x06, 0x87, 0x36, 0x43, 0xd5, - 0x1e, 0xda, 0xe0, 0xd0, 0x9b, 0xa7, 0xbb, 0x30, 0x97, 0x31, 0xd4, 0xdd, 0x43, 0xe7, 0x2b, 0xc8, - 0xc6, 0xba, 0x6d, 0x55, 0x6a, 0x60, 0x6f, 0xa5, 0xcb, 0x80, 0x6f, 0xb4, 0xc8, 0xa0, 0x1c, 0x6c, - 0xac, 0x21, 0x94, 0xa9, 0x62, 0x7d, 0xcd, 0x99, 0x2f, 0xbc, 0xb1, 0xbe, 0x63, 0xb1, 0xe5, 0x7b, - 0x35, 0xeb, 0x99, 0x33, 0x95, 0x60, 0x7b, 0x9d, 0x50, 0x1d, 0xb1, 0xba, 0x30, 0xc1, 0xea, 0x3e, - 0x98, 0x52, 0x33, 0x7b, 0xe0, 0x7d, 0x34, 0x85, 0xd7, 0xb7, 0xfc, 0xaa, 0xd9, 0xb5, 0xb3, 0x50, - 0x4b, 0x76, 0x15, 0x37, 0x3c, 0xe3, 0x6e, 0x8d, 0x57, 0x47, 0x21, 0xe1, 0x1c, 0x60, 0xc4, 0xe0, - 0xec, 0xf0, 0x35, 0x0b, 0xe6, 0x52, 0x71, 0xb6, 0x7f, 0x00, 0xef, 0x45, 0x6a, 0x2d, 0x67, 0x96, - 0xed, 0x21, 0x5c, 0x26, 0x15, 0xfa, 0x47, 0xdf, 0x9b, 0x42, 0xe0, 0x4b, 0xce, 0x52, 0x75, 0xbf, - 0xb2, 0xb9, 0xbb, 0x2b, 0xd8, 0x5e, 0x13, 0x41, 0x2e, 0x26, 0x69, 0x55, 0x38, 0x8a, 0x9f, 0xfa, - 0x0f, 0xc5, 0xbe, 0x11, 0xc5, 0x93, 0x74, 0xfe, 0x84, 0x74, 0x0e, 0xd8, 0xd5, 0xf2, 0x49, 0x72, - 0x40, 0xc4, 0x86, 0x02, 0xa2, 0x8d, 0x95, 0x2c, 0x72, 0x71, 0x77, 0x3a, 0xf1, 0x06, 0x9d, 0x03, - 0xe8, 0x65, 0x63, 0x72, 0x15, 0xec, 0x2c, 0xdc, 0xb2, 0x1f, 0xe0, 0x80, 0x2b, 0xc8, 0x38, 0xd7, - 0x47, 0xed, 0xeb, 0xa1, 0x54, 0x65, 0xe5, 0x02, 0x82, 0x9c, 0xb3, 0x99, 0xcc, 0x73, 0xcc, 0x71, - 0x41, 0x3d, 0x30, 0xed, 0x2c, 0xc4, 0xb2, 0x4f, 0xbb, 0x77, 0x16, 0xf2, 0x88, 0xaa, 0x0e, 0x58, - 0x22, 0xc6, 0x26, 0xe0, 0x49, 0x8a, 0x94, 0xb1, 0xd1, 0x55, 0x5f, 0x42, 0x8f, 0xff, 0x6f, 0x6f, - 0x3b, 0x0b, 0xbd, 0x84, 0xb3, 0xc7, 0xb0, 0x37, 0x3c, 0xed, 0x2c, 0x3c, 0xc6, 0x9c, 0x02, 0x5f, - 0x65, 0x10, 0x1b, 0xfe, 0xd8, 0xf5, 0xce, 0xc2, 0x2e, 0xd1, 0x4b, 0xbd, 0xa3, 0x86, 0x30, 0xa1, - 0x9b, 0x49, 0x1b, 0xef, 0xed, 0x2c, 0x7e, 0x8c, 0xdc, 0x72, 0x2f, 0xc2, 0x84, 0x38, 0x36, 0xa3, - 0xab, 0xe5, 0x46, 0x49, 0xbe, 0x33, 0xba, 0x44, 0x87, 0x54, 0xb5, 0xd8, 0xff, 0x68, 0x1a, 0x11, - 0x05, 0x4d, 0x5b, 0x11, 0x8a, 0x76, 0x7d, 0x4e, 0xb3, 0xc7, 0xf7, 0x5f, 0x10, 0x69, 0x5b, 0x3c, - 0xd1, 0xc5, 0xc1, 0x25, 0x75, 0x01, 0x09, 0xd9, 0x3f, 0xf9, 0x72, 0xf6, 0xeb, 0x57, 0x3a, 0x99, - 0x4c, 0x5c, 0x3a, 0x25, 0x2b, 0xa4, 0xb7, 0x66, 0x47, 0xbd, 0x08, 0x00, 0x1e, 0x1e, 0x1e, 0xfb, - 0x45, 0xb3, 0x14, 0xd5, 0x21, 0x08, 0x3c, 0x7a, 0x04, 0x07, 0xd2, 0xf7, 0x9d, 0xc1, 0x66, 0xe1, - 0xc9, 0x24, 0x6d, 0xe7, 0x99, 0x55, 0xe7, 0xe8, 0x74, 0x4c, 0xdd, 0xab, 0x2c, 0x5f, 0x7f, 0x8d, - 0x42, 0x1c, 0xd4, 0xb3, 0xd1, 0x36, 0xb7, 0xde, 0x17, 0x82, 0xf3, 0xae, 0xd7, 0x17, 0x3c, 0xa7, - 0xd7, 0x17, 0x3c, 0x61, 0xd7, 0x16, 0x9e, 0x0c, 0x51, 0xf5, 0x72, 0x6c, 0xeb, 0x20, 0xa3, 0x65, - 0xd3, 0x50, 0x9f, 0x8e, 0x5a, 0x34, 0x9c, 0xec, 0xc3, 0xc4, 0x4f, 0x3a, 0x32, 0x29, 0x53, 0x03, - 0xd0, 0x1a, 0xec, 0x5a, 0xdd, 0x6f, 0xe6, 0xae, 0x18, 0xca, 0xab, 0x56, 0x7e, 0xaa, 0xa2, 0xd8, - 0x48, 0xd2, 0x69, 0x49, 0x7f, 0xd5, 0xd2, 0xe2, 0x35, 0x93, 0x2c, 0x00, 0x9a, 0x88, 0xea, 0x1d, - 0x03, 0x02, 0x4d, 0x7e, 0x9f, 0x37, 0xed, 0xf7, 0x41, 0x29, 0x1a, 0x38, 0xd1, 0x8a, 0x80, 0x33, - 0x92, 0xc0, 0x5d, 0x2c, 0x36, 0x06, 0x3f, 0x74, 0x26, 0xc2, 0x98, 0xfc, 0xd4, 0x8a, 0x8e, 0x4e, - 0x49, 0x2f, 0xbe, 0x60, 0xc4, 0xb1, 0xeb, 0xe2, 0xbe, 0x58, 0x7f, 0x01, 0x81, 0x6f, 0x5b, 0xb3, - 0x48, 0xe8, 0xb4, 0x38, 0x3f, 0x2d, 0x20, 0xd7, 0x34, 0xf2, 0x10, 0x69, 0x44, 0x7e, 0x42, 0x44, - 0xe4, 0x2e, 0xda, 0xe4, 0xdd, 0x89, 0x9a, 0xe8, 0xf6, 0x40, 0x6d, 0xf4, 0xcf, 0x30, 0x0b, 0xa1, - 0xe3, 0x23, 0xbb, 0xbb, 0xf4, 0x13, 0x94, 0xc6, 0x1c, 0xe4, 0xde, 0xe4, 0xdf, 0x80, 0x9b, 0x72, - 0x34, 0x1d, 0x61, 0x9c, 0x9d, 0x60, 0xec, 0xc2, 0x31, 0xd0, 0x3b, 0x77, 0xd5, 0xd8, 0x96, 0x03, - 0xd6, 0x51, 0xeb, 0xd3, 0x36, 0x8d, 0x57, 0x8b, 0x89, 0x20, 0xbd, 0xa5, 0x11, 0xee, 0xc8, 0x8f, - 0xfe, 0x98, 0xfc, 0x59, 0xc7, 0x8f, 0x60, 0xa4, 0xa3, 0x1d, 0xd6, 0xcd, 0x26, 0xd3, 0xe4, 0x9b, - 0x05, 0x54, 0xf1, 0x02, 0x57, 0xb5, 0x99, 0xce, 0xfb, 0x0c, 0xc1, 0xb0, 0x65, 0x94, 0xb8, 0x19, - 0x26, 0x7a, 0x0c, 0xb4, 0x38, 0x90, 0xbe, 0x6e, 0x47, 0x34, 0x48, 0x84, 0x31, 0xd4, 0xaa, 0xfd, - 0x48, 0x91, 0x4b, 0x8b, 0x54, 0xde, 0x93, 0x60, 0x16, 0x52, 0x09, 0x94, 0x89, 0xf0, 0xce, 0x42, - 0xcc, 0x77, 0xab, 0xfd, 0x94, 0xb5, 0xfa, 0x5e, 0x25, 0x92, 0x6a, 0x1e, 0x3f, 0xce, 0x16, 0xb5, - 0x34, 0x70, 0xc6, 0x62, 0x6a, 0x84, 0xde, 0x64, 0x7d, 0xca, 0x00, 0x44, 0xcf, 0x74, 0xba, 0xc6, - 0x6c, 0xa5, 0x2a, 0x33, 0x83, 0x4b, 0xeb, 0xe1, 0x88, 0x14, 0x63, 0xd8, 0xc5, 0x1f, 0x57, 0xf1, - 0x5a, 0x3f, 0x5a, 0xf5, 0x44, 0x54, 0xf8, 0x80, 0x51, 0xb1, 0xf9, 0x7d, 0xad, 0xde, 0x72, 0xb6, - 0x1a, 0x2f, 0x37, 0x67, 0x6f, 0xa5, 0x31, 0x78, 0xeb, 0x4a, 0xe5, 0x09, 0xe9, 0xc6, 0x99, 0x11, - 0xd6, 0x06, 0x43, 0x39, 0x3a, 0x4f, 0x6f, 0xc4, 0xb0, 0x2b, 0x47, 0x81, 0xd3, 0x41, 0x73, 0x6b, - 0x95, 0xff, 0xc6, 0x24, 0x5e, 0x37, 0x01, 0x8b, 0xc9, 0x34, 0x7e, 0x6e, 0x8e, 0xad, 0x6f, 0x99, - 0xcd, 0xed, 0xe7, 0x0f, 0x52, 0xd1, 0xde, 0x9d, 0xba, 0x16, 0x20, 0x1e, 0x95, 0xfc, 0x15, 0x8b, - 0x31, 0x28, 0x20, 0x13, 0x98, 0xe0, 0x91, 0x44, 0x82, 0xf2, 0xbf, 0xc8, 0x41, 0xbc, 0x7e, 0xff, - 0x10, 0x1b, 0xf7, 0x03, 0x7b, 0x73, 0x4e, 0x23, 0x9d, 0xc0, 0x5d, 0x40, 0xd0, 0xf5, 0xe5, 0x5d, - 0x1d, 0x78, 0x48, 0x17, 0xa2, 0xf3, 0x49, 0xe2, 0x05, 0xf5, 0x37, 0x9c, 0x29, 0x97, 0xee, 0x3e, - 0x44, 0x57, 0xf2, 0xab, 0x90, 0xd5, 0xb9, 0x84, 0xcd, 0x72, 0x6b, 0xd8, 0x6d, 0xee, 0xd1, 0x43, - 0xff, 0xe5, 0xd1, 0x2f, 0x72, 0x4e, 0xd7, 0xef, 0xa0, 0x32, 0x45, 0xc8, 0x9a, 0x19, 0x13, 0x62, - 0x12, 0x0d, 0x60, 0xe8, 0x0d, 0x90, 0x10, 0x91, 0xe6, 0xd0, 0x5e, 0x5c, 0xb6, 0xa0, 0xdb, 0x84, - 0x00, 0x67, 0x60, 0x25, 0xe4, 0x18, 0x69, 0x9e, 0x6f, 0x05, 0x12, 0xcf, 0xf4, 0xd7, 0xef, 0xb6, - 0x55, 0xfe, 0xf3, 0x09, 0x9a, 0xb2, 0xe7, 0x21, 0x67, 0xa5, 0xb6, 0x8e, 0x61, 0x5f, 0x1d, 0x01, - 0x9a, 0x33, 0x85, 0x4f, 0x71, 0x93, 0x83, 0x5c, 0xde, 0xb4, 0x0d, 0xd9, 0x69, 0xdc, 0x4d, 0x6e, - 0xd9, 0x68, 0x6b, 0x7d, 0x71, 0x26, 0x8a, 0xf2, 0x98, 0x74, 0xbf, 0x72, 0x0e, 0x47, 0xaf, 0xdb, - 0x4e, 0xfd, 0x40, 0x3e, 0xb3, 0x42, 0x66, 0xd7, 0x9c, 0x7d, 0xa4, 0x60, 0x8e, 0x86, 0xdd, 0xfa, - 0x05, 0x02, 0x86, 0x87, 0xd5, 0x9e, 0xad, 0x1f, 0x6c, 0x3a, 0xa6, 0x4d, 0xc7, 0x69, 0x76, 0xfd, - 0xb8, 0x6f, 0xe3, 0x2b, 0x75, 0xbc, 0xac, 0xa1, 0xcb, 0xca, 0xc4, 0x20, 0x40, 0x5b, 0xa6, 0xca, - 0x9f, 0xba, 0xb0, 0xb6, 0xca, 0x56, 0xe3, 0x81, 0x1f, 0xcd, 0xfb, 0x53, 0x23, 0x84, 0x1a, 0x34, - 0xf9, 0xec, 0x2b, 0x8d, 0x64, 0x8e, 0x76, 0x5f, 0x1c, 0xf4, 0x7a, 0xbd, 0xbf, 0x0c, 0x82, 0xb7, - 0x9b, 0x97, 0x43, 0xb8, 0xce, 0xb7, 0x29, 0x23, 0x70, 0x38, 0x0a, 0xd6, 0xfd, 0x12, 0x37, 0x36, - 0xfd, 0xe2, 0x2e, 0xf0, 0xc4, 0xeb, 0xd6, 0xee, 0x8b, 0xd7, 0xaf, 0x5e, 0xbd, 0x22, 0xaf, 0x55, - 0x91, 0x7b, 0xba, 0x53, 0x72, 0x36, 0xab, 0x20, 0x69, 0xbc, 0xfb, 0x12, 0xab, 0x81, 0x99, 0xbd, - 0x5c, 0xff, 0x1f, 0x4b, 0x55, 0x22, 0xc1, 0x2f, 0x7d, 0x2a, 0xea, 0x54, 0x82, 0xf7, 0xa3, 0xf6, - 0x3e, 0xdb, 0x92, 0x39, 0x49, 0x92, 0x76, 0xb3, 0xf9, 0xb3, 0x6c, 0xac, 0x80, 0xdd, 0xfa, 0x9f, - 0x90, 0xed, 0x12, 0x85, 0xf0, 0x8b, 0x68, 0x46, 0x9c, 0xa3, 0x7f, 0x64, 0xfd, 0x07, 0xe9, 0x71, - 0x3b, 0x45, 0xde, 0x12, 0x00, 0x00 + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xb5, 0x58, 0x6d, 0x73, 0xdb, 0xb8, + 0x11, 0xfe, 0xee, 0x5f, 0x41, 0x23, 0x1e, 0x9b, 0x1c, 0xd1, 0x94, 0x1c, 0xf7, 0xae, 0x89, 0x24, + 0xc8, 0x4d, 0x9c, 0xe4, 0xa2, 0x5e, 0x12, 0x7b, 0x46, 0xb9, 0xbb, 0xe9, 0xb8, 0x9e, 0x33, 0x4d, + 0x42, 0x12, 0x62, 0x0a, 0x64, 0x01, 0xd0, 0x2f, 0x95, 0xf5, 0xdf, 0xfb, 0x2c, 0x48, 0xea, 0xc5, + 0xb1, 0x93, 0x66, 0x3a, 0xfd, 0x22, 0x89, 0xe0, 0x62, 0xb1, 0x78, 0x76, 0xf7, 0xd9, 0x5d, 0xf5, + 0xb7, 0xdf, 0x9c, 0x1c, 0x7f, 0xfe, 0xc7, 0xe9, 0x5b, 0x6f, 0x6a, 0x67, 0xd9, 0xa0, 0x5f, 0x7f, + 0x8a, 0x38, 0xf5, 0xb2, 0x58, 0x4d, 0x38, 0x13, 0x8a, 0x0d, 0xfa, 0x33, 0x61, 0x63, 0x2f, 0x99, + 0xc6, 0xda, 0x08, 0xcb, 0x59, 0x69, 0xc7, 0xfb, 0x2f, 0x9a, 0xd5, 0x2d, 0x15, 0xcf, 0x04, 0x67, + 0xd7, 0x52, 0xdc, 0x14, 0xb9, 0xb6, 0xcc, 0x4b, 0x72, 0x65, 0x85, 0x82, 0xd8, 0x8d, 0x4c, 0xed, + 0x94, 0xff, 0xd4, 0xe9, 0x2c, 0x45, 0x1f, 0xbc, 0x4a, 0xc5, 0xb5, 0x4c, 0xc4, 0xbe, 0x7b, 0x08, + 0xa5, 0x92, 0x56, 0xc6, 0xd9, 0xbe, 0x49, 0xe2, 0x4c, 0xf0, 0x83, 0x70, 0x16, 0xdf, 0xca, 0x59, + 0x39, 0x5b, 0x3e, 0x97, 0x46, 0x68, 0xf7, 0x10, 0x5f, 0xe2, 0x59, 0xe5, 0xec, 0xab, 0x93, 0x07, + 0x7d, 0x2b, 0x6d, 0x26, 0x06, 0xbf, 0x41, 0x72, 0x96, 0xa7, 0xde, 0x48, 0x58, 0x2b, 0xd5, 0xc4, + 0xf4, 0xdb, 0xd5, 0x7a, 0xdf, 0x24, 0x5a, 0x16, 0x76, 0xb0, 0x75, 0x1d, 0x6b, 0x2f, 0xbf, 0x51, + 0x42, 0x87, 0x59, 0x9e, 0xc8, 0x22, 0x2c, 0x75, 0x7e, 0x63, 0xc2, 0x94, 0xa7, 0x79, 0x52, 0xce, + 0x60, 0x5f, 0x58, 0xce, 0x8e, 0xc7, 0x13, 0x3e, 0x5f, 0x84, 0x85, 0x54, 0x86, 0x9f, 0xfd, 0x1c, + 0xfe, 0x35, 0x7c, 0x11, 0xbe, 0x0c, 0x0f, 0x3a, 0xe1, 0xc1, 0xc1, 0x39, 0x2d, 0x9e, 0xf0, 0x33, + 0xa6, 0xcd, 0x75, 0xca, 0xc2, 0xef, 0x7f, 0x9d, 0xd3, 0x29, 0x7c, 0xfb, 0x20, 0x54, 0xe5, 0xec, + 0x23, 0xef, 0xf4, 0xc6, 0xa5, 0x4a, 0xac, 0xcc, 0x95, 0x37, 0x19, 0xa6, 0xbe, 0x08, 0xe6, 0x5a, + 0xd8, 0x52, 0x2b, 0x2f, 0x8d, 0x26, 0xc2, 0xbe, 0xcd, 0x04, 0x19, 0xf0, 0xfa, 0xce, 0xbd, 0x5a, + 0x2c, 0x45, 0xa5, 0x39, 0x59, 0x13, 0x15, 0xbb, 0xbb, 0x2c, 0xbf, 0xfc, 0x22, 0x12, 0xcb, 0x38, + 0xb7, 0x77, 0x85, 0xc8, 0xc7, 0xb4, 0xb6, 0xfd, 0x4a, 0xeb, 0xf8, 0x2e, 0x92, 0xc6, 0x7d, 0x6f, + 0xec, 0x7f, 0xef, 0x07, 0xf3, 0x1b, 0xa9, 0xd2, 0xfc, 0x26, 0xca, 0x0b, 0xa1, 0x7c, 0x36, 0xb5, + 0xb6, 0x30, 0xdd, 0x76, 0x7b, 0x22, 0xed, 0xb4, 0xbc, 0x8c, 0x92, 0x7c, 0xd6, 0x7e, 0x25, 0x75, + 0x92, 0xe7, 0xf9, 0x95, 0x14, 0xed, 0x3f, 0x3e, 0xbc, 0x7d, 0xd3, 0xbe, 0x91, 0x57, 0xb2, 0xdd, + 0x60, 0xf8, 0xac, 0xac, 0x40, 0xdd, 0x37, 0xf5, 0x02, 0x5b, 0xd3, 0xfe, 0xfa, 0xa1, 0xf6, 0xf6, + 0x52, 0x2a, 0x64, 0x7f, 0x1a, 0x91, 0x8d, 0xd7, 0xa5, 0xb3, 0x3c, 0x4e, 0xff, 0x3e, 0xf2, 0x45, + 0x68, 0xf9, 0x76, 0x27, 0x98, 0x67, 0xc2, 0x7a, 0x8a, 0xa7, 0x51, 0xa2, 0x45, 0x6c, 0x45, 0x0d, + 0x80, 0xcf, 0x2a, 0x5f, 0xb1, 0xa0, 0xa7, 0x22, 0x28, 0x7b, 0x65, 0xad, 0x96, 0x97, 0xa5, 0x15, + 0x78, 0xa1, 0x13, 0x16, 0x8a, 0x20, 0x7c, 0xb8, 0x4e, 0x38, 0xe0, 0x38, 0x2b, 0x6e, 0x6d, 0xfb, + 0x4b, 0x7c, 0x1d, 0x37, 0x0a, 0xbe, 0x12, 0x8c, 0xcd, 0x9d, 0x82, 0x0a, 0x1b, 0x84, 0x69, 0x74, + 0x99, 0xa7, 0x77, 0x51, 0x5c, 0xc0, 0xe8, 0xf4, 0x78, 0x2a, 0xb3, 0xd4, 0x57, 0x24, 0x1f, 0xa7, + 0xe9, 0xdb, 0x6b, 0x58, 0xf1, 0x41, 0x1a, 0x84, 0xab, 0xd0, 0x3e, 0x23, 0x9b, 0x59, 0xe8, 0x07, + 0x7c, 0x30, 0xff, 0x45, 0xd8, 0xdf, 0xfd, 0x60, 0xf1, 0xb8, 0x9c, 0xd0, 0x3a, 0xd7, 0x30, 0x0f, + 0x72, 0x88, 0x75, 0x93, 0x67, 0x22, 0xca, 0xf2, 0x89, 0xcf, 0xde, 0xd2, 0xba, 0x57, 0x5f, 0x1e, + 0xc0, 0x78, 0x63, 0x99, 0x09, 0x77, 0x0d, 0x04, 0xb7, 0xc6, 0x75, 0x3f, 0xd4, 0xeb, 0xf0, 0x24, + 0x36, 0x8e, 0xe5, 0xa4, 0xd4, 0xb1, 0x43, 0xab, 0xba, 0x86, 0x37, 0x8e, 0xb1, 0x21, 0x8d, 0xfe, + 0xa9, 0x86, 0x0a, 0xbe, 0x2a, 0x00, 0x9a, 0xf0, 0x8a, 0x78, 0x22, 0xbc, 0x34, 0xb6, 0xf1, 0x36, + 0xe0, 0x5d, 0x03, 0x78, 0x04, 0x77, 0x30, 0x3a, 0xa0, 0x8b, 0xf0, 0xa8, 0xfd, 0x82, 0x10, 0x74, + 0xfa, 0xa2, 0x42, 0xe7, 0x36, 0x4f, 0xf2, 0x6c, 0x77, 0xd7, 0x77, 0x61, 0xd9, 0x09, 0x7d, 0x97, + 0x04, 0x9c, 0x24, 0xb2, 0x91, 0xcd, 0x35, 0xb4, 0x52, 0x28, 0x0e, 0xad, 0x98, 0xd1, 0xc5, 0x93, + 0x61, 0xc1, 0x82, 0xe0, 0xfe, 0xbe, 0x16, 0xc3, 0xfe, 0x59, 0x01, 0x83, 0xdf, 0x41, 0xbf, 0xf7, + 0x31, 0x4f, 0x45, 0xe4, 0x9d, 0x66, 0x22, 0x36, 0xc2, 0x03, 0x10, 0x42, 0x7b, 0x14, 0x3a, 0xde, + 0xf0, 0x14, 0x26, 0x85, 0x1b, 0x1a, 0xcd, 0xa6, 0xc6, 0x2a, 0xf3, 0x82, 0x00, 0x52, 0x29, 0xec, + 0x75, 0xb9, 0x81, 0x33, 0x28, 0x25, 0x58, 0x39, 0x63, 0x41, 0x24, 0x15, 0x00, 0x7d, 0xff, 0xf9, + 0xe3, 0x07, 0xce, 0x3e, 0xe5, 0x5e, 0x9d, 0xd2, 0xc6, 0x43, 0x3e, 0xda, 0x38, 0x23, 0x28, 0xd8, + 0x46, 0x7a, 0xbc, 0x5b, 0x4f, 0x0f, 0xce, 0x79, 0x0b, 0xf9, 0x20, 0xb6, 0x39, 0xf7, 0x3b, 0xf7, + 0x9b, 0x79, 0x34, 0x7c, 0x4c, 0x90, 0x7f, 0x25, 0x98, 0x4c, 0x45, 0x72, 0x45, 0x31, 0x1a, 0xcc, + 0x89, 0x2d, 0x14, 0x17, 0x11, 0xb1, 0x4d, 0xa4, 0x45, 0x91, 0xc5, 0x09, 0xa2, 0xe8, 0xec, 0x1c, + 0xc1, 0x06, 0x3b, 0x4d, 0x79, 0x69, 0xac, 0xf6, 0xf7, 0x0f, 0x83, 0x9e, 0x1c, 0xfb, 0x0c, 0xf7, + 0xb8, 0x14, 0x1a, 0xb8, 0x8b, 0x88, 0x02, 0x12, 0x89, 0x0a, 0xb6, 0xc0, 0xa3, 0x6a, 0x04, 0x3b, + 0xe1, 0x61, 0x10, 0x8c, 0x73, 0xed, 0x93, 0x5a, 0x09, 0x3a, 0x90, 0x7d, 0x22, 0x99, 0x28, 0x13, + 0x6a, 0x62, 0xa7, 0x3d, 0xd9, 0x6a, 0x05, 0xd0, 0x63, 0xb7, 0x39, 0xb1, 0xcc, 0x99, 0x3c, 0x0f, + 0xe6, 0x78, 0x14, 0xd1, 0x75, 0x9c, 0x95, 0x30, 0x93, 0x44, 0xb1, 0x08, 0xb5, 0x72, 0x0c, 0xad, + 0x2b, 0x21, 0x00, 0x6c, 0xef, 0x10, 0x6d, 0xf0, 0x6c, 0xae, 0x39, 0xcb, 0xe4, 0x4c, 0xb0, 0xde, + 0x25, 0x52, 0xea, 0x6a, 0xf1, 0xc8, 0xfe, 0xfb, 0xfb, 0x7a, 0xa5, 0xbf, 0x7f, 0xb0, 0xfc, 0x3d, + 0x38, 0x7c, 0xf9, 0x95, 0x1e, 0x2d, 0xd2, 0x46, 0xcd, 0xe6, 0x9b, 0xe5, 0x9e, 0xc3, 0x23, 0x06, + 0x07, 0xab, 0x89, 0x60, 0x5d, 0xf6, 0x6c, 0x3c, 0x1e, 0xb3, 0xc5, 0x0a, 0x44, 0x44, 0xd1, 0x29, + 0x0e, 0x24, 0xc4, 0x61, 0x44, 0xc5, 0x61, 0xee, 0xee, 0x94, 0x1b, 0xf6, 0x4c, 0x85, 0xf2, 0x1c, + 0xf1, 0x7e, 0xe2, 0x98, 0x2c, 0x42, 0xf8, 0x68, 0x29, 0x48, 0x38, 0xa8, 0x85, 0x65, 0x10, 0x38, + 0x96, 0xe6, 0x2a, 0x6c, 0x34, 0xc9, 0xa0, 0x27, 0x32, 0xc4, 0x1a, 0x41, 0xdd, 0x00, 0xfb, 0x0d, + 0x97, 0x90, 0xa6, 0x4d, 0x52, 0x94, 0x2b, 0xf0, 0x2d, 0xc0, 0xb7, 0x7d, 0xd9, 0x20, 0x6f, 0x09, + 0xf9, 0x33, 0x7b, 0x3e, 0xe0, 0x1d, 0xe4, 0x86, 0xf3, 0x49, 0x51, 0x9a, 0xa9, 0x4f, 0x6b, 0x81, + 0xe3, 0xfc, 0xea, 0xd9, 0x99, 0x14, 0x34, 0x76, 0x7c, 0x25, 0xfd, 0xb4, 0xe8, 0x13, 0xa6, 0x3c, + 0x62, 0xc6, 0xf2, 0xb6, 0x74, 0xf4, 0x0a, 0xce, 0xb2, 0x48, 0xdd, 0x72, 0x30, 0x5f, 0xad, 0x81, + 0x82, 0xde, 0x49, 0x01, 0xe2, 0x42, 0xa8, 0x86, 0x00, 0x14, 0x75, 0x66, 0x09, 0xb6, 0x0a, 0x82, + 0xb9, 0x2b, 0x6d, 0x2d, 0xbe, 0xd7, 0x9f, 0x6a, 0xcf, 0xf9, 0xaf, 0xae, 0xbd, 0xdd, 0xe7, 0x3f, + 0x77, 0x8a, 0x5b, 0x36, 0xd8, 0xeb, 0xad, 0xfc, 0x21, 0x43, 0xfd, 0x88, 0x3f, 0xa0, 0x85, 0x95, + 0xea, 0x4a, 0xe1, 0x32, 0x14, 0x71, 0x96, 0xe2, 0x45, 0xaa, 0x24, 0x2b, 0x53, 0xbc, 0x84, 0xd3, + 0x83, 0xa3, 0x35, 0x1b, 0xa0, 0x22, 0xe8, 0xae, 0x9e, 0x5b, 0x78, 0xdf, 0xb2, 0x6e, 0x75, 0xf1, + 0x38, 0x08, 0x6a, 0xe5, 0x0f, 0x0d, 0x20, 0x74, 0x5f, 0x35, 0x40, 0x68, 0x00, 0xb1, 0x79, 0xbb, + 0x33, 0x7d, 0x1e, 0xa2, 0x62, 0x38, 0x38, 0x5d, 0x56, 0x9a, 0x30, 0x6f, 0xca, 0x9f, 0xea, 0x99, + 0x1b, 0x69, 0x13, 0x60, 0x1e, 0xcc, 0x13, 0xb0, 0x11, 0xbb, 0xcc, 0x41, 0xbe, 0xb1, 0x62, 0xdd, + 0x9c, 0x33, 0x97, 0xcc, 0x97, 0xf9, 0x2d, 0x0b, 0x0d, 0xdf, 0xab, 0x32, 0x81, 0x59, 0x5d, 0x0a, + 0xb6, 0xd7, 0xf2, 0xd5, 0x11, 0xab, 0x92, 0x1d, 0x91, 0xde, 0x45, 0xf4, 0x54, 0xd1, 0xde, 0x73, + 0x3a, 0xea, 0x64, 0xee, 0x1a, 0x7e, 0x51, 0xef, 0xda, 0x99, 0xab, 0x05, 0xbb, 0x08, 0xeb, 0xd8, + 0xe3, 0x76, 0x2d, 0xd6, 0x8e, 0x7c, 0xc2, 0xd9, 0x43, 0xdb, 0xc2, 0xd9, 0xe1, 0x4b, 0xe6, 0xcd, + 0xa4, 0xe2, 0x6c, 0xff, 0x00, 0xda, 0xb3, 0xd8, 0x18, 0xce, 0x0c, 0xdb, 0x83, 0xb9, 0x4c, 0x2a, + 0xd4, 0xa4, 0xae, 0x13, 0x45, 0xd1, 0x28, 0x38, 0x8b, 0xd5, 0xdd, 0x52, 0xe6, 0xf6, 0x36, 0x63, + 0x7b, 0xb5, 0x05, 0xa9, 0x18, 0xc7, 0x65, 0x66, 0xc9, 0x7e, 0xaa, 0x69, 0x64, 0xfb, 0x86, 0x15, + 0x0f, 0xdc, 0xf9, 0x13, 0xdc, 0xd9, 0x63, 0x17, 0x8b, 0x07, 0xce, 0x41, 0x70, 0xd6, 0x21, 0x20, + 0x1a, 0x5b, 0x49, 0x22, 0x15, 0xb7, 0x27, 0x63, 0x27, 0xd0, 0x3a, 0x00, 0x07, 0xd7, 0x22, 0x17, + 0xde, 0xce, 0xdc, 0x2e, 0xba, 0x1e, 0x2e, 0xb8, 0x84, 0x8c, 0xf3, 0xfc, 0xa8, 0x79, 0xdd, 0x97, + 0xaa, 0x28, 0xad, 0x47, 0x90, 0x73, 0x36, 0x95, 0x69, 0x8a, 0xde, 0xd0, 0xab, 0x9a, 0xb0, 0x9d, + 0xb9, 0x58, 0x74, 0x69, 0xf7, 0xce, 0x5c, 0x1e, 0x51, 0x26, 0x02, 0x4b, 0xd8, 0x58, 0x1b, 0x3c, + 0x8e, 0xe1, 0x32, 0x36, 0xb8, 0xe8, 0x4a, 0x70, 0xfc, 0xff, 0xac, 0x6d, 0x67, 0x9e, 0x2f, 0xa0, + 0x6c, 0x65, 0xf6, 0x86, 0xa6, 0x9d, 0xb9, 0xc3, 0x98, 0x93, 0xe1, 0x4b, 0x0f, 0x62, 0xc3, 0xb7, + 0x55, 0xef, 0xcc, 0xcd, 0x02, 0xf5, 0xd9, 0x29, 0xaa, 0x03, 0xc6, 0xb7, 0x53, 0x69, 0xc2, 0xbd, + 0x9d, 0xf9, 0xd3, 0xc8, 0x2d, 0xf6, 0x02, 0x74, 0x9d, 0x97, 0x7a, 0x70, 0xb1, 0xd8, 0x48, 0xc9, + 0x37, 0x3a, 0x2f, 0x50, 0x75, 0x55, 0x55, 0x40, 0x9e, 0xea, 0x70, 0x44, 0x46, 0x1d, 0x5c, 0x80, + 0xa4, 0x5d, 0xef, 0xfd, 0xcc, 0xeb, 0xbb, 0x4f, 0xb0, 0xb4, 0x49, 0x9e, 0xe0, 0xec, 0xe0, 0x9c, + 0x2a, 0x8b, 0x04, 0xe7, 0x0f, 0x3f, 0x9d, 0xfe, 0xf6, 0x99, 0x6e, 0x26, 0x23, 0x1b, 0x4f, 0x48, + 0x0a, 0xee, 0xad, 0xa2, 0xa3, 0x5a, 0x04, 0x00, 0xf7, 0xf7, 0xab, 0x1a, 0x54, 0x2f, 0x05, 0x95, + 0x09, 0x02, 0x8f, 0x0e, 0xc1, 0x9e, 0x74, 0xb5, 0xac, 0xb7, 0x99, 0x78, 0x32, 0x8a, 0x9b, 0x1e, + 0x69, 0x59, 0x8d, 0x5a, 0x2d, 0x5d, 0xd5, 0x3f, 0xc3, 0xd7, 0x5f, 0x23, 0x11, 0x7b, 0x55, 0xbf, + 0xb5, 0xcd, 0x8d, 0xd3, 0x05, 0xe3, 0x9c, 0xea, 0xf5, 0x05, 0x17, 0xd3, 0xeb, 0x0b, 0x2e, 0x60, + 0xd7, 0x16, 0x1e, 0x34, 0x66, 0xd5, 0x72, 0x68, 0x2a, 0x23, 0x83, 0x45, 0x5d, 0xa4, 0x1f, 0xb6, + 0x6f, 0xd4, 0xf0, 0xec, 0x43, 0xc4, 0x75, 0x4f, 0x32, 0x2a, 0x62, 0x0d, 0xd0, 0x6a, 0xec, 0x9a, + 0x5a, 0x50, 0xf7, 0x72, 0x21, 0xd8, 0x58, 0x2d, 0xf5, 0x94, 0x59, 0xb6, 0xe1, 0xa4, 0x93, 0x82, + 0x7e, 0x55, 0xd4, 0xe2, 0x38, 0x93, 0x24, 0x00, 0x9a, 0x08, 0xaa, 0x1d, 0x3d, 0x02, 0x4d, 0x7e, + 0xed, 0xb7, 0xdc, 0xed, 0x03, 0x53, 0xd4, 0x70, 0xa2, 0x3c, 0x01, 0x67, 0x38, 0x81, 0xdb, 0x50, + 0x6c, 0x34, 0x93, 0xa8, 0x56, 0x84, 0x31, 0xe9, 0xa9, 0x58, 0x1e, 0xd5, 0x93, 0x5e, 0x7c, 0x42, + 0xdb, 0x64, 0xd6, 0x09, 0x7f, 0xbe, 0xfe, 0x02, 0xa4, 0xdf, 0x94, 0x6b, 0x11, 0xd1, 0x6d, 0x71, + 0x7f, 0x5a, 0x80, 0xaf, 0xa9, 0x8d, 0xa2, 0xa0, 0x11, 0xe9, 0x90, 0x02, 0x91, 0xdb, 0x60, 0x33, + 0xee, 0x86, 0x6a, 0x9c, 0x37, 0x17, 0x6a, 0xac, 0x7f, 0x24, 0xb2, 0x60, 0x3a, 0x0e, 0xd9, 0xdd, + 0xa5, 0x4f, 0x84, 0x34, 0x7a, 0x2b, 0xfb, 0x2a, 0xfd, 0x02, 0xdc, 0x94, 0xa5, 0x8e, 0x0b, 0x2d, + 0xf2, 0x18, 0xad, 0x1c, 0xae, 0x81, 0x7a, 0xba, 0xab, 0x2e, 0x4d, 0xd1, 0x63, 0x2d, 0xb5, 0xde, + 0xc1, 0x53, 0xcb, 0x36, 0x1f, 0x0b, 0xe2, 0x5b, 0x6a, 0x0b, 0x8f, 0xdc, 0x38, 0x81, 0x69, 0x82, + 0xb5, 0x5c, 0x5b, 0x47, 0x3c, 0xda, 0x62, 0xed, 0x64, 0x3c, 0x89, 0xbe, 0x18, 0x40, 0x15, 0xce, + 0x31, 0xfe, 0x4d, 0xf3, 0xb4, 0xcb, 0x60, 0x0c, 0x5b, 0x04, 0x91, 0x9d, 0x62, 0x4a, 0x40, 0x93, + 0x8c, 0x0b, 0xe5, 0x57, 0x4d, 0xdb, 0x07, 0x8a, 0xd0, 0x9a, 0xca, 0xb7, 0x6b, 0x33, 0x52, 0x69, + 0xe0, 0xca, 0x3b, 0x22, 0xcc, 0x4c, 0x2a, 0x81, 0x34, 0x11, 0x4e, 0x99, 0x8f, 0x9e, 0x71, 0xb9, + 0x9f, 0xbc, 0x56, 0xcd, 0x6a, 0x22, 0x2a, 0x67, 0xe1, 0xaa, 0xdf, 0xa8, 0xa8, 0x81, 0x33, 0x16, + 0x52, 0x21, 0x74, 0x22, 0xeb, 0x9d, 0x07, 0x20, 0x7a, 0xa4, 0xd2, 0xd5, 0x62, 0x4b, 0x56, 0x99, + 0x6a, 0x0c, 0xc2, 0x87, 0x03, 0x62, 0x8c, 0x7e, 0x1b, 0x3f, 0x2e, 0xc2, 0xb5, 0x7a, 0xb4, 0xac, + 0x89, 0xc8, 0xf0, 0x1e, 0xa3, 0x64, 0x73, 0xfb, 0x1a, 0xbe, 0xe5, 0x6c, 0xd9, 0xb2, 0x6e, 0xf6, + 0xf3, 0x2a, 0x47, 0x33, 0x9f, 0x97, 0x2a, 0x8d, 0x88, 0x37, 0x4e, 0xb5, 0x30, 0xc6, 0xeb, 0xcb, + 0xc1, 0x28, 0xbe, 0x16, 0xfd, 0xb6, 0x1c, 0x78, 0x36, 0xf7, 0xea, 0x49, 0x58, 0xfe, 0x1b, 0xdd, + 0x7d, 0x55, 0x04, 0x0c, 0xba, 0xdd, 0xf0, 0xb1, 0xde, 0xb8, 0x9a, 0x5c, 0xeb, 0x89, 0xea, 0x1b, + 0xae, 0x68, 0xe6, 0xb1, 0xb6, 0x01, 0x88, 0x47, 0x05, 0x7f, 0xc1, 0x42, 0x34, 0x0a, 0xf0, 0x04, + 0xa6, 0x02, 0x38, 0x91, 0xa0, 0xfc, 0x2f, 0x7c, 0x10, 0xae, 0xcf, 0x34, 0x62, 0x63, 0xe6, 0x30, + 0xd7, 0x23, 0x6a, 0xf3, 0x04, 0xe6, 0x0b, 0x41, 0x23, 0xd1, 0x9b, 0xca, 0x70, 0x9f, 0x86, 0xac, + 0xd1, 0x38, 0x72, 0x84, 0xfa, 0x3b, 0xee, 0x94, 0x4a, 0x7b, 0xe7, 0xa3, 0x2a, 0xb9, 0x55, 0xd0, + 0xea, 0x4c, 0x42, 0x66, 0xb1, 0xd5, 0x6f, 0xd7, 0xb3, 0x79, 0xdf, 0x9d, 0x3c, 0xf8, 0x9b, 0x9c, + 0xd1, 0x48, 0xef, 0x95, 0x3a, 0xf3, 0x59, 0xdd, 0x77, 0x82, 0x4c, 0x82, 0x1e, 0x04, 0x9d, 0x00, + 0x1c, 0x22, 0xe2, 0x14, 0xdc, 0x8b, 0x01, 0x0e, 0xbc, 0x4d, 0x08, 0x70, 0x86, 0xa8, 0x04, 0x1d, + 0xc3, 0xcd, 0xb3, 0x2d, 0x4f, 0xe2, 0x99, 0x7e, 0xfd, 0x69, 0x1a, 0xe6, 0x1f, 0x8d, 0x51, 0x94, + 0x5d, 0x1c, 0x72, 0x56, 0xe4, 0xc6, 0x32, 0xec, 0xab, 0x2c, 0x40, 0x71, 0x26, 0xf3, 0xc9, 0x6e, + 0x52, 0x90, 0xca, 0xeb, 0xa6, 0x20, 0xdb, 0x1c, 0xf3, 0xce, 0x0d, 0x1b, 0x6c, 0xad, 0x2f, 0x4e, + 0x45, 0x56, 0xbc, 0x26, 0xde, 0x2f, 0xad, 0xc5, 0xd5, 0xab, 0xb2, 0x53, 0x3d, 0x90, 0xce, 0x24, + 0x93, 0xc9, 0x15, 0x67, 0xef, 0xc9, 0x98, 0xa3, 0x7e, 0xbb, 0x7a, 0x01, 0x83, 0xa1, 0x61, 0xb9, + 0x67, 0xeb, 0x89, 0x4d, 0xaf, 0x69, 0xd3, 0xeb, 0x38, 0xb9, 0x5a, 0xed, 0xdb, 0x38, 0xa5, 0xb2, + 0x97, 0xd5, 0xe1, 0xb2, 0x14, 0xd1, 0x30, 0xd0, 0x14, 0xb1, 0x72, 0xb7, 0xce, 0x8c, 0x29, 0x93, + 0x65, 0x7b, 0xe0, 0xda, 0xf5, 0xee, 0x44, 0x0b, 0xa1, 0x7a, 0xb5, 0x3f, 0xbb, 0x2a, 0x87, 0x33, + 0x07, 0xbb, 0xcf, 0x0e, 0x3a, 0x9d, 0xce, 0x5f, 0x7a, 0xde, 0xf1, 0xe6, 0xc0, 0x09, 0xd5, 0xe9, + 0x36, 0x79, 0x04, 0x0a, 0x07, 0xde, 0xba, 0x5e, 0x8a, 0x8d, 0x4d, 0xbd, 0x98, 0x0f, 0x1e, 0x68, + 0xdd, 0xda, 0x7d, 0xf6, 0xf2, 0xc5, 0x8b, 0x17, 0xa4, 0xb5, 0xcc, 0x52, 0x17, 0xee, 0xe4, 0x9c, + 0xcd, 0x2c, 0x88, 0x6a, 0xed, 0x2e, 0xc5, 0x2a, 0x60, 0xa6, 0xcf, 0xd7, 0xff, 0xb7, 0x29, 0x0b, + 0x38, 0xf8, 0xf9, 0x60, 0xeb, 0x97, 0x2c, 0xbf, 0x8c, 0x33, 0x6f, 0xd8, 0x37, 0x65, 0x31, 0x78, + 0x8e, 0x5d, 0xf8, 0x3a, 0xf6, 0x7e, 0x39, 0x1d, 0x9e, 0x18, 0xcf, 0x7f, 0xff, 0x47, 0x40, 0x57, + 0xef, 0xcb, 0x4d, 0x9b, 0xea, 0x71, 0x64, 0xb0, 0xe5, 0x23, 0x2e, 0xee, 0xe8, 0x5f, 0x2b, 0x35, + 0xa1, 0xff, 0x8c, 0x68, 0xfc, 0x7e, 0x3b, 0x3a, 0x3d, 0x7c, 0x1e, 0x56, 0x6b, 0xc2, 0xd3, 0xe2, + 0x5f, 0xa5, 0x44, 0x06, 0xe2, 0x07, 0xda, 0x45, 0xbb, 0x1d, 0x50, 0x06, 0x92, 0xca, 0xd1, 0x9b, + 0x57, 0xdd, 0xba, 0xa9, 0xa8, 0x3d, 0x55, 0xd7, 0xd4, 0x55, 0x57, 0x57, 0xf5, 0x79, 0x87, 0xcb, + 0xe0, 0x7a, 0xf3, 0xca, 0xb9, 0xd1, 0x29, 0xe6, 0x6c, 0xd9, 0xaa, 0xaf, 0xb5, 0x7f, 0xde, 0x96, + 0xab, 0x4d, 0xd3, 0x3c, 0x4b, 0x31, 0xd3, 0xb8, 0x1d, 0x03, 0x6f, 0x74, 0xfc, 0xa1, 0xbb, 0xd1, + 0xbe, 0x7c, 0xf7, 0xa0, 0xe3, 0x0f, 0xd0, 0xf4, 0x9d, 0x93, 0x36, 0x0f, 0xc2, 0x8e, 0xc1, 0x53, + 0xfd, 0x7f, 0x83, 0xf0, 0xe8, 0x74, 0xf8, 0xff, 0x87, 0xf5, 0xe3, 0xc9, 0x68, 0xf8, 0x83, 0xb8, + 0xd2, 0x96, 0x1f, 0x04, 0xd6, 0x6d, 0x71, 0xc8, 0xfe, 0xfa, 0xc3, 0xd0, 0xfe, 0xfa, 0xe3, 0xd8, + 0xfe, 0x8a, 0xb3, 0x8e, 0x47, 0x8f, 0x9f, 0xb4, 0xf5, 0xd4, 0x51, 0xc7, 0xa3, 0xef, 0x5e, 0x6a, + 0xe3, 0x1c, 0xc8, 0x3b, 0x5e, 0xaa, 0x78, 0x0d, 0x45, 0x60, 0xd0, 0xfc, 0x61, 0xd4, 0x30, 0x7b, + 0x14, 0x45, 0x4d, 0x26, 0xe9, 0xef, 0x51, 0xd3, 0x92, 0x65, 0xb6, 0x7e, 0x88, 0x66, 0xda, 0xc4, + 0xa7, 0xf8, 0x22, 0xce, 0x25, 0x02, 0xa6, 0x7f, 0x8a, 0xff, 0x03, 0x76, 0xda, 0xd5, 0xdf, 0x3f, + 0x16, 0x00, 0x00 }; diff --git a/wled00/pin_manager.h b/wled00/pin_manager.h index 9b5005b24..d6a4ca57d 100644 --- a/wled00/pin_manager.h +++ b/wled00/pin_manager.h @@ -34,8 +34,7 @@ enum struct PinOwner : uint8_t { DebugOut = 0x89, // 'Dbg' == debug output always IO1 DMX = 0x8A, // 'DMX' == hard-coded to IO2 HW_I2C = 0x8B, // 'I2C' == hardware I2C pins (4&5 on ESP8266, 21&22 on ESP32) - AnalogMic = 0x8C, // WLEDSR - DigitalMic = 0x8D, // WLEDSR + HW_SPI = 0x8C, // 'SPI' == hardware SPI pins (13,14&15 on ESP8266, 5,18&23 on ESP32) // Use UserMod IDs from const.h here UM_Unspecified = USERMOD_ID_UNSPECIFIED, // 0x01 UM_Example = USERMOD_ID_EXAMPLE, // 0x02 // Usermod "usermod_v2_example.h" diff --git a/wled00/set.cpp b/wled00/set.cpp index 9360a5b32..4f0f7ada9 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -477,6 +477,53 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) { if (!requestJSONBufferLock(5)) return; + // global I2C & SPI pins + uint8_t oldpins[3]; + int8_t hw_sda_pin = max(-1,min(33,(int)request->arg(F("SDA")).toInt())); + int8_t hw_scl_pin = max(-1,min(33,(int)request->arg(F("SCL")).toInt())); + oldpins[0] = i2c_sda; + oldpins[1] = i2c_scl; + pinManager.deallocateMultiplePins(oldpins, 2, PinOwner::HW_I2C); + #ifdef ESP8266 + // cannot change pins on ESP8266 + if (hw_sda_pin != HW_PIN_SDA) hw_sda_pin = -1; + if (hw_scl_pin != HW_PIN_SCL) hw_scl_pin = -1; + #endif + PinManagerPinType i2c[2] = { { hw_sda_pin, true }, { hw_scl_pin, true } }; + if (pinManager.allocateMultiplePins(i2c, 2, PinOwner::HW_I2C)) { + i2c_sda = hw_sda_pin; + i2c_scl = hw_scl_pin; + #ifdef ESP32 + Wire.setPins(i2c_sda, i2c_scl); // this will fail if Wire is initilised (Wire.begin() called) + #endif + } else { + i2c_sda = -1; + i2c_scl = -1; + } + int8_t hw_mosi_pin = max(-1,min(33,(int)request->arg(F("MOSI")).toInt())); + int8_t hw_sclk_pin = max(-1,min(33,(int)request->arg(F("SCLK")).toInt())); + int8_t hw_cs_pin = max(-1,min(33,(int)request->arg(F("CS")).toInt())); + oldpins[0] = spi_mosi; + oldpins[1] = spi_sclk; + oldpins[2] = spi_cs; + pinManager.deallocateMultiplePins(oldpins, 3, PinOwner::HW_SPI); + #ifdef ESP8266 + // cannot change pins on ESP8266 + if (hw_mosi_pin != HW_PIN_DATASPI) hw_mosi_pin = -1; + if (hw_sclk_pin != HW_PIN_CLOCKSPI) hw_sclk_pin = -1; + if (hw_cs_pin != HW_PIN_CSSPI) hw_cs_pin = -1; + #endif + PinManagerPinType spi[3] = { { hw_mosi_pin, true }, { hw_sclk_pin, true }, { hw_cs_pin, true } }; + if (pinManager.allocateMultiplePins(spi, 3, PinOwner::HW_SPI)) { + spi_mosi = hw_mosi_pin; + spi_sclk = hw_sclk_pin; + spi_cs = hw_cs_pin; + } else { + spi_mosi = -1; + spi_sclk = -1; + spi_cs = -1; + } + JsonObject um = doc.createNestedObject("um"); size_t args = request->args(); diff --git a/wled00/wled.h b/wled00/wled.h index 3f5b7c2c6..d37ad488c 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -86,6 +86,8 @@ #endif #include "esp_task_wdt.h" #endif +#include +#include #include "src/dependencies/network/Network.h" @@ -641,6 +643,12 @@ WLED_GLOBAL int8_t loadLedmap _INIT(-1); // Usermod manager WLED_GLOBAL UsermodManager usermods _INIT(UsermodManager()); +WLED_GLOBAL int8_t i2c_sda _INIT(HW_PIN_SDA); // global I2C SDA pin (used for usermods) +WLED_GLOBAL int8_t i2c_scl _INIT(HW_PIN_SCL); // global I2C SDA pin (used for usermods) +WLED_GLOBAL int8_t spi_mosi _INIT(HW_PIN_DATASPI); // global I2C SDA pin (used for usermods) +WLED_GLOBAL int8_t spi_sclk _INIT(HW_PIN_CLOCKSPI); // global I2C SDA pin (used for usermods) +WLED_GLOBAL int8_t spi_cs _INIT(HW_PIN_CSSPI); // global I2C SDA pin (used for usermods) + // global ArduinoJson buffer WLED_GLOBAL StaticJsonDocument doc; WLED_GLOBAL volatile uint8_t jsonBufferLock _INIT(0); diff --git a/wled00/xml.cpp b/wled00/xml.cpp index bce11f060..4e03b1843 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -261,6 +261,16 @@ void getSettingsJS(byte subPage, char* dest) // add reserved and usermod pins as d.um_p array oappend(SET_F("d.um_p=[6,7,8,9,10,11")); + if (i2c_sda > -1 && i2c_scl > -1) { + oappend(","); oappend(itoa(i2c_sda,nS,10)); + oappend(","); oappend(itoa(i2c_scl,nS,10)); + } + if (spi_mosi > -1 && spi_sclk > -1 && spi_cs > -1) { + oappend(","); oappend(itoa(spi_mosi,nS,10)); + oappend(","); oappend(itoa(spi_sclk,nS,10)); + oappend(","); oappend(itoa(spi_cs,nS,10)); + } + if (requestJSONBufferLock(6)) { // if we can't allocate JSON buffer ignore usermod pins JsonObject mods = doc.createNestedObject(F("um")); @@ -625,6 +635,11 @@ 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("SCLK"),spi_sclk); + sappend('v',SET_F("CS"),spi_cs); usermods.appendConfigData(); }