From 40d25f04f5b9e007fc9649f663fd3eccd26bf900 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 13 Nov 2023 01:01:45 +0100 Subject: [PATCH] [ESP-IDF5.1] Move ESP32 partition definitions --- boards/esp32-cam.json | 2 +- boards/esp32-m5core2.json | 2 +- boards/esp32-odroid.json | 2 +- boards/esp32_16M1M.json | 2 +- boards/esp32_16M8M.json | 2 +- boards/esp32_4M.json | 2 +- boards/esp32_4M2M.json | 2 +- boards/esp32_4M_fix.json | 2 +- boards/esp32_8M.json | 2 +- boards/esp32_solo1_4M.json | 2 +- boards/esp32c2.json | 2 +- boards/esp32c2_2M.json | 2 +- boards/esp32c3.json | 2 +- boards/esp32c3cdc.json | 2 +- boards/esp32c6.json | 2 +- boards/esp32c6cdc.json | 2 +- boards/esp32s2.json | 2 +- boards/esp32s2_cdc.json | 2 +- boards/esp32s2cdc.json | 2 +- boards/esp32s3cdc-qio_opi-16M.json | 2 +- boards/esp32s3cdc-qio_opi-8M.json | 2 +- boards/esp32s3cdc-qio_opi.json | 2 +- boards/esp32s3cdc-qio_qspi-16M.json | 2 +- boards/esp32s3cdc-qio_qspi-8M.json | 2 +- boards/esp32s3cdc-qio_qspi.json | 2 +- .../esp32_partition_app1310k_spiffs1503k.csv | 0 .../esp32_partition_app1572k_spiffs983k.csv | 0 .../esp32_partition_app1700k_spiffs320k_noOTA.csv | 0 .../esp32_partition_app1810k_spiffs2172k.csv | 0 .../esp32_partition_app1810k_spiffs316k.csv | 0 .../esp32_partition_app1856k_spiffs320k.csv | 0 .../esp32_partition_app2944k_spiffs10M.csv | 0 .../esp32_partition_app3520k_spiffs1088k.csv | 0 .../esp32_partition_app4096k_spiffs1024k.csv | 0 .../esp32_partition_app4096k_spiffs2048k.csv | 0 .../esp32_partition_app4096k_spiffs8124k.csv | 0 platformio_core_defs.ini | 2 +- src/include/esp32x_fixes.h | 4 ++-- src/src/WebServer/LoadFromFS.cpp | 13 +++++++------ 39 files changed, 35 insertions(+), 34 deletions(-) rename esp32_partition_app1310k_spiffs1503k.csv => boards/partitions/esp32_partition_app1310k_spiffs1503k.csv (100%) rename esp32_partition_app1572k_spiffs983k.csv => boards/partitions/esp32_partition_app1572k_spiffs983k.csv (100%) rename esp32_partition_app1700k_spiffs320k_noOTA.csv => boards/partitions/esp32_partition_app1700k_spiffs320k_noOTA.csv (100%) rename esp32_partition_app1810k_spiffs2172k.csv => boards/partitions/esp32_partition_app1810k_spiffs2172k.csv (100%) rename esp32_partition_app1810k_spiffs316k.csv => boards/partitions/esp32_partition_app1810k_spiffs316k.csv (100%) rename esp32_partition_app1856k_spiffs320k.csv => boards/partitions/esp32_partition_app1856k_spiffs320k.csv (100%) rename esp32_partition_app2944k_spiffs10M.csv => boards/partitions/esp32_partition_app2944k_spiffs10M.csv (100%) rename esp32_partition_app3520k_spiffs1088k.csv => boards/partitions/esp32_partition_app3520k_spiffs1088k.csv (100%) rename esp32_partition_app4096k_spiffs1024k.csv => boards/partitions/esp32_partition_app4096k_spiffs1024k.csv (100%) rename esp32_partition_app4096k_spiffs2048k.csv => boards/partitions/esp32_partition_app4096k_spiffs2048k.csv (100%) rename esp32_partition_app4096k_spiffs8124k.csv => boards/partitions/esp32_partition_app4096k_spiffs8124k.csv (100%) diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json index 11c90c3aa..6fd7bdb53 100644 --- a/boards/esp32-cam.json +++ b/boards/esp32-cam.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json index c924f1d78..0defb1d60 100644 --- a/boards/esp32-m5core2.json +++ b/boards/esp32-m5core2.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "m5stack_core2", - "partitions": "esp32_partition_app4096k_spiffs8124k.csv" + "partitions": "boards/partitions/esp32_partition_app4096k_spiffs8124k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json index e0cdcda1a..a63cbfbc5 100644 --- a/boards/esp32-odroid.json +++ b/boards/esp32-odroid.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "odroid_esp32", - "partitions": "esp32_partition_app4096k_spiffs8124k.csv" + "partitions": "boards/partitions/esp32_partition_app4096k_spiffs8124k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32_16M1M.json b/boards/esp32_16M1M.json index 55aef7053..58feece14 100644 --- a/boards/esp32_16M1M.json +++ b/boards/esp32_16M1M.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app4096k_spiffs1024k.csv" + "partitions": "boards/partitions/esp32_partition_app4096k_spiffs1024k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32_16M8M.json b/boards/esp32_16M8M.json index b57480800..453be7e5a 100644 --- a/boards/esp32_16M8M.json +++ b/boards/esp32_16M8M.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app4096k_spiffs8124k.csv" + "partitions": "boards/partitions/esp32_partition_app4096k_spiffs8124k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json index 3ee30cce0..c2704e19c 100644 --- a/boards/esp32_4M.json +++ b/boards/esp32_4M.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32_4M2M.json b/boards/esp32_4M2M.json index ea083f441..aac31ebdc 100644 --- a/boards/esp32_4M2M.json +++ b/boards/esp32_4M2M.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app1810k_spiffs2172k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs2172k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32_4M_fix.json b/boards/esp32_4M_fix.json index 56136ab15..5a2327b19 100644 --- a/boards/esp32_4M_fix.json +++ b/boards/esp32_4M_fix.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32_8M.json b/boards/esp32_8M.json index 7999e7272..02d5fb362 100644 --- a/boards/esp32_8M.json +++ b/boards/esp32_8M.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app2944k_spiffs2M.csv" + "partitions": "boards/partitions/esp32_partition_app2944k_spiffs2M.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32_solo1_4M.json b/boards/esp32_solo1_4M.json index 7500bbbf0..edee14a57 100644 --- a/boards/esp32_solo1_4M.json +++ b/boards/esp32_solo1_4M.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32", "variant": "esp32", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32c2.json b/boards/esp32c2.json index 4504f0bf1..f8b826fa2 100644 --- a/boards/esp32c2.json +++ b/boards/esp32c2.json @@ -10,7 +10,7 @@ "flash_mode": "qio", "mcu": "esp32c2", "variant": "esp32c2", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32c2_2M.json b/boards/esp32c2_2M.json index c2c3e6b10..741790d71 100644 --- a/boards/esp32c2_2M.json +++ b/boards/esp32c2_2M.json @@ -10,7 +10,7 @@ "flash_mode": "qio", "mcu": "esp32c2", "variant": "esp32c2", - "partitions": "esp32_partition_app1700k_spiffs320k_noOTA.csv" + "partitions": "boards/partitions/esp32_partition_app1700k_spiffs320k_noOTA.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32c3.json b/boards/esp32c3.json index 8326dd444..884ad3953 100644 --- a/boards/esp32c3.json +++ b/boards/esp32c3.json @@ -10,7 +10,7 @@ "flash_mode": "dio", "mcu": "esp32c3", "variant": "esp32c3", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32c3cdc.json b/boards/esp32c3cdc.json index 691ba9b92..54b81e9d0 100644 --- a/boards/esp32c3cdc.json +++ b/boards/esp32c3cdc.json @@ -10,7 +10,7 @@ "flash_mode": "dio", "mcu": "esp32c3", "variant": "esp32c3", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32c6.json b/boards/esp32c6.json index 1bb791a6e..10555b49c 100644 --- a/boards/esp32c6.json +++ b/boards/esp32c6.json @@ -10,7 +10,7 @@ "flash_mode": "qio", "mcu": "esp32c6", "variant": "esp32c6", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32c6cdc.json b/boards/esp32c6cdc.json index d22f30078..339126b2b 100644 --- a/boards/esp32c6cdc.json +++ b/boards/esp32c6cdc.json @@ -10,7 +10,7 @@ "flash_mode": "qio", "mcu": "esp32c6", "variant": "esp32c6", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32s2.json b/boards/esp32s2.json index 6e1e8112d..0eb189030 100644 --- a/boards/esp32s2.json +++ b/boards/esp32s2.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32s2", "variant": "esp32s2", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi" diff --git a/boards/esp32s2_cdc.json b/boards/esp32s2_cdc.json index 90ed151bd..f358f6a3c 100644 --- a/boards/esp32s2_cdc.json +++ b/boards/esp32s2_cdc.json @@ -11,7 +11,7 @@ "flash_mode": "dio", "mcu": "esp32s2", "variant": "esp32s2", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi" diff --git a/boards/esp32s2cdc.json b/boards/esp32s2cdc.json index 8aaae36df..166ef3287 100644 --- a/boards/esp32s2cdc.json +++ b/boards/esp32s2cdc.json @@ -10,7 +10,7 @@ "flash_mode": "dio", "mcu": "esp32s2", "variant": "esp32s2", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi" diff --git a/boards/esp32s3cdc-qio_opi-16M.json b/boards/esp32s3cdc-qio_opi-16M.json index 4449d9c48..ff62fb130 100644 --- a/boards/esp32s3cdc-qio_opi-16M.json +++ b/boards/esp32s3cdc-qio_opi-16M.json @@ -18,7 +18,7 @@ "mcu": "esp32s3", "variant": "esp32s3", "filesystem": "littlefs", - "partitions": "esp32_partition_app4096k_spiffs8124k.csv" + "partitions": "boards/partitions/esp32_partition_app4096k_spiffs8124k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32s3cdc-qio_opi-8M.json b/boards/esp32s3cdc-qio_opi-8M.json index ac7f0bfa3..49511be40 100644 --- a/boards/esp32s3cdc-qio_opi-8M.json +++ b/boards/esp32s3cdc-qio_opi-8M.json @@ -18,7 +18,7 @@ "mcu": "esp32s3", "variant": "esp32s3", "filesystem": "littlefs", - "partitions": "esp32_partition_app3520k_spiffs1088k.csv" + "partitions": "boards/partitions/esp32_partition_app3520k_spiffs1088k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32s3cdc-qio_opi.json b/boards/esp32s3cdc-qio_opi.json index 41fcb8907..63f69a7d7 100644 --- a/boards/esp32s3cdc-qio_opi.json +++ b/boards/esp32s3cdc-qio_opi.json @@ -17,7 +17,7 @@ ], "mcu": "esp32s3", "variant": "esp32s3", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32s3cdc-qio_qspi-16M.json b/boards/esp32s3cdc-qio_qspi-16M.json index 5debab61f..b93dc474d 100644 --- a/boards/esp32s3cdc-qio_qspi-16M.json +++ b/boards/esp32s3cdc-qio_qspi-16M.json @@ -18,7 +18,7 @@ "mcu": "esp32s3", "variant": "esp32s3", "filesystem": "littlefs", - "partitions": "esp32_partition_app4096k_spiffs8124k.csv" + "partitions": "boards/partitions/esp32_partition_app4096k_spiffs8124k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32s3cdc-qio_qspi-8M.json b/boards/esp32s3cdc-qio_qspi-8M.json index 4cfba2c9b..705df27c4 100644 --- a/boards/esp32s3cdc-qio_qspi-8M.json +++ b/boards/esp32s3cdc-qio_qspi-8M.json @@ -18,7 +18,7 @@ "mcu": "esp32s3", "variant": "esp32s3", "filesystem": "littlefs", - "partitions": "esp32_partition_app3520k_spiffs1088k.csv" + "partitions": "boards/partitions/esp32_partition_app3520k_spiffs1088k.csv" }, "connectivity": [ "wifi", diff --git a/boards/esp32s3cdc-qio_qspi.json b/boards/esp32s3cdc-qio_qspi.json index b766d42e7..e040168ac 100644 --- a/boards/esp32s3cdc-qio_qspi.json +++ b/boards/esp32s3cdc-qio_qspi.json @@ -17,7 +17,7 @@ ], "mcu": "esp32s3", "variant": "esp32s3", - "partitions": "esp32_partition_app1810k_spiffs316k.csv" + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" }, "connectivity": [ "wifi", diff --git a/esp32_partition_app1310k_spiffs1503k.csv b/boards/partitions/esp32_partition_app1310k_spiffs1503k.csv similarity index 100% rename from esp32_partition_app1310k_spiffs1503k.csv rename to boards/partitions/esp32_partition_app1310k_spiffs1503k.csv diff --git a/esp32_partition_app1572k_spiffs983k.csv b/boards/partitions/esp32_partition_app1572k_spiffs983k.csv similarity index 100% rename from esp32_partition_app1572k_spiffs983k.csv rename to boards/partitions/esp32_partition_app1572k_spiffs983k.csv diff --git a/esp32_partition_app1700k_spiffs320k_noOTA.csv b/boards/partitions/esp32_partition_app1700k_spiffs320k_noOTA.csv similarity index 100% rename from esp32_partition_app1700k_spiffs320k_noOTA.csv rename to boards/partitions/esp32_partition_app1700k_spiffs320k_noOTA.csv diff --git a/esp32_partition_app1810k_spiffs2172k.csv b/boards/partitions/esp32_partition_app1810k_spiffs2172k.csv similarity index 100% rename from esp32_partition_app1810k_spiffs2172k.csv rename to boards/partitions/esp32_partition_app1810k_spiffs2172k.csv diff --git a/esp32_partition_app1810k_spiffs316k.csv b/boards/partitions/esp32_partition_app1810k_spiffs316k.csv similarity index 100% rename from esp32_partition_app1810k_spiffs316k.csv rename to boards/partitions/esp32_partition_app1810k_spiffs316k.csv diff --git a/esp32_partition_app1856k_spiffs320k.csv b/boards/partitions/esp32_partition_app1856k_spiffs320k.csv similarity index 100% rename from esp32_partition_app1856k_spiffs320k.csv rename to boards/partitions/esp32_partition_app1856k_spiffs320k.csv diff --git a/esp32_partition_app2944k_spiffs10M.csv b/boards/partitions/esp32_partition_app2944k_spiffs10M.csv similarity index 100% rename from esp32_partition_app2944k_spiffs10M.csv rename to boards/partitions/esp32_partition_app2944k_spiffs10M.csv diff --git a/esp32_partition_app3520k_spiffs1088k.csv b/boards/partitions/esp32_partition_app3520k_spiffs1088k.csv similarity index 100% rename from esp32_partition_app3520k_spiffs1088k.csv rename to boards/partitions/esp32_partition_app3520k_spiffs1088k.csv diff --git a/esp32_partition_app4096k_spiffs1024k.csv b/boards/partitions/esp32_partition_app4096k_spiffs1024k.csv similarity index 100% rename from esp32_partition_app4096k_spiffs1024k.csv rename to boards/partitions/esp32_partition_app4096k_spiffs1024k.csv diff --git a/esp32_partition_app4096k_spiffs2048k.csv b/boards/partitions/esp32_partition_app4096k_spiffs2048k.csv similarity index 100% rename from esp32_partition_app4096k_spiffs2048k.csv rename to boards/partitions/esp32_partition_app4096k_spiffs2048k.csv diff --git a/esp32_partition_app4096k_spiffs8124k.csv b/boards/partitions/esp32_partition_app4096k_spiffs8124k.csv similarity index 100% rename from esp32_partition_app4096k_spiffs8124k.csv rename to boards/partitions/esp32_partition_app4096k_spiffs8124k.csv diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 8a476b24f..cc80e6633 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -275,7 +275,7 @@ lib_ignore = ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1732/framework-arduinoespressif32-release_v5.1-4cafc60a00.zip ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1752/framework-arduinoespressif32-release_v5.1_no_SECP256R1-e97d377907.zip platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.12/platform-espressif32.zip -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1786/framework-arduinoespressif32-release_v5.1-02b9e1c552.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1787/framework-arduinoespressif32-release_v5.1-f61c914469.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/include/esp32x_fixes.h b/src/include/esp32x_fixes.h index ad7726120..8bf04469f 100644 --- a/src/include/esp32x_fixes.h +++ b/src/include/esp32x_fixes.h @@ -74,7 +74,7 @@ # define SPI_HOST SPI1_HOST # define HSPI_HOST SPI2_HOST # define VSPI_HOST SPI2_HOST /* No SPI3_host on C3 */ -//# if ESP_IDF_VERSION_MAJOR < 5 +# if ESP_IDF_VERSION_MAJOR < 5 // fix a bug in esp-idf 4.4 for esp32c3 # ifndef REG_SPI_BASE @@ -83,7 +83,7 @@ // SPI_MOSI_DLEN_REG is not defined anymore in esp32c3, instead use SPI_MS_DLEN_REG # define SPI_MOSI_DLEN_REG(x) SPI_MS_DLEN_REG(x) # endif // REG_SPI_BASE -//# endif // ESP_IDF_VERSION_MAJOR < 5 +# endif // ESP_IDF_VERSION_MAJOR < 5 #elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 # define SPI_HOST SPI1_HOST diff --git a/src/src/WebServer/LoadFromFS.cpp b/src/src/WebServer/LoadFromFS.cpp index 595ba2218..8298ec672 100644 --- a/src/src/WebServer/LoadFromFS.cpp +++ b/src/src/WebServer/LoadFromFS.cpp @@ -231,7 +231,11 @@ bool loadFromFS(String path) { #ifndef BUILD_NO_DEBUG if (static_file) { - addLog(LOG_LEVEL_INFO, concat(F("static_file: "), path)); + addLog(LOG_LEVEL_INFO, strformat( + F("static_file: %s to: %s"), + path.c_str(), + web_server.client().remoteIP().toString().c_str() + )); } #endif // ifndef BUILD_NO_DEBUG #ifdef WEBSERVER_CUSTOM @@ -256,9 +260,7 @@ bool loadFromFS(String path) { #ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - String log = F("HTML : Request file "); - log += path; - addLogMove(LOG_LEVEL_DEBUG, log); + addLogMove(LOG_LEVEL_DEBUG, concat(F("HTML : Request file "), path)); } #endif // ifndef BUILD_NO_DEBUG @@ -272,8 +274,7 @@ bool loadFromFS(String path) { sendHeader(F("Last-Modified"), get_build_date_RFC1123()); } sendHeader(F("Age"), F("100")); - sendHeader(F("ETag"), wrap_String(String(Cache.fileCacheClearMoment) + F("-a"), '"')); // added "-a" to the ETag to - // match the same encoding + sendHeader(F("ETag"), strformat(F("\"%u-a\""), Cache.fileCacheClearMoment)); // added "-a" to the ETag to match the same encoding } else { sendHeader(F("Cache-Control"), F("no-cache")); sendHeader(F("ETag"), F("\"2.0.0\""));