From 36d5df65b880fb9431ed899bcfc500bd98e416fd Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 31 Mar 2023 16:49:30 +0200 Subject: [PATCH] env for asymetric partitions (loader) --- esp32_asym_partition_4M.csv | 6 ++++++ platformio.ini | 27 ++++++++++++++++++++------- scripts/build_interface.py | 1 + 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 esp32_asym_partition_4M.csv diff --git a/esp32_asym_partition_4M.csv b/esp32_asym_partition_4M.csv new file mode 100644 index 000000000..f87875c3a --- /dev/null +++ b/esp32_asym_partition_4M.csv @@ -0,0 +1,6 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, , 0x2000, +app1, app, ota_1, , 0x140000, +app0, app, ota_0, , 0x2A0000, +spiffs, data, spiffs, , 64K, \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index cb2e485a4..02ab00239 100644 --- a/platformio.ini +++ b/platformio.ini @@ -40,9 +40,9 @@ unbuild_flags = ${common.core_unbuild_flags} [espressi32_base] -; platform = espressif32 +platform = espressif32 ; platform = espressif32@5.3.0 -platform = espressif32@5.2.0 +; platform = espressif32@5.2.0 framework = arduino [env] @@ -62,7 +62,8 @@ check_flags = ; build for GitHub Actions CI ; the Web interface is built seperately [env:ci] -extends = espressi32_base +platform = espressif32@5.2.0 +framework = arduino extra_scripts = scripts/rename_fw.py board = esp32dev board_build.partitions = esp32_partition_4M.csv @@ -71,7 +72,8 @@ build_flags = ${common.build_flags} build_unflags = ${common.unbuild_flags} [env:esp32_4M] -extends = espressi32_base +platform = espressif32@5.2.0 +framework = arduino extra_scripts = pre:scripts/build_interface.py scripts/rename_fw.py @@ -81,6 +83,17 @@ board_build.partitions = esp32_partition_4M.csv build_flags = ${common.build_flags} -Os build_unflags = ${common.unbuild_flags} +[env:esp32_4M+] +extends = espressi32_base +extra_scripts = + pre:scripts/build_interface.py + scripts/rename_fw.py +board = esp32dev +board_upload.flash_size = 4MB +board_build.partitions = esp32_asym_partition_4M.csv +build_flags = ${common.build_flags} +build_unflags = ${common.unbuild_flags} + [env:esp32_16M] extends = espressi32_base extra_scripts = @@ -99,7 +112,7 @@ extra_scripts = scripts/rename_fw.py board = lolin_c3_mini board_upload.flash_size = 4MB -board_build.partitions = esp32_partition_4M.csv +board_build.partitions = esp32_asym_partition_4M.csv build_flags = ${common.build_flags} build_unflags = ${common.unbuild_flags} @@ -112,7 +125,7 @@ extra_scripts = scripts/rename_fw.py board = lolin_c3_mini board_upload.flash_size = 4MB -board_build.partitions = esp32_partition_4M.csv +board_build.partitions = esp32_asym_partition_4M.csv build_flags = ${common.build_flags} -DBOARD_C3_MINI_V1 build_unflags = ${common.unbuild_flags} @@ -123,7 +136,7 @@ extra_scripts = scripts/rename_fw.py board = lolin_s2_mini board_upload.flash_size = 4MB -board_build.partitions = esp32_partition_4M.csv +board_build.partitions = esp32_asym_partition_4M.csv build_flags = ${common.build_flags} build_unflags = ${common.unbuild_flags} diff --git a/scripts/build_interface.py b/scripts/build_interface.py index 6fd6e215b..608a2ab7c 100644 --- a/scripts/build_interface.py +++ b/scripts/build_interface.py @@ -39,6 +39,7 @@ def buildWeb(): text = r.read().replace("Locales = 'pl'", "Locales = 'en'") with open("./src/i18n/i18n-util.ts", "w") as w: w.write(text) + print("Setting locale to 'en'") env.Execute("yarn run build") buildPath = Path("build")