diff --git a/platformio.ini b/platformio.ini index f3caa585..f1f4d421 100644 --- a/platformio.ini +++ b/platformio.ini @@ -37,6 +37,7 @@ default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32d ; default_envs = wemos_shield_esp32 ; default_envs = m5atom ; default_envs = esp32_eth +; default_envs = esp32_V4_eth ; default_envs = esp32dev_qio80 ; default_envs = esp32_eth_ota1mapp ; default_envs = esp32s2_saola @@ -444,6 +445,21 @@ board_build.partitions = ${esp32_idf_V4.default_partitions} board_build.f_flash = 80000000L board_build.flash_mode = dio +[env:esp32_V4_eth] +;; experimental ESP32 env using ESP-IDF V4.4.x +;; Warning: this build environment is not stable!! +;; please erase your device before installing. +board = esp32dev +platform = ${esp32_idf_V4.platform} +platform_packages = ${esp32_idf_V4.platform_packages} +upload_speed = 921600 +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} ${esp32_idf_V4.build_flags} -D WLED_RELEASE_NAME=ESP32_V4_eth -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1 + -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only +lib_deps = ${esp32_idf_V4.lib_deps} +monitor_filters = esp32_exception_decoder +board_build.partitions = ${esp32_idf_V4.default_partitions} + [env:esp32_eth] board = esp32-poe platform = ${esp32.platform} diff --git a/wled00/const.h b/wled00/const.h index 6ee83451..8c66b1d3 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -283,12 +283,16 @@ #define BTN_TYPE_ANALOG_INVERTED 8 //Ethernet board types -#define WLED_NUM_ETH_TYPES 11 +#if defined(ARDUINO_ARCH_ESP32) && (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) + #define WLED_NUM_ETH_TYPES 12 +#else + #define WLED_NUM_ETH_TYPES 11 +#endif #define WLED_ETH_NONE 0 #define WLED_ETH_WT32_ETH01 1 #define WLED_ETH_ESP32_POE 2 -#define WLED_ETH_WESP32 3 +#define WLED_ETH_WESP32_R6 3 #define WLED_ETH_QUINLED 4 #define WLED_ETH_TWILIGHTLORD 5 #define WLED_ETH_ESP32DEUX 6 @@ -297,6 +301,10 @@ #define WLED_ETH_ABCWLEDV43ETH 9 #define WLED_ETH_SERG74 10 +#if defined(ARDUINO_ARCH_ESP32) && (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) + #define WLED_ETH_WESP32_R7 11 +#endif + //Hue error codes #define HUE_ERROR_INACTIVE 0 #define HUE_ERROR_UNAUTHORIZED 1 diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm index 026381e5..a9638bba 100644 --- a/wled00/data/settings_wifi.htm +++ b/wled00/data/settings_wifi.htm @@ -215,7 +215,8 @@ - + +

diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 1f5e0b17..fad57dd1 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -8,7 +8,7 @@ // Autogenerated from wled00/data/style.css, do not edit!! const uint16_t PAGE_settingsCss_length = 888; const uint8_t PAGE_settingsCss[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x56, 0x51, 0x8b, 0xab, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xad, 0x56, 0x51, 0x8b, 0xab, 0x38, 0x14, 0xfe, 0x2b, 0x2e, 0x65, 0x60, 0x2e, 0x54, 0x51, 0xab, 0x9d, 0xde, 0xc8, 0xc2, 0xb2, 0xef, 0xf7, 0x6d, 0x58, 0x16, 0x96, 0x79, 0x88, 0xe6, 0x58, 0x43, 0x63, 0x22, 0x49, 0xbc, 0xb5, 0x23, 0xfe, 0xf7, 0x4d, 0xa2, 0x8e, 0xb6, 0x23, 0x73, 0x5f, 0x2e, 0xa5, 0x25, 0xe6, 0xc4, 0xe4, 0x3b, @@ -70,7 +70,7 @@ const uint8_t PAGE_settingsCss[] PROGMEM = { // Autogenerated from wled00/data/settings.htm, do not edit!! const uint16_t PAGE_settings_length = 1115; const uint8_t PAGE_settings[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x56, 0xdb, 0x52, 0xe3, 0x46, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xb5, 0x56, 0xdb, 0x52, 0xe3, 0x46, 0x10, 0x7d, 0xf7, 0x57, 0x0c, 0xb3, 0x15, 0x56, 0x2a, 0x64, 0xf9, 0x42, 0x2a, 0x95, 0xc8, 0x96, 0xa9, 0x2c, 0x97, 0x8d, 0x53, 0x50, 0x4b, 0x05, 0x58, 0x92, 0x4a, 0xf2, 0x30, 0xd6, 0xb4, 0xac, 0x59, 0xa4, 0x19, 0xd5, 0x4c, 0xcb, 0xe0, 0xb0, 0xfc, 0x7b, 0x7a, 0x64, 0x63, 0x60, 0xe1, 0x21, @@ -144,164 +144,167 @@ const uint8_t PAGE_settings[] PROGMEM = { // Autogenerated from wled00/data/settings_wifi.htm, do not edit!! -const uint16_t PAGE_settings_wifi_length = 2378; +const uint16_t PAGE_settings_wifi_length = 2422; const uint8_t PAGE_settings_wifi[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x58, 0xff, 0x53, 0xdb, 0x3a, - 0x12, 0xff, 0x3d, 0x7f, 0x85, 0xd0, 0xdd, 0x30, 0xf6, 0xe0, 0x38, 0x09, 0x69, 0xfb, 0x7a, 0x21, - 0x4e, 0x0f, 0x42, 0x5e, 0xe1, 0x1e, 0x85, 0x5c, 0xc3, 0x95, 0xb9, 0xe1, 0x3a, 0xef, 0x19, 0x5b, - 0x49, 0x54, 0x1c, 0xc9, 0xcf, 0x92, 0x13, 0x18, 0xc8, 0xff, 0x7e, 0xbb, 0x92, 0x9d, 0xc4, 0x01, - 0xda, 0x9b, 0x0e, 0x37, 0x9d, 0x29, 0xb6, 0xbc, 0xda, 0xfd, 0xec, 0xb7, 0x8f, 0x56, 0xe9, 0xee, - 0x1c, 0x5f, 0xf4, 0x2f, 0xff, 0x3d, 0x1c, 0x90, 0xa9, 0x9e, 0x25, 0xbd, 0x2e, 0xfe, 0x4f, 0x92, - 0x50, 0x4c, 0x02, 0xca, 0x04, 0x85, 0x77, 0x16, 0xc6, 0xbd, 0xee, 0x8c, 0xe9, 0x90, 0x44, 0xd3, - 0x30, 0x53, 0x4c, 0x07, 0x34, 0xd7, 0xe3, 0xfa, 0x7b, 0x5a, 0xac, 0xd6, 0x22, 0x29, 0x34, 0x13, - 0xb0, 0xbc, 0xe0, 0xb1, 0x9e, 0x06, 0x31, 0x9b, 0xf3, 0x88, 0xd5, 0xcd, 0x8b, 0xc7, 0x05, 0xd7, - 0x3c, 0x4c, 0xea, 0x2a, 0x0a, 0x13, 0x16, 0xb4, 0xbc, 0x59, 0x78, 0xc7, 0x67, 0xf9, 0x6c, 0xf5, - 0x9e, 0x2b, 0x96, 0x99, 0x97, 0xf0, 0x06, 0xde, 0x85, 0xa4, 0xa4, 0x26, 0xc2, 0x19, 0x0b, 0xe8, - 0x9c, 0xb3, 0x45, 0x2a, 0x33, 0x0d, 0x56, 0x34, 0xd7, 0x09, 0xeb, 0x5d, 0xf1, 0x5f, 0x39, 0x19, - 0x31, 0xad, 0xb9, 0x98, 0xa8, 0x6e, 0xc3, 0x2e, 0x76, 0x55, 0x94, 0xf1, 0x54, 0xf7, 0x6a, 0xf3, - 0x30, 0x23, 0x89, 0x8c, 0x78, 0xea, 0xc5, 0x41, 0x2c, 0xa3, 0x7c, 0x06, 0x80, 0x3c, 0x58, 0x08, - 0x76, 0x5a, 0xf8, 0x27, 0xcd, 0xa4, 0x96, 0x01, 0x9d, 0x6a, 0x9d, 0x76, 0xa8, 0x07, 0xf6, 0xc4, - 0x99, 0x94, 0xa9, 0x0a, 0x9a, 0x5e, 0x9a, 0xb1, 0x11, 0xbc, 0x8e, 0x46, 0xa7, 0xc7, 0x01, 0xa5, - 0x07, 0xe3, 0x5c, 0x44, 0x9a, 0x4b, 0x41, 0x26, 0xa7, 0xb1, 0xa3, 0xdd, 0x87, 0x8c, 0xe9, 0x3c, - 0x13, 0x24, 0xf6, 0x27, 0x4c, 0x0f, 0x12, 0x86, 0x6a, 0x8f, 0xee, 0xcd, 0xa7, 0xe5, 0x4a, 0x34, - 0x1a, 0x54, 0x24, 0xa3, 0x8c, 0x85, 0x9a, 0x15, 0xc2, 0x15, 0xc1, 0x13, 0xc7, 0x7d, 0x58, 0x70, - 0x11, 0xcb, 0x85, 0x2f, 0x53, 0x26, 0x1c, 0x83, 0x47, 0x75, 0x1a, 0x8d, 0x5b, 0x21, 0xfd, 0x45, - 0xc2, 0xd0, 0x4a, 0x63, 0x0c, 0xbb, 0xf3, 0x8c, 0xa9, 0x86, 0x2a, 0x7c, 0x6d, 0xfc, 0x65, 0xc1, - 0xc7, 0xbc, 0x5e, 0xbe, 0xd2, 0x0d, 0x85, 0x47, 0x5b, 0x0a, 0x01, 0xe4, 0xbf, 0x3e, 0x9f, 0x39, - 0xb4, 0xb1, 0x16, 0xf6, 0xe8, 0xef, 0x8a, 0x25, 0xe3, 0xcd, 0x5d, 0xe7, 0xb0, 0x0b, 0x72, 0xa6, - 0x34, 0xd1, 0x01, 0xba, 0x49, 0x31, 0x1e, 0xd4, 0x3d, 0xd0, 0x7e, 0xcc, 0x15, 0xe6, 0x21, 0x0e, - 0x76, 0x9a, 0x9e, 0xf6, 0x35, 0xbb, 0xd3, 0xfd, 0x32, 0xb7, 0x18, 0x24, 0x01, 0x2a, 0x7d, 0xdf, - 0xa7, 0xde, 0x98, 0xe9, 0x68, 0xba, 0xb6, 0xf6, 0x4d, 0x49, 0xd1, 0x10, 0x4c, 0x53, 0xd7, 0xf5, - 0xf5, 0x14, 0x70, 0xe8, 0xa0, 0xa7, 0x7d, 0x5c, 0x75, 0x36, 0x56, 0x2e, 0x6e, 0xbe, 0xb1, 0x48, - 0xfb, 0xa1, 0x52, 0x7c, 0x22, 0x9c, 0x87, 0xa5, 0xf7, 0x00, 0x5b, 0x16, 0x32, 0xbb, 0x55, 0x9d, - 0xeb, 0xaf, 0x4b, 0x4f, 0xbb, 0x7e, 0xf9, 0xee, 0x2b, 0x48, 0xbc, 0xe3, 0x68, 0x8f, 0xb9, 0x41, - 0x8f, 0xf9, 0x19, 0xec, 0xa8, 0x6b, 0xf3, 0xc7, 0xf5, 0x33, 0x16, 0xe7, 0x11, 0x2b, 0x3f, 0x3a, - 0x1a, 0x64, 0x67, 0xcc, 0x1a, 0x84, 0xef, 0x71, 0x10, 0x04, 0xcc, 0x3c, 0xb8, 0x8f, 0x8f, 0xda, - 0x4f, 0x73, 0x35, 0x75, 0x98, 0x0b, 0xba, 0xbd, 0xeb, 0xaf, 0x25, 0x14, 0x16, 0xf4, 0x1e, 0xf8, - 0xd8, 0x69, 0x1a, 0xd1, 0x84, 0x89, 0x89, 0x9e, 0xee, 0xee, 0xae, 0x4a, 0xa2, 0xdb, 0x6a, 0xba, - 0x45, 0x2a, 0x57, 0x6b, 0x7b, 0x7b, 0xde, 0x5c, 0xf2, 0x98, 0x40, 0x54, 0x2f, 0xf9, 0x8c, 0xc9, - 0x5c, 0x3b, 0xe7, 0x5e, 0x8b, 0xb5, 0xdd, 0x83, 0x8d, 0x4a, 0x3a, 0x48, 0x98, 0x26, 0xc2, 0x06, - 0xb4, 0x3f, 0x82, 0x70, 0x82, 0x0d, 0xe1, 0x3e, 0xe0, 0xaa, 0x0e, 0xa0, 0x44, 0x28, 0xa4, 0x01, - 0xfc, 0x37, 0x71, 0x06, 0x45, 0x87, 0x5a, 0x67, 0xfc, 0x26, 0xd7, 0xcc, 0xa1, 0x3c, 0xa6, 0x9e, - 0xd9, 0xe2, 0x6d, 0x7f, 0xc1, 0x56, 0x78, 0xe9, 0x9b, 0x14, 0xd0, 0x8e, 0x62, 0x82, 0xdf, 0x2f, - 0x1d, 0x17, 0x04, 0x36, 0x2b, 0x59, 0xf8, 0xf3, 0x30, 0xc9, 0xd9, 0xc1, 0x58, 0x66, 0x0e, 0x22, - 0x60, 0x80, 0x8f, 0x75, 0xb5, 0x1f, 0x4d, 0x79, 0x12, 0x67, 0x4c, 0x14, 0x7e, 0x1f, 0xb0, 0xbd, - 0x3d, 0x17, 0x22, 0xcb, 0x66, 0x72, 0xce, 0xfa, 0xf8, 0xcd, 0x59, 0xcb, 0x5c, 0xb3, 0xaf, 0xee, - 0x4a, 0x81, 0x04, 0x05, 0xb2, 0x5b, 0xc6, 0xeb, 0x40, 0xc2, 0xbe, 0xa2, 0x86, 0xb8, 0x71, 0x4e, - 0xa6, 0x58, 0x5a, 0xe8, 0xf5, 0x16, 0x4c, 0x83, 0x83, 0x7a, 0xec, 0x5a, 0x7e, 0xb5, 0x79, 0xf1, - 0x78, 0xa5, 0xb0, 0xfe, 0xf8, 0xeb, 0xc3, 0xea, 0xdb, 0x92, 0x38, 0xc5, 0x1b, 0xe6, 0x7a, 0x49, - 0xe2, 0xa3, 0x99, 0xfb, 0xc7, 0x7a, 0x2b, 0x24, 0xac, 0xf0, 0x6b, 0x77, 0x77, 0xdb, 0x8c, 0x0d, - 0x2e, 0xc3, 0x48, 0xae, 0x1e, 0x31, 0x66, 0x61, 0x0a, 0x7d, 0x11, 0x5b, 0xd7, 0xb8, 0xbb, 0xb4, - 0x90, 0x65, 0x15, 0xb2, 0x7c, 0x1e, 0x32, 0xdd, 0xe9, 0x63, 0xff, 0xc8, 0x6a, 0x1f, 0x5c, 0x40, - 0x0d, 0x65, 0xa4, 0xa8, 0x54, 0xd3, 0x0c, 0x55, 0x23, 0xd2, 0xf5, 0x04, 0x04, 0x34, 0x4d, 0xc2, - 0x88, 0x5d, 0x71, 0x3d, 0x45, 0x02, 0xd8, 0x6c, 0xac, 0xd6, 0x73, 0x8d, 0x45, 0x97, 0x1b, 0xed, - 0x09, 0xd9, 0x2c, 0xaa, 0xa6, 0x52, 0x4b, 0x3b, 0xfa, 0xf1, 0xd1, 0x40, 0xda, 0x09, 0xb4, 0x8d, - 0x42, 0x51, 0xa7, 0x07, 0x36, 0xc1, 0xe8, 0x12, 0x17, 0x69, 0x8e, 0x15, 0xc6, 0x7c, 0x7d, 0x9f, - 0x02, 0x89, 0xa2, 0x21, 0x88, 0xbd, 0x0f, 0xb1, 0x43, 0x3d, 0xf0, 0x64, 0xc9, 0xd5, 0x3e, 0x57, - 0xbd, 0x06, 0x66, 0xb6, 0xc9, 0xa5, 0x5e, 0x7b, 0xdf, 0x85, 0xcf, 0xc6, 0x46, 0xb0, 0x51, 0x55, - 0x9e, 0xae, 0x38, 0xc6, 0x36, 0x30, 0x27, 0x32, 0x8c, 0xff, 0x31, 0xc2, 0xa6, 0x04, 0xea, 0xb0, - 0xf0, 0x85, 0x2d, 0x7a, 0xc3, 0xcf, 0x00, 0x49, 0x6c, 0x27, 0x2c, 0x8b, 0x28, 0xf6, 0xe5, 0xf6, - 0x3a, 0x02, 0x87, 0xd8, 0x23, 0xf2, 0xc6, 0xb7, 0x70, 0x1e, 0x96, 0x0a, 0x9e, 0x08, 0x86, 0xea, - 0x5e, 0x80, 0x0a, 0xe8, 0xee, 0xd8, 0xbf, 0x91, 0xf1, 0x7d, 0x25, 0x0b, 0x02, 0xe5, 0xc3, 0x38, - 0x1e, 0xcc, 0x21, 0xc6, 0x67, 0x5c, 0x41, 0xa8, 0x59, 0xe6, 0x50, 0x84, 0x49, 0x3d, 0x07, 0x88, - 0xe3, 0xe1, 0x23, 0xd3, 0x5f, 0x1c, 0x77, 0xf9, 0xbc, 0x1c, 0xcb, 0x32, 0x99, 0x01, 0x3c, 0x90, - 0xc3, 0x8a, 0x91, 0x09, 0x14, 0xbe, 0x9c, 0x38, 0x74, 0x80, 0xeb, 0xa4, 0xf0, 0x17, 0xc8, 0x90, - 0x8c, 0x79, 0xc2, 0x8c, 0x1b, 0x70, 0x9a, 0x01, 0x65, 0xd1, 0xb3, 0x62, 0x5d, 0x8e, 0x09, 0x6c, - 0x1c, 0xf3, 0x49, 0x9e, 0x85, 0x26, 0x40, 0xd6, 0x0d, 0x32, 0x0e, 0x39, 0xd2, 0xfc, 0x7f, 0xc4, - 0xa9, 0x88, 0xe4, 0x2c, 0x85, 0x38, 0x31, 0x92, 0x86, 0x13, 0x46, 0xe2, 0x50, 0x87, 0x3b, 0x40, - 0xd2, 0x1b, 0x31, 0x1d, 0xad, 0xea, 0xa0, 0xa0, 0x78, 0x38, 0xc7, 0x8c, 0x32, 0xac, 0x06, 0x8a, - 0x96, 0x3b, 0x34, 0x80, 0x5a, 0x30, 0x67, 0x5b, 0x24, 0x13, 0xd7, 0x1c, 0x77, 0x4d, 0xcf, 0x31, - 0xe7, 0x60, 0x80, 0xd2, 0xc9, 0x48, 0xcb, 0x0c, 0xd4, 0xe3, 0xe9, 0x75, 0xaa, 0xd9, 0x0c, 0x23, - 0x10, 0x9d, 0xa6, 0xc0, 0xd3, 0x8f, 0x8f, 0x85, 0x18, 0xec, 0x9e, 0xa5, 0x80, 0xfc, 0x57, 0xd0, - 0x47, 0x3e, 0xc9, 0x98, 0xf9, 0x64, 0x98, 0xb0, 0x50, 0x31, 0x02, 0x11, 0x81, 0x4a, 0xbf, 0x3a, - 0x1b, 0x1c, 0x93, 0xd3, 0x21, 0x60, 0xf3, 0x2a, 0x1a, 0x55, 0x55, 0xa3, 0x67, 0xb4, 0xb9, 0x50, - 0x7a, 0x89, 0x62, 0x0f, 0xb6, 0x22, 0x01, 0x5a, 0xa8, 0xa7, 0x58, 0x71, 0x9e, 0x40, 0x56, 0x4e, - 0x60, 0x2c, 0x70, 0x5a, 0x50, 0x59, 0x90, 0x26, 0x65, 0x4a, 0x88, 0x36, 0xa8, 0xfb, 0xa1, 0xde, - 0xea, 0x18, 0x76, 0x6d, 0xba, 0xbe, 0x4a, 0x13, 0xae, 0xcd, 0xea, 0x41, 0x49, 0x51, 0xbd, 0xfd, - 0xdd, 0x5d, 0x67, 0x75, 0x82, 0xaf, 0xbd, 0xf5, 0x0a, 0x6f, 0xad, 0x17, 0xda, 0x9f, 0x4a, 0xa5, - 0xd1, 0xd4, 0x1e, 0x30, 0x18, 0xce, 0x0d, 0x1f, 0x68, 0x87, 0xee, 0xd9, 0xc7, 0x0e, 0xa5, 0xee, - 0x1e, 0x28, 0xdd, 0x13, 0xd7, 0xcd, 0xaf, 0xee, 0xb2, 0xa8, 0xd5, 0x27, 0x67, 0x65, 0x43, 0xc1, - 0x91, 0xf5, 0x21, 0x0d, 0x5a, 0xe0, 0xea, 0x4e, 0xcb, 0xb8, 0x0b, 0xa6, 0x63, 0x7f, 0x34, 0xf6, - 0x43, 0x93, 0x91, 0xe0, 0xe9, 0x16, 0x3c, 0x99, 0x21, 0x9a, 0xeb, 0xa4, 0x15, 0x22, 0xab, 0x79, - 0x00, 0xa1, 0x7f, 0x28, 0xe1, 0x03, 0x08, 0x40, 0x61, 0x10, 0x1b, 0x4c, 0x7a, 0x59, 0xeb, 0x36, - 0x8a, 0x09, 0xa6, 0xab, 0xf4, 0x3d, 0x0c, 0x34, 0x7f, 0xe7, 0x33, 0x84, 0x4c, 0xf2, 0x2c, 0x81, - 0x1e, 0xc1, 0x25, 0x3f, 0x52, 0x40, 0x43, 0x07, 0x20, 0x68, 0x04, 0xba, 0x0d, 0x3b, 0x90, 0x61, - 0xc9, 0x43, 0x25, 0xa2, 0x33, 0xc0, 0x21, 0x70, 0x00, 0xf4, 0xba, 0xc0, 0xd5, 0xb3, 0x1a, 0xc1, - 0x5e, 0xc7, 0xa7, 0xdf, 0x15, 0x25, 0xb6, 0xdb, 0x47, 0x63, 0x4a, 0x60, 0x52, 0x9b, 0x4a, 0xf8, - 0x92, 0x42, 0x98, 0x40, 0x34, 0xe6, 0x73, 0x12, 0x25, 0x70, 0x14, 0x03, 0x47, 0x48, 0xc0, 0xb6, - 0xa8, 0xae, 0x4d, 0x59, 0x92, 0x1e, 0xd1, 0x5e, 0xad, 0x0b, 0xad, 0xa6, 0xc1, 0x2b, 0xcb, 0x26, - 0xf6, 0x85, 0x82, 0xd5, 0x08, 0x52, 0x79, 0x1b, 0xd0, 0x13, 0x34, 0xfb, 0xa1, 0xdb, 0xb0, 0x1f, - 0x00, 0x1a, 0xa8, 0xe8, 0x3d, 0xbf, 0xa7, 0xb6, 0xda, 0x74, 0x84, 0x9b, 0x8e, 0xc2, 0xe8, 0x76, - 0xbd, 0xaf, 0xb2, 0x43, 0xe5, 0x37, 0x33, 0x0e, 0x18, 0x47, 0xe1, 0x9c, 0x91, 0x5d, 0x02, 0x3c, - 0x29, 0x80, 0xce, 0xd7, 0xc2, 0xd3, 0x0c, 0x70, 0x59, 0x4b, 0xd3, 0x7d, 0x3b, 0x15, 0x42, 0x3a, - 0xf2, 0x14, 0x02, 0xb3, 0x0f, 0x4b, 0xed, 0x5e, 0xb1, 0x83, 0x68, 0x49, 0xd8, 0x1d, 0xb4, 0x34, - 0xf6, 0x63, 0xc1, 0xd7, 0x20, 0xd3, 0x5e, 0x99, 0xab, 0x55, 0x11, 0x62, 0xdc, 0xcc, 0x20, 0xb4, - 0xf6, 0xef, 0x1c, 0xa1, 0x22, 0xfb, 0x6d, 0x40, 0x05, 0xeb, 0xe7, 0x56, 0x99, 0x89, 0x2e, 0x71, - 0x0c, 0x33, 0x12, 0x06, 0x4d, 0x74, 0x8f, 0x26, 0x85, 0xd4, 0xd8, 0xfa, 0x88, 0xc0, 0xed, 0xa0, - 0x78, 0xd7, 0x90, 0x32, 0xd9, 0x20, 0x64, 0x52, 0xd0, 0x71, 0x39, 0xea, 0xe2, 0xe3, 0x8a, 0x7d, - 0x03, 0xda, 0xde, 0xa7, 0xc6, 0x4e, 0x69, 0x26, 0x85, 0x94, 0xc0, 0x43, 0xfc, 0x54, 0x5b, 0xf9, - 0x65, 0xad, 0x69, 0x58, 0xd1, 0xf4, 0xae, 0x6d, 0x35, 0x8d, 0x34, 0xf0, 0x46, 0x04, 0x5d, 0x4c, - 0xe0, 0x2c, 0xc7, 0xb0, 0x86, 0x9a, 0x34, 0x7d, 0xf3, 0x8f, 0x40, 0xa9, 0x90, 0xe3, 0x93, 0xfe, - 0xb0, 0x02, 0xb6, 0x50, 0x77, 0xda, 0xa4, 0x85, 0x25, 0x91, 0xcf, 0x6e, 0x58, 0x46, 0xcb, 0xfa, - 0x80, 0xd2, 0x9a, 0x71, 0x11, 0xd0, 0xa6, 0x31, 0x17, 0xd0, 0xfd, 0xb7, 0x6f, 0x29, 0xc9, 0xd8, - 0x9f, 0x39, 0x87, 0xf1, 0xac, 0x47, 0x7c, 0xb2, 0xa5, 0xa7, 0xf5, 0x4a, 0x7a, 0xf6, 0x5f, 0x49, - 0x4f, 0xfb, 0xa7, 0xf4, 0x6c, 0x84, 0x72, 0x02, 0x13, 0xfe, 0x22, 0xbc, 0xef, 0xd4, 0x36, 0x82, - 0x66, 0x75, 0x7f, 0xfc, 0xe9, 0x98, 0xd5, 0xaa, 0x7a, 0x5e, 0x29, 0x66, 0x1f, 0x5f, 0x29, 0x66, - 0x1f, 0x7f, 0x3e, 0x66, 0xb5, 0x22, 0x68, 0xd0, 0xd9, 0xd0, 0x87, 0x20, 0xa5, 0x6e, 0x3b, 0x4f, - 0xe2, 0x36, 0xfa, 0x1f, 0xe2, 0x56, 0xfb, 0x2e, 0xd0, 0x42, 0x4f, 0xeb, 0x95, 0xf4, 0xec, 0xbf, - 0x92, 0x9e, 0xf6, 0xcf, 0xe9, 0xc1, 0x00, 0xcd, 0x8e, 0xcf, 0x47, 0x04, 0xa6, 0x13, 0xb8, 0x0d, - 0xaa, 0xb2, 0x75, 0x2d, 0xd1, 0x60, 0xd7, 0x0a, 0x49, 0x50, 0xc0, 0x36, 0xae, 0xb9, 0xd9, 0x36, - 0x1a, 0x85, 0xed, 0x5a, 0x85, 0x6e, 0x0a, 0x6e, 0xf8, 0xf4, 0x84, 0x65, 0x88, 0x19, 0x29, 0x12, - 0xdc, 0xdf, 0x4f, 0x38, 0x9c, 0xf7, 0x40, 0x11, 0x1d, 0xd2, 0x55, 0x69, 0x28, 0x56, 0x28, 0x79, - 0x0a, 0xe7, 0xc0, 0xf9, 0x9a, 0xd4, 0x58, 0x0c, 0x27, 0x11, 0x08, 0x18, 0x80, 0x05, 0xdd, 0x9a, - 0x39, 0x87, 0x91, 0xc3, 0x28, 0x42, 0xa0, 0x43, 0xc9, 0x85, 0x36, 0x4c, 0x5b, 0x3b, 0x1c, 0x12, - 0xa4, 0xc7, 0x67, 0xb1, 0x1f, 0x0e, 0x5f, 0xe4, 0x47, 0x0b, 0xf8, 0xf0, 0x29, 0x2d, 0x9a, 0x76, - 0x3b, 0xe1, 0x31, 0xd8, 0x1a, 0x1a, 0xa9, 0x0e, 0xa9, 0x6c, 0x8f, 0xa6, 0x2c, 0xba, 0xbd, 0x91, - 0x77, 0x2b, 0x15, 0x27, 0x96, 0x00, 0x11, 0x48, 0x49, 0x96, 0x4f, 0xc1, 0xe0, 0xd5, 0xd9, 0xfd, - 0x1e, 0xbb, 0x16, 0xca, 0x86, 0x36, 0x53, 0x1b, 0xec, 0x0a, 0x4a, 0x35, 0x0c, 0x49, 0x90, 0x45, - 0xc7, 0x7f, 0x78, 0xef, 0xbd, 0x6b, 0x2f, 0xdd, 0x47, 0x38, 0x33, 0x88, 0xf9, 0x71, 0x22, 0xa0, - 0x03, 0x63, 0x02, 0x2c, 0x40, 0xa2, 0x7d, 0xf2, 0xde, 0xfc, 0x7e, 0x02, 0xa3, 0x04, 0xcb, 0x54, - 0x09, 0x6b, 0x23, 0x62, 0xc4, 0x1c, 0x65, 0x78, 0xa7, 0x13, 0x2c, 0xe9, 0x54, 0x8b, 0xe8, 0xb0, - 0xff, 0x42, 0x11, 0xdd, 0x95, 0x55, 0xd4, 0x2a, 0xab, 0xa8, 0xd5, 0xde, 0x2a, 0x22, 0x70, 0x1d, - 0x1d, 0x54, 0x98, 0x58, 0x73, 0x33, 0x2a, 0x75, 0xc2, 0x01, 0xdf, 0xb5, 0x77, 0x20, 0x62, 0x47, - 0x7d, 0x28, 0x45, 0x4c, 0x75, 0x99, 0x69, 0xfc, 0x10, 0x8e, 0x71, 0x06, 0xbc, 0x91, 0x12, 0x12, - 0x6a, 0x65, 0xb7, 0xf7, 0xb4, 0x68, 0xef, 0x98, 0xab, 0x8d, 0xe2, 0xd8, 0x12, 0xab, 0x15, 0x72, - 0x90, 0xbd, 0xc3, 0x04, 0x28, 0x53, 0xbd, 0xa4, 0x08, 0xce, 0xaa, 0x73, 0x36, 0x07, 0x6b, 0x0e, - 0x1e, 0xa1, 0x19, 0x83, 0xf9, 0x78, 0x06, 0x83, 0x22, 0x8b, 0xdd, 0xd5, 0x0e, 0x9c, 0x96, 0x8c, - 0x0b, 0xa5, 0x63, 0xcf, 0x97, 0x2b, 0x56, 0x2b, 0x4e, 0x6c, 0x73, 0xb6, 0x55, 0xaa, 0x83, 0xbb, - 0x94, 0x65, 0x1c, 0x7f, 0x96, 0x81, 0xa2, 0x37, 0x05, 0x7a, 0x6c, 0xef, 0x65, 0x36, 0xf6, 0x2a, - 0x61, 0x2c, 0xfd, 0x41, 0x45, 0x5d, 0x8d, 0x6c, 0xea, 0xba, 0xbc, 0x57, 0xeb, 0x83, 0x5d, 0x9c, - 0x94, 0xc8, 0x02, 0x66, 0xd9, 0x55, 0xd4, 0xe6, 0x1c, 0x72, 0xce, 0x95, 0xca, 0x99, 0xf2, 0x4d, - 0x92, 0x8f, 0xed, 0x50, 0xc0, 0x84, 0xb1, 0xc4, 0xc7, 0xd6, 0x18, 0x57, 0x04, 0x4f, 0x77, 0x1c, - 0x4e, 0x22, 0x99, 0x81, 0xbb, 0x3a, 0xb9, 0xf7, 0x08, 0x17, 0xf8, 0xeb, 0x91, 0x62, 0x8a, 0xa4, - 0x72, 0x01, 0xb1, 0xc0, 0xdb, 0x47, 0x3e, 0x33, 0xde, 0xfb, 0xdd, 0x06, 0x37, 0x43, 0x9a, 0x1d, - 0xf1, 0xe0, 0xce, 0x1e, 0x53, 0xe3, 0xd5, 0x15, 0xa4, 0x3a, 0xc1, 0x32, 0xfa, 0x0c, 0xd7, 0x78, - 0xcd, 0xec, 0x8c, 0xc3, 0x7b, 0xf6, 0x36, 0x63, 0x0a, 0x9c, 0xe1, 0xed, 0x46, 0x11, 0x89, 0xd1, - 0x1d, 0x8c, 0x86, 0xf5, 0xf3, 0x8b, 0x2b, 0x83, 0xec, 0x37, 0xf0, 0x97, 0x94, 0x57, 0x53, 0x44, - 0x86, 0x38, 0x73, 0x85, 0x98, 0x42, 0x92, 0x19, 0x6d, 0x3f, 0x80, 0x84, 0x91, 0x00, 0x58, 0xb5, - 0x81, 0x75, 0xce, 0x22, 0xf8, 0x41, 0x08, 0x3f, 0x0f, 0x6c, 0x08, 0x4f, 0xc2, 0x2c, 0x5e, 0x84, - 0xc0, 0x1b, 0x9f, 0x0e, 0xfb, 0xab, 0x2d, 0xb5, 0xa7, 0x3c, 0xf0, 0x19, 0xbe, 0xdb, 0x1d, 0x67, - 0x21, 0x5c, 0xde, 0x47, 0x8c, 0x89, 0xad, 0xac, 0x67, 0x09, 0x8f, 0x31, 0xed, 0xa2, 0x92, 0x70, - 0x33, 0x23, 0xd6, 0xcc, 0x58, 0x8b, 0x01, 0x83, 0x01, 0xb8, 0x08, 0xd8, 0x00, 0xaf, 0xf0, 0x78, - 0x12, 0x5d, 0x82, 0x2d, 0x1b, 0xae, 0x4a, 0x67, 0x0c, 0x2e, 0x4f, 0x9e, 0x6b, 0x0d, 0xd4, 0x5f, - 0x7b, 0xa9, 0x7a, 0xff, 0x06, 0xe5, 0x7d, 0xd4, 0xdf, 0xb1, 0xd7, 0xa5, 0x2f, 0x6f, 0xda, 0x30, - 0xb9, 0xe2, 0x05, 0x0f, 0xce, 0x3d, 0x88, 0xcb, 0x4b, 0x9b, 0x90, 0xd1, 0x20, 0x1f, 0xed, 0xfd, - 0xfa, 0xf0, 0x62, 0xf0, 0x92, 0xd0, 0x3b, 0xda, 0x33, 0x32, 0xc7, 0x2c, 0xbf, 0x7b, 0x49, 0xe6, - 0x17, 0xda, 0xfb, 0xed, 0xf4, 0xb2, 0xfe, 0x65, 0xf0, 0x22, 0xbe, 0xf7, 0xb4, 0xf7, 0xcf, 0x9c, - 0x0b, 0x40, 0x57, 0x3f, 0xe6, 0x93, 0xfa, 0x45, 0xa4, 0x43, 0x80, 0x78, 0x59, 0x07, 0x5f, 0x9f, - 0x35, 0x5e, 0xb6, 0xed, 0x9b, 0xf5, 0x3e, 0x83, 0xe2, 0x45, 0x1a, 0x80, 0x00, 0x8d, 0x58, 0x36, - 0xf9, 0xe5, 0x0d, 0xaa, 0x7c, 0x46, 0xae, 0x54, 0xf8, 0x96, 0xf6, 0x2e, 0x17, 0x3c, 0xe1, 0x93, - 0xa9, 0x3e, 0x03, 0x72, 0xfd, 0xbe, 0x56, 0xe0, 0x84, 0xab, 0xe7, 0x05, 0x6a, 0x6b, 0xfa, 0xb9, - 0xba, 0x84, 0x00, 0x82, 0xd1, 0x66, 0x6b, 0x2d, 0xb5, 0xc9, 0x13, 0xeb, 0x62, 0xc0, 0xbb, 0xc3, - 0xff, 0xfb, 0x7a, 0xd2, 0xc0, 0xbb, 0x17, 0x32, 0x15, 0x5e, 0xd0, 0xf0, 0xb6, 0x86, 0x3f, 0xaa, - 0xff, 0x17, 0x39, 0xb0, 0x85, 0xbd, 0x64, 0x17, 0x00, 0x00 + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xad, 0x58, 0x6b, 0x53, 0xdb, 0x4a, + 0x12, 0xfd, 0xee, 0x5f, 0x31, 0xcc, 0x6e, 0x51, 0x52, 0x21, 0xcb, 0x18, 0xe7, 0xb5, 0xc6, 0x72, + 0x96, 0x87, 0x6f, 0x60, 0x2f, 0x01, 0x6f, 0xcc, 0x86, 0xda, 0xca, 0xa6, 0x72, 0x85, 0xd4, 0xb6, + 0x27, 0xc8, 0x33, 0xba, 0xd2, 0xc8, 0x86, 0x02, 0xfe, 0xfb, 0x76, 0xcf, 0x48, 0x7e, 0x81, 0x93, + 0x5b, 0x29, 0x2a, 0x55, 0x41, 0x1a, 0xf5, 0x74, 0x9f, 0x7e, 0x9d, 0xe9, 0x71, 0x67, 0xeb, 0xf8, + 0xe2, 0xe8, 0xf2, 0xbf, 0xfd, 0x1e, 0x1b, 0xeb, 0x49, 0xd2, 0xed, 0xd0, 0xff, 0x2c, 0x09, 0xe5, + 0x28, 0xe0, 0x20, 0x39, 0xbe, 0x43, 0x18, 0x77, 0x3b, 0x13, 0xd0, 0x21, 0x8b, 0xc6, 0x61, 0x96, + 0x83, 0x0e, 0x78, 0xa1, 0x87, 0xf5, 0x77, 0xbc, 0x5c, 0xad, 0x45, 0x4a, 0x6a, 0x90, 0xb8, 0x3c, + 0x13, 0xb1, 0x1e, 0x07, 0x31, 0x4c, 0x45, 0x04, 0x75, 0xf3, 0xe2, 0x09, 0x29, 0xb4, 0x08, 0x93, + 0x7a, 0x1e, 0x85, 0x09, 0x04, 0x4d, 0x6f, 0x12, 0xde, 0x8a, 0x49, 0x31, 0x99, 0xbf, 0x17, 0x39, + 0x64, 0xe6, 0x25, 0xbc, 0xc6, 0x77, 0xa9, 0x38, 0xab, 0xc9, 0x70, 0x02, 0x01, 0x9f, 0x0a, 0x98, + 0xa5, 0x2a, 0xd3, 0x68, 0x45, 0x0b, 0x9d, 0x40, 0xf7, 0x4a, 0xfc, 0x26, 0xd8, 0x00, 0xb4, 0x16, + 0x72, 0x94, 0x77, 0x1a, 0x76, 0xb1, 0x93, 0x47, 0x99, 0x48, 0x75, 0xb7, 0x36, 0x0d, 0x33, 0x96, + 0xa8, 0x48, 0xa4, 0x5e, 0x1c, 0xc4, 0x2a, 0x2a, 0x26, 0x08, 0xc8, 0xc3, 0x85, 0x60, 0xab, 0x49, + 0x7f, 0xd2, 0x4c, 0x69, 0x15, 0xf0, 0xb1, 0xd6, 0x69, 0x9b, 0x7b, 0x68, 0x4f, 0x9e, 0x29, 0x95, + 0xe6, 0xc1, 0xae, 0x97, 0x66, 0x30, 0xc0, 0xd7, 0xc1, 0xe0, 0xf4, 0x38, 0xe0, 0x7c, 0x7f, 0x58, + 0xc8, 0x48, 0x0b, 0x25, 0xd9, 0xe8, 0x34, 0x76, 0xb4, 0x7b, 0x9f, 0x81, 0x2e, 0x32, 0xc9, 0x62, + 0x7f, 0x04, 0xba, 0x97, 0x00, 0xa9, 0x3d, 0xbc, 0x33, 0x9f, 0x1e, 0xe7, 0xa2, 0x51, 0x6f, 0x45, + 0x32, 0xca, 0x20, 0xd4, 0x50, 0x0a, 0xaf, 0x08, 0x9e, 0x38, 0xee, 0xfd, 0x4c, 0xc8, 0x58, 0xcd, + 0x7c, 0x95, 0x82, 0x74, 0x0c, 0x9e, 0xbc, 0xdd, 0x68, 0xdc, 0x48, 0xe5, 0xcf, 0x12, 0x20, 0x2b, + 0x8d, 0x21, 0xee, 0x2e, 0x32, 0xc8, 0x1b, 0x79, 0xe9, 0x6b, 0xe3, 0x6f, 0x33, 0x31, 0x14, 0xf5, + 0xea, 0x95, 0x2f, 0x29, 0x3c, 0x5c, 0x53, 0x88, 0x20, 0xff, 0xf3, 0xe9, 0xcc, 0xe1, 0x8d, 0x85, + 0xb0, 0xc7, 0xbf, 0xe5, 0x90, 0x0c, 0x97, 0x77, 0x9d, 0xe3, 0x2e, 0xcc, 0x59, 0xae, 0x99, 0x0e, + 0xc8, 0x4d, 0x4e, 0xf1, 0xe0, 0xee, 0xbe, 0xf6, 0x63, 0x91, 0x53, 0x1e, 0xe2, 0x60, 0x6b, 0xd7, + 0xd3, 0xbe, 0x86, 0x5b, 0x7d, 0x54, 0xe5, 0x96, 0x82, 0x24, 0x51, 0xa5, 0xef, 0xfb, 0xdc, 0x1b, + 0x82, 0x8e, 0xc6, 0x0b, 0x6b, 0xdf, 0x73, 0x25, 0x1b, 0x12, 0x34, 0x77, 0x5d, 0x5f, 0x8f, 0x11, + 0x87, 0x0e, 0xba, 0xda, 0xa7, 0x55, 0x67, 0x69, 0xe5, 0xe2, 0xfa, 0x3b, 0x44, 0xda, 0x0f, 0xf3, + 0x5c, 0x8c, 0xa4, 0x73, 0xff, 0xe8, 0xdd, 0xe3, 0x96, 0x99, 0xca, 0x6e, 0xf2, 0xf6, 0x97, 0xaf, + 0x8f, 0x9e, 0x76, 0xfd, 0xea, 0xdd, 0xcf, 0x31, 0xf1, 0x8e, 0xa3, 0x3d, 0x70, 0x83, 0x2e, 0xf8, + 0x19, 0xee, 0xa8, 0x6b, 0xf3, 0xc7, 0xf5, 0x33, 0x88, 0x8b, 0x08, 0xaa, 0x8f, 0x8e, 0x46, 0xd9, + 0x09, 0x58, 0x83, 0xf8, 0x3d, 0x0e, 0x82, 0x00, 0xcc, 0x83, 0xfb, 0xf0, 0xa0, 0xfd, 0xb4, 0xc8, + 0xc7, 0x0e, 0xb8, 0xa8, 0xdb, 0xfb, 0xf2, 0xb5, 0x82, 0x02, 0x41, 0xf7, 0x5e, 0x0c, 0x9d, 0x5d, + 0x23, 0x9a, 0x80, 0x1c, 0xe9, 0xf1, 0xf6, 0xf6, 0xbc, 0x24, 0x3a, 0xcd, 0x5d, 0xb7, 0x4c, 0xe5, + 0x7c, 0x6d, 0x67, 0xc7, 0x9b, 0x2a, 0x11, 0x33, 0x8c, 0xea, 0xa5, 0x98, 0x80, 0x2a, 0xb4, 0x73, + 0xee, 0x35, 0xa1, 0xe5, 0xee, 0x2f, 0x55, 0xd2, 0x7e, 0x02, 0x9a, 0x49, 0x1b, 0xd0, 0xa3, 0x01, + 0x86, 0x13, 0x6d, 0x48, 0xf7, 0x9e, 0x56, 0x75, 0x80, 0x25, 0xc2, 0x31, 0x0d, 0xe8, 0xbf, 0x89, + 0x33, 0x2a, 0x3a, 0xd0, 0x3a, 0x13, 0xd7, 0x85, 0x06, 0x87, 0x8b, 0x98, 0x7b, 0x66, 0x8b, 0xb7, + 0xfe, 0x85, 0x5a, 0x61, 0xd3, 0x37, 0x25, 0xb1, 0x1d, 0xe5, 0x88, 0xbe, 0x5f, 0x3a, 0x2e, 0x0a, + 0x2c, 0x57, 0xb2, 0xf4, 0xa7, 0x61, 0x52, 0xc0, 0xfe, 0x50, 0x65, 0x0e, 0x21, 0x00, 0xc4, 0x07, + 0x1d, 0xed, 0x47, 0x63, 0x91, 0xc4, 0x19, 0xc8, 0xd2, 0xef, 0x7d, 0xd8, 0xd9, 0x71, 0x31, 0xb2, + 0x30, 0x51, 0x53, 0x38, 0xa2, 0x6f, 0xce, 0x42, 0xe6, 0x0b, 0x7c, 0x75, 0xe7, 0x0a, 0x14, 0x2a, + 0x50, 0x9d, 0x2a, 0x5e, 0xfb, 0x0a, 0xf7, 0x95, 0x35, 0x24, 0x8c, 0x73, 0x2a, 0xa5, 0xd2, 0x22, + 0xaf, 0xd7, 0x60, 0x1a, 0x1c, 0xdc, 0x83, 0x2f, 0xea, 0xab, 0xcd, 0x8b, 0x27, 0x56, 0x0a, 0xeb, + 0x8f, 0xbf, 0xdf, 0xcf, 0xbf, 0x3d, 0x32, 0xa7, 0x7c, 0xa3, 0x5c, 0x3f, 0xb2, 0xf8, 0x70, 0xe2, + 0xfe, 0xb1, 0xd8, 0x8a, 0x09, 0x2b, 0xfd, 0xda, 0xde, 0x5e, 0x37, 0x63, 0x83, 0x0b, 0x14, 0xc9, + 0xf9, 0x23, 0xc5, 0x2c, 0x4c, 0xb1, 0x2f, 0x62, 0xeb, 0x9a, 0x70, 0x1f, 0x2d, 0x64, 0xb5, 0x0a, + 0x59, 0x3d, 0x0f, 0x99, 0x6f, 0x1d, 0x51, 0xff, 0xa8, 0xd5, 0x3e, 0xb8, 0xc0, 0x1a, 0xca, 0x58, + 0x59, 0xa9, 0xa6, 0x19, 0x56, 0x8d, 0x28, 0xd7, 0x93, 0x18, 0xd0, 0x34, 0x09, 0x23, 0xb8, 0x12, + 0x7a, 0x4c, 0x04, 0xb0, 0xdc, 0x58, 0xcd, 0xe7, 0x1a, 0x8b, 0x3f, 0x2e, 0xb5, 0x27, 0x66, 0xb3, + 0xac, 0x9a, 0x95, 0x5a, 0xda, 0xd2, 0x0f, 0x0f, 0x06, 0xd2, 0x56, 0xa0, 0x6d, 0x14, 0xca, 0x3a, + 0xdd, 0xb7, 0x09, 0x26, 0x97, 0x84, 0x4c, 0x0b, 0xaa, 0x30, 0xf0, 0xf5, 0x5d, 0x8a, 0x24, 0x4a, + 0x86, 0x30, 0xf6, 0x3e, 0xc6, 0x8e, 0xf4, 0xe0, 0x93, 0x25, 0x57, 0xfb, 0xbc, 0xea, 0x35, 0x32, + 0xb3, 0x4d, 0x2e, 0xf7, 0x5a, 0x7b, 0x2e, 0x7e, 0x36, 0x36, 0x82, 0xa5, 0xaa, 0xf2, 0xf4, 0x8a, + 0x63, 0xb0, 0x84, 0x39, 0x51, 0x61, 0xfc, 0xaf, 0x01, 0x35, 0x25, 0x52, 0x87, 0x85, 0x2f, 0x6d, + 0xd1, 0x1b, 0x7e, 0x46, 0x48, 0x72, 0x3d, 0x61, 0x59, 0xc4, 0xa9, 0x2f, 0xd7, 0xd7, 0x09, 0x38, + 0xc6, 0x9e, 0x90, 0x37, 0xbe, 0x87, 0xd3, 0xb0, 0x52, 0xf0, 0x44, 0x30, 0xcc, 0xef, 0x24, 0xaa, + 0xc0, 0xee, 0x8e, 0xfd, 0x6b, 0x15, 0xdf, 0xad, 0x64, 0x41, 0x92, 0x7c, 0x18, 0xc7, 0xbd, 0x29, + 0xc6, 0xf8, 0x4c, 0xe4, 0x18, 0x6a, 0xc8, 0x1c, 0x4e, 0x30, 0xb9, 0xe7, 0x20, 0x71, 0xdc, 0x7f, + 0x00, 0xfd, 0xd9, 0x71, 0x1f, 0x9f, 0x97, 0x83, 0x2c, 0x53, 0x19, 0xc2, 0x43, 0x39, 0xaa, 0x18, + 0x95, 0x60, 0xe1, 0xab, 0x91, 0xc3, 0x7b, 0xb4, 0xce, 0x4a, 0x7f, 0x91, 0x0c, 0xd9, 0x50, 0x24, + 0x60, 0xdc, 0xc0, 0xd3, 0x0c, 0x29, 0x8b, 0x9f, 0x95, 0xeb, 0x6a, 0xc8, 0x70, 0xe3, 0x50, 0x8c, + 0x8a, 0x2c, 0x34, 0x01, 0xb2, 0x6e, 0xb0, 0x61, 0x28, 0x88, 0xe6, 0xff, 0x27, 0x4f, 0x65, 0xa4, + 0x26, 0x29, 0xc6, 0x09, 0x58, 0x1a, 0x8e, 0x80, 0xc5, 0xa1, 0x0e, 0xb7, 0x90, 0xa4, 0x97, 0x62, + 0x3a, 0x98, 0xd7, 0x41, 0x49, 0xf1, 0x78, 0x8e, 0x19, 0x65, 0x54, 0x0d, 0x9c, 0x2c, 0xb7, 0x79, + 0x80, 0xb5, 0x60, 0xce, 0xb6, 0x48, 0x25, 0xae, 0x39, 0xee, 0x76, 0x3d, 0xc7, 0x9c, 0x83, 0x01, + 0x49, 0x27, 0x03, 0xad, 0x32, 0x54, 0x4f, 0xa7, 0xd7, 0xa9, 0x86, 0x09, 0x45, 0x20, 0x3a, 0x4d, + 0x91, 0xa7, 0x1f, 0x1e, 0x4a, 0x31, 0xdc, 0x3d, 0x49, 0x11, 0xf9, 0x6f, 0xa8, 0x8f, 0x7d, 0x54, + 0x31, 0xf8, 0xac, 0x9f, 0x40, 0x98, 0x03, 0xc3, 0x88, 0x60, 0xa5, 0x5f, 0x9d, 0xf5, 0x8e, 0xd9, + 0x69, 0x1f, 0xb1, 0x79, 0x2b, 0x1a, 0xf3, 0x55, 0x8d, 0x9e, 0xd1, 0xe6, 0x62, 0xe9, 0x25, 0x39, + 0xdc, 0xdb, 0x8a, 0x44, 0x68, 0xa1, 0x1e, 0x53, 0xc5, 0x79, 0x92, 0x58, 0x39, 0xc1, 0xb1, 0xc0, + 0x69, 0x62, 0x65, 0x61, 0x9a, 0x72, 0x53, 0x42, 0xbc, 0xc1, 0xdd, 0xf7, 0xf5, 0x66, 0xdb, 0xb0, + 0xeb, 0xae, 0xeb, 0xe7, 0x69, 0x22, 0xb4, 0x59, 0xdd, 0xaf, 0x28, 0xaa, 0xbb, 0xb7, 0xbd, 0xed, + 0xcc, 0x4f, 0xf0, 0x85, 0xb7, 0x5e, 0xe9, 0xad, 0xf5, 0x42, 0xfb, 0x63, 0x95, 0x6b, 0x32, 0xb5, + 0x83, 0x0c, 0x46, 0x73, 0xc3, 0x7b, 0xde, 0xe6, 0x3b, 0xf6, 0xb1, 0xcd, 0xb9, 0xbb, 0x83, 0x4a, + 0x77, 0xe4, 0x97, 0xdd, 0xaf, 0xee, 0x63, 0x59, 0xab, 0x4f, 0xce, 0xca, 0x46, 0x8e, 0x47, 0xd6, + 0xfb, 0x34, 0x68, 0xa2, 0xab, 0x5b, 0x4d, 0xe3, 0x2e, 0x9a, 0x8e, 0xfd, 0xc1, 0xd0, 0x0f, 0x4d, + 0x46, 0x82, 0xa7, 0x5b, 0xe8, 0x64, 0xc6, 0x68, 0x2e, 0x92, 0x56, 0x8a, 0xcc, 0xe7, 0x01, 0x82, + 0xfe, 0xbe, 0x82, 0x8f, 0x20, 0x10, 0x85, 0x41, 0x6c, 0x30, 0xe9, 0xc7, 0x5a, 0xa7, 0x51, 0x4e, + 0x30, 0x9d, 0x5c, 0xdf, 0xe1, 0x40, 0xf3, 0x4f, 0x31, 0x21, 0xc8, 0xac, 0xc8, 0x12, 0xec, 0x11, + 0x5a, 0xf2, 0xa3, 0x1c, 0x69, 0x68, 0x1f, 0x05, 0x8d, 0x40, 0xa7, 0x61, 0x07, 0x32, 0x2a, 0x79, + 0xac, 0x44, 0x72, 0x06, 0x39, 0x04, 0x0f, 0x80, 0x6e, 0x07, 0xb9, 0x7a, 0x52, 0x63, 0xd4, 0xeb, + 0xf4, 0xf4, 0x2d, 0xe7, 0xcc, 0x76, 0xfb, 0x60, 0xc8, 0x19, 0x4e, 0x6a, 0x63, 0x85, 0x5f, 0x52, + 0x0c, 0x13, 0x8a, 0xc6, 0x62, 0xca, 0xa2, 0x04, 0x8f, 0x62, 0xe4, 0x08, 0x85, 0xd8, 0x66, 0xab, + 0x6b, 0x63, 0x48, 0xd2, 0x43, 0xde, 0xad, 0x75, 0xb0, 0xd5, 0x34, 0x7a, 0x65, 0xd9, 0xc4, 0xbe, + 0x70, 0xb4, 0x1a, 0x61, 0x2a, 0x6f, 0x02, 0x7e, 0x42, 0x66, 0xdf, 0x77, 0x1a, 0xf6, 0x03, 0x42, + 0x43, 0x15, 0xdd, 0xe7, 0xf7, 0xd4, 0xe6, 0x9b, 0x0e, 0x69, 0xd3, 0x61, 0x18, 0xdd, 0x2c, 0xf6, + 0xad, 0xec, 0xc8, 0x8b, 0xeb, 0x89, 0x40, 0x8c, 0x83, 0x70, 0x0a, 0x6c, 0x9b, 0x21, 0x4f, 0x4a, + 0xa4, 0xf3, 0x85, 0xf0, 0x38, 0x43, 0x5c, 0xd6, 0xd2, 0x78, 0xcf, 0x4e, 0x85, 0x98, 0x8e, 0x22, + 0xc5, 0xc0, 0xec, 0xe1, 0x52, 0xab, 0x5b, 0xee, 0x60, 0x5a, 0x31, 0xb8, 0xc5, 0x96, 0xa6, 0x7e, + 0x2c, 0xf9, 0x1a, 0x65, 0x5a, 0x73, 0x73, 0xb5, 0x55, 0x84, 0x14, 0x37, 0x33, 0x08, 0x2d, 0xfc, + 0x3b, 0x27, 0xa8, 0xc4, 0x7e, 0x4b, 0x50, 0xd1, 0xfa, 0xb9, 0x55, 0x66, 0xa2, 0xcb, 0x1c, 0xc3, + 0x8c, 0x0c, 0xb0, 0x89, 0xee, 0xc8, 0xa4, 0x54, 0x9a, 0x5a, 0x9f, 0x10, 0xb8, 0x6d, 0x12, 0xef, + 0x18, 0x52, 0x66, 0x4b, 0x84, 0xcc, 0x4a, 0x3a, 0xae, 0x46, 0x5d, 0x7a, 0x9c, 0xb3, 0x6f, 0xc0, + 0x5b, 0x7b, 0xdc, 0xd8, 0xa9, 0xcc, 0xa4, 0x98, 0x12, 0x7c, 0x88, 0x9f, 0x6a, 0xab, 0xbe, 0x2c, + 0x34, 0xf5, 0x57, 0x34, 0xbd, 0x69, 0x59, 0x4d, 0x03, 0x8d, 0xbc, 0x11, 0x61, 0x17, 0x33, 0x3c, + 0xcb, 0x29, 0xac, 0xa1, 0x66, 0xbb, 0xbe, 0xf9, 0xc7, 0xb0, 0x54, 0xd8, 0xf1, 0xc9, 0x51, 0x7f, + 0x05, 0x6c, 0xa9, 0xee, 0x74, 0x97, 0x97, 0x96, 0x64, 0x31, 0xb9, 0x86, 0x8c, 0x57, 0xf5, 0x81, + 0xa5, 0x35, 0x11, 0x32, 0xe0, 0xbb, 0xc6, 0x5c, 0xc0, 0xf7, 0x5e, 0xbf, 0xe6, 0x2c, 0x83, 0x3f, + 0x0b, 0x81, 0xe3, 0x59, 0x97, 0xf9, 0x6c, 0x4d, 0x4f, 0xf3, 0x85, 0xf4, 0xec, 0xbd, 0x90, 0x9e, + 0xd6, 0x2f, 0xe9, 0x59, 0x0a, 0xe5, 0x08, 0x27, 0xfc, 0x59, 0x78, 0xd7, 0xae, 0x2d, 0x05, 0xcd, + 0xea, 0xfe, 0xf0, 0xcb, 0x31, 0xab, 0xad, 0xea, 0x79, 0xa1, 0x98, 0x7d, 0x78, 0xa1, 0x98, 0x7d, + 0xf8, 0xf5, 0x98, 0xd5, 0xca, 0xa0, 0x61, 0x67, 0x63, 0x1f, 0xa2, 0x54, 0x7e, 0xd3, 0x7e, 0x12, + 0xb7, 0xc1, 0x5f, 0x88, 0x5b, 0xed, 0x87, 0x40, 0x4b, 0x3d, 0xcd, 0x17, 0xd2, 0xb3, 0xf7, 0x42, + 0x7a, 0x5a, 0xbf, 0xa6, 0x87, 0x02, 0x34, 0x39, 0x3e, 0x1f, 0x30, 0x9c, 0x4e, 0xf0, 0x36, 0x98, + 0x57, 0xad, 0x6b, 0x89, 0x86, 0xba, 0x56, 0x2a, 0x46, 0x02, 0xb6, 0x71, 0xcd, 0xcd, 0xb6, 0xd1, + 0x28, 0x6d, 0xd7, 0x56, 0xe8, 0xa6, 0xe4, 0x86, 0x8f, 0x4f, 0x58, 0x86, 0x99, 0x91, 0x22, 0xa1, + 0xfd, 0x47, 0x89, 0xc0, 0xf3, 0x1e, 0x29, 0xa2, 0xcd, 0x3a, 0x79, 0x1a, 0xca, 0x39, 0x4a, 0x91, + 0xe2, 0x39, 0x70, 0xbe, 0x20, 0x35, 0x88, 0xf1, 0x24, 0x42, 0x01, 0x03, 0xb0, 0xa4, 0x5b, 0x33, + 0xe7, 0x00, 0x3b, 0x88, 0x22, 0x02, 0xda, 0x57, 0x42, 0x6a, 0xc3, 0xb4, 0xb5, 0x83, 0x3e, 0x23, + 0x7a, 0x7c, 0x16, 0xfb, 0x41, 0x7f, 0x23, 0x3f, 0x5a, 0xc0, 0x07, 0x4f, 0x69, 0xd1, 0xb4, 0xdb, + 0x89, 0x88, 0xd1, 0x56, 0xdf, 0x48, 0xb5, 0xd9, 0xca, 0xf6, 0x68, 0x0c, 0xd1, 0xcd, 0xb5, 0xba, + 0x9d, 0xab, 0x38, 0xb1, 0x04, 0x48, 0x40, 0x2a, 0xb2, 0x7c, 0x0a, 0x86, 0xae, 0xce, 0xee, 0x8f, + 0xd8, 0xb5, 0x54, 0xd6, 0xb7, 0x99, 0x5a, 0x62, 0x57, 0x54, 0xaa, 0x71, 0x48, 0xc2, 0x2c, 0x3a, + 0xfe, 0xfd, 0x3b, 0xef, 0x4d, 0xeb, 0xd1, 0x7d, 0xc0, 0x33, 0x83, 0x99, 0x1f, 0x27, 0x02, 0xde, + 0x33, 0x26, 0xd0, 0x02, 0x26, 0xda, 0x67, 0xef, 0xcc, 0xef, 0x27, 0x38, 0x4a, 0x40, 0x96, 0x57, + 0xb0, 0x96, 0x22, 0xc6, 0xcc, 0x51, 0x46, 0x77, 0x3a, 0x09, 0x49, 0x7b, 0xb5, 0x88, 0x0e, 0x8e, + 0x36, 0x14, 0xd1, 0x6d, 0x55, 0x45, 0xcd, 0xaa, 0x8a, 0x9a, 0xad, 0xb5, 0x22, 0x42, 0xd7, 0xc9, + 0xc1, 0x9c, 0x12, 0x6b, 0x6e, 0x46, 0x95, 0x4e, 0x3c, 0xe0, 0x3b, 0xf6, 0x0e, 0xc4, 0xec, 0xa8, + 0x8f, 0xa5, 0x48, 0xa9, 0xae, 0x32, 0x4d, 0x1f, 0xc2, 0x21, 0xcd, 0x80, 0xd7, 0x4a, 0x61, 0x42, + 0xad, 0xec, 0xfa, 0x9e, 0x26, 0xef, 0x1e, 0x8b, 0x7c, 0xa9, 0x38, 0xd6, 0xc4, 0x6a, 0xa5, 0x1c, + 0x66, 0xef, 0x20, 0x41, 0xca, 0xcc, 0x37, 0x29, 0xc2, 0xb3, 0xea, 0x1c, 0xa6, 0x68, 0xcd, 0xa1, + 0x23, 0x34, 0x03, 0x9c, 0x8f, 0x27, 0x38, 0x28, 0x42, 0xec, 0xce, 0x77, 0xd0, 0xb4, 0x64, 0x5c, + 0xa8, 0x1c, 0x7b, 0xbe, 0x5c, 0xa9, 0x5a, 0x69, 0x62, 0x9b, 0xc2, 0x5a, 0xa9, 0xf6, 0x6e, 0x53, + 0xc8, 0x04, 0xfd, 0x2c, 0x83, 0x45, 0x6f, 0x0a, 0xf4, 0xd8, 0xde, 0xcb, 0x6c, 0xec, 0xf3, 0x04, + 0x20, 0xfd, 0x49, 0x45, 0x5d, 0x0d, 0x6c, 0xea, 0x3a, 0xa2, 0x5b, 0x3b, 0x42, 0xbb, 0x34, 0x29, + 0xb1, 0x19, 0xce, 0xb2, 0xf3, 0xa8, 0x4d, 0x05, 0xe6, 0x5c, 0xe4, 0x79, 0x01, 0xb9, 0x6f, 0x92, + 0x7c, 0x6c, 0x87, 0x02, 0x90, 0xc6, 0x92, 0x18, 0x5a, 0x63, 0x22, 0x67, 0x74, 0xba, 0xd3, 0x70, + 0x12, 0xa9, 0x0c, 0xdd, 0xd5, 0xc9, 0x9d, 0xc7, 0x84, 0xa4, 0x5f, 0x8f, 0x72, 0xc8, 0x59, 0xaa, + 0x66, 0x18, 0x0b, 0xba, 0x7d, 0x14, 0x13, 0xe3, 0xbd, 0xdf, 0x69, 0x08, 0x33, 0xa4, 0xd9, 0x11, + 0x0f, 0xef, 0xec, 0x31, 0x37, 0x5e, 0x5d, 0x61, 0xaa, 0x13, 0x2a, 0xa3, 0x4f, 0x78, 0x8d, 0xd7, + 0x60, 0x67, 0x1c, 0xd1, 0xb5, 0xb7, 0x19, 0x53, 0xe0, 0x40, 0xb7, 0x9b, 0x9c, 0x29, 0x8a, 0x6e, + 0x6f, 0xd0, 0xaf, 0x9f, 0x5f, 0x5c, 0x19, 0x64, 0xbf, 0xa3, 0xbf, 0xac, 0xba, 0x9a, 0x12, 0x32, + 0xc2, 0x59, 0xe4, 0x84, 0x29, 0x64, 0x99, 0xd1, 0xf6, 0x13, 0x48, 0x14, 0x09, 0x84, 0x55, 0xeb, + 0x59, 0xe7, 0x2c, 0x82, 0x9f, 0x84, 0xf0, 0x53, 0xcf, 0x86, 0xf0, 0x24, 0xcc, 0xe2, 0x59, 0x88, + 0xbc, 0xf1, 0xf1, 0xe0, 0x68, 0xbe, 0xa5, 0xf6, 0x94, 0x07, 0x3e, 0xe1, 0x77, 0xbb, 0xe3, 0x2c, + 0xc4, 0xcb, 0xfb, 0x00, 0x40, 0xae, 0x65, 0x3d, 0x4b, 0x44, 0x4c, 0x69, 0x97, 0x2b, 0x09, 0x37, + 0x33, 0x62, 0xcd, 0x8c, 0xb5, 0x14, 0x30, 0x1c, 0x80, 0xcb, 0x80, 0xf5, 0xe8, 0x0a, 0x4f, 0x27, + 0xd1, 0x25, 0xda, 0xb2, 0xe1, 0x5a, 0xe9, 0x8c, 0xde, 0xe5, 0xc9, 0x73, 0xad, 0x41, 0xfa, 0x6b, + 0x9b, 0xaa, 0xf7, 0x1f, 0x58, 0xde, 0x87, 0x47, 0x5b, 0xf6, 0xba, 0xf4, 0xf9, 0x55, 0x0b, 0x27, + 0x57, 0xba, 0xe0, 0xe1, 0xb9, 0x87, 0x71, 0xd9, 0xb4, 0x89, 0x18, 0x0d, 0xf3, 0xd1, 0xda, 0xab, + 0xf7, 0x2f, 0x7a, 0x9b, 0x84, 0xde, 0xf0, 0xae, 0x91, 0x39, 0x86, 0xe2, 0x76, 0x93, 0xcc, 0x5b, + 0xde, 0xfd, 0xfd, 0xf4, 0xb2, 0xfe, 0xb9, 0xb7, 0x11, 0xdf, 0x3b, 0xde, 0xfd, 0x77, 0x21, 0x24, + 0xa2, 0xab, 0x1f, 0x8b, 0x51, 0xfd, 0x22, 0xd2, 0x21, 0x42, 0xbc, 0xac, 0xa3, 0xaf, 0xcf, 0x1a, + 0xaf, 0xda, 0xf6, 0xd5, 0x62, 0x9f, 0x41, 0xb1, 0x91, 0x06, 0x30, 0x40, 0x03, 0xc8, 0x46, 0x6f, + 0x5f, 0x91, 0xca, 0x67, 0xe4, 0x2a, 0x85, 0xaf, 0x79, 0xf7, 0x72, 0x26, 0x12, 0x31, 0x1a, 0xeb, + 0x33, 0x24, 0xd7, 0x1f, 0x6b, 0x45, 0x4e, 0xa8, 0x5d, 0x19, 0x09, 0xe6, 0x7c, 0x82, 0x29, 0x7b, + 0xc3, 0x42, 0x19, 0x33, 0x08, 0x31, 0xe1, 0x90, 0xb9, 0x1b, 0xb1, 0x34, 0xed, 0x88, 0x3d, 0x83, + 0x3c, 0x6d, 0xed, 0x7d, 0xcb, 0xde, 0xae, 0x69, 0x79, 0x6b, 0xb4, 0x24, 0x38, 0xc2, 0xfd, 0x40, + 0x07, 0xef, 0x5e, 0x5d, 0x62, 0x62, 0xd0, 0x99, 0xdd, 0xe6, 0x42, 0xa8, 0xe2, 0x1f, 0x3b, 0xf7, + 0xcd, 0xab, 0x8c, 0x2e, 0x25, 0x3f, 0xb9, 0x2b, 0x6d, 0xbe, 0xf6, 0xd4, 0xfe, 0xda, 0xbd, 0xa7, + 0x41, 0x97, 0x3a, 0xfc, 0x43, 0x17, 0x3f, 0xba, 0x05, 0xd2, 0x8f, 0xf5, 0xff, 0x07, 0xab, 0x60, + 0x61, 0x18, 0xbc, 0x17, 0x00, 0x00 }; // Autogenerated from wled00/data/settings_leds.htm, do not edit!! const uint16_t PAGE_settings_leds_length = 8380; const uint8_t PAGE_settings_leds[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xdd, 0x7d, 0xdb, 0x56, 0xe3, 0xc8, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xdd, 0x7d, 0xdb, 0x56, 0xe3, 0xc8, 0xb2, 0xe0, 0xbb, 0xbf, 0x22, 0xc9, 0xee, 0xa6, 0xa4, 0xb6, 0x6c, 0x4b, 0xc6, 0xae, 0xa6, 0x6c, 0xcb, 0x0c, 0x50, 0x97, 0xe6, 0x6c, 0x28, 0x58, 0x40, 0x75, 0xed, 0xb3, 0xaa, 0x6b, 0xba, 0x64, 0x39, 0x6d, 0xab, 0x90, 0x25, 0x6f, 0x49, 0x86, 0x62, 0x80, 0xf9, 0xa6, 0xf9, 0x86, 0xf9, 0xb2, @@ -831,7 +834,7 @@ const uint8_t PAGE_settings_leds[] PROGMEM = { // Autogenerated from wled00/data/settings_dmx.htm, do not edit!! const uint16_t PAGE_settings_dmx_length = 1740; const uint8_t PAGE_settings_dmx[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x57, 0x5b, 0x73, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x95, 0x57, 0x5b, 0x73, 0xdb, 0x36, 0x16, 0x7e, 0xd7, 0xaf, 0x40, 0xf0, 0x50, 0x93, 0x23, 0x86, 0x94, 0x9c, 0x75, 0xb7, 0x91, 0x45, 0x7a, 0x63, 0xc5, 0x6b, 0x7b, 0xc7, 0x76, 0x3d, 0x51, 0xd2, 0x74, 0xa7, 0xe9, 0x74, 0x20, 0x12, 0x12, 0x51, 0x93, 0x04, 0x17, 0x00, 0x25, 0xbb, 0x69, 0xfe, 0xfb, 0x7e, 0x00, 0xa9, 0x8b, 0x6f, @@ -946,7 +949,7 @@ const uint8_t PAGE_settings_dmx[] PROGMEM = { // Autogenerated from wled00/data/settings_ui.htm, do not edit!! const uint16_t PAGE_settings_ui_length = 3318; const uint8_t PAGE_settings_ui[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x5a, 0x6b, 0x73, 0xd3, 0x48, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xad, 0x5a, 0x6b, 0x73, 0xd3, 0x48, 0x16, 0xfd, 0xee, 0x5f, 0xd1, 0x34, 0x54, 0xc6, 0xaa, 0x08, 0xc5, 0x09, 0x53, 0xb5, 0x60, 0x5b, 0xce, 0x92, 0xc0, 0x40, 0xa6, 0xc2, 0xc0, 0xe2, 0x64, 0x99, 0x2d, 0x96, 0xca, 0xc8, 0x52, 0xdb, 0x6e, 0x90, 0xd5, 0x1a, 0x75, 0x2b, 0x8f, 0x35, 0xfe, 0xef, 0x7b, 0x6e, 0xb7, 0x64, 0xcb, 0x4e, @@ -1160,7 +1163,7 @@ const uint8_t PAGE_settings_ui[] PROGMEM = { // Autogenerated from wled00/data/settings_sync.htm, do not edit!! const uint16_t PAGE_settings_sync_length = 3465; const uint8_t PAGE_settings_sync[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x9d, 0x5a, 0xeb, 0x53, 0xdb, 0x48, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x9d, 0x5a, 0xeb, 0x53, 0xdb, 0x48, 0x12, 0xff, 0xae, 0xbf, 0x62, 0xa2, 0xab, 0xca, 0xda, 0x8b, 0xf1, 0x03, 0x30, 0x21, 0x60, 0x29, 0x07, 0x98, 0x80, 0xef, 0x20, 0x71, 0x6c, 0xd8, 0x64, 0xeb, 0xee, 0x6a, 0x6b, 0x2c, 0x8d, 0xed, 0x01, 0x49, 0xa3, 0xd5, 0x8c, 0x78, 0x54, 0x36, 0xff, 0xfb, 0x75, 0xcf, 0x48, 0xb2, 0x2d, 0xfc, @@ -1383,7 +1386,7 @@ const uint8_t PAGE_settings_sync[] PROGMEM = { // Autogenerated from wled00/data/settings_time.htm, do not edit!! const uint16_t PAGE_settings_time_length = 3432; const uint8_t PAGE_settings_time[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xd5, 0x1a, 0x6b, 0x77, 0xda, 0x38, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xd5, 0x1a, 0x6b, 0x77, 0xda, 0x38, 0xf6, 0x3b, 0xbf, 0x42, 0x51, 0x7b, 0x32, 0xf6, 0xc4, 0x3c, 0x13, 0xda, 0x04, 0xb0, 0xb3, 0x84, 0xd0, 0x26, 0x2d, 0x90, 0x9c, 0x42, 0x27, 0xbb, 0x7d, 0x9c, 0xa9, 0xc0, 0x02, 0x9c, 0x18, 0x89, 0xb5, 0xe5, 0x90, 0x6c, 0x9a, 0xff, 0xbe, 0x57, 0x92, 0x31, 0x4f, 0x27, 0x6d, 0x67, 0xf6, 0xc3, @@ -1604,7 +1607,7 @@ const uint8_t PAGE_settings_time[] PROGMEM = { // Autogenerated from wled00/data/settings_sec.htm, do not edit!! const uint16_t PAGE_settings_sec_length = 2548; const uint8_t PAGE_settings_sec[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x9d, 0x58, 0x6d, 0x53, 0xdb, 0x48, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x9d, 0x58, 0x6d, 0x53, 0xdb, 0x48, 0x12, 0xfe, 0xee, 0x5f, 0x31, 0x9e, 0xad, 0xca, 0x4a, 0x17, 0x21, 0x03, 0x49, 0x6d, 0x25, 0x60, 0x99, 0x83, 0x40, 0x36, 0x5c, 0x41, 0xa0, 0xb0, 0xd9, 0xdc, 0x55, 0x2e, 0x95, 0x92, 0xa5, 0xb1, 0x35, 0xb1, 0xac, 0xd1, 0xce, 0x8c, 0x70, 0x7c, 0xd9, 0xfc, 0xf7, 0x7b, 0x7a, 0x24, 0xf9, 0x85, @@ -1770,7 +1773,7 @@ const uint8_t PAGE_settings_sec[] PROGMEM = { // Autogenerated from wled00/data/settings_um.htm, do not edit!! const uint16_t PAGE_settings_um_length = 3298; const uint8_t PAGE_settings_um[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x59, 0x6d, 0x73, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xad, 0x59, 0x6d, 0x73, 0xdb, 0x36, 0x12, 0xfe, 0xae, 0x5f, 0x41, 0xa3, 0x19, 0x99, 0x1c, 0xd1, 0x94, 0x9c, 0xb6, 0x33, 0x39, 0x49, 0x94, 0x2e, 0x76, 0xdc, 0xc6, 0x97, 0x17, 0x7b, 0xe2, 0xa4, 0x99, 0x1b, 0xc7, 0x17, 0x53, 0x22, 0x24, 0x21, 0xa6, 0x08, 0x96, 0x00, 0xed, 0xf8, 0x64, 0xfd, 0xf7, 0x7b, 0x16, 0x20, 0x29, 0xca, @@ -1983,7 +1986,7 @@ const uint8_t PAGE_settings_um[] PROGMEM = { // Autogenerated from wled00/data/settings_2D.htm, do not edit!! const uint16_t PAGE_settings_2D_length = 3288; const uint8_t PAGE_settings_2D[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xc5, 0x5a, 0x5b, 0x77, 0xdb, 0x36, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xc5, 0x5a, 0x5b, 0x77, 0xdb, 0x36, 0x12, 0x7e, 0xd7, 0xaf, 0x80, 0xb1, 0x5d, 0x97, 0xb4, 0xa8, 0x9b, 0x9b, 0xf6, 0xb4, 0x92, 0x28, 0x6d, 0x1c, 0xa7, 0xb1, 0xf7, 0xd8, 0x89, 0x8e, 0xe5, 0xc6, 0xc9, 0x69, 0x7b, 0x36, 0x34, 0x09, 0x49, 0x48, 0x28, 0x80, 0x25, 0x40, 0xd9, 0xae, 0xe3, 0xff, 0xbe, 0x33, 0x00, 0x6f, 0xba, 0xd8, @@ -2195,7 +2198,7 @@ const uint8_t PAGE_settings_2D[] PROGMEM = { // Autogenerated from wled00/data/settings_pin.htm, do not edit!! const uint16_t PAGE_settings_pin_length = 461; const uint8_t PAGE_settings_pin[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x5d, 0x92, 0x4b, 0x6f, 0x13, 0x31, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x5d, 0x92, 0x4b, 0x6f, 0x13, 0x31, 0x14, 0x85, 0xf7, 0xf3, 0x2b, 0xcc, 0xdd, 0x34, 0x41, 0xc9, 0x4c, 0xa9, 0x58, 0x80, 0x6a, 0x8f, 0x50, 0xa0, 0x0b, 0x36, 0xa5, 0x52, 0xd9, 0xa0, 0xaa, 0xaa, 0x1c, 0xfb, 0x4e, 0x62, 0xd5, 0x8f, 0xc1, 0x8f, 0x84, 0x80, 0xfa, 0xdf, 0xb9, 0x9e, 0x29, 0x05, 0xb1, 0x19, 0xfb, 0x5c, 0xdb, 0xe7, diff --git a/wled00/network.cpp b/wled00/network.cpp index 1b02d0c5..2d09df1d 100644 --- a/wled00/network.cpp +++ b/wled00/network.cpp @@ -45,7 +45,7 @@ const ethernet_settings ethernetBoards[] = { ETH_CLOCK_GPIO17_OUT // eth_clk_mode }, - // WESP32 + // WESP32 R6 and earlier { 0, // eth_address, -1, // eth_power, @@ -124,6 +124,20 @@ const ethernet_settings ethernetBoards[] = { ETH_PHY_LAN8720, // eth_type, ETH_CLOCK_GPIO17_OUT // eth_clk_mode } + +#if defined(ARDUINO_ARCH_ESP32) && (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) + , + + // WESP32 R7 and up + { + 0, // eth_address, + -1, // eth_power, + 16, // eth_mdc, + 17, // eth_mdio, + ETH_PHY_RTL8201, // eth_type, + ETH_CLOCK_GPIO0_IN // eth_clk_mode + } +#endif }; #endif diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 23de8179..0a641960 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -288,6 +288,12 @@ void getSettingsJS(byte subPage, char* dest) #endif #ifdef WLED_USE_ETHERNET + #if defined(ARDUINO_ARCH_ESP32) && (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) + // leave WESP32 Rev 7+ option shown + #else + // hide WESP32 Rev 7+ option + oappend(SET_F("document.getElementById('wesp32_r7').style.display='none';")); + #endif sappend('v',SET_F("ETH"),ethernetType); #else //hide ethernet setting if not compiled in