From 72b36f54b9d081c5ca23c5562abc5f835b53b3ab Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Tue, 16 Mar 2021 20:55:17 +0100
Subject: [PATCH] Adjust partitions

---
 platformio.ini                                                  | 2 +-
 platformio_override-template.ini                                | 2 +-
 user_setups/esp32/lanbon_l8.ini                                 | 2 +-
 user_setups/esp32/lolin-d32-pro_ili9341.ini                     | 2 +-
 user_setups/esp32/m5stack_core2.ini                             | 2 +-
 .../partition_app1280k_spiffs1472k.csv}                         | 0
 .../partition_app1300k_spiffs1216k.csv}                         | 0
 .../partition_app1536k_spiffs1024k.csv}                         | 0
 .../partition_app2000k_spiffs4000k.csv}                         | 0
 user_setups/esp32/ttgo-esp32-lilygo-pi.ini                      | 2 +-
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename user_setups/{esp32_partition_app1280k_spiffs1472k.csv => esp32/partition_app1280k_spiffs1472k.csv} (100%)
 rename user_setups/{esp32_partition_app1300k_spiffs1216k.csv => esp32/partition_app1300k_spiffs1216k.csv} (100%)
 rename user_setups/{esp32_partition_app1536k_spiffs1024k.csv => esp32/partition_app1536k_spiffs1024k.csv} (100%)
 rename user_setups/{esp32_partition_app2000k_spiffs4000k.csv => esp32/partition_app2000k_spiffs4000k.csv} (100%)

diff --git a/platformio.ini b/platformio.ini
index 2bfe140c..0cdb3c59 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -92,7 +92,7 @@ extra_scripts = tools/copy_fw.py    ; tools/pre:extra_script.py
 [esp32]
 framework = arduino
 platform = espressif32
-board_build.partitions = user_setups/esp32_partition_app1536k_spiffs1024k.csv
+board_build.partitions = user_setups/esp32/partition_app1536k_spiffs1024k.csv
 
 ; ----- crash reporter
 monitor_filters = esp32_exception_decoder
diff --git a/platformio_override-template.ini b/platformio_override-template.ini
index 226f7038..8ab9c7ab 100644
--- a/platformio_override-template.ini
+++ b/platformio_override-template.ini
@@ -75,7 +75,7 @@ board = nodemcu-32s
 upload_port = COM12     ; To change the port, use platform_override.ini
 monitor_port = COM12    ; To change the port, use platform_override.ini
 
-board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv ; default.csv
+board_build.partitions = user_setups/esp32/partition_app1536k_spiffs1024k.csv ; default.csv
 
 debug_tool = esp-prog
 debug_init_break = tbreak setup
diff --git a/user_setups/esp32/lanbon_l8.ini b/user_setups/esp32/lanbon_l8.ini
index c2653856..b5f44da9 100644
--- a/user_setups/esp32/lanbon_l8.ini
+++ b/user_setups/esp32/lanbon_l8.ini
@@ -11,7 +11,7 @@ board = esp32dev
 
 board_upload.flash_size=8MB
 board_upload.maximum_size = 8388608
-board_build.partitions = user_setups/esp32_partition_app2000k_spiffs4000k.csv
+board_build.partitions = user_setups/esp32/partition_app2000k_spiffs4000k.csv
 
 build_flags =
     ${env.build_flags}
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 236bee89..f31e7639 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -13,7 +13,7 @@ board = lolin_d32_pro
 
 board_upload.flash_size=16MB
 board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32_partition_app2000k_spiffs4000k.csv
+board_build.partitions = user_setups/esp32/partition_app2000k_spiffs4000k.csv
 
 build_flags =
     ${env.build_flags}
diff --git a/user_setups/esp32/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini
index 36833db5..a379ef26 100644
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@@ -11,7 +11,7 @@ board = esp32dev
 
 board_upload.flash_size=16MB
 board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32_partition_app2000k_spiffs4000k.csv
+board_build.partitions = user_setups/esp32/partition_app2000k_spiffs4000k.csv
 
 build_flags =
     ${env.build_flags}
diff --git a/user_setups/esp32_partition_app1280k_spiffs1472k.csv b/user_setups/esp32/partition_app1280k_spiffs1472k.csv
similarity index 100%
rename from user_setups/esp32_partition_app1280k_spiffs1472k.csv
rename to user_setups/esp32/partition_app1280k_spiffs1472k.csv
diff --git a/user_setups/esp32_partition_app1300k_spiffs1216k.csv b/user_setups/esp32/partition_app1300k_spiffs1216k.csv
similarity index 100%
rename from user_setups/esp32_partition_app1300k_spiffs1216k.csv
rename to user_setups/esp32/partition_app1300k_spiffs1216k.csv
diff --git a/user_setups/esp32_partition_app1536k_spiffs1024k.csv b/user_setups/esp32/partition_app1536k_spiffs1024k.csv
similarity index 100%
rename from user_setups/esp32_partition_app1536k_spiffs1024k.csv
rename to user_setups/esp32/partition_app1536k_spiffs1024k.csv
diff --git a/user_setups/esp32_partition_app2000k_spiffs4000k.csv b/user_setups/esp32/partition_app2000k_spiffs4000k.csv
similarity index 100%
rename from user_setups/esp32_partition_app2000k_spiffs4000k.csv
rename to user_setups/esp32/partition_app2000k_spiffs4000k.csv
diff --git a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini
index fa27a3aa..396c61a7 100644
--- a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini
+++ b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini
@@ -11,7 +11,7 @@ board = esp32dev
 
 board_upload.flash_size=16MB
 board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32_partition_app2000k_spiffs4000k.csv
+board_build.partitions = user_setups/esp32/partition_app2000k_spiffs4000k.csv
 
 build_flags =
     ${env.build_flags}