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

[Build] Rearrange 8M2M to 8M1M configuration

Browse Source
This commit is contained in:
Ton Huisman
2023-07-02 20:16:28 +02:00
parent 6a8d3db0f5
commit 9aa27d4a1f
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -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 |
esp32_partition_app2944k_spiffs2112k.csv
-6
View File
@@ -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,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 app0 app ota_0 0x10000 0x2F0000
5 app1 app ota_1 0x300000 0x2F0000
6 spiffs data spiffs 0x5F0000 0x210000
esp32_partition_app3520k_spiffs1088k.csv
+6
View File
@@ -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,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 app0 app ota_0 0x10000 0x370000
5 app1 app ota_1 0x380000 0x370000
6 spiffs data spiffs 0x6F0000 0x110000
platformio_esp32s3_envs.ini
+12 -12
View File
@@ -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]
tools/pio/copy_files.py
+3 -3
View File
@@ -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.