From fa2f9803121fd4aef8b40c02114f20977e5ff659 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Sun, 16 Feb 2025 12:29:12 +0100 Subject: [PATCH] fix: update partition settings and version in platformio.ini, and enhance release workflow --- .github/workflows/release.yml | 2 ++ partitions.csv | 10 +++++----- platformio.ini | 9 ++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3839c26..28c1cf4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,6 +44,8 @@ jobs: --flash_freq 40m \ --flash_size 4MB \ -o .pio/build/esp32dev/filaman.bin \ + 0x1000 .pio/build/esp32dev/bootloader.bin \ + 0x8000 .pio/build/esp32dev/partitions.bin \ 0x10000 .pio/build/esp32dev/firmware.bin \ 0x290000 .pio/build/esp32dev/spiffs.bin diff --git a/partitions.csv b/partitions.csv index 61776c8..4ca13c4 100644 --- a/partitions.csv +++ b/partitions.csv @@ -1,5 +1,5 @@ -# Name, Type, SubType, Offset, Size, Flags -nvs, data, nvs, 0x9000, 0x5000, -otadata, data, ota, 0xe000, 0x2000, -app0, app, ota_0, 0x10000, 0x280000, -spiffs, data, spiffs, 0x290000,0x170000, \ No newline at end of file +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +app0, app, ota_0, 0x10000, 0x280000, +spiffs, data, spiffs, 0x290000, 0x170000, \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index ba5ae73..a93b530 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.0.7" +version = "1.0.2" [env:esp32dev] platform = espressif32 @@ -32,9 +32,12 @@ lib_deps = ; Enable SPIFFS upload board_build.filesystem = spiffs -board_build.spiffs.partition = 2M -board_build.spiffs.upload_size = 2M +; Update partition settings board_build.partitions = partitions.csv +board_upload.flash_size = 4MB +; Remove these as they're now defined in partitions.csv +; board_build.spiffs.partition = 2M +; board_build.spiffs.upload_size = 2M build_flags = -Os