mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-18 15:35:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-07 11:51:46 -10:00
parent fb03947d28 1339f3e77e
commit 4ad721f632
3 changed files with 3922 additions and 3941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
esphome/components/captive_portal/captive_index.h
View File

@@ -85,12 +85,9 @@ const uint8_t INDEX_GZ[] PROGMEM = {
0x7c, 0x03, 0x41, 0xef, 0x46, 0x2f, 0x98, 0x92, 0x1d, 0xaa, 0x9d, 0xb5, 0x7b, 0xb8, 0xbc, 0xfe, 0xb6, 0xbd, 0xfe,
0xea, 0xbd, 0xee, 0xa5, 0xfb, 0x0f, 0x53, 0x58, 0x46, 0xb2, 0xf9, 0x0a, 0x00, 0x00};
static constexpr size_t INDEX_SIZE = sizeof(INDEX_GZ);
static constexpr const char *INDEX_CONTENT_ENCODING = "gzip";
#else // Brotli (default, smaller)
const uint8_t INDEX_BR[] PROGMEM = {
0x1f, 0xf8, 0x0a, 0x00, 0x64, 0x5a, 0xd3, 0xfa, 0xe7, 0xf3, 0x62, 0xd8, 0x06, 0x1b, 0xe9, 0x6a, 0x8a, 0x81, 0x2b,
0x1b, 0xf8, 0x0a, 0x00, 0x64, 0x5a, 0xd3, 0xfa, 0xe7, 0xf3, 0x62, 0xd8, 0x06, 0x1b, 0xe9, 0x6a, 0x8a, 0x81, 0x2b,
0xb5, 0x49, 0x14, 0x37, 0xdc, 0x9e, 0x1a, 0xcb, 0x56, 0x87, 0xfb, 0xff, 0xf7, 0x73, 0x75, 0x12, 0x0a, 0xd6, 0x48,
0x84, 0xc6, 0x21, 0xa4, 0x6d, 0xb5, 0x71, 0xef, 0x13, 0xbe, 0x4e, 0x54, 0xf1, 0x64, 0x8f, 0x3f, 0xcc, 0x9a, 0x78,
0xa5, 0x89, 0x25, 0xb3, 0xda, 0x2c, 0xa2, 0x32, 0x9c, 0x57, 0x07, 0x56, 0xbc, 0x34, 0x13, 0xff, 0x5c, 0x0a, 0xa1,
@@ -152,8 +149,6 @@ const uint8_t INDEX_BR[] PROGMEM = {
// Backwards compatibility alias
#define INDEX_GZ INDEX_BR
static constexpr size_t INDEX_SIZE = sizeof(INDEX_BR);
static constexpr const char *INDEX_CONTENT_ENCODING = "br";
#endif // USE_CAPTIVE_PORTAL_GZIP

7
esphome/components/web_server/server_index_v2.h
View File

@@ -645,12 +645,9 @@ const uint8_t INDEX_GZ[] PROGMEM = {
0x22, 0xf7, 0xa0, 0x94, 0x0e, 0x99, 0x41, 0xa1, 0x1a, 0xa9, 0xa3, 0x20, 0xbf, 0xa9, 0xdc, 0x0a, 0xfc, 0x2d, 0xbe,
0xee, 0xff, 0x03, 0x85, 0xa3, 0x0b, 0x12, 0x20, 0x8b, 0x00, 0x00};
static constexpr size_t INDEX_SIZE = sizeof(INDEX_GZ);
static constexpr const char *INDEX_CONTENT_ENCODING = "gzip";
#else // Brotli (default, smaller)
const uint8_t INDEX_BR[] PROGMEM = {
0x1f, 0x1f, 0x8b, 0x11, 0x15, 0xb5, 0x07, 0x2e, 0x8a, 0x32, 0xd1, 0x4a, 0x00, 0x3d, 0x0c, 0xf0, 0x64, 0x64, 0xfe,
0x1b, 0x1f, 0x8b, 0x11, 0x15, 0xb5, 0x07, 0x2e, 0x8a, 0x32, 0xd1, 0x4a, 0x00, 0x3d, 0x0c, 0xf0, 0x64, 0x64, 0xfe,
0xca, 0x03, 0x1e, 0x15, 0x6c, 0xb2, 0x3d, 0x4d, 0x23, 0x3c, 0x36, 0x77, 0xaa, 0xd8, 0x7a, 0xb4, 0xd1, 0x42, 0x40,
0x11, 0xba, 0x7d, 0xa8, 0xfe, 0xef, 0x5a, 0xfe, 0xb4, 0x58, 0x8c, 0x03, 0x96, 0xaa, 0x9a, 0x1e, 0xa8, 0x33, 0x7d,
0x5d, 0x84, 0x65, 0xb5, 0x47, 0x68, 0xec, 0x93, 0x5c, 0xff, 0x2b, 0x9b, 0x76, 0xcf, 0xe5, 0xd4, 0x74, 0x28, 0xfc,
@@ -1223,8 +1220,6 @@ const uint8_t INDEX_BR[] PROGMEM = {
// Backwards compatibility alias
#define INDEX_GZ INDEX_BR
static constexpr size_t INDEX_SIZE = sizeof(INDEX_BR);
static constexpr const char *INDEX_CONTENT_ENCODING = "br";
#endif // USE_WEBSERVER_GZIP

7849
esphome/components/web_server/server_index_v3.h
View File

File diff suppressed because it is too large Load Diff