From 8de9be679c8a58576a72c84998b5ce4f8dc50f70 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 9 Jan 2026 13:02:26 -1000 Subject: [PATCH] tweaks --- esphome/components/captive_portal/__init__.py | 16 +- .../components/captive_portal/captive_index.h | 288 +++++++++--------- .../captive_portal/captive_portal.cpp | 15 +- .../captive_portal/captive_portal.h | 19 +- .../captive_portal/dns_server_arduino.cpp | 205 +++++++++++++ .../captive_portal/dns_server_arduino.h | 27 ++ .../captive_portal/dns_server_esp32_idf.cpp | 62 +++- esphome/components/web_server/__init__.py | 18 ++ esphome/components/web_server/web_server.cpp | 7 +- 9 files changed, 475 insertions(+), 182 deletions(-) create mode 100644 esphome/components/captive_portal/dns_server_arduino.cpp create mode 100644 esphome/components/captive_portal/dns_server_arduino.h diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py index 4b30dc5d16..a91cd42ace 100644 --- a/esphome/components/captive_portal/__init__.py +++ b/esphome/components/captive_portal/__init__.py @@ -101,19 +101,21 @@ async def to_code(config): if config[CONF_COMPRESSION] == "gzip": cg.add_define("USE_CAPTIVE_PORTAL_GZIP") - if CORE.using_arduino: - if CORE.is_esp8266: - cg.add_library("DNSServer", None) - if CORE.is_libretiny: - cg.add_library("DNSServer", None) + # All platforms now use our custom DNS server implementations -# Only compile the ESP-IDF DNS server when using ESP-IDF framework +# Compile platform-specific DNS server implementations FILTER_SOURCE_FILES = filter_source_files_from_platform( { "dns_server_esp32_idf.cpp": { - PlatformFramework.ESP32_ARDUINO, PlatformFramework.ESP32_IDF, }, + "dns_server_arduino.cpp": { + PlatformFramework.ESP8266_ARDUINO, + PlatformFramework.RP2040_ARDUINO, + PlatformFramework.BK72XX_ARDUINO, + PlatformFramework.RTL87XX_ARDUINO, + PlatformFramework.LN882X_ARDUINO, + }, } ) diff --git a/esphome/components/captive_portal/captive_index.h b/esphome/components/captive_portal/captive_index.h index 05601d3eb6..15596256bf 100644 --- a/esphome/components/captive_portal/captive_index.h +++ b/esphome/components/captive_portal/captive_index.h @@ -7,153 +7,153 @@ namespace esphome::captive_portal { #ifdef USE_CAPTIVE_PORTAL_GZIP const uint8_t INDEX_GZ[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x95, 0x56, 0x59, 0x6f, 0xdb, 0x38, 0x10, 0x7e, 0xef, - 0xaf, 0xe0, 0xb2, 0x47, 0xa4, 0x36, 0x92, 0x2c, 0x25, 0x4e, 0x5b, 0x5b, 0x52, 0xd1, 0x63, 0x8b, 0x16, 0xe8, 0x05, - 0x24, 0xdb, 0x3e, 0x14, 0xc5, 0x86, 0x96, 0x46, 0x16, 0x1b, 0x89, 0xd2, 0x92, 0xf4, 0x55, 0xc3, 0xfb, 0xdb, 0x77, - 0x48, 0xc9, 0x8a, 0x13, 0xb4, 0x8b, 0xdd, 0x06, 0x95, 0x79, 0xcc, 0xcd, 0x99, 0x6f, 0x26, 0xfe, 0x2d, 0x6f, 0x32, - 0xbd, 0x69, 0x81, 0x94, 0xba, 0xae, 0xd2, 0xd8, 0x7c, 0x49, 0xc5, 0xc4, 0x3c, 0x01, 0x81, 0x3b, 0x60, 0x79, 0x1a, - 0xd7, 0xa0, 0x19, 0xc9, 0x4a, 0x26, 0x15, 0xe8, 0xe4, 0x8f, 0x8b, 0xd7, 0xde, 0x93, 0x34, 0xae, 0xb8, 0xb8, 0x22, - 0x12, 0xaa, 0x84, 0x67, 0x8d, 0x20, 0xa5, 0x84, 0x22, 0xc9, 0x99, 0x66, 0x13, 0x5e, 0xb3, 0x39, 0xf4, 0x2c, 0x82, - 0xd5, 0x90, 0x2c, 0x39, 0xac, 0xda, 0x46, 0x6a, 0x82, 0x74, 0x1a, 0x84, 0x4e, 0xe8, 0x8a, 0xe7, 0xba, 0x4c, 0x72, - 0x58, 0xf2, 0x0c, 0x3c, 0xbb, 0x39, 0xe6, 0x82, 0x6b, 0xce, 0x2a, 0x4f, 0x65, 0xac, 0x82, 0x24, 0x3c, 0x5e, 0x28, - 0x90, 0x76, 0xc3, 0x66, 0xb8, 0x17, 0x0d, 0x4d, 0x63, 0x95, 0x49, 0xde, 0x6a, 0x62, 0x4c, 0x4d, 0xea, 0x26, 0x5f, - 0x54, 0x90, 0x06, 0x01, 0x53, 0x68, 0x92, 0x0a, 0xb8, 0xc8, 0x61, 0xed, 0x87, 0xf0, 0xb4, 0x18, 0x9f, 0x66, 0x85, - 0xff, 0x5d, 0xdd, 0x41, 0xa7, 0x16, 0x35, 0x6a, 0xf3, 0xab, 0x26, 0x63, 0x9a, 0x37, 0xc2, 0x57, 0xc0, 0x64, 0x56, - 0x26, 0x49, 0x42, 0x9f, 0x29, 0xb6, 0x04, 0xfa, 0xe0, 0x81, 0x33, 0x10, 0xcd, 0x41, 0xff, 0x5e, 0x81, 0x59, 0xaa, - 0x17, 0x9b, 0x0b, 0x36, 0xff, 0x80, 0x86, 0x3b, 0x94, 0x29, 0x9e, 0x03, 0x75, 0xbf, 0x8e, 0xbe, 0xf9, 0x4a, 0x6f, - 0x2a, 0xf0, 0x73, 0xae, 0xda, 0x8a, 0x6d, 0x12, 0x3a, 0x43, 0xa9, 0x57, 0xd4, 0x9d, 0x16, 0x0b, 0x91, 0x19, 0xe1, - 0x44, 0x3a, 0xe0, 0x6e, 0x2b, 0x40, 0xf3, 0x92, 0xf7, 0x4c, 0x97, 0x7e, 0xcd, 0xd6, 0x4e, 0xb7, 0xe0, 0xc2, 0x89, - 0x1e, 0x3a, 0xf0, 0x28, 0x1c, 0x8d, 0xdc, 0x63, 0xfb, 0x19, 0xb9, 0x01, 0xfe, 0x4e, 0x25, 0xe8, 0x85, 0x14, 0x44, - 0x39, 0x97, 0x71, 0x8b, 0x94, 0x24, 0x4f, 0xe8, 0xfb, 0x30, 0x22, 0xe1, 0x53, 0x3f, 0x1a, 0xbf, 0xf3, 0x1f, 0x93, - 0x53, 0xfc, 0xcd, 0x1e, 0x7b, 0x63, 0x12, 0x9e, 0xe2, 0x27, 0x8a, 0xfc, 0x31, 0x19, 0xfd, 0xa0, 0xa4, 0xe0, 0x55, - 0x95, 0x50, 0xd1, 0x08, 0xa0, 0x44, 0x69, 0xd9, 0x5c, 0x41, 0x42, 0xb3, 0x85, 0x94, 0x68, 0xfb, 0xcb, 0xa6, 0x6a, - 0x24, 0x0d, 0xd2, 0x3b, 0xff, 0x4b, 0xa0, 0x96, 0x4c, 0xa8, 0xa2, 0x91, 0x75, 0x42, 0x6d, 0xf4, 0x9d, 0x7b, 0x5b, - 0xbd, 0x23, 0xe6, 0xe3, 0x1e, 0x5c, 0x7a, 0x8d, 0xe4, 0x73, 0x2e, 0x12, 0x6a, 0x24, 0x3e, 0x41, 0x25, 0x97, 0xee, - 0x6e, 0xf0, 0x5e, 0x19, 0xef, 0x7b, 0x7f, 0x98, 0xf3, 0xf5, 0x32, 0x56, 0xcb, 0x39, 0x59, 0xd7, 0x95, 0x50, 0x09, - 0x2d, 0xb5, 0x6e, 0x27, 0x41, 0xb0, 0x5a, 0xad, 0xfc, 0xd5, 0x89, 0xdf, 0xc8, 0x79, 0x10, 0x8d, 0x46, 0xa3, 0x00, - 0x29, 0x28, 0xe9, 0x12, 0x81, 0x46, 0xa7, 0x94, 0x94, 0xc0, 0xe7, 0xa5, 0xb6, 0xeb, 0xf4, 0xde, 0x16, 0x76, 0xb1, - 0xa1, 0x48, 0x2f, 0xbf, 0x1d, 0x68, 0xe1, 0x07, 0x5a, 0xe0, 0x99, 0x72, 0xe8, 0xde, 0xcd, 0x23, 0xeb, 0xe6, 0x63, - 0x16, 0x91, 0x88, 0x8c, 0xec, 0x5f, 0xe4, 0x99, 0x75, 0xbf, 0xf3, 0x6e, 0xed, 0xc8, 0xc1, 0xce, 0xac, 0xea, 0x33, - 0xef, 0xe9, 0xc0, 0x1b, 0x9a, 0x93, 0x65, 0x38, 0xba, 0x3e, 0x30, 0x0c, 0x6f, 0xce, 0x0e, 0xf7, 0x5e, 0xf4, 0xf9, - 0x90, 0xc0, 0x68, 0x2b, 0xc3, 0xcf, 0x67, 0x6c, 0x4c, 0xc6, 0xfd, 0xc9, 0xd8, 0x33, 0xeb, 0x61, 0x47, 0xc6, 0x4b, - 0xa4, 0xa8, 0xbd, 0x33, 0x6f, 0xcc, 0x4e, 0xc8, 0x49, 0x6f, 0x08, 0xae, 0xf0, 0xf8, 0x0c, 0x19, 0x0f, 0xce, 0xbc, - 0x93, 0x1f, 0x47, 0x41, 0x4a, 0xdd, 0x09, 0xa5, 0xd7, 0x9e, 0xb3, 0x43, 0xcf, 0xfd, 0xef, 0x0d, 0xe6, 0x14, 0xa5, - 0x18, 0x19, 0xd0, 0x59, 0xe9, 0xd0, 0x00, 0x0b, 0xab, 0xe0, 0x73, 0xcc, 0xfa, 0x46, 0x50, 0xd7, 0xd7, 0x25, 0x08, - 0x67, 0xcf, 0x6a, 0x18, 0xc1, 0xde, 0x38, 0xb7, 0x6f, 0xb4, 0xbb, 0x1d, 0xf2, 0x5f, 0x73, 0x8d, 0x65, 0xa6, 0x7d, - 0x53, 0xb0, 0xc7, 0xc3, 0xe9, 0xac, 0xc9, 0x37, 0xbf, 0x28, 0x8d, 0x32, 0xec, 0xea, 0x82, 0x0b, 0x01, 0xf2, 0x02, - 0xd6, 0xf8, 0x72, 0xef, 0x9f, 0xbf, 0x24, 0xcf, 0xf3, 0x5c, 0x82, 0x52, 0x13, 0x42, 0x1f, 0x69, 0xac, 0x81, 0xec, - 0xbf, 0xcb, 0x0a, 0x6f, 0xc8, 0xfa, 0xc2, 0x5f, 0x73, 0xf2, 0x01, 0xf4, 0xaa, 0x91, 0x57, 0xbd, 0x34, 0x63, 0xda, - 0xd4, 0x54, 0x58, 0x83, 0x76, 0xb2, 0x56, 0xf9, 0xaa, 0x42, 0xf8, 0x70, 0x42, 0x17, 0xf5, 0xb4, 0xd7, 0x5e, 0x89, - 0x7d, 0xa0, 0x2e, 0xe3, 0x9c, 0x2f, 0x49, 0x56, 0x21, 0x42, 0x60, 0xb9, 0x74, 0xa2, 0x28, 0xb9, 0x43, 0xec, 0xbf, - 0x46, 0x64, 0xc8, 0x7d, 0x95, 0xd0, 0x9f, 0x20, 0xc0, 0x8b, 0xcd, 0xdb, 0xdc, 0x39, 0x52, 0x58, 0xfb, 0x47, 0xae, - 0xbf, 0x64, 0xd5, 0x02, 0x48, 0x42, 0x74, 0xc9, 0xd5, 0xb5, 0x81, 0xd3, 0x5f, 0xb2, 0xb5, 0xea, 0x0a, 0xb9, 0x0a, - 0xbc, 0x56, 0x8e, 0x4b, 0xd3, 0x5e, 0x5d, 0xcc, 0x3a, 0x80, 0xa4, 0x77, 0xe9, 0x2d, 0x8b, 0xbc, 0x0a, 0x0a, 0x3d, - 0xd0, 0x11, 0x2c, 0x3b, 0xe9, 0x08, 0x5f, 0xa2, 0x76, 0x77, 0x37, 0x1c, 0xc6, 0xaa, 0x65, 0xe2, 0x36, 0xa3, 0x31, - 0xd0, 0x94, 0x0a, 0x02, 0x1b, 0xae, 0x4c, 0xbd, 0x20, 0xd1, 0xa0, 0x30, 0x60, 0xfb, 0xe5, 0xbd, 0x2d, 0x47, 0x89, - 0x06, 0xaf, 0x06, 0x89, 0x71, 0x80, 0xa1, 0x49, 0x2f, 0x77, 0xee, 0x94, 0x17, 0xd7, 0x18, 0xf8, 0xd7, 0x02, 0xe4, - 0xe6, 0x1c, 0x2a, 0xc8, 0x74, 0x23, 0x1d, 0x7a, 0x17, 0x15, 0x61, 0x36, 0x59, 0x9f, 0xdf, 0x5c, 0xbc, 0x7f, 0x97, - 0x30, 0xa7, 0x71, 0x8f, 0x7f, 0x45, 0x6d, 0xba, 0xc1, 0x57, 0xec, 0x06, 0x7f, 0x27, 0x47, 0xa6, 0x1f, 0x1c, 0x7d, - 0x43, 0x56, 0xeb, 0xf2, 0xe5, 0x75, 0x53, 0x30, 0x15, 0xfd, 0x08, 0x51, 0xe1, 0xd8, 0x38, 0xe9, 0x9d, 0x8d, 0xdd, - 0xdd, 0xe5, 0xb1, 0xf6, 0x57, 0x30, 0xfb, 0x13, 0xc1, 0x7e, 0x09, 0xb2, 0x03, 0x50, 0x91, 0x0c, 0x3a, 0x32, 0x09, - 0x4c, 0x43, 0x1f, 0x5f, 0x87, 0xa2, 0xd1, 0x08, 0xb9, 0xe2, 0xc0, 0xa4, 0xa3, 0xb8, 0x3c, 0x49, 0x5f, 0xd9, 0x3e, - 0x42, 0x5e, 0x62, 0x77, 0x91, 0x4d, 0x15, 0x07, 0x78, 0x34, 0xc4, 0x3b, 0x78, 0x76, 0x2d, 0x9e, 0xa6, 0x1f, 0x5b, - 0x10, 0xe4, 0x0b, 0xcc, 0xc8, 0xb9, 0x3d, 0x30, 0x41, 0x8a, 0x67, 0xb2, 0xfb, 0x5f, 0x76, 0xbf, 0x47, 0xff, 0x3d, - 0x63, 0xa3, 0x6f, 0xfe, 0x0c, 0x10, 0x1a, 0x01, 0x73, 0x6e, 0xb7, 0x73, 0x31, 0x9a, 0xf8, 0x06, 0xb6, 0x47, 0x61, - 0xaf, 0x32, 0xed, 0x22, 0x7d, 0xb8, 0x9d, 0x35, 0x6b, 0x4f, 0xf1, 0x1f, 0x5c, 0xcc, 0x27, 0x5c, 0x94, 0x20, 0xb9, - 0xde, 0xa1, 0x17, 0xd8, 0xed, 0xda, 0x85, 0xde, 0xb6, 0x2c, 0xcf, 0xcd, 0xcd, 0xb8, 0x5d, 0x4f, 0x0b, 0xb4, 0xde, - 0x50, 0xc2, 0x24, 0x84, 0x7a, 0xd7, 0xdd, 0x5b, 0x74, 0x9c, 0x3c, 0x1d, 0xdf, 0xdf, 0x19, 0x53, 0xb6, 0x1a, 0x13, - 0xcf, 0x63, 0x15, 0x9f, 0x8b, 0x49, 0x86, 0xf6, 0x80, 0xec, 0x98, 0x0a, 0x56, 0xf3, 0x6a, 0x33, 0x51, 0x88, 0xd3, - 0x1e, 0x3a, 0xca, 0x8b, 0xdd, 0x6c, 0xa1, 0x75, 0x23, 0x50, 0xb7, 0xcc, 0x41, 0x4e, 0x46, 0xd3, 0x6e, 0xe1, 0x49, - 0x96, 0xf3, 0x85, 0x9a, 0xf8, 0x27, 0x12, 0xea, 0xe9, 0x8c, 0x65, 0x57, 0x73, 0xd9, 0x2c, 0x44, 0xee, 0x65, 0xa6, - 0x6b, 0x4c, 0xee, 0x86, 0x05, 0x3b, 0x81, 0x6c, 0xda, 0xef, 0x8a, 0xa2, 0x98, 0xe2, 0x9b, 0x82, 0xd7, 0xe1, 0xf2, - 0x24, 0xf2, 0x4f, 0x0d, 0xdb, 0x81, 0x99, 0x7e, 0x64, 0x0e, 0x3a, 0x1b, 0xb1, 0x9d, 0xdd, 0x9f, 0xee, 0xdd, 0x19, - 0x4d, 0xb1, 0x1d, 0x29, 0x14, 0xd2, 0x22, 0x4e, 0xa1, 0x99, 0xbb, 0x9a, 0x71, 0x71, 0x68, 0xbd, 0x49, 0xf9, 0x69, - 0xdf, 0x4a, 0x31, 0x2c, 0x56, 0x8d, 0x6d, 0xa8, 0x53, 0x6c, 0x96, 0xdd, 0x3c, 0x30, 0x89, 0xce, 0x46, 0xed, 0x7a, - 0xe7, 0xf7, 0xc9, 0xbe, 0xdd, 0x53, 0x17, 0x15, 0xac, 0xa7, 0xdf, 0x17, 0x4a, 0xf3, 0x62, 0xe3, 0xf5, 0xf3, 0xc4, - 0x04, 0x13, 0x1f, 0xe7, 0x88, 0x19, 0x92, 0x02, 0x88, 0xa9, 0xd5, 0xe1, 0x71, 0x0d, 0xb5, 0xea, 0xe3, 0x34, 0x88, - 0xb1, 0xc5, 0x76, 0x53, 0xd6, 0xbf, 0x51, 0x9b, 0xba, 0xda, 0xd6, 0x4c, 0x62, 0xdb, 0xf3, 0x66, 0x0d, 0xc6, 0xb4, - 0x9e, 0x78, 0x8f, 0xf1, 0xad, 0xfa, 0x23, 0x23, 0x0c, 0x3d, 0x47, 0x33, 0xed, 0x9c, 0xb0, 0x8f, 0x77, 0xd8, 0xae, - 0x89, 0x6a, 0x2a, 0x9e, 0xf7, 0x74, 0x96, 0x84, 0x8c, 0x86, 0xf0, 0x84, 0xf8, 0xdc, 0xc4, 0x9c, 0xed, 0x43, 0x7d, - 0x5a, 0x3c, 0x61, 0xe1, 0xe8, 0x27, 0x2f, 0x92, 0x17, 0x45, 0x34, 0x2b, 0x86, 0x48, 0x99, 0x96, 0x6f, 0xca, 0xdc, - 0xa6, 0x16, 0xa6, 0xb9, 0x9d, 0xcc, 0x4c, 0x66, 0xe0, 0xb0, 0x85, 0x11, 0xc6, 0x14, 0x0e, 0x09, 0xcf, 0x13, 0x44, - 0xdd, 0xf4, 0x00, 0x8a, 0x91, 0x30, 0xdc, 0x5f, 0xe1, 0xea, 0x06, 0xb0, 0x76, 0x77, 0xd6, 0xfa, 0x14, 0xcb, 0x47, - 0x60, 0x2d, 0xa3, 0x85, 0x44, 0x37, 0xa4, 0x0f, 0x81, 0xef, 0xfb, 0xa6, 0x28, 0x3e, 0x55, 0xc0, 0x14, 0x90, 0x15, - 0xe3, 0xda, 0xc7, 0xa2, 0xb1, 0xf4, 0x1d, 0x26, 0xa1, 0x50, 0x24, 0x4d, 0x7b, 0xf0, 0x31, 0xd5, 0x68, 0x15, 0x9c, - 0x83, 0x36, 0x92, 0x54, 0x57, 0x8c, 0x66, 0x7c, 0x20, 0xcc, 0xc2, 0x73, 0x12, 0xac, 0x78, 0xc1, 0xcd, 0xf8, 0x95, - 0xc6, 0x36, 0xc9, 0x8d, 0x04, 0x13, 0xe7, 0x6e, 0x54, 0xb4, 0xab, 0x0a, 0xc4, 0x1c, 0xa7, 0x82, 0x93, 0x88, 0xa0, - 0xdb, 0x19, 0x94, 0x4d, 0x85, 0x61, 0x4d, 0xce, 0xcf, 0xdf, 0xbe, 0xea, 0x2a, 0x75, 0xe0, 0x43, 0xac, 0xed, 0xd8, - 0xcc, 0xa2, 0xe7, 0x3a, 0x3b, 0xed, 0x06, 0xc4, 0x16, 0xb1, 0x12, 0x3d, 0xc8, 0x6f, 0xc8, 0xf8, 0xd4, 0x1f, 0x5e, - 0x57, 0x7d, 0x57, 0x2a, 0xe9, 0x39, 0x1a, 0x14, 0x07, 0xfd, 0x26, 0x0e, 0x8c, 0xc1, 0x37, 0x50, 0x01, 0xe3, 0x97, - 0x7e, 0xbc, 0x78, 0x4e, 0xfe, 0x68, 0x11, 0xcd, 0xa0, 0x0b, 0x9b, 0xf5, 0x0a, 0xa7, 0xdc, 0xb2, 0xc9, 0x93, 0x4f, - 0x1f, 0xcf, 0x2f, 0x06, 0x0f, 0x17, 0x96, 0x88, 0x80, 0xc8, 0xba, 0x51, 0x75, 0x51, 0x69, 0xde, 0x32, 0xa9, 0xad, - 0x58, 0xcf, 0xc0, 0xe1, 0xde, 0x07, 0x7b, 0x8f, 0xf3, 0x1c, 0x74, 0x6e, 0x74, 0x8c, 0x29, 0xd9, 0x5b, 0xb5, 0xd7, - 0x76, 0xcb, 0xae, 0xa0, 0x7b, 0xed, 0xa0, 0x7b, 0xfa, 0xc0, 0x4e, 0xed, 0xff, 0x00, 0x46, 0xa2, 0x41, 0xe2, 0xc5, - 0x0b, 0x00, 0x00}; + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x95, 0x56, 0xeb, 0x6f, 0xdb, 0x36, 0x10, 0xff, 0xde, + 0xbf, 0x82, 0x63, 0x1f, 0x91, 0xda, 0x48, 0xb2, 0xe4, 0x38, 0x69, 0x6d, 0x49, 0x45, 0x1f, 0x2b, 0x3a, 0x60, 0x5d, + 0x0b, 0x24, 0xdb, 0x3e, 0x14, 0xc5, 0x42, 0x4b, 0x27, 0x8b, 0x8d, 0x44, 0x69, 0x24, 0xfd, 0xaa, 0xe1, 0xfd, 0xed, + 0x3b, 0x52, 0xb2, 0xe2, 0x04, 0xeb, 0xb0, 0x35, 0xa8, 0xcc, 0xc7, 0xbd, 0x79, 0xf7, 0xbb, 0x8b, 0x7f, 0xc8, 0x9b, + 0x4c, 0x6f, 0x5b, 0x20, 0xa5, 0xae, 0xab, 0x34, 0x36, 0x5f, 0x52, 0x31, 0xb1, 0x48, 0x40, 0xe0, 0x0e, 0x58, 0x9e, + 0xc6, 0x35, 0x68, 0x46, 0xb2, 0x92, 0x49, 0x05, 0x3a, 0xf9, 0xf5, 0xea, 0x9d, 0xf7, 0x3c, 0x8d, 0x2b, 0x2e, 0x6e, + 0x88, 0x84, 0x2a, 0xe1, 0x59, 0x23, 0x48, 0x29, 0xa1, 0x48, 0x72, 0xa6, 0xd9, 0x94, 0xd7, 0x6c, 0x01, 0x3d, 0x8b, + 0x60, 0x35, 0x24, 0x2b, 0x0e, 0xeb, 0xb6, 0x91, 0x9a, 0x20, 0x9d, 0x06, 0xa1, 0x13, 0xba, 0xe6, 0xb9, 0x2e, 0x93, + 0x1c, 0x56, 0x3c, 0x03, 0xcf, 0x6e, 0x4e, 0xb9, 0xe0, 0x9a, 0xb3, 0xca, 0x53, 0x19, 0xab, 0x20, 0x09, 0x4f, 0x97, + 0x0a, 0xa4, 0xdd, 0xb0, 0x39, 0xee, 0x45, 0x43, 0xd3, 0x58, 0x65, 0x92, 0xb7, 0x9a, 0x18, 0x53, 0x93, 0xba, 0xc9, + 0x97, 0x15, 0xa4, 0x41, 0xc0, 0x14, 0x9a, 0xa4, 0x02, 0x2e, 0x72, 0xd8, 0xf8, 0x93, 0x71, 0x94, 0x8f, 0x2f, 0xc6, + 0x23, 0xff, 0xab, 0x7a, 0x80, 0x4e, 0x2d, 0x6b, 0xd4, 0xe6, 0x57, 0x4d, 0xc6, 0x34, 0x6f, 0x84, 0xaf, 0x80, 0xc9, + 0xac, 0x4c, 0x92, 0x84, 0xbe, 0x54, 0x6c, 0x05, 0xf4, 0xc9, 0x13, 0x67, 0x20, 0x5a, 0x80, 0xfe, 0xb1, 0x02, 0xb3, + 0x54, 0xaf, 0xb7, 0x57, 0x6c, 0xf1, 0x0b, 0x1a, 0xee, 0x50, 0xa6, 0x78, 0x0e, 0xd4, 0xfd, 0x3c, 0xfa, 0xe2, 0x2b, + 0xbd, 0xad, 0xc0, 0xcf, 0xb9, 0x6a, 0x2b, 0xb6, 0x4d, 0xe8, 0x1c, 0xa5, 0xde, 0x50, 0x77, 0x56, 0x2c, 0x45, 0x66, + 0x84, 0x13, 0xe9, 0x80, 0xbb, 0xab, 0x00, 0xcd, 0x4b, 0x3e, 0x30, 0x5d, 0xfa, 0x35, 0xdb, 0x38, 0xdd, 0x82, 0x0b, + 0x27, 0x7a, 0xea, 0xc0, 0xb3, 0x70, 0x34, 0x72, 0x4f, 0xed, 0x67, 0xe4, 0x06, 0xf8, 0x3b, 0x93, 0xa0, 0x97, 0x52, + 0x10, 0xe5, 0x5c, 0xc7, 0x2d, 0x52, 0x92, 0x3c, 0xa1, 0x1f, 0xc2, 0x88, 0x84, 0x2f, 0xfc, 0x68, 0xf2, 0xb3, 0x7f, + 0x41, 0xce, 0xf0, 0x37, 0xbb, 0xf0, 0x26, 0x24, 0x3c, 0xc3, 0x4f, 0x14, 0xf9, 0x13, 0x32, 0xfa, 0x46, 0x49, 0xc1, + 0xab, 0x2a, 0xa1, 0xa2, 0x11, 0x40, 0x89, 0xd2, 0xb2, 0xb9, 0x81, 0x84, 0x66, 0x4b, 0x29, 0xd1, 0xf6, 0x37, 0x4d, + 0xd5, 0x48, 0x1a, 0xa4, 0x0f, 0xfe, 0x97, 0x40, 0x2d, 0x99, 0x50, 0x45, 0x23, 0xeb, 0x84, 0xda, 0xe8, 0x3b, 0x8f, + 0x76, 0x7a, 0x4f, 0xcc, 0xc7, 0x3d, 0xba, 0xf4, 0x1a, 0xc9, 0x17, 0x5c, 0x24, 0xd4, 0x48, 0x7c, 0x8e, 0x4a, 0xae, + 0xdd, 0xfd, 0xe0, 0xbd, 0x32, 0xde, 0xf7, 0xfe, 0x30, 0xe7, 0xf3, 0x75, 0xac, 0x56, 0x0b, 0xb2, 0xa9, 0x2b, 0xa1, + 0x12, 0x5a, 0x6a, 0xdd, 0x4e, 0x83, 0x60, 0xbd, 0x5e, 0xfb, 0xeb, 0xb1, 0xdf, 0xc8, 0x45, 0x10, 0x8d, 0x46, 0xa3, + 0x00, 0x29, 0x28, 0xe9, 0x12, 0x81, 0x46, 0x67, 0x94, 0x94, 0xc0, 0x17, 0xa5, 0xb6, 0xeb, 0xf4, 0xd1, 0x0e, 0xf6, + 0xb1, 0xa1, 0x48, 0xaf, 0xbf, 0x1c, 0x69, 0xe1, 0x47, 0x5a, 0xe0, 0xa5, 0x72, 0xe8, 0xc1, 0xcd, 0x13, 0xeb, 0xe6, + 0x05, 0x8b, 0x48, 0x44, 0x46, 0xf6, 0x2f, 0xf2, 0xcc, 0xba, 0xdf, 0x79, 0xf7, 0x76, 0xe4, 0x68, 0x67, 0x56, 0xf5, + 0xb9, 0xf7, 0x62, 0xe0, 0x0d, 0xcd, 0xc9, 0x2a, 0x1c, 0xdd, 0x1e, 0x18, 0x86, 0xf7, 0xe7, 0xc7, 0x7b, 0x2f, 0xfa, + 0xed, 0x98, 0xc0, 0x68, 0x2b, 0xc3, 0xdf, 0xce, 0xd9, 0x84, 0x4c, 0xfa, 0x93, 0x89, 0x67, 0xd6, 0xc3, 0x8e, 0x4c, + 0x56, 0x48, 0x51, 0x7b, 0xe7, 0xde, 0x84, 0x8d, 0xc9, 0xb8, 0x37, 0x04, 0x57, 0x78, 0x7c, 0x8e, 0x8c, 0x47, 0x67, + 0xde, 0xf8, 0xdb, 0x49, 0x90, 0x52, 0x77, 0x4a, 0xe9, 0xad, 0xe7, 0xec, 0xd8, 0x73, 0xff, 0x6b, 0x83, 0x39, 0x45, + 0x29, 0x46, 0x06, 0x74, 0x56, 0x3a, 0x34, 0xc0, 0xc2, 0x2a, 0xf8, 0x02, 0xb3, 0xbe, 0x11, 0xd4, 0xf5, 0x75, 0x09, + 0xc2, 0x39, 0xb0, 0x1a, 0x46, 0xb0, 0x37, 0xce, 0xfd, 0x1b, 0xed, 0xee, 0x86, 0xfc, 0xd7, 0x5c, 0x63, 0x99, 0x69, + 0xdf, 0x14, 0xec, 0xe9, 0x70, 0x3a, 0x6f, 0xf2, 0xed, 0x77, 0x4a, 0xa3, 0x0c, 0xbb, 0xba, 0xe0, 0x42, 0x80, 0xbc, + 0x82, 0x0d, 0xbe, 0xdc, 0x87, 0x57, 0x6f, 0xc8, 0xab, 0x3c, 0x97, 0xa0, 0xd4, 0x94, 0xd0, 0x67, 0x1a, 0x6b, 0x20, + 0xfb, 0xef, 0xb2, 0xc2, 0x3b, 0xb2, 0x7e, 0xe7, 0xef, 0x38, 0xf9, 0x05, 0xf4, 0xba, 0x91, 0x37, 0xbd, 0x34, 0x63, + 0xda, 0xcc, 0x54, 0x58, 0x83, 0x76, 0xb2, 0x56, 0xf9, 0xaa, 0x42, 0xf8, 0x70, 0x42, 0x17, 0xf5, 0xb4, 0xb7, 0x5e, + 0x89, 0x43, 0xa0, 0xae, 0xe3, 0x9c, 0xaf, 0x48, 0x56, 0x21, 0x42, 0x60, 0xb9, 0x74, 0xa2, 0x28, 0x79, 0x40, 0xec, + 0xbf, 0x46, 0x64, 0xc8, 0x7d, 0x93, 0xd0, 0x7f, 0x40, 0x80, 0xd7, 0xdb, 0x9f, 0x72, 0xe7, 0x44, 0x61, 0xed, 0x9f, + 0xb8, 0xfe, 0x8a, 0x55, 0x4b, 0x20, 0x09, 0xd1, 0x25, 0x57, 0xb7, 0x06, 0xce, 0xbe, 0xcb, 0xd6, 0xaa, 0x1b, 0xe4, + 0x2a, 0xf0, 0x5a, 0x39, 0x2e, 0x4d, 0x7b, 0x75, 0x31, 0xeb, 0x00, 0x92, 0x3e, 0xa4, 0xf7, 0x2c, 0xf2, 0x2a, 0x28, + 0xf4, 0x40, 0x47, 0xb0, 0xec, 0xa4, 0x23, 0x7c, 0x89, 0xda, 0xdd, 0xfd, 0x70, 0x18, 0xab, 0x96, 0x89, 0xfb, 0x8c, + 0xc6, 0x40, 0x53, 0x2a, 0x08, 0x6c, 0xb8, 0x32, 0xf5, 0x82, 0x44, 0x83, 0xc2, 0x80, 0x1d, 0x96, 0x8f, 0x76, 0x1c, + 0x25, 0x1a, 0xbc, 0x1a, 0x24, 0xc6, 0x01, 0x86, 0x26, 0xbd, 0xde, 0xbb, 0x33, 0x5e, 0xdc, 0x62, 0xe0, 0x9f, 0x4b, + 0x90, 0xdb, 0x4b, 0xa8, 0x20, 0xd3, 0x8d, 0x74, 0xe8, 0x43, 0x54, 0x84, 0xd9, 0x64, 0x7d, 0x7e, 0x7f, 0xf5, 0xe1, + 0xe7, 0x84, 0x39, 0x8d, 0x7b, 0xfa, 0x3d, 0x6a, 0xd3, 0x0d, 0x3e, 0x63, 0x37, 0xf8, 0x2b, 0x39, 0x31, 0xfd, 0xe0, + 0xe4, 0x0b, 0xb2, 0x5a, 0x97, 0xaf, 0x6f, 0x9b, 0x82, 0xa9, 0xe8, 0x67, 0x88, 0x0a, 0xa7, 0xc6, 0x49, 0xef, 0x7c, + 0xe2, 0xee, 0xaf, 0x4f, 0xb5, 0xbf, 0x86, 0xf9, 0x1f, 0x08, 0xf6, 0x2b, 0x90, 0x1d, 0x80, 0x8a, 0x64, 0xd0, 0x91, + 0x49, 0x60, 0x1a, 0xfa, 0xf8, 0x3a, 0x14, 0x8d, 0x46, 0xc8, 0x15, 0x47, 0x26, 0x9d, 0xc4, 0xe5, 0x38, 0x7d, 0x6b, + 0xfb, 0x08, 0x79, 0x83, 0xdd, 0x45, 0x36, 0x55, 0x1c, 0xe0, 0xd1, 0x10, 0xef, 0xe0, 0xe5, 0xad, 0xf8, 0x24, 0xa4, + 0xe9, 0xc7, 0x16, 0x04, 0xf9, 0x1d, 0xe6, 0xe4, 0xd2, 0x1e, 0x99, 0x30, 0xc5, 0x73, 0xd9, 0xfd, 0x2f, 0xbb, 0xdf, + 0x93, 0xff, 0x9e, 0xb3, 0xd1, 0x17, 0x7f, 0x0e, 0x08, 0x8e, 0x80, 0x59, 0xb7, 0xdf, 0xbb, 0x18, 0x4f, 0x7c, 0x05, + 0xdb, 0xa5, 0xb0, 0x5b, 0x99, 0x86, 0x91, 0x3e, 0xdd, 0xcd, 0x9b, 0x8d, 0xa7, 0xf8, 0x37, 0x2e, 0x16, 0x53, 0x2e, + 0x4a, 0x90, 0x5c, 0xef, 0xd1, 0x0f, 0xec, 0x77, 0xed, 0x52, 0xef, 0x5a, 0x96, 0xe7, 0xe6, 0x66, 0xd2, 0x6e, 0x66, + 0x05, 0xda, 0x6f, 0x28, 0x61, 0x1a, 0x42, 0xbd, 0xef, 0xee, 0x2d, 0x3e, 0x4e, 0x5f, 0x4c, 0x1e, 0xef, 0x8d, 0x29, + 0x3b, 0x8d, 0xa9, 0xe7, 0xb1, 0x8a, 0x2f, 0xc4, 0x34, 0x43, 0x7b, 0x40, 0x76, 0x4c, 0x05, 0xab, 0x79, 0xb5, 0x9d, + 0x2a, 0x44, 0x6a, 0x0f, 0x5d, 0xe5, 0xc5, 0x7e, 0xbe, 0xd4, 0xba, 0x11, 0xa8, 0x5b, 0xe6, 0x20, 0xa7, 0xa3, 0x59, + 0xb7, 0xf0, 0x24, 0xcb, 0xf9, 0x52, 0x4d, 0xfd, 0xb1, 0x84, 0x7a, 0x36, 0x67, 0xd9, 0xcd, 0x42, 0x36, 0x4b, 0x91, + 0x7b, 0x99, 0xe9, 0x1b, 0xd3, 0x87, 0x61, 0xc1, 0xc6, 0x90, 0xcd, 0xfa, 0x5d, 0x51, 0x14, 0x33, 0x7c, 0x55, 0xf0, + 0x3a, 0x64, 0x9e, 0x46, 0xfe, 0x99, 0x61, 0x3b, 0x32, 0xd3, 0x8f, 0xcc, 0x41, 0x67, 0x23, 0x36, 0xb4, 0xc7, 0xb3, + 0x83, 0x3b, 0xa3, 0x19, 0x36, 0x24, 0x85, 0x42, 0x5a, 0x44, 0x2a, 0x34, 0x73, 0x5f, 0x33, 0x2e, 0x8e, 0xad, 0x37, + 0x49, 0x3f, 0xeb, 0x9b, 0x29, 0x86, 0xc5, 0xaa, 0xb1, 0x2d, 0x75, 0x86, 0xed, 0xb2, 0x9b, 0x08, 0xa6, 0xd1, 0xf9, + 0xa8, 0xdd, 0xec, 0xfd, 0x3e, 0xdd, 0x77, 0x07, 0xea, 0xa2, 0x82, 0xcd, 0xec, 0xeb, 0x52, 0x69, 0x5e, 0x6c, 0xbd, + 0x7e, 0xa2, 0x98, 0x62, 0xea, 0xe3, 0x24, 0x31, 0x47, 0x52, 0x00, 0x31, 0xb3, 0x3a, 0x3c, 0xae, 0xa1, 0x56, 0x7d, + 0x9c, 0x06, 0x31, 0xb6, 0xdc, 0xee, 0xca, 0xfa, 0x37, 0x6a, 0x53, 0x59, 0xbb, 0x9a, 0x49, 0x6c, 0x7c, 0xde, 0xbc, + 0xc1, 0x98, 0xd6, 0x53, 0xef, 0x02, 0xdf, 0xaa, 0x3f, 0x32, 0xc2, 0xd0, 0x73, 0x34, 0xd3, 0x4e, 0x0a, 0x87, 0x78, + 0x87, 0xed, 0x86, 0xa8, 0xa6, 0xe2, 0x79, 0x4f, 0x67, 0x49, 0xc8, 0x68, 0x08, 0x4f, 0x88, 0xcf, 0x4d, 0xcc, 0xd9, + 0x21, 0xd4, 0x67, 0xc5, 0x73, 0x16, 0x8e, 0xfe, 0xe1, 0x45, 0xf2, 0xa2, 0x88, 0xe6, 0xc5, 0x10, 0x29, 0xd3, 0xf4, + 0x4d, 0xa1, 0xdb, 0xd4, 0xc2, 0x44, 0xb7, 0xb3, 0x99, 0xc9, 0x0c, 0x1c, 0xb7, 0x30, 0xc2, 0x98, 0xc2, 0x21, 0xe1, + 0x79, 0x82, 0xb8, 0x9b, 0x1e, 0x81, 0x31, 0x12, 0x86, 0x87, 0x2b, 0x5c, 0xdd, 0x81, 0xd6, 0xee, 0xce, 0x5a, 0x9f, + 0x62, 0x01, 0x09, 0xac, 0x66, 0xb4, 0x90, 0xe8, 0x86, 0xf4, 0x21, 0xf0, 0x7d, 0xdf, 0x14, 0xc5, 0xa7, 0x0a, 0x98, + 0x02, 0xb2, 0x66, 0x5c, 0xfb, 0x58, 0x34, 0x96, 0xbe, 0x43, 0x25, 0x14, 0x8a, 0xa4, 0x69, 0x0f, 0x3f, 0xa6, 0x1e, + 0xad, 0x82, 0x4b, 0xd0, 0x46, 0x92, 0xea, 0xca, 0xd1, 0x0c, 0x10, 0x84, 0x59, 0x80, 0x4e, 0x82, 0x35, 0x2f, 0xb8, + 0x19, 0xc0, 0xd2, 0xd8, 0x26, 0xb9, 0x91, 0x60, 0xe2, 0xdc, 0x0d, 0x8b, 0x76, 0x55, 0x81, 0x58, 0xe0, 0x5c, 0x30, + 0x8e, 0x08, 0xba, 0x9d, 0x41, 0xd9, 0x54, 0x18, 0xd6, 0xe4, 0xf2, 0xf2, 0xa7, 0xb7, 0x5d, 0xa5, 0x0e, 0x7c, 0x88, + 0xb6, 0x1d, 0x9b, 0x59, 0xf4, 0x5c, 0xe7, 0x67, 0xdd, 0x88, 0xd8, 0x22, 0x5a, 0xa2, 0x07, 0xf9, 0x1d, 0x19, 0x9f, + 0xfa, 0xc3, 0xdb, 0xaa, 0xef, 0x4a, 0x25, 0xbd, 0x44, 0x83, 0xe2, 0xa0, 0xdf, 0xc4, 0x81, 0x31, 0xf8, 0x0e, 0x2a, + 0x60, 0xfc, 0xd2, 0x8f, 0x57, 0xaf, 0xc8, 0xaf, 0x2d, 0xe2, 0x19, 0x74, 0x61, 0xb3, 0x5e, 0xe1, 0x9c, 0x5b, 0x36, + 0x79, 0xf2, 0xe9, 0xe3, 0xe5, 0xd5, 0xe0, 0xe1, 0xd2, 0x12, 0x11, 0x10, 0x59, 0x37, 0xac, 0x2e, 0x2b, 0xcd, 0x5b, + 0x26, 0xb5, 0x15, 0xeb, 0x19, 0x40, 0x3c, 0xf8, 0x60, 0xef, 0x71, 0xa2, 0x83, 0xce, 0x8d, 0x8e, 0x31, 0x25, 0x07, + 0xab, 0x0e, 0xda, 0xee, 0xd9, 0x15, 0x74, 0xaf, 0x1d, 0x74, 0x4f, 0x1f, 0xd8, 0xb9, 0xfd, 0x6f, 0x0f, 0x3c, 0x55, + 0xdc, 0xc7, 0x0b, 0x00, 0x00}; #else // Brotli (default, smaller) const uint8_t INDEX_BR[] PROGMEM = { - 0x1b, 0xc4, 0x0b, 0x00, 0xe4, 0x6f, 0x3f, 0xad, 0xff, 0xfc, 0x7c, 0x31, 0x2f, 0x0d, 0x36, 0x82, 0x3d, 0xcd, 0xc0, - 0x95, 0xda, 0x24, 0x8a, 0x1b, 0x2e, 0x27, 0x66, 0x84, 0xad, 0x0e, 0x77, 0xb5, 0xa6, 0x36, 0x20, 0x0b, 0xe8, 0xaa, - 0x2a, 0x5c, 0xa7, 0x42, 0x25, 0xb1, 0xae, 0x0b, 0xb7, 0xe9, 0xe5, 0xbf, 0x04, 0xa8, 0x3a, 0x73, 0xd7, 0x8f, 0xf8, - 0xa4, 0xec, 0x80, 0x6d, 0x15, 0xa0, 0x22, 0xb2, 0x8e, 0x64, 0x4d, 0xc6, 0x96, 0x9f, 0x09, 0x4a, 0xbb, 0xed, 0x30, - 0x7a, 0x39, 0x85, 0xd5, 0x33, 0x41, 0xbb, 0x32, 0xa2, 0x76, 0xf1, 0x6c, 0xe3, 0x40, 0x23, 0x75, 0xf0, 0x8b, 0x7e, - 0x47, 0x80, 0x87, 0x41, 0xfa, 0x6a, 0x6e, 0x6b, 0x62, 0xeb, 0x9b, 0x14, 0xd1, 0xe3, 0x83, 0x92, 0x1d, 0x42, 0x8c, - 0x54, 0xe7, 0x59, 0x1e, 0x71, 0x83, 0xd0, 0x53, 0x6a, 0xb7, 0xf0, 0x38, 0x08, 0x1f, 0xbe, 0x20, 0x40, 0xa7, 0x70, - 0xd3, 0x81, 0x18, 0xf7, 0x21, 0x52, 0x26, 0x05, 0xaa, 0x4d, 0x84, 0x61, 0xa2, 0x33, 0xc5, 0xfc, 0x49, 0xac, 0x36, - 0x4d, 0x9e, 0x55, 0x0d, 0xfb, 0x6b, 0x47, 0xe1, 0xa7, 0x18, 0x1b, 0xe1, 0x9c, 0xc3, 0x9d, 0xe4, 0x19, 0x80, 0xd9, - 0x0c, 0x57, 0x98, 0x04, 0x2b, 0xd7, 0x32, 0xf2, 0x90, 0xf8, 0x97, 0x99, 0xa6, 0x1a, 0x8c, 0xeb, 0x4e, 0x20, 0x45, - 0xec, 0x0e, 0xf5, 0x58, 0x91, 0xe1, 0x7a, 0xd2, 0x21, 0xc7, 0x47, 0xae, 0xdb, 0xd7, 0xca, 0x6b, 0xac, 0x78, 0x59, - 0x1b, 0x9c, 0x9c, 0x61, 0xb5, 0x88, 0xa3, 0x88, 0x04, 0x7f, 0x9a, 0x23, 0x12, 0xde, 0x14, 0x15, 0xf6, 0x58, 0x5c, - 0xee, 0x78, 0xfb, 0xd7, 0x35, 0x87, 0x57, 0x71, 0x82, 0xe2, 0x0d, 0x4b, 0xf2, 0x97, 0x6c, 0x85, 0xb2, 0x62, 0x7a, - 0xb5, 0xa2, 0x39, 0x8a, 0xb3, 0x5d, 0x6e, 0x92, 0xb0, 0x96, 0xe8, 0x16, 0x96, 0x85, 0x23, 0x0c, 0x01, 0x6f, 0x29, - 0xb2, 0xae, 0xef, 0x8e, 0x8a, 0x43, 0x1d, 0x80, 0x4b, 0x83, 0xe2, 0xd0, 0x42, 0x31, 0xb2, 0x54, 0x96, 0x20, 0x23, - 0xa6, 0xc0, 0x0c, 0x3c, 0x19, 0x9c, 0x47, 0x7b, 0x3f, 0xa9, 0xc0, 0xa1, 0x9b, 0xb7, 0x0c, 0xd8, 0xba, 0x78, 0x0d, - 0xa1, 0x28, 0x89, 0x8f, 0x81, 0x90, 0xe5, 0x30, 0x35, 0x49, 0xfc, 0xe3, 0xb4, 0xdd, 0x5e, 0x9e, 0x2f, 0x79, 0x80, - 0x7a, 0x0e, 0xd2, 0x1e, 0x88, 0xbb, 0xf6, 0x2a, 0x25, 0x59, 0xe0, 0xda, 0xe5, 0x61, 0x55, 0x42, 0x95, 0x9b, 0x93, - 0x8c, 0xde, 0x4b, 0x65, 0x20, 0x26, 0x83, 0xf2, 0xbb, 0xed, 0xa2, 0xfc, 0xe5, 0x52, 0xa4, 0x9e, 0x50, 0x77, 0x2c, - 0x86, 0xa0, 0x86, 0xe7, 0x5d, 0x2b, 0x99, 0xa0, 0xef, 0x70, 0x54, 0x93, 0x50, 0x35, 0x5f, 0x62, 0xd1, 0x48, 0x14, - 0x44, 0x83, 0xed, 0x92, 0x6e, 0xcc, 0xeb, 0x58, 0x77, 0xdb, 0x65, 0x1c, 0x1d, 0x83, 0x74, 0xcb, 0xd3, 0xe5, 0x71, - 0x07, 0x4d, 0x3e, 0x57, 0x04, 0x2e, 0x36, 0x1d, 0xe2, 0xcf, 0xaf, 0xc2, 0x1c, 0xe5, 0x2d, 0x28, 0xa7, 0x6a, 0xb9, - 0x34, 0xa3, 0xfc, 0xb2, 0xaa, 0xa6, 0x96, 0x2e, 0x4b, 0x15, 0xc9, 0x14, 0xa5, 0xc5, 0x11, 0x4d, 0x51, 0x1a, 0x5f, - 0x1a, 0xb6, 0xde, 0xdf, 0xa1, 0xe9, 0xed, 0x3c, 0x14, 0x40, 0xb6, 0x00, 0xa1, 0x8f, 0x92, 0xb0, 0x38, 0x40, 0x5e, - 0x05, 0x20, 0xbe, 0x51, 0xae, 0x3a, 0x60, 0x08, 0x39, 0x97, 0x66, 0xc3, 0x88, 0xd4, 0x64, 0x39, 0x85, 0x28, 0xe3, - 0x60, 0x38, 0xa1, 0xca, 0xc6, 0xc4, 0x01, 0x27, 0x34, 0xc0, 0xe3, 0x38, 0xa9, 0x71, 0x8c, 0x68, 0xd3, 0x04, 0x4c, - 0x24, 0x09, 0xf2, 0xa8, 0x3b, 0xc4, 0x57, 0x99, 0xb0, 0x5e, 0x58, 0xaf, 0x48, 0xed, 0xaf, 0xee, 0x3d, 0xe8, 0x1f, - 0xef, 0x3e, 0x6d, 0x11, 0x2c, 0x1c, 0x6b, 0x65, 0x65, 0x5f, 0x74, 0xdc, 0xff, 0x45, 0x3f, 0xd6, 0xbd, 0x56, 0xe1, - 0x85, 0xbc, 0xa7, 0x0b, 0x2a, 0x9b, 0xdd, 0x71, 0xc7, 0xe4, 0xc9, 0x2e, 0x62, 0x93, 0x33, 0x62, 0xc2, 0x5a, 0x79, - 0x0a, 0x59, 0x85, 0x89, 0xac, 0x94, 0x92, 0xd3, 0xf1, 0x24, 0xd0, 0xb5, 0xa2, 0x11, 0xfa, 0x12, 0xde, 0x9a, 0x14, - 0x08, 0x9b, 0x6f, 0xad, 0xae, 0xe7, 0x84, 0xe5, 0xa9, 0x51, 0x96, 0x8a, 0x27, 0x57, 0x57, 0x18, 0x6d, 0x3a, 0xd9, - 0xe3, 0x51, 0xfa, 0xce, 0xaa, 0x03, 0xe1, 0xa4, 0x17, 0xe6, 0x60, 0x5f, 0xb9, 0xb4, 0x59, 0x03, 0x7f, 0x7d, 0x38, - 0x19, 0x7a, 0x6c, 0x58, 0x6f, 0xad, 0x26, 0xbe, 0x84, 0xcd, 0xb4, 0x95, 0x61, 0xf0, 0x24, 0x90, 0x4b, 0x8d, 0x61, - 0x2a, 0xd7, 0xe3, 0x05, 0x36, 0x07, 0x83, 0xac, 0x57, 0xb6, 0x06, 0x35, 0xf0, 0x2c, 0xde, 0x29, 0x70, 0x51, 0x5b, - 0x7a, 0x24, 0x20, 0xc1, 0x41, 0x71, 0x49, 0xb2, 0xb4, 0x64, 0xd7, 0x63, 0x18, 0x1b, 0xe5, 0x40, 0x90, 0xd3, 0x15, - 0x71, 0x89, 0x3b, 0x12, 0x98, 0x00, 0x89, 0x10, 0xfc, 0xd1, 0xf2, 0x9f, 0xcf, 0x2f, 0xd5, 0xf3, 0x5f, 0xc6, 0x31, - 0xd8, 0xbe, 0x52, 0x30, 0x00, 0x55, 0x8f, 0x2c, 0xae, 0xdb, 0x7f, 0x41, 0x40, 0x5f, 0xa7, 0xcb, 0x9c, 0xf8, 0x32, - 0x70, 0xec, 0x4a, 0xed, 0xff, 0x48, 0x2e, 0x62, 0xa2, 0xab, 0x32, 0xc0, 0xe7, 0xec, 0x5a, 0x5f, 0x02, 0x29, 0x8c, - 0xb7, 0xf4, 0x1c, 0xfa, 0x50, 0xb7, 0x73, 0x2c, 0x9e, 0x11, 0x12, 0x18, 0x52, 0xd3, 0x77, 0xc7, 0x89, 0x1a, 0x10, - 0x8d, 0xbe, 0xe3, 0x5f, 0x34, 0x33, 0xd0, 0x07, 0x63, 0x34, 0x21, 0xf4, 0xeb, 0x1c, 0xfe, 0xaf, 0xd3, 0xbc, 0xae, - 0x0d, 0x24, 0x24, 0xe0, 0xcf, 0xc6, 0x86, 0x78, 0x4f, 0x3c, 0x1e, 0x60, 0xb8, 0x38, 0x72, 0x36, 0xec, 0xbb, 0x6b, - 0x00, 0x36, 0xa8, 0xcd, 0xf9, 0x76, 0x74, 0xa0, 0xa3, 0xbe, 0xd6, 0x97, 0x81, 0x68, 0x16, 0x60, 0x06, 0x38, 0xc6, - 0x04, 0x46, 0x6d, 0xaa, 0xf5, 0xd5, 0x10, 0x76, 0xdb, 0x6d, 0x93, 0x4f, 0x07, 0xe5, 0xe3, 0x21, 0xb0, 0x2d, 0x01, - 0x6e, 0x00, 0x3b, 0xc7, 0x43, 0x07, 0x77, 0xc0, 0x7b, 0x75, 0x51, 0xa1, 0xf8, 0x07, 0xda, 0xcb, 0x5a, 0x5f, 0xd8, - 0x2d, 0x4b, 0x7b, 0xd5, 0x16, 0xf2, 0xff, 0x02, 0x71, 0x23, 0x53, 0x55, 0xf5, 0x5a, 0x97, 0x52, 0xc0, 0x83, 0x96, - 0x84, 0x65, 0x46, 0x4d, 0xaf, 0xd6, 0xb0, 0x44, 0xd3, 0x84, 0x9c, 0x82, 0x8f, 0xd3, 0x15, 0xcd, 0x15, 0xb5, 0x87, - 0x2a, 0x69, 0x07, 0x34, 0xe2, 0x8d, 0x3e, 0xda, 0x5b, 0x6d, 0xd0, 0xb2, 0x4e, 0x80, 0x6a, 0xbd, 0x67, 0x35, 0x7c, - 0xc5, 0x60, 0x42, 0x4d, 0x1d, 0xb2, 0x5b, 0xe0, 0x7b, 0x97, 0xae, 0xc3, 0x20, 0x04, 0x3d, 0x2e, 0x85, 0x65, 0x89, - 0xc2, 0x9d, 0x04, 0x05, 0x51, 0x1c, 0x57, 0x5b, 0x3c, 0x23, 0x38, 0xdb, 0xbe, 0x64, 0x4d, 0x10, 0x95, 0xa5, 0x19, - 0xa0, 0x92, 0xa6, 0x58, 0xd7, 0x82, 0x54, 0x3a, 0xf6, 0x2a, 0x62, 0x05, 0x15, 0xe7, 0xe6, 0x68, 0x55, 0xb9, 0x5a, - 0x67, 0x8b, 0xa2, 0x25, 0x8a, 0x20, 0xd3, 0x0d, 0xfa, 0x2a, 0xba, 0x2f, 0x95, 0x35, 0x6b, 0x19, 0x47, 0xa9, 0x72, - 0x5e, 0xdd, 0x34, 0xc9, 0xbe, 0x29, 0x00, 0xb2, 0x00, 0x77, 0xff, 0x0e, 0xe6, 0x8d, 0x88, 0x5d, 0x2b, 0x35, 0x5e, - 0xbb, 0x3b, 0x46, 0xba, 0xe6, 0xad, 0xac, 0x04, 0x3b, 0xc6, 0x2c, 0x02, 0x97, 0x2e, 0x53, 0xd9, 0xcc, 0x95, 0xca, - 0x63, 0x08, 0x7c, 0xa2, 0xa5, 0x65, 0xbd, 0xeb, 0xfa, 0x18, 0x6d, 0x61, 0x8c, 0x11, 0x06, 0xc3, 0x50, 0xc0, 0xcc, - 0x6d, 0x6c, 0x17, 0x9a, 0x31, 0xfa, 0x6c, 0x1d, 0x30, 0xca, 0x89, 0x9c, 0x46, 0xdd, 0x21, 0x75, 0x44, 0x75, 0x82, - 0x8e, 0x04, 0xe9, 0xdd, 0xc6, 0x64, 0x24, 0xbc, 0xd2, 0x8d, 0x86, 0x60, 0x7e, 0xd1, 0xa3, 0x2b, 0xc4, 0x35, 0xc2, - 0x45, 0x52, 0x11, 0x7c, 0xdd, 0x85, 0xa7, 0x49, 0x27, 0x2e, 0x7d, 0x1f, 0x3e, 0x3c, 0x7b, 0x48, 0xad, 0x62, 0xb6, - 0xed, 0x64, 0x8f, 0x47, 0x50, 0xf0, 0xbd, 0x6e, 0x99, 0x81, 0x44, 0x85, 0x8f, 0x6d, 0x7b, 0x54, 0x47, 0xf3, 0x06, - 0xe5, 0x13, 0xb9, 0x68, 0xd1, 0xb9, 0xbe, 0xe4, 0x6d, 0x38, 0x0b, 0x60, 0x71, 0x06, 0xc8, 0x8b, 0xb5, 0xbd, 0xf9, - 0x78, 0x6f, 0xd6, 0xd9, 0x29, 0xea, 0xec, 0x0e, 0x6c, 0x20, 0x6f, 0x25, 0xa1, 0xa4, 0x06, 0x6c, 0xad, 0xca, 0x54, - 0xbe, 0xc1, 0x6c, 0x0a, 0x20, 0x78, 0xb4, 0x5a, 0x53, 0x96, 0x68, 0x67, 0xaa, 0x20, 0xdf, 0x40, 0x41, 0x21, 0xc3, - 0x0d, 0x02, 0xf9, 0x0c, 0x5d, 0xf4, 0x78, 0x39, 0x61, 0x8a, 0xdb, 0xb9, 0x2b}; + 0x1b, 0xc6, 0x0b, 0x00, 0x64, 0x5a, 0x4b, 0xfb, 0xe7, 0xf3, 0x62, 0x48, 0xda, 0x42, 0x2b, 0xb7, 0xe6, 0x32, 0xb0, + 0xc7, 0x79, 0x49, 0x23, 0x36, 0x6c, 0x57, 0xcc, 0x88, 0x3d, 0x1d, 0xf6, 0x6a, 0x4d, 0x6d, 0x40, 0x16, 0xd0, 0x55, + 0x55, 0xb8, 0x4e, 0x85, 0x4a, 0x62, 0x5d, 0x17, 0x6e, 0xd3, 0xcb, 0x7f, 0x09, 0x50, 0x75, 0xe6, 0xae, 0x1f, 0xf1, + 0x49, 0xd9, 0x01, 0xdb, 0x2a, 0x40, 0x45, 0x64, 0x1d, 0xc9, 0x9a, 0x8c, 0x2d, 0x3f, 0x13, 0x94, 0x76, 0xdb, 0x61, + 0xf4, 0x72, 0x0a, 0xab, 0x67, 0x82, 0x76, 0x17, 0x4c, 0xed, 0xe2, 0xd9, 0xc6, 0x81, 0x46, 0xea, 0xe0, 0x37, 0xfd, + 0x8e, 0x00, 0x0f, 0x83, 0xf4, 0xd5, 0xda, 0xd6, 0xc4, 0xda, 0x37, 0x29, 0xa6, 0xc7, 0x07, 0x25, 0x3b, 0x84, 0x18, + 0xa9, 0xce, 0xb3, 0x3c, 0xe2, 0x66, 0xa1, 0xa7, 0xd4, 0x6e, 0xd1, 0x22, 0x0b, 0x1f, 0xbe, 0x20, 0x40, 0xa7, 0xe8, + 0xd0, 0x41, 0x33, 0xee, 0x43, 0xa4, 0x4c, 0x0a, 0x54, 0x9b, 0x61, 0x2c, 0xd1, 0x99, 0x62, 0xfe, 0xa4, 0x50, 0xb2, + 0x56, 0x0b, 0xc5, 0xe9, 0xdf, 0x38, 0x09, 0x3f, 0xc5, 0xd8, 0x88, 0xd6, 0x1a, 0xde, 0x49, 0x9e, 0x01, 0x78, 0x78, + 0x88, 0x2a, 0x4c, 0x82, 0x95, 0x6b, 0x1b, 0x79, 0x48, 0xfc, 0xcb, 0x4c, 0x53, 0x0d, 0xc6, 0x75, 0x27, 0xc4, 0x65, + 0xec, 0x0e, 0xf5, 0xc8, 0xe1, 0xf1, 0x7a, 0x72, 0x00, 0x83, 0x1e, 0xb9, 0x6e, 0x5f, 0x6b, 0xaf, 0x91, 0xe2, 0x65, + 0x1f, 0x90, 0x3c, 0x46, 0xee, 0x44, 0x70, 0x8e, 0xb3, 0x3f, 0xcd, 0x1c, 0xb3, 0x9b, 0xa2, 0xc2, 0x9e, 0x88, 0xaa, + 0x0d, 0x6f, 0xff, 0xba, 0xd6, 0xf0, 0x95, 0x90, 0x40, 0xac, 0xa8, 0x2c, 0x5e, 0xd2, 0x05, 0xc8, 0x8b, 0xe9, 0xdb, + 0x05, 0x29, 0x80, 0xc8, 0x77, 0xb9, 0x52, 0xd2, 0x16, 0x7e, 0x0b, 0x97, 0x85, 0x23, 0x0c, 0x01, 0x6f, 0x29, 0x88, + 0x43, 0xdf, 0x9d, 0x3b, 0x0d, 0xeb, 0x00, 0x5c, 0x1a, 0x14, 0x87, 0xc6, 0xcc, 0xc4, 0x52, 0x59, 0x82, 0x8c, 0x98, + 0x02, 0x33, 0xd0, 0x6c, 0x1c, 0x12, 0xd8, 0xfb, 0x71, 0x05, 0x0e, 0xd9, 0xbc, 0x65, 0xc0, 0xd6, 0xc5, 0x4b, 0xc8, + 0x4c, 0x85, 0x53, 0x0c, 0x84, 0x22, 0x87, 0xa9, 0xc9, 0xa2, 0x1f, 0xa7, 0xed, 0xf1, 0xf2, 0x6c, 0xc9, 0x03, 0xd4, + 0x6b, 0x28, 0xed, 0x81, 0xb8, 0x6b, 0xaf, 0x14, 0xc9, 0x02, 0xd7, 0x2e, 0x67, 0x55, 0x09, 0x55, 0x6e, 0x96, 0x39, + 0xbd, 0x97, 0xca, 0xa1, 0x99, 0x8d, 0x2e, 0x6d, 0xb6, 0x9b, 0xea, 0x97, 0x4b, 0x91, 0x7e, 0xc2, 0xdd, 0x89, 0x08, + 0x06, 0x35, 0x7c, 0xd4, 0xb5, 0xb0, 0x12, 0x7c, 0x87, 0x79, 0x8d, 0x24, 0x6a, 0xbe, 0xc4, 0x22, 0x91, 0x20, 0x08, + 0x06, 0xdb, 0x39, 0x59, 0x99, 0xd7, 0x42, 0x77, 0xdb, 0xa5, 0xe0, 0xc7, 0x20, 0xd9, 0xf2, 0x74, 0x7e, 0xdc, 0x41, + 0xe4, 0xe7, 0x8a, 0xc0, 0xc5, 0xa6, 0x9d, 0xf8, 0xfc, 0x2a, 0x2c, 0x40, 0xd1, 0x02, 0x0a, 0xa2, 0x96, 0x4b, 0x33, + 0x28, 0x2e, 0xab, 0x6a, 0x6a, 0xc9, 0xbc, 0x54, 0x91, 0x55, 0x40, 0x15, 0x73, 0xa2, 0x80, 0x8a, 0xcf, 0x0d, 0x5b, + 0xef, 0xef, 0x10, 0x75, 0x7b, 0xc4, 0x0c, 0xc4, 0x6b, 0x08, 0x43, 0x1f, 0x65, 0x61, 0x71, 0x80, 0xbc, 0x0a, 0x21, + 0x4e, 0x8d, 0x1b, 0xb6, 0x3b, 0x04, 0x19, 0xe7, 0xd2, 0x74, 0x18, 0x91, 0x1a, 0x2f, 0xa7, 0x10, 0x65, 0x1c, 0x0c, + 0x27, 0x5c, 0xd9, 0x98, 0x28, 0x30, 0x08, 0x0d, 0xf0, 0x38, 0x4e, 0x6a, 0x06, 0x4a, 0xb4, 0x69, 0x32, 0x26, 0x92, + 0x04, 0x79, 0xd4, 0xed, 0xc4, 0x55, 0x26, 0xac, 0x17, 0xd6, 0x2b, 0x52, 0xfb, 0xab, 0x7b, 0x0f, 0xfa, 0xc7, 0xbb, + 0x4f, 0x6b, 0x00, 0x4f, 0x06, 0xda, 0xda, 0xad, 0x7d, 0xd1, 0xa2, 0xff, 0x8b, 0x7f, 0xec, 0x7b, 0xad, 0xc2, 0x0b, + 0x79, 0x4f, 0x97, 0x54, 0x36, 0xbb, 0xd3, 0x03, 0xb5, 0xfb, 0xb8, 0x88, 0x4d, 0xce, 0x10, 0x98, 0xb6, 0x76, 0x1f, + 0xb2, 0x8a, 0x10, 0x59, 0x29, 0x15, 0xa7, 0x63, 0x16, 0xd8, 0x03, 0xc1, 0x04, 0x7c, 0x19, 0xc2, 0x24, 0x29, 0x10, + 0x36, 0x3f, 0x46, 0x5f, 0x1f, 0x61, 0x9a, 0xa7, 0x46, 0x59, 0x2a, 0x9e, 0x5c, 0x5d, 0x69, 0xb4, 0x69, 0x1f, 0xcf, + 0x8f, 0xd2, 0x77, 0x56, 0x1d, 0x34, 0x4e, 0x7a, 0x61, 0x0e, 0xf6, 0x95, 0x4b, 0x9a, 0x35, 0xf0, 0xd7, 0x87, 0xb3, + 0xb1, 0x47, 0x81, 0xf6, 0x31, 0x7a, 0x9c, 0x4a, 0xd8, 0x4c, 0x5b, 0x19, 0x06, 0x4f, 0x02, 0xb9, 0xd4, 0x04, 0xaa, + 0x72, 0x13, 0x5e, 0x60, 0x73, 0x30, 0xc8, 0x7a, 0x65, 0x6b, 0xd0, 0x03, 0xcf, 0xe2, 0x9d, 0x02, 0x17, 0xb5, 0x55, + 0x42, 0x02, 0x12, 0x1c, 0x14, 0x97, 0x24, 0x4b, 0x4b, 0x76, 0x3d, 0x82, 0xd3, 0xe0, 0x06, 0x28, 0xc8, 0xe9, 0x8a, + 0xb4, 0x45, 0x1d, 0xce, 0x4c, 0x80, 0x44, 0x08, 0xfe, 0x68, 0xf9, 0xaf, 0x8f, 0x2e, 0xd5, 0x47, 0xbf, 0x8c, 0x63, + 0xb0, 0x7d, 0x95, 0x60, 0x00, 0xaa, 0x1e, 0x39, 0xb9, 0x6e, 0xff, 0x65, 0x01, 0x7d, 0x9d, 0xcc, 0x0b, 0x9c, 0xaa, + 0x6c, 0xa0, 0x57, 0xee, 0xf4, 0x8f, 0xe4, 0x22, 0x26, 0xba, 0xaa, 0x00, 0x7c, 0xce, 0xae, 0xfd, 0x25, 0xc4, 0x65, + 0xf0, 0x96, 0x3e, 0x82, 0x3e, 0xd4, 0xed, 0x1c, 0x8b, 0x67, 0x84, 0x04, 0x86, 0xd4, 0xf4, 0xdd, 0x71, 0xa2, 0x47, + 0x0b, 0x68, 0x1a, 0x7e, 0xc7, 0xbf, 0x68, 0x67, 0x80, 0x0f, 0xc6, 0x88, 0x42, 0xe8, 0xd7, 0xd9, 0xfd, 0x5f, 0xa7, + 0xa3, 0xfa, 0x36, 0x20, 0x49, 0xc4, 0x9f, 0x8d, 0x02, 0x4e, 0x09, 0x27, 0x44, 0xc0, 0x80, 0x71, 0xe4, 0x78, 0x3c, + 0xed, 0xae, 0x21, 0xd8, 0xa0, 0x0f, 0x67, 0xeb, 0x11, 0x82, 0x8e, 0xa6, 0xda, 0x5f, 0x66, 0xc2, 0x59, 0xa0, 0x19, + 0x20, 0x19, 0x13, 0x1a, 0xb5, 0xb9, 0x36, 0x55, 0x43, 0xe8, 0x6d, 0xb7, 0x55, 0x71, 0x30, 0x30, 0x1f, 0x0f, 0x91, + 0x6d, 0x89, 0x70, 0x03, 0xda, 0x39, 0x09, 0x3c, 0xb8, 0x23, 0xe2, 0xab, 0xe3, 0xa5, 0xe2, 0x1f, 0x48, 0x6f, 0x6b, + 0x7f, 0x11, 0xd7, 0x54, 0xf5, 0xae, 0x2d, 0x11, 0xc0, 0x05, 0x44, 0x63, 0x95, 0xdb, 0xf6, 0x5c, 0x97, 0x52, 0x02, + 0x84, 0x16, 0x49, 0x73, 0xa3, 0xa6, 0x57, 0x6b, 0xa8, 0xd4, 0x34, 0x41, 0xa7, 0x20, 0xe4, 0x74, 0x65, 0x93, 0x45, + 0x9d, 0xc0, 0x4a, 0xda, 0x11, 0x8f, 0x78, 0xe3, 0x8f, 0xf6, 0xd6, 0x07, 0xbc, 0xac, 0x25, 0x54, 0xad, 0x4f, 0xb4, + 0x96, 0xaf, 0x18, 0x4d, 0xa8, 0xe9, 0x43, 0x76, 0x4b, 0x84, 0xef, 0x92, 0xb5, 0x18, 0x84, 0xb0, 0xc7, 0x25, 0xc0, + 0x2c, 0x51, 0xba, 0x93, 0x20, 0x30, 0x8a, 0xe3, 0x6a, 0x4b, 0xa2, 0x24, 0x67, 0xdb, 0x97, 0xac, 0x09, 0xa2, 0xb3, + 0x34, 0x23, 0x58, 0xd2, 0x04, 0xed, 0x5a, 0xa0, 0x4a, 0x0b, 0xaf, 0x22, 0x5a, 0x50, 0x71, 0x6e, 0x8e, 0x58, 0x95, + 0xab, 0x75, 0xd6, 0x38, 0x5a, 0xa2, 0x08, 0xb2, 0xdd, 0xa0, 0xaf, 0xa2, 0xfb, 0x52, 0x79, 0xb3, 0xb4, 0x82, 0xa7, + 0xca, 0x79, 0x75, 0xd3, 0xc8, 0xd3, 0xa6, 0x84, 0xc8, 0x02, 0xdd, 0xfd, 0x1b, 0xa0, 0x37, 0x62, 0x36, 0xad, 0xf5, + 0x88, 0xed, 0x6e, 0x01, 0x7c, 0xad, 0x5b, 0xbb, 0x35, 0x0c, 0x19, 0x33, 0x09, 0x5c, 0xba, 0x4c, 0x65, 0xb3, 0x57, + 0x2a, 0x8f, 0x21, 0xf0, 0x99, 0xd6, 0x96, 0xf5, 0x43, 0xd7, 0xcf, 0x68, 0x0b, 0xa5, 0x94, 0x30, 0x18, 0x88, 0x02, + 0x6a, 0x6e, 0xa3, 0x1b, 0x66, 0xc6, 0xe8, 0xb7, 0x75, 0x20, 0xb8, 0xc1, 0xe4, 0x35, 0xea, 0x76, 0xca, 0x11, 0xd5, + 0x11, 0x3a, 0x92, 0xa4, 0x77, 0x3b, 0x93, 0x11, 0x76, 0xe5, 0x1b, 0x0f, 0xc2, 0xfc, 0xa6, 0x57, 0x57, 0x88, 0x6b, + 0x04, 0x8c, 0xa4, 0x22, 0x00, 0xbb, 0x8b, 0x56, 0xb2, 0x23, 0x97, 0xbe, 0x0f, 0x1f, 0x9e, 0x3d, 0xa4, 0x56, 0x31, + 0xdb, 0xb6, 0x8f, 0xe7, 0x47, 0x50, 0xf0, 0xbd, 0x6e, 0x9e, 0xc3, 0x44, 0x85, 0x90, 0x6d, 0x7b, 0x54, 0x67, 0xf3, + 0x06, 0xe5, 0x13, 0xb9, 0x68, 0xd3, 0xc1, 0xbe, 0xe4, 0x6e, 0x38, 0x13, 0x60, 0x71, 0x06, 0xc8, 0x8d, 0xb5, 0xbd, + 0xf9, 0x78, 0x6f, 0xe6, 0xd9, 0x29, 0xea, 0xec, 0x4e, 0x6c, 0x20, 0x77, 0x25, 0xa1, 0xa4, 0x46, 0x6c, 0xad, 0x2e, + 0x6c, 0x7d, 0x83, 0x19, 0x15, 0xc0, 0xf0, 0x68, 0xb5, 0x26, 0x4c, 0xd1, 0xce, 0x56, 0x41, 0xce, 0x81, 0x82, 0x42, + 0x86, 0x1b, 0x0c, 0xf0, 0x19, 0xba, 0xe8, 0xf1, 0x72, 0x58, 0x8a, 0xdb, 0xf9, 0x2b}; // Backwards compatibility alias #define INDEX_GZ INDEX_BR diff --git a/esphome/components/captive_portal/captive_portal.cpp b/esphome/components/captive_portal/captive_portal.cpp index c400172889..cf8d5388c6 100644 --- a/esphome/components/captive_portal/captive_portal.cpp +++ b/esphome/components/captive_portal/captive_portal.cpp @@ -80,15 +80,9 @@ void CaptivePortal::start() { network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip(); -#if defined(USE_ESP32) - // Create DNS server instance for ESP-IDF + // Create DNS server instance with domain whitelisting support this->dns_server_ = make_unique(); this->dns_server_->start(ip); -#elif defined(USE_ARDUINO) - this->dns_server_ = make_unique(); - this->dns_server_->setErrorReplyCode(DNSReplyCode::NoError); - this->dns_server_->start(53, ESPHOME_F("*"), ip); -#endif this->initialized_ = true; this->active_ = true; @@ -131,6 +125,13 @@ float CaptivePortal::get_setup_priority() const { } void CaptivePortal::dump_config() { ESP_LOGCONFIG(TAG, "Captive Portal:"); } +bool CaptivePortal::canHandle(AsyncWebServerRequest *request) const { + bool result = this->active_ && request->method() == HTTP_GET; + ESP_LOGD(TAG, "canHandle called: url=%s method=%d active=%d result=%d", request->url().c_str(), request->method(), + this->active_, result); + return result; +} + CaptivePortal *global_captive_portal = nullptr; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) } // namespace captive_portal diff --git a/esphome/components/captive_portal/captive_portal.h b/esphome/components/captive_portal/captive_portal.h index 909a860689..1a88ef231a 100644 --- a/esphome/components/captive_portal/captive_portal.h +++ b/esphome/components/captive_portal/captive_portal.h @@ -4,8 +4,8 @@ #include #if defined(USE_ESP32) #include "dns_server_esp32_idf.h" -#elif defined(USE_ARDUINO) -#include +#elif defined(USE_ESP8266) || defined(USE_RP2040) || defined(USE_LIBRETINY) +#include "dns_server_arduino.h" #endif #include "esphome/core/component.h" #include "esphome/core/helpers.h" @@ -22,15 +22,9 @@ class CaptivePortal : public AsyncWebHandler, public Component { void setup() override; void dump_config() override; void loop() override { -#if defined(USE_ESP32) if (this->dns_server_ != nullptr) { this->dns_server_->process_next_request(); } -#elif defined(USE_ARDUINO) - if (this->dns_server_ != nullptr) { - this->dns_server_->processNextRequest(); - } -#endif } float get_setup_priority() const override; void start(); @@ -45,14 +39,7 @@ class CaptivePortal : public AsyncWebHandler, public Component { } } - bool canHandle(AsyncWebServerRequest *request) const override { - // Handle all GET requests when captive portal is active. - // This allows us to respond with the portal page for any URL, - // triggering OS captive portal detection. - // Note: web_server registers its handlers first, so it will handle - // /?web_server before captive_portal sees the request. - return this->active_ && request->method() == HTTP_GET; - } + bool canHandle(AsyncWebServerRequest *request) const override; void handle_config(AsyncWebServerRequest *request); diff --git a/esphome/components/captive_portal/dns_server_arduino.cpp b/esphome/components/captive_portal/dns_server_arduino.cpp new file mode 100644 index 0000000000..5505992ea7 --- /dev/null +++ b/esphome/components/captive_portal/dns_server_arduino.cpp @@ -0,0 +1,205 @@ +#include "dns_server_arduino.h" +#if defined(USE_ARDUINO) && (defined(USE_ESP8266) || defined(USE_RP2040) || defined(USE_LIBRETINY)) + +#include +#include "esphome/core/log.h" +#include + +namespace esphome::captive_portal { + +static const char *const TAG = "captive_portal.dns"; + +// DNS constants +static constexpr uint16_t DNS_PORT = 53; +static constexpr uint16_t DNS_QR_FLAG = 1 << 15; +static constexpr uint16_t DNS_OPCODE_MASK = 0x7800; +static constexpr uint16_t DNS_QTYPE_A = 0x0001; +static constexpr uint16_t DNS_QCLASS_IN = 0x0001; +static constexpr uint16_t DNS_ANSWER_TTL = 300; + +// DNS Header structure +struct DNSHeader { + uint16_t id; + uint16_t flags; + uint16_t qd_count; + uint16_t an_count; + uint16_t ns_count; + uint16_t ar_count; +} __attribute__((packed)); + +// DNS Question structure +struct DNSQuestion { + uint16_t type; + uint16_t dns_class; +} __attribute__((packed)); + +// DNS Answer structure +struct DNSAnswer { + uint16_t ptr_offset; + uint16_t type; + uint16_t dns_class; + uint32_t ttl; + uint16_t addr_len; + uint32_t ip_addr; +} __attribute__((packed)); + +void DNSServer::start(const network::IPAddress &ip) { + this->server_ip_ = ip; + ESP_LOGV(TAG, "Starting DNS server"); + + this->udp_ = make_unique(); + if (!this->udp_->begin(DNS_PORT)) { + ESP_LOGE(TAG, "Failed to start UDP on port %d", DNS_PORT); + this->udp_ = nullptr; + return; + } + ESP_LOGV(TAG, "Bound to port %d", DNS_PORT); +} + +void DNSServer::stop() { + if (this->udp_ != nullptr) { + this->udp_->stop(); + this->udp_ = nullptr; + } + ESP_LOGV(TAG, "Stopped"); +} + +void DNSServer::process_next_request() { + if (this->udp_ == nullptr) { + return; + } + + int packet_size = this->udp_->parsePacket(); + if (packet_size == 0) { + return; + } + + if (packet_size > static_cast(sizeof(this->buffer_))) { + // Packet too large, skip it + while (this->udp_->available()) { + this->udp_->read(); + } + return; + } + + int len = this->udp_->read(this->buffer_, sizeof(this->buffer_)); + if (len < static_cast(sizeof(DNSHeader) + 1)) { + ESP_LOGV(TAG, "Request too short: %d", len); + return; + } + + // Parse DNS header + DNSHeader *header = (DNSHeader *) this->buffer_; + uint16_t flags = ntohs(header->flags); + uint16_t qd_count = ntohs(header->qd_count); + + // Check if it's a standard query + if ((flags & DNS_QR_FLAG) || (flags & DNS_OPCODE_MASK) || qd_count != 1) { + ESP_LOGV(TAG, "Not a standard query: flags=0x%04X, qd_count=%d", flags, qd_count); + return; + } + + // Parse domain name and check for whitelisted domains + uint8_t *ptr = this->buffer_ + sizeof(DNSHeader); + uint8_t *end = this->buffer_ + len; + + // Build domain name string for whitelist checking + char domain[128]; + size_t domain_len = 0; + uint8_t *name_ptr = ptr; + + while (name_ptr < end && *name_ptr != 0) { + uint8_t label_len = *name_ptr; + if (label_len > 63) { + return; + } + if (name_ptr + label_len + 1 > end) { + return; + } + if (domain_len > 0 && domain_len < sizeof(domain) - 1) { + domain[domain_len++] = '.'; + } + for (uint8_t i = 0; i < label_len && domain_len < sizeof(domain) - 1; i++) { + domain[domain_len++] = name_ptr[1 + i]; + } + name_ptr += label_len + 1; + } + domain[domain_len] = '\0'; + + if (name_ptr >= end || *name_ptr != 0) { + return; + } + ptr = name_ptr + 1; + +#ifdef USE_WEBSERVER + // Whitelist: don't redirect web_server's CDN domain + // Respond with REFUSED to tell client to try another DNS server (e.g., cellular) + if (domain_len >= 11) { + const char *suffix = domain + domain_len - 11; + if (strcmp(suffix, ".esphome.io") == 0 || strcmp(domain, "esphome.io") == 0) { + ESP_LOGD(TAG, "Whitelisted domain, sending REFUSED: %s", domain); + // Send REFUSED response (RCODE=5) to trigger fallback to other DNS + header->flags = htons(DNS_QR_FLAG | 0x8005); // Response + REFUSED + header->an_count = 0; + header->ns_count = 0; + header->ar_count = 0; + this->udp_->beginPacket(this->udp_->remoteIP(), this->udp_->remotePort()); + this->udp_->write(this->buffer_, len); + this->udp_->endPacket(); + return; + } + } +#endif + + ESP_LOGV(TAG, "Redirecting DNS query for: %s", domain); + + // Check we have room for the question + if (ptr + sizeof(DNSQuestion) > end) { + return; + } + + // Parse DNS question + DNSQuestion *question = (DNSQuestion *) ptr; + uint16_t qtype = ntohs(question->type); + uint16_t qclass = ntohs(question->dns_class); + + if (qtype != DNS_QTYPE_A || qclass != DNS_QCLASS_IN) { + ESP_LOGV(TAG, "Not an A query: type=0x%04X, class=0x%04X", qtype, qclass); + return; + } + + // Build DNS response + header->flags = htons(DNS_QR_FLAG | 0x8000); + header->an_count = htons(1); + + size_t question_len = (ptr + sizeof(DNSQuestion)) - this->buffer_ - sizeof(DNSHeader); + size_t answer_offset = sizeof(DNSHeader) + question_len; + + if (answer_offset + sizeof(DNSAnswer) > sizeof(this->buffer_)) { + ESP_LOGW(TAG, "Response too large"); + return; + } + + DNSAnswer *answer = (DNSAnswer *) (this->buffer_ + answer_offset); + answer->ptr_offset = htons(0xC000 | sizeof(DNSHeader)); + answer->type = htons(DNS_QTYPE_A); + answer->dns_class = htons(DNS_QCLASS_IN); + answer->ttl = htonl(DNS_ANSWER_TTL); + answer->addr_len = htons(4); + answer->ip_addr = static_cast(this->server_ip_); + + size_t response_len = answer_offset + sizeof(DNSAnswer); + + // Send response + this->udp_->beginPacket(this->udp_->remoteIP(), this->udp_->remotePort()); + this->udp_->write(this->buffer_, response_len); + if (!this->udp_->endPacket()) { + ESP_LOGV(TAG, "Send failed"); + } else { + ESP_LOGV(TAG, "Sent %d bytes", response_len); + } +} + +} // namespace esphome::captive_portal + +#endif // USE_ARDUINO diff --git a/esphome/components/captive_portal/dns_server_arduino.h b/esphome/components/captive_portal/dns_server_arduino.h new file mode 100644 index 0000000000..d6fc90063a --- /dev/null +++ b/esphome/components/captive_portal/dns_server_arduino.h @@ -0,0 +1,27 @@ +#pragma once +#if defined(USE_ARDUINO) && (defined(USE_ESP8266) || defined(USE_RP2040) || defined(USE_LIBRETINY)) + +#include +#include "esphome/core/helpers.h" +#include "esphome/components/network/ip_address.h" +#include + +namespace esphome::captive_portal { + +class DNSServer { + public: + void start(const network::IPAddress &ip); + void stop(); + void process_next_request(); + + protected: + static constexpr size_t DNS_BUFFER_SIZE = 192; + + std::unique_ptr udp_{nullptr}; + network::IPAddress server_ip_; + uint8_t buffer_[DNS_BUFFER_SIZE]; +}; + +} // namespace esphome::captive_portal + +#endif // USE_ARDUINO && (USE_ESP8266 || USE_RP2040 || USE_LIBRETINY) diff --git a/esphome/components/captive_portal/dns_server_esp32_idf.cpp b/esphome/components/captive_portal/dns_server_esp32_idf.cpp index 5743cbd671..15b223129f 100644 --- a/esphome/components/captive_portal/dns_server_esp32_idf.cpp +++ b/esphome/components/captive_portal/dns_server_esp32_idf.cpp @@ -1,6 +1,7 @@ #include "dns_server_esp32_idf.h" #ifdef USE_ESP32 +#include #include "esphome/core/log.h" #include "esphome/core/hal.h" #include "esphome/components/socket/socket.h" @@ -126,27 +127,74 @@ void DNSServer::process_next_request() { return; // Not a standard query } - // Parse domain name (we don't actually care about it - redirect everything) + // Parse domain name and check for whitelisted domains uint8_t *ptr = this->buffer_ + sizeof(DNSHeader); uint8_t *end = this->buffer_ + len; - while (ptr < end && *ptr != 0) { - uint8_t label_len = *ptr; + // Build domain name string for whitelist checking + char domain[128]; + size_t domain_len = 0; + uint8_t *name_ptr = ptr; + + while (name_ptr < end && *name_ptr != 0) { + uint8_t label_len = *name_ptr; if (label_len > 63) { // Check for invalid label length return; } // Check if we have room for this label plus the length byte - if (ptr + label_len + 1 > end) { + if (name_ptr + label_len + 1 > end) { return; // Would overflow } - ptr += label_len + 1; + // Add dot separator if not first label + if (domain_len > 0 && domain_len < sizeof(domain) - 1) { + domain[domain_len++] = '.'; + } + // Copy label to domain string + for (uint8_t i = 0; i < label_len && domain_len < sizeof(domain) - 1; i++) { + domain[domain_len++] = name_ptr[1 + i]; + } + name_ptr += label_len + 1; } + domain[domain_len] = '\0'; // Check if we reached a proper null terminator - if (ptr >= end || *ptr != 0) { + if (name_ptr >= end || *name_ptr != 0) { return; // Name not terminated or truncated } - ptr++; // Skip the null terminator + ptr = name_ptr + 1; // Skip the null terminator + +#ifdef USE_WEBSERVER + // Whitelist: don't redirect web_server's CDN domains + // Respond with REFUSED to tell client to try another DNS server (e.g., cellular) + { + bool is_whitelisted = false; + // Check against configured CDN domains from web_server config +#ifdef WEBSERVER_CDN_DOMAIN_0 + if (strcasecmp(domain, WEBSERVER_CDN_DOMAIN_0) == 0) + is_whitelisted = true; +#endif +#ifdef WEBSERVER_CDN_DOMAIN_1 + if (strcasecmp(domain, WEBSERVER_CDN_DOMAIN_1) == 0) + is_whitelisted = true; +#endif + + if (is_whitelisted) { + ESP_LOGD(TAG, "Whitelisted domain, sending REFUSED: %s", domain); + // Send REFUSED response (RCODE=5) to trigger fallback to other DNS + header->flags = htons(DNS_QR_FLAG | 0x8005); // Response + REFUSED + header->an_count = 0; + header->ns_count = 0; + header->ar_count = 0; + ssize_t sent = this->socket_->sendto(this->buffer_, len, 0, (struct sockaddr *) &client_addr, client_addr_len); + if (sent < 0) { + ESP_LOGV(TAG, "Send REFUSED failed: %d", errno); + } + return; + } + } +#endif + + ESP_LOGV(TAG, "Redirecting DNS query for: %s", domain); // Check we have room for the question if (ptr + sizeof(DNSQuestion) > end) { diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py index 7937e7a540..56b4dea157 100644 --- a/esphome/components/web_server/__init__.py +++ b/esphome/components/web_server/__init__.py @@ -1,6 +1,7 @@ from __future__ import annotations import gzip +from urllib.parse import urlparse import esphome.codegen as cg from esphome.components import web_server_base @@ -335,6 +336,23 @@ async def to_code(config): if config[CONF_COMPRESSION] == "gzip": cg.add_define("USE_WEBSERVER_GZIP") + # Extract domains from CDN URLs for DNS whitelisting (used by captive_portal) + cdn_domains: set[str] = set() + for url_key in (CONF_CSS_URL, CONF_JS_URL): + url = config.get(url_key, "") + if url: + try: + parsed = urlparse(url) + if parsed.netloc: + cdn_domains.add(parsed.netloc.lower()) + except Exception: # pylint: disable=broad-except + pass + + # Generate defines for each CDN domain + for i, domain in enumerate(sorted(cdn_domains)): + cg.add_define(f"WEBSERVER_CDN_DOMAIN_{i}", domain) + cg.add_define("WEBSERVER_CDN_DOMAIN_COUNT", len(cdn_domains)) + if (sorting_group_config := config.get(CONF_SORTING_GROUPS)) is not None: cg.add_define("USE_WEBSERVER_SORTING") add_sorting_groups(var, sorting_group_config) diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp index 6ee169159a..e5148f673c 100644 --- a/esphome/components/web_server/web_server.cpp +++ b/esphome/components/web_server/web_server.cpp @@ -1966,15 +1966,20 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) const { const auto &url = request->url(); const auto method = request->method(); + ESP_LOGD(TAG, "canHandle called: url=%s method=%d", url.c_str(), method); + // Handle root URL if (url == ESPHOME_F("/")) { #ifdef USE_CAPTIVE_PORTAL // When captive portal is active, only handle "/" if ?web_server param is present // This lets captive_portal show its page at "/" while web_server handles /?web_server if (captive_portal::global_captive_portal != nullptr && captive_portal::global_captive_portal->is_active()) { - return request->hasParam(ESPHOME_F("web_server")); + bool has_param = request->hasParam(ESPHOME_F("web_server")); + ESP_LOGD(TAG, "canHandle: captive_portal active, hasParam(web_server)=%d", has_param); + return has_param; } #endif + ESP_LOGD(TAG, "canHandle: returning true for /"); return true; }