From 006e60650909db03ce6564e3a03b8414233e37f4 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Apr 2020 18:45:42 +0200 Subject: [PATCH 1/7] ESP32 board partition --- platformio_tasmota_env32.ini | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index fb280f1bc..4f6661c17 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -4,6 +4,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -22,6 +23,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -40,6 +42,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -58,6 +61,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -76,6 +80,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -94,6 +99,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -112,6 +118,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -130,6 +137,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -148,6 +156,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -166,6 +175,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -184,6 +194,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -202,6 +213,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -220,6 +232,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -238,6 +251,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -256,6 +270,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -274,6 +289,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -292,6 +308,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -310,6 +327,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -328,6 +346,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -346,6 +365,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -364,6 +384,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -382,6 +403,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -400,6 +422,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -418,6 +441,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -436,6 +460,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -454,6 +479,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -472,6 +498,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -490,6 +517,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -508,6 +536,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} @@ -526,6 +555,7 @@ platform = ${common32.platform} platform_packages = ${common32.platform_packages} board = ${common32.board} board_build.ldscript = ${common32.board_build.ldscript} +board_build.partitions = ${common32.board_build.partitions} board_build.flash_mode = ${common32.board_build.flash_mode} board_build.f_cpu = ${common32.board_build.f_cpu} monitor_speed = ${common32.monitor_speed} From 757d2bb93d9dd74cf036fa1032c996f859819fa0 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Apr 2020 18:46:26 +0200 Subject: [PATCH 2/7] Add files via upload --- esp32_partition_app2000k_spiffs32k.csv | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 esp32_partition_app2000k_spiffs32k.csv diff --git a/esp32_partition_app2000k_spiffs32k.csv b/esp32_partition_app2000k_spiffs32k.csv new file mode 100644 index 000000000..01505a86b --- /dev/null +++ b/esp32_partition_app2000k_spiffs32k.csv @@ -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, 0x1F4000, +app1, app, ota_1, 0x20400, 0x1F4000, +spiffs, data, spiffs, 0x3F8000,0x8000, From 2e2675db73e3d669bbb29eea8f0c95fbf1791e53 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Apr 2020 18:53:05 +0200 Subject: [PATCH 3/7] Delete esp32_partition_app2000k_spiffs32k.csv --- esp32_partition_app2000k_spiffs32k.csv | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 esp32_partition_app2000k_spiffs32k.csv diff --git a/esp32_partition_app2000k_spiffs32k.csv b/esp32_partition_app2000k_spiffs32k.csv deleted file mode 100644 index 01505a86b..000000000 --- a/esp32_partition_app2000k_spiffs32k.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, 0x1F4000, -app1, app, ota_1, 0x20400, 0x1F4000, -spiffs, data, spiffs, 0x3F8000,0x8000, From 8fab7ddf2830475f681099528b8b0851838567c3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Apr 2020 18:53:28 +0200 Subject: [PATCH 4/7] Add files via upload --- esp32_partition_app2000k_spiffs32k.csv | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 esp32_partition_app2000k_spiffs32k.csv diff --git a/esp32_partition_app2000k_spiffs32k.csv b/esp32_partition_app2000k_spiffs32k.csv new file mode 100644 index 000000000..2d024922a --- /dev/null +++ b/esp32_partition_app2000k_spiffs32k.csv @@ -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, 0x1F4000, +app1, app, ota_1, 0x204000, 0x1F4000, +spiffs, data, spiffs, 0x3F8000,0x8000, From 5c49a89d21f8d3bdb9e0cddc2191342e495673d0 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Apr 2020 19:05:07 +0200 Subject: [PATCH 5/7] Update platformio_override_sample.ini --- platformio_override_sample.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index aa979497a..8a2ec07d6 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -230,6 +230,7 @@ platform = espressif32@1.12.0 platform_packages = board = wemos_d1_mini32 board_build.ldscript = esp32_out.ld +board_build.partitions = esp32_partition_app1810k_spiffs320k.csv board_build.flash_mode = ${common.board_build.flash_mode} board_build.f_cpu = ${common.board_build.f_cpu} build_unflags = ${common.build_unflags} From 6a0c2414216d72a6175af2e2f8f6060b6afc7dbd Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Apr 2020 19:05:30 +0200 Subject: [PATCH 6/7] Delete esp32_partition_app2000k_spiffs32k.csv --- esp32_partition_app2000k_spiffs32k.csv | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 esp32_partition_app2000k_spiffs32k.csv diff --git a/esp32_partition_app2000k_spiffs32k.csv b/esp32_partition_app2000k_spiffs32k.csv deleted file mode 100644 index 2d024922a..000000000 --- a/esp32_partition_app2000k_spiffs32k.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, 0x1F4000, -app1, app, ota_1, 0x204000, 0x1F4000, -spiffs, data, spiffs, 0x3F8000,0x8000, From 037d3791fadaebc7b226a72202396274842b1eb8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Apr 2020 19:05:50 +0200 Subject: [PATCH 7/7] Add files via upload --- esp32_partition_app1810k_spiffs320k.csv | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 esp32_partition_app1810k_spiffs320k.csv diff --git a/esp32_partition_app1810k_spiffs320k.csv b/esp32_partition_app1810k_spiffs320k.csv new file mode 100644 index 000000000..49f6c1150 --- /dev/null +++ b/esp32_partition_app1810k_spiffs320k.csv @@ -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, 0x1D0000, +app1, app, ota_1, 0x1E0000, 0x1D0000, +spiffs, data, spiffs, 0x3B0000,0x50000,