diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 239d2fb..4507c42 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,7 +17,7 @@ jobs: # obname: onboard image (bootloader + partitions + firmware + littlefs merged) # for flashing a new chip via USB/serial # addr_bootloader: chip-dependent (ESP32: 0x1000, C3/S3: 0x0) - # addr_fs: must match spiffs/littlefs offset in huge_app.csv + # addr_fs: must match spiffs/littlefs offset in esp32_3MB.csv include: - env: esp32dev name: ESP32 @@ -39,7 +39,7 @@ jobs: name: ESP32-S3 chip: ESP32-S3 addr_bootloader: "0x0" - addr_fs: "0x310000" + addr_fs: "0x670000" fwname: SomfyController.ino.esp32s3.bin fsname: SomfyController.littlefs.esp32s3.bin obname: SomfyController.onboard.esp32s3.bin diff --git a/esp32_3MB.csv b/esp32_3MB.csv new file mode 100644 index 0000000..9457d66 --- /dev/null +++ b/esp32_3MB.csv @@ -0,0 +1,6 @@ +# Name, Type, SubType, Offset, Size +nvs, data, nvs, 0x9000, 0x5000 +otadata, data, ota, 0xE000, 0x2000 +app0, app, ota_0, 0x10000, 0x180000 +app1, app, ota_1, 0x190000, 0x180000 +spiffs, data, spiffs, 0x310000, 0x0F0000 diff --git a/huge_app.csv b/huge_app.csv deleted file mode 100644 index 1d00925..0000000 --- a/huge_app.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, 0x300000, -spiffs, data, spiffs, 0x310000,0xE0000, -coredump, data, coredump,0x3F0000,0x10000, diff --git a/min_spiffs.csv b/min_spiffs.csv deleted file mode 100644 index 0990a3b..0000000 --- a/min_spiffs.csv +++ /dev/null @@ -1,7 +0,0 @@ -# Name, Type, SubType, Offset, Size, Flags -nvs, data, nvs, 0x9000, 0x5000, -otadata, data, ota, 0xe000, 0x2000, -app0, app, ota_0, 0x10000, 0x1E0000, -app1, app, ota_1, 0x1F0000,0x1E0000, -spiffs, data, spiffs, 0x3D0000,0x20000, -coredump, data, coredump,0x3F0000,0x10000, diff --git a/platformio.ini b/platformio.ini index 7a6d3b9..71b34e1 100644 --- a/platformio.ini +++ b/platformio.ini @@ -23,10 +23,10 @@ lib_deps = extra_scripts = pre:minify.py post:archive_elf.py -board_build.partitions = huge_app.csv + board_build.filesystem = littlefs build_flags = - -DCORE_DEBUG_LEVEL=3 + -DCORE_DEBUG_LEVEL=1 -DCONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=1 -DCONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=1 -DCONFIG_ESP_COREDUMP_CHECKSUM_CRC32=1 @@ -40,13 +40,16 @@ monitor_filters = [env:esp32dev] board = esp32dev +board_build.partitions = esp32_3MB.csv [env:esp32devdbg] board = esp32dev build_type = debug +board_build.partitions = esp32_3MB.csv [env:esp32c3] board = esp32-c3-devkitm-1 +board_build.partitions = esp32_3MB.csv [env:esp32s3] board = esp32-s3-devkitc-1