From b5775895d206164b805ad8e1b1699768f304410a Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 22 Aug 2025 17:38:08 +0200 Subject: [PATCH] Remove `user-scalable=no` from HTTP HEADER (#23798) - Fix ESP32-C5 config-version --- CHANGELOG.md | 3 ++ RELEASENOTES.md | 5 ++- tasmota/html_compressed/HTTP_GV_PAGE.h | 24 +++++------ tasmota/html_compressed/HTTP_HEADER1_ES6.h | 45 ++++++++++---------- tasmota/html_uncompressed/HTTP_GV_PAGE.h | 2 +- tasmota/html_uncompressed/HTTP_HEADER1_ES6.h | 2 +- tasmota/tasmota_support/settings.ino | 8 ++-- 7 files changed, 48 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b89bf0276..148895aca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,11 +11,14 @@ All notable changes to this project will be documented in this file. ### Changed - ESP32 Platform from 2025.07.31 to 2025.08.30, Framework (Arduino Core) from v3.1.3.250712 to v3.1.3.250808 and IDF from v5.3.3.250707 to v5.3.3.250801 (#23778) - Epdiy library from v1.0.0 to v2.0.0 +- ESP8266 platform update from 2025.07.00 to 2025.08.00 (#23801) +- Support for ESP32-C5 (#23804) ### Fixed - Syslog RFC5424 compliance (#23509) ### Removed +- `user-scalable=no` from HTTP HEADER (#23798) ## [15.0.1.2] 20250803 ### Added diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 613810fda..27d7a9e01 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -124,6 +124,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm - NeoPool add Redox tank alarm [#19811](https://github.com/arendst/Tasmota/issues/19811) - I2S additions [#23543](https://github.com/arendst/Tasmota/issues/23543) - Basic support for ESP32-P4 [#23663](https://github.com/arendst/Tasmota/issues/23663) +- Support for ESP32-C5 [#23804](https://github.com/arendst/Tasmota/issues/23804) - ESP32-P4 command `HostedOta` [#23675](https://github.com/arendst/Tasmota/issues/23675) - Berry f-strings now support ':' in expression [#23618](https://github.com/arendst/Tasmota/issues/23618) - Berry preview of animation framework [#23740](https://github.com/arendst/Tasmota/issues/23740) @@ -132,7 +133,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm ### Breaking Changed ### Changed -- ESP8266 platform update from 2025.05.00 to 2025.07.00 [#23700](https://github.com/arendst/Tasmota/issues/23700) +- ESP8266 platform update from 2025.05.00 to 2025.08.00 [#23801](https://github.com/arendst/Tasmota/issues/23801) - ESP32 Platform from 2025.05.30 to 2025.08.30, Framework (Arduino Core) from v3.1.3.250504 to v3.1.3.250808 and IDF from v5.3.3.250501 to v5.3.3.250801 [#23778](https://github.com/arendst/Tasmota/issues/23778) - Epdiy library from v1.0.0 to v2.0.0 - OpenTherm library from v0.9.0 to v1.1.5 [#23704](https://github.com/arendst/Tasmota/issues/23704) @@ -155,3 +156,5 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm - LVGL restore `lv_chart.set_range` removed in LVGL 9.3.0 in favor of `lv_chart.set_axis_range` [#23567](https://github.com/arendst/Tasmota/issues/23567) ### Removed +- `user-scalable=no` from HTTP HEADER [#23798](https://github.com/arendst/Tasmota/issues/23798) + diff --git a/tasmota/html_compressed/HTTP_GV_PAGE.h b/tasmota/html_compressed/HTTP_GV_PAGE.h index 4aaba697c..c8507f5c0 100644 --- a/tasmota/html_compressed/HTTP_GV_PAGE.h +++ b/tasmota/html_compressed/HTTP_GV_PAGE.h @@ -1,9 +1,9 @@ ///////////////////////////////////////////////////////////////////// // compressed by tools/unishox/compress-html-uncompressed.py -// input sha256: f5150873f8737621b7fd8bab0e471d73c893429c79c045a1b20c26c5fee1d3fa +// input sha256: 2374942a5c44b2ab1338bdfba0f5802191543b963c4f54fd7ac39228a1849d10 ///////////////////////////////////////////////////////////////////// -const size_t HTTP_GV_PAGE_SIZE = 463; +const size_t HTTP_GV_PAGE_SIZE = 461; // compressed size 337 bytes const char HTTP_GV_PAGE_COMPRESSED[] PROGMEM = "\x3D\x0F\xE1\x10\x98\x1D\x19\x0C\x64\x85\x50\xD0\x8F\xC3\xD0\x55\x0D\x09\x05\x7C" "\x3C\x7C\x3E\xDF\x1F\x67\xE1\xE8\x29\xD8\x87\xE1\xE9\x5B\x41\x33\xF0\xFA\xF2\x21" "\xE2\x18\x5A\x58\x88\xCF\x58\xFB\xF9\xE8\x76\x02\x0D\x23\xD0\x6B\xAB\x41\x8A\xBF" @@ -11,15 +11,15 @@ const char HTTP_GV_PAGE_COMPRESSED[] PROGMEM = "\x3D\x0F\xE1\x10\x98\x1D\x19\x0C "\x0F\x87\xD9\xF5\xE3\xEC\xFC\x3D\x02\xDE\x34\x5F\x61\x1F\x0F\xBD\x0F\x38\xFB\x04" "\x2A\x2B\xE6\x2C\xCF\x43\xCE\x3A\x68\x78\x7D\x82\x16\x4D\xD6\x35\x9F\x0F\xB3\x3D" "\x63\xE3\x33\xF4\x7D\xA0\xF3\xA9\xF5\x1F\x0F\xB1\xFD\x12\x85\x1F\x04\x66\x7A\x1B" - "\x3A\xC7\xF4\x4A\x14\x75\x2D\xED\xAD\xB0\x8E\xBF\x07\x61\x33\xE1\xC8\x74\x67\xD9" - "\xF8\x7A\x17\x83\xFE\x8C\xA5\x46\x43\x19\xF0\xFB\x1B\x82\x0B\x09\x9F\x68\x3F\xE7" - "\xBD\x9F\xD1\xED\xE5\xEF\x86\x7C\x3E\xC8\x78\x86\x16\x96\x02\x0F\x04\xA4\x66\x2D" - "\x9D\x0D\x7E\x3E\xCF\xC3\xD0\xEC\x04\x1C\x58\x11\xF8\x08\xF5\x19\x04\xFC\x29\xBA" - "\x04\x9C\x7C\x10\x78\x1A\xBF\x79\xD7\x8E\xC1\xB7\xBC\x74\x0F\xDE\x3E\xCF\xC3\xD0" - "\xEC\x04\x1E\x23\x07\x60\x86\x47\xE1\xE8\x26\x99\xAD\x10\xF8\x7D\xD8\xC1\x87\xD9" - "\xF8\x7A\x1D\x82\x69\x98\x21\xEF\x27\xE0\xFE\xF0\x98\x3E\x74\x1E\x19\xB8\x7E\xFC" - "\xEA\xB7\x87\xBC\x8F\x88\xF6\xE8\xC3\xCC\xFB\x3E\xBC\x7D\x9D\x43\x33\xF4\x79\x9F" - "\x67\xD0\x87\xD9\xD4\x63\xED\x97\x8D\x1D\x06\x28\xBF\x63\x4F\x33\xEC\xFA\x11\x11" - "\xA1\x0E\x3E\xCF\x71\xE0\x11\x78\x09\x3B\x01\x07\x49\x3B\x05\x50\xD0\x8F\xC3"; + "\x3A\xC7\xF4\x4A\x14\x75\x2D\xED\xAD\xB0\x8E\xBF\x07\x61\x33\xE1\xC8\x7D\x9F\x87" + "\xA1\x78\x3F\xE8\xCA\x54\x64\x31\x9F\x0F\xB1\xB8\x20\xB0\x99\xF6\x83\xFE\x7B\xD9" + "\xFD\x1E\xDE\x5E\xF8\x67\xC3\xEC\x87\x88\x61\x69\x60\x20\xF0\x46\x46\x62\xD9\xD0" + "\xD7\xE3\xEC\xFC\x3D\x0E\xC0\x41\xC5\x81\x1F\x80\x6F\x51\x90\x4F\xC2\x9B\xA0\x49" + "\xC7\xC1\x07\x81\x8B\xF7\x9D\x78\xEC\x1B\x7B\xC7\x40\xFD\xE3\xEC\xFC\x3D\x0E\xC0" + "\x41\xE2\x28\x76\x08\x64\x7E\x1E\x82\x69\x9A\xD1\x0F\x87\xDD\x8C\x18\x7D\x9F\x87" + "\xA1\xD8\x26\x99\x82\x1E\xF2\x7E\x0F\xEF\x09\x83\xE7\x41\xE1\x9B\x87\xEF\xCE\xAB" + "\x78\x7B\xC8\xF8\x8F\x6E\x8C\x3C\xCF\xB3\xEB\xC7\xD9\xD4\x33\x3F\x47\x99\xF6\x7D" + "\x08\x7D\x9D\x46\x3E\xD9\x78\xD1\xD0\x62\x8B\xF6\x34\xF3\x3E\xCF\xA1\x11\x1A\x10" + "\xE3\xEC\xF7\x1E\x01\x17\x80\x93\xB0\x10\x74\x93\xB0\x55\x0D\x08\xFC"; #define HTTP_GV_PAGE Decompress(HTTP_GV_PAGE_COMPRESSED,HTTP_GV_PAGE_SIZE).c_str() \ No newline at end of file diff --git a/tasmota/html_compressed/HTTP_HEADER1_ES6.h b/tasmota/html_compressed/HTTP_HEADER1_ES6.h index bcfb27e3c..9761907bb 100644 --- a/tasmota/html_compressed/HTTP_HEADER1_ES6.h +++ b/tasmota/html_compressed/HTTP_HEADER1_ES6.h @@ -1,34 +1,33 @@ ///////////////////////////////////////////////////////////////////// // compressed by tools/unishox/compress-html-uncompressed.py -// input sha256: 3417a3f0d32f6537d82e4638a9cd462098b9da4f641160355e0c8d9334aed1d4 +// input sha256: 2a0513dadd9c02089d323481a7ad72694f3f5eec4bd4bf7e2fb7e47df7807a1b ///////////////////////////////////////////////////////////////////// -const size_t HTTP_HEADER1_SIZE = 683; // compressed size 502 bytes +const size_t HTTP_HEADER1_SIZE = 666; // compressed size 490 bytes const char HTTP_HEADER1_COMPRESSED[] PROGMEM = "\x3D\x0F\xE1\x10\x98\x1D\x19\x0C\x64\x85\x50\xD0\x8F\xC3\xD0\x55\x0D\x09\x05\x7C" "\x3C\x7C\x3D\x87\xD7\x8F\x62\x0C\x2B\xF7\x8F\x87\xB0\xF6\x1F\x87\xA0\xA7\x62\x1F" "\x87\xA0\xD7\x56\x83\x15\x7F\xF3\xA3\xE1\xF6\x2E\x8C\x1D\x67\x3E\x7D\x90\x21\x52" "\xEB\x1A\xCF\x87\xB0\xCF\x58\xF8\xCC\xFD\x1E\xC4\x1E\x75\x3E\xA3\xE1\xEC\x1F\xD1" "\x28\x51\xF0\x46\x67\xA1\xB3\xAC\x7F\x44\xA1\x47\x56\xF6\xD6\xD8\x47\x5F\x83\xB0" - "\x99\xF0\xE4\x3A\x88\x5F\x9F\xCE\xBF\x07\x61\x58\xE0\x99\xF3\xB0\xF6\x1D\x87\xE1" - "\xE8\x16\xF1\xA2\xFB\x08\xF8\x7B\x34\x3C\xE3\xD8\x85\x7D\x98\x3E\x1E\xC1\x2E\xAC" - "\xF3\xD1\xB6\x3C\xCE\xC3\x61\xD7\xA1\xE7\x1E\x07\x5F\x99\xCE\xC3\xA8\x88\xAE\xEC" - "\x75\xDB\xB6\x3A\xC3\xBB\x77\x66\xA0\xC8\x7C\xAC\xAC\xAC\xAC\x8C\x0F\x15\x95\x95" - "\x90\x63\xC4\x57\x77\x66\xAB\xBB\xBD\xB2\x37\xA0\x11\x32\x04\x29\x46\xF5\xE3\xB0" - "\xEC\x3B\x0E\xC2\xB2\x18\x73\x4E\xC2\x1C\x76\xC8\x51\xCE\x22\x36\x1C\xA3\xB0\x85" - "\x1C\xF9\x1A\x1C\x44\x66\x73\x09\x91\xB7\x87\x1D\xB2\x14\x2C\x43\x94\x76\x10\xA3" - "\x9E\x2E\x10\xCC\xE6\x13\x39\xB6\x43\x8E\xD9\x18\x1A\x46\xD1\xA7\x60\xA2\x1A\x68" - "\x6C\x33\x39\x84\x46\xD1\xE2\x36\x8E\x3B\x64\x28\xB0\x33\x94\x76\x10\xA3\x9A\x76" - "\xC8\x43\x33\x98\x46\x08\x61\x0C\x1C\x76\xC8\x51\xCD\x2E\x39\x47\x61\x0A\x3B\x08" - "\x43\x88\x8C\xCE\x61\x18\x39\xA7\x61\x0E\x3B\x64\xCA\xCA\xCB\x0E\x61\x13\x2B\x2B" - "\x21\x05\x90\xE2\xB2\xB2\xB3\x9E\x21\xE2\x35\x02\x5C\xC0\x5B\xB8\x0A\x17\x0F\x61" - "\xF8\x7A\x56\xD0\x4C\xFC\x3E\xBC\x8F\xAF\x1E\x87\x60\x20\xC9\x3D\x3C\x1F\xF4\x65" - "\x1F\x86\x77\xF4\x6C\x3E\x70\xB0\x82\x3A\x82\xA3\xAA\xB0\xEA\xA1\x87\x50\xC0\xCF" - "\x87\xD9\xF6\x78\x63\x8F\x9E\x3E\x1F\x82\x60\x62\xC6\xBE\xA3\xA0\xF3\xA2\x61\x31" - "\xAF\xA8\x87\x19\x16\x88\x77\x7C\x77\x8F\x06\xAF\x02\x45\xD3\x50\xB7\xF3\x22\xF3" - "\x09\x87\x59\xF3\xBB\xE3\xBC\x78\xF0\xC3\xE6\x9F\x0F\xC6\x38\xEE\xE9\xDE\x3A\x51" - "\x90\xC6\x7C\x3B\xA0\x8D\x20\xF8\x7C\x3E\xE9\x9B\x28\xFB\x3B\x47\xD8\xCB\xF7\x87" - "\xF3\xE2\x1F\x67\x98\x20\xCE\x3B\xC7\x81\xF0\x8F\x86\x0F\x87\xE0\xFE\xF0\x98\x3E" - "\x74\xB1\x04\x26\x66\xFA\x88\x2D\xF5\x3E\x7F\x3B\xA7\xD8\x59\x62\x1F\x67\x51\x83" - "\xBC\x78"; + "\x99\xF0\xE4\x3D\x87\x61\xF8\x7A\x10\x5B\xC6\x8B\xEC\x23\xE1\xEC\xD0\xF3\x8F\x62" + "\x15\xF6\x60\xF8\x7B\x04\xBA\xB3\xCF\x46\xD8\xF3\x3B\x0D\x87\x5E\x87\x9C\x78\x1D" + "\x7E\x67\x3B\x0E\xA2\x22\xBB\xB1\xD7\x6E\xD8\xEB\x0E\xED\xDD\x9A\x83\x21\xF2\xB2" + "\xB2\xB2\xB2\x30\x3C\x56\x56\x56\x41\x8F\x11\x5D\xDD\x9A\xAE\xEE\xF6\xC8\xDE\x80" + "\x44\xC8\x10\xA5\x1B\xD7\x8E\xC3\xB0\xEC\x3B\x0A\xC8\x61\xCD\x3B\x08\x71\xDB\x21" + "\x47\x38\x88\xD8\x72\x8E\xC2\x14\x73\xE4\x68\x71\x11\x99\xCC\x26\x46\xDE\x1C\x76" + "\xC8\x50\xB1\x0E\x51\xD8\x42\x8E\x78\xB8\x43\x33\x98\x4C\xE6\xD9\x0E\x3B\x64\x60" + "\x69\x1B\x46\x9D\x82\x88\x69\xA1\xB0\xCC\xE6\x11\x1B\x47\x88\xDA\x38\xED\x90\xA2" + "\xC0\xCE\x51\xD8\x42\x8E\x69\xDB\x21\x0C\xCE\x61\x18\x21\x84\x30\x71\xDB\x21\x47" + "\x34\xB8\xE5\x1D\x84\x28\xEC\x21\x0E\x22\x33\x39\x84\x60\xE6\x9D\x84\x38\xED\x93" + "\x2B\x2B\x2C\x39\x84\x4C\xAC\xAC\x84\x16\x43\x8A\xCA\xCA\xCE\x78\x87\x88\xD4\x09" + "\x73\x01\x6E\xE0\x28\x5C\x3D\x87\xE1\xE9\x5B\x41\x33\xF0\xFA\xF2\x3E\xBC\x7A\x1D" + "\x80\x83\x24\xF4\xF0\x7F\xD1\x94\x7E\x19\xDF\xD1\xB0\xF9\xC2\xC2\x08\xEA\x0A\x8E" + "\xAA\xC3\xAA\x86\x1D\x43\x03\x3E\x1F\x67\xD9\xE1\x8E\x3E\x78\xF8\x7E\x09\x81\x8B" + "\x1A\xFA\x8E\x83\xCE\x89\x84\xC6\xBE\xA2\x1C\x64\x5A\x21\xDD\xF1\xDE\x3C\x1A\xBC" + "\x09\x17\x4D\x42\xDF\xCC\x8B\xCC\x26\x1D\x67\xCE\xEF\x8E\xF1\xE3\xC3\x0F\x9A\x7C" + "\x3F\x18\xE3\xBB\xA7\x78\xE9\x46\x43\x19\xF0\xEE\x82\x34\x83\xE1\xF0\xFB\xA6\x6C" + "\xA3\xEC\xED\x1F\x63\x2F\xDE\x1F\xCF\x88\x7D\x9E\x60\x83\x38\xEF\x1E\x07\xC2\x3E" + "\x18\x3E\x1F\x83\xFB\xC2\x60\xF9\xD2\xC4\x10\x99\x9B\xEA\x20\xB7\xD4\xF9\xFC\xEE" + "\x9F\x61\x65\x88\x7D\x9D\x46\x0E\xF1\xE0"; #define HTTP_HEADER1 Decompress(HTTP_HEADER1_COMPRESSED,HTTP_HEADER1_SIZE).c_str() \ No newline at end of file diff --git a/tasmota/html_uncompressed/HTTP_GV_PAGE.h b/tasmota/html_uncompressed/HTTP_GV_PAGE.h index 89a628518..f6de75b02 100644 --- a/tasmota/html_uncompressed/HTTP_GV_PAGE.h +++ b/tasmota/html_uncompressed/HTTP_GV_PAGE.h @@ -6,7 +6,7 @@ const char HTTP_GV_PAGE[] PROGMEM = "" "" // GV_BASE_URL "" - "" + "" "" "" diff --git a/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h b/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h index 2aea91e75..086a55a32 100644 --- a/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h +++ b/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h @@ -2,7 +2,7 @@ const char HTTP_HEADER1[] PROGMEM = "" "" "" - "" + "" "" "%s %s" diff --git a/tasmota/tasmota_support/settings.ino b/tasmota/tasmota_support/settings.ino index edb04b4f9..f9a70e259 100644 --- a/tasmota/tasmota_support/settings.ino +++ b/tasmota/tasmota_support/settings.ino @@ -990,10 +990,10 @@ void SettingsDefaultSet2(void) { Settings->config_version = 5; // ESP32C2 #elif CONFIG_IDF_TARGET_ESP32C6 Settings->config_version = 6; // ESP32C6 -#elif CONFIG_IDF_TARGET_ESP32C5 - Settings->config_version = 7; // ESP32C5 #elif CONFIG_IDF_TARGET_ESP32P4 Settings->config_version = 7; // ESP32P4 +#elif CONFIG_IDF_TARGET_ESP32C5 + Settings->config_version = 8; // ESP32C5 #else Settings->config_version = 1; // ESP32 #endif // CONFIG_IDF_TARGET_ESP32S3 @@ -1606,8 +1606,10 @@ void SettingsDelta(void) { Settings->config_version = 5; // ESP32C2 #elif CONFIG_IDF_TARGET_ESP32C6 Settings->config_version = 6; // ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32P4 + Settings->config_version = 7; // ESP32P4 #elif CONFIG_IDF_TARGET_ESP32C5 - Settings->config_version = 7; // ESP32C5 + Settings->config_version = 8; // ESP32C5 #else Settings->config_version = 1; // ESP32 #endif // CONFIG_IDF_TARGET_ESP32S3