Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[ESP-IDF5.1] Move ESP32 partition definitions

Browse Source
This commit is contained in:
TD-er
2023-11-13 01:01:45 +01:00
parent e0611471cd
commit 40d25f04f5
39 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/esp32-cam.json
+1 -1
View File
@@ -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",
boards/esp32-m5core2.json
+1 -1
View File
@@ -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",
boards/esp32-odroid.json
+1 -1
View File
@@ -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",
boards/esp32_16M1M.json
+1 -1
View File
@@ -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",
boards/esp32_16M8M.json
+1 -1
View File
@@ -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",
boards/esp32_4M.json
+1 -1
View File
@@ -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",
boards/esp32_4M2M.json
+1 -1
View File
@@ -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",
boards/esp32_4M_fix.json
+1 -1
View File
@@ -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",
boards/esp32_8M.json
+1 -1
View File
@@ -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",
boards/esp32_solo1_4M.json
+1 -1
View File
@@ -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",
boards/esp32c2.json
+1 -1
View File
@@ -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",
boards/esp32c2_2M.json
+1 -1
View File
@@ -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",
boards/esp32c3.json
+1 -1
View File
@@ -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",
boards/esp32c3cdc.json
+1 -1
View File
@@ -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",
boards/esp32c6.json
+1 -1
View File
@@ -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",
boards/esp32c6cdc.json
+1 -1
View File
@@ -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",
boards/esp32s2.json
+1 -1
View File
@@ -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"
boards/esp32s2_cdc.json
+1 -1
View File
@@ -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"
boards/esp32s2cdc.json
+1 -1
View File
@@ -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"
boards/esp32s3cdc-qio_opi-16M.json
+1 -1
View File
@@ -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",
boards/esp32s3cdc-qio_opi-8M.json
+1 -1
View File
@@ -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",
boards/esp32s3cdc-qio_opi.json
+1 -1
View File
@@ -17,7 +17,7 @@
],
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
"partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv"
},
"connectivity": [
"wifi",
boards/esp32s3cdc-qio_qspi-16M.json
+1 -1
View File
@@ -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",
boards/esp32s3cdc-qio_qspi-8M.json
+1 -1
View File
@@ -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",
boards/esp32s3cdc-qio_qspi.json
+1 -1
View File
@@ -17,7 +17,7 @@
],
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "esp32_partition_app1810k_spiffs316k.csv"
"partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv"
},
"connectivity": [
"wifi",
esp32_partition_app1310k_spiffs1503k.csv → boards/partitions/esp32_partition_app1310k_spiffs1503k.csv
View File
esp32_partition_app1572k_spiffs983k.csv → boards/partitions/esp32_partition_app1572k_spiffs983k.csv
View File
esp32_partition_app1700k_spiffs320k_noOTA.csv → boards/partitions/esp32_partition_app1700k_spiffs320k_noOTA.csv
View File
esp32_partition_app1810k_spiffs2172k.csv → boards/partitions/esp32_partition_app1810k_spiffs2172k.csv
View File
esp32_partition_app1810k_spiffs316k.csv → boards/partitions/esp32_partition_app1810k_spiffs316k.csv
View File
esp32_partition_app1856k_spiffs320k.csv → boards/partitions/esp32_partition_app1856k_spiffs320k.csv
View File
esp32_partition_app2944k_spiffs10M.csv → boards/partitions/esp32_partition_app2944k_spiffs10M.csv
View File
esp32_partition_app3520k_spiffs1088k.csv → boards/partitions/esp32_partition_app3520k_spiffs1088k.csv
View File
esp32_partition_app4096k_spiffs1024k.csv → boards/partitions/esp32_partition_app4096k_spiffs1024k.csv
View File
esp32_partition_app4096k_spiffs2048k.csv → boards/partitions/esp32_partition_app4096k_spiffs2048k.csv
View File
esp32_partition_app4096k_spiffs8124k.csv → boards/partitions/esp32_partition_app4096k_spiffs8124k.csv
View File
platformio_core_defs.ini
+1 -1
View File
@@ -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
src/include/esp32x_fixes.h
+2 -2
View File
@@ -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
src/src/WebServer/LoadFromFS.cpp
+7 -6
View File
@@ -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\""));