diff --git a/esp32_partition_app1984k_spiffs64k.csv b/esp32_partition_app1984k_spiffs64k.csv index 3b428f9a9..7eaebdbc1 100644 --- a/esp32_partition_app1984k_spiffs64k.csv +++ b/esp32_partition_app1984k_spiffs64k.csv @@ -1,6 +1,6 @@ -# Name, Type, SubType, Offset, Size, Flags -nvs, data, nvs, 0x9000, 0x5000, -otadata, data, ota, 0xe000, 0x2000, -app0, app, ota_0, 0x10000, 0x1F0000, +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xE000, 0x2000, +app0, app, ota_0, 0x10000, 0x1F0000, app1, app, ota_1, 0x200000, 0x1F0000, -spiffs, data, spiffs, 0x3F0000,0x10000, +spiffs, data, spiffs, 0x3F0000, 0x10000, diff --git a/platformio.ini b/platformio.ini index 07241650d..88ac17869 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,10 +15,8 @@ core_build_flags = -D NDEBUG -D ARDUINO_ARCH_ESP32=1 -D ESP32=1 - ; -std=c++17 -std=gnu++17 core_unbuild_flags = - ; -std=gnu++11 build_flags = ${common.core_build_flags} @@ -30,9 +28,6 @@ build_flags = unbuild_flags = ${common.core_unbuild_flags} -; these are set in your pio_local.ini -debug_flags = - [env] framework = arduino monitor_speed = 115200 @@ -47,6 +42,7 @@ check_flags = clangtidy: --checks=-*,clang-analyzer-*,performance-* ; build for GitHub Actions CI +; the Web interface is built seperately [env:ci] extra_scripts = scripts/rename_fw.py board = esp32dev @@ -62,5 +58,5 @@ extra_scripts = board = esp32dev platform = espressif32 board_build.partitions = esp32_partition_app1984k_spiffs64k.csv -build_flags = ${common.build_flags} ${common.debug_flags} +build_flags = ${common.build_flags} build_unflags = ${common.unbuild_flags} diff --git a/scripts/partitions.bin b/scripts/partitions.bin index fa042d671..7ae174cb4 100644 Binary files a/scripts/partitions.bin and b/scripts/partitions.bin differ