From 9aa27d4a1f5e83011089448a3caac6ae747cf098 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 2 Jul 2023 20:16:28 +0200 Subject: [PATCH] [Build] Rearrange 8M2M to 8M1M configuration --- README.md | 2 +- esp32_partition_app2944k_spiffs2112k.csv | 6 ------ esp32_partition_app3520k_spiffs1088k.csv | 6 ++++++ platformio_esp32s3_envs.ini | 24 ++++++++++++------------ tools/pio/copy_files.py | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 esp32_partition_app2944k_spiffs2112k.csv create mode 100644 esp32_partition_app3520k_spiffs1088k.csv diff --git a/README.md b/README.md index 0f0454590..2c2468a71 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Flash size | Description | 4M2M | 4 MB with 2 MB filesystem | 16M | 16 MB with 14 MB filesystem | 4M316k | 4 MB with 316 kB filesystem | -8M2M | 8 MB with 2 MB filesystem | +8M1M | 8 MB with 1 MB filesystem | 16M1M | 16 MB with 1 MB filesystem | 16M8M | 16 MB with 8 MB filesystem | diff --git a/esp32_partition_app2944k_spiffs2112k.csv b/esp32_partition_app2944k_spiffs2112k.csv deleted file mode 100644 index 6cfa31926..000000000 --- a/esp32_partition_app2944k_spiffs2112k.csv +++ /dev/null @@ -1,6 +0,0 @@ -# Name, Type, SubType, Offset, Size, Flags -nvs, data, nvs, 0x9000, 0x5000, -otadata, data, ota, 0xe000, 0x2000, -app0, app, ota_0, 0x10000, 0x2F0000, -app1, app, ota_1, 0x300000, 0x2F0000, -spiffs, data, spiffs, 0x5F0000, 0x210000, diff --git a/esp32_partition_app3520k_spiffs1088k.csv b/esp32_partition_app3520k_spiffs1088k.csv new file mode 100644 index 000000000..c0b1177cf --- /dev/null +++ b/esp32_partition_app3520k_spiffs1088k.csv @@ -0,0 +1,6 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +app0, app, ota_0, 0x10000, 0x370000, +app1, app, ota_1, 0x380000, 0x370000, +spiffs, data, spiffs, 0x6F0000, 0x110000, diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index b3fb92d14..de193abb6 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -120,30 +120,30 @@ build_flags = ${esp32s3_common.build_flags} -DPLUGIN_NEOPIXEL_COLLECTION -[env:custom_ESP32s3_8M2M_LittleFS_CDC] +[env:custom_ESP32s3_8M1M_LittleFS_CDC] extends = esp32s3_common board = esp32s3cdc-qio_qspi board_upload.flash_size = 8MB -board_name = "Espressif Generic ESP32-S3 8M Flash, ESPEasy 2944k Code/OTA 2112k FS" +board_name = "Espressif Generic ESP32-S3 8M Flash, ESPEasy 3520k Code/OTA 1088k FS" build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_CUSTOM -DFEATURE_SD=1 extra_scripts = ${esp32s3_common.extra_scripts} pre:tools/pio/pre_custom_esp32.py -board_build.partitions = esp32_partition_app2944k_spiffs2112k.csv +board_build.partitions = esp32_partition_app3520k_spiffs1088k.csv -[env:custom_ESP32s3_8M2M_LittleFS_OPI_PSRAM_CDC] -extends = env:custom_ESP32s3_8M2M_LittleFS_CDC +[env:custom_ESP32s3_8M1M_LittleFS_OPI_PSRAM_CDC] +extends = env:custom_ESP32s3_8M1M_LittleFS_CDC board = esp32s3cdc-qio_opi -board_name = "Espressif Generic ESP32-S3 8M Flash OPI PSRAM, ESPEasy 2944k Code/OTA 2112k FS" +board_name = "Espressif Generic ESP32-S3 8M Flash OPI PSRAM, ESPEasy 3520k Code/OTA 1088k FS" -[env:max_ESP32s3_8M2M_LittleFS_CDC] +[env:max_ESP32s3_8M1M_LittleFS_CDC] extends = esp32s3_common board = esp32s3cdc-qio_qspi board_upload.flash_size = 8MB -board_name = "Espressif Generic ESP32-S3 8M Flash, ESPEasy 2944k Code/OTA 2112k FS" +board_name = "Espressif Generic ESP32-S3 8M Flash, ESPEasy 3520k Code/OTA 1088k FS" lib_ignore = ${esp32_always.lib_ignore} ESP32_ping build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -151,13 +151,13 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED extra_scripts = ${esp32_common.extra_scripts} -board_build.partitions = esp32_partition_app2944k_spiffs2112k.csv +board_build.partitions = esp32_partition_app3520k_spiffs1088k.csv -[env:max_ESP32s3_8M2M_LittleFS_OPI_PSRAM_CDC] -extends = env:max_ESP32s3_8M2M_LittleFS_CDC +[env:max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_CDC] +extends = env:max_ESP32s3_8M1M_LittleFS_CDC board = esp32s3cdc-qio_opi -board_name = "Espressif Generic ESP32-S3 8M Flash OPI PSRAM, ESPEasy 2944k Code/OTA 2112k FS" +board_name = "Espressif Generic ESP32-S3 8M Flash OPI PSRAM, ESPEasy 3520k Code/OTA 1088k FS" [env:custom_ESP32s3_16M8M_LittleFS_CDC] diff --git a/tools/pio/copy_files.py b/tools/pio/copy_files.py index 59a3e90a0..1dd95de0f 100644 --- a/tools/pio/copy_files.py +++ b/tools/pio/copy_files.py @@ -25,9 +25,9 @@ def get_max_bin_size(env_name, file_suffix): # Factory bin files include a part which is not overwritten via OTA max_bin_size = max_bin_size + 65536 if "_ESP32_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: - if "_8M2M" in env_name: - # ESP32 with 2944k of sketch space. - max_bin_size = 3080192 + if "_8M1M" in env_name: + # ESP32 with 3520k of sketch space. + max_bin_size = 3604480 if "_ESP32_" in env_name or "_ESP32c3_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: if "_16M8M" in env_name or "_16M2M" in env_name or "_16M1M" in env_name: # ESP32 with 4096k of sketch space.