From 333185a472ba114718c3628c08e09344b68e135e Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Sun, 9 May 2021 23:07:36 +0200
Subject: [PATCH] Adjust partitions to use all remaining space for lfs
 filesystem

---
 platformio.ini                                       | 3 ++-
 user_setups/esp32/esp32-touchdown.ini                | 1 +
 user_setups/esp32/freetouchdeck.ini                  | 1 +
 user_setups/esp32/huzzah32-featherwing-24.ini        | 2 ++
 user_setups/esp32/huzzah32-featherwing-35.ini        | 2 ++
 user_setups/esp32/lanbon_l8.ini                      | 4 ++--
 user_setups/esp32/lolin-d32-pro_ili9341.ini          | 3 +--
 user_setups/esp32/m5stack_core2.ini                  | 3 +--
 user_setups/esp32/partition_app1280k_spiffs1472k.csv | 6 ------
 user_setups/esp32/partition_app1300k_spiffs1216k.csv | 6 ------
 user_setups/esp32/partition_app1536k_spiffs1024k.csv | 6 ------
 user_setups/esp32/partition_app1704k_spiffs720k.csv  | 6 ------
 user_setups/esp32/partition_app2000k_spiffs4000k.csv | 6 ------
 user_setups/esp32/partitions_16MB.csv                | 9 +++++++++
 user_setups/esp32/partitions_2MB.csv                 | 8 ++++++++
 user_setups/esp32/partitions_32MB.csv                | 9 +++++++++
 user_setups/esp32/partitions_4MB.csv                 | 9 +++++++++
 user_setups/esp32/partitions_8MB.csv                 | 9 +++++++++
 user_setups/esp32/ttgo-esp32-lilygo-pi.ini           | 3 +--
 19 files changed, 57 insertions(+), 39 deletions(-)
 delete mode 100644 user_setups/esp32/partition_app1280k_spiffs1472k.csv
 delete mode 100644 user_setups/esp32/partition_app1300k_spiffs1216k.csv
 delete mode 100644 user_setups/esp32/partition_app1536k_spiffs1024k.csv
 delete mode 100644 user_setups/esp32/partition_app1704k_spiffs720k.csv
 delete mode 100644 user_setups/esp32/partition_app2000k_spiffs4000k.csv
 create mode 100644 user_setups/esp32/partitions_16MB.csv
 create mode 100644 user_setups/esp32/partitions_2MB.csv
 create mode 100644 user_setups/esp32/partitions_32MB.csv
 create mode 100644 user_setups/esp32/partitions_4MB.csv
 create mode 100644 user_setups/esp32/partitions_8MB.csv

diff --git a/platformio.ini b/platformio.ini
index 8d84a093..9c379c5c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,7 +94,7 @@ platform = espressif32@^3.2.0
 
 board_upload.flash_size=4MB
 board_upload.maximum_size = 4194304
-board_build.partitions = user_setups/esp32/partition_app1704k_spiffs720k.csv
+board_build.partitions = user_setups/esp32/partitions_4MB.csv
 board_build.filesystem = littlefs
 board_build.embed_files =
     data/edit.htm.gz
@@ -117,6 +117,7 @@ build_flags =
 ; -- lvgl build options -----------------------------
     -D LV_MEM_SIZE=61440U           ; 60kB lvgl memory
     -D LV_ATTRIBUTE_FAST_MEM=IRAM_ATTR
+    ;-D LV_FS_PC_PATH="/lfs"         ; this needs to match the vfs mount pount
 ; -- ArduinoJson build options ----------------------------
     -D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments
 ; -- tft_espi build options ------------------------
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index 61ae1322..f02387e0 100644
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@@ -12,6 +12,7 @@ build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
+    -D HASP_MODEL="ESP32 Touchdown"
 
 ;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
diff --git a/user_setups/esp32/freetouchdeck.ini b/user_setups/esp32/freetouchdeck.ini
index 9bd6aebf..de662271 100644
--- a/user_setups/esp32/freetouchdeck.ini
+++ b/user_setups/esp32/freetouchdeck.ini
@@ -11,6 +11,7 @@ board = esp32dev
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
+    -D HASP_MODEL="FreeTouchDeck"
 
 ;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
diff --git a/user_setups/esp32/huzzah32-featherwing-24.ini b/user_setups/esp32/huzzah32-featherwing-24.ini
index 2c1d23fc..ecbb68e0 100644
--- a/user_setups/esp32/huzzah32-featherwing-24.ini
+++ b/user_setups/esp32/huzzah32-featherwing-24.ini
@@ -12,6 +12,8 @@ board = featheresp32
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
+    -D HASP_MODEL="Adafruit Featherwing 2.4"
+
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.featherwing-24}
     -D TFT_MISO=19
diff --git a/user_setups/esp32/huzzah32-featherwing-35.ini b/user_setups/esp32/huzzah32-featherwing-35.ini
index 86096861..27775bf6 100644
--- a/user_setups/esp32/huzzah32-featherwing-35.ini
+++ b/user_setups/esp32/huzzah32-featherwing-35.ini
@@ -12,6 +12,8 @@ board = featheresp32
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
+    -D HASP_MODEL="Adafruit Featherwing 3.2"
+
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.featherwing-35}
     -D TFT_MISO=19
diff --git a/user_setups/esp32/lanbon_l8.ini b/user_setups/esp32/lanbon_l8.ini
index 780fb0ab..6c8e6606 100644
--- a/user_setups/esp32/lanbon_l8.ini
+++ b/user_setups/esp32/lanbon_l8.ini
@@ -8,15 +8,15 @@
 [env:lanbon_l8]
 extends = esp32
 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/partitions_8MB.csv
 
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
     ${esp32.ps_ram}
+    -D HASP_MODEL="Lanbon L8"
 
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.st7789v}
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 7967a72c..83a53575 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -10,10 +10,9 @@
 [env:lolin-d32-pro_ili9341]
 extends = esp32
 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/partitions_16MB.csv
 
 build_flags =
     ${env.build_flags}
diff --git a/user_setups/esp32/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini
index 7eaa0427..bf336aec 100644
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@@ -8,10 +8,9 @@
 [env:m5stack-core2]
 extends = esp32
 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/partitions_16MB.csv
 
 build_flags =
     ${env.build_flags}
diff --git a/user_setups/esp32/partition_app1280k_spiffs1472k.csv b/user_setups/esp32/partition_app1280k_spiffs1472k.csv
deleted file mode 100644
index 47367800..00000000
--- a/user_setups/esp32/partition_app1280k_spiffs1472k.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,  0x140000,
-app1,     app,  ota_1,   0x150000,  0x140000,
-spiffs,   data, spiffs,  0x290000,  0x170000,
diff --git a/user_setups/esp32/partition_app1300k_spiffs1216k.csv b/user_setups/esp32/partition_app1300k_spiffs1216k.csv
deleted file mode 100644
index d361047a..00000000
--- a/user_setups/esp32/partition_app1300k_spiffs1216k.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, 0x160000,
-app1,     app,  ota_1,   0x170000, 0x160000,
-spiffs,   data, spiffs,  0x2D0000, 0x130000,
diff --git a/user_setups/esp32/partition_app1536k_spiffs1024k.csv b/user_setups/esp32/partition_app1536k_spiffs1024k.csv
deleted file mode 100644
index 414702e0..00000000
--- a/user_setups/esp32/partition_app1536k_spiffs1024k.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, 0x180000,
-app1,     app,  ota_1,   0x190000, 0x180000,
-spiffs,   data, spiffs,  0x310000, 0x0F0000,
diff --git a/user_setups/esp32/partition_app1704k_spiffs720k.csv b/user_setups/esp32/partition_app1704k_spiffs720k.csv
deleted file mode 100644
index cd96d227..00000000
--- a/user_setups/esp32/partition_app1704k_spiffs720k.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, 0x1A0000,
-app1,     app,  ota_1,   0x1B0000, 0x1A0000,
-spiffs,   data, spiffs,  0x350000, 0x0B0000,
diff --git a/user_setups/esp32/partition_app2000k_spiffs4000k.csv b/user_setups/esp32/partition_app2000k_spiffs4000k.csv
deleted file mode 100644
index 0ada1ac6..00000000
--- a/user_setups/esp32/partition_app2000k_spiffs4000k.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, 0x1F0000,
-app1,     app,  ota_1,   0x200000, 0x1F0000,
-spiffs,   data, spiffs,  0x3F0000, 0x410000,
diff --git a/user_setups/esp32/partitions_16MB.csv b/user_setups/esp32/partitions_16MB.csv
new file mode 100644
index 00000000..6d259294
--- /dev/null
+++ b/user_setups/esp32/partitions_16MB.csv
@@ -0,0 +1,9 @@
+# Two application partitions of ~2.0 MB
+# 12 MB filesystem
+#
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     36K,   20K,
+otadata,  data, ota,     56K,   8K,
+app0,     app,  ota_0,   64K,   2016K,
+app1,     app,  ota_1,   2080K, 2016K,
+spiffs,   data, spiffs,  4M,    12M,
\ No newline at end of file
diff --git a/user_setups/esp32/partitions_2MB.csv b/user_setups/esp32/partitions_2MB.csv
new file mode 100644
index 00000000..19840001
--- /dev/null
+++ b/user_setups/esp32/partitions_2MB.csv
@@ -0,0 +1,8 @@
+# One single application partition of 1.625 MB
+# 320 kB filesystem
+#
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     36K,     20K,
+otadata,  data, ota,     56K,     8K,
+app0,     app,  ota_0,   64K,     1664K,
+spiffs,   data, spiffs,  1728K,   320K,
diff --git a/user_setups/esp32/partitions_32MB.csv b/user_setups/esp32/partitions_32MB.csv
new file mode 100644
index 00000000..49b445b8
--- /dev/null
+++ b/user_setups/esp32/partitions_32MB.csv
@@ -0,0 +1,9 @@
+# Two application partitions of ~2.0 MB
+# 28 MB filesystem
+#
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     36K,   20K,
+otadata,  data, ota,     56K,   8K,
+app0,     app,  ota_0,   64K,   2016K,
+app1,     app,  ota_1,   2080K, 2016K,
+spiffs,   data, spiffs,  4M,    28M,
diff --git a/user_setups/esp32/partitions_4MB.csv b/user_setups/esp32/partitions_4MB.csv
new file mode 100644
index 00000000..733ff0c5
--- /dev/null
+++ b/user_setups/esp32/partitions_4MB.csv
@@ -0,0 +1,9 @@
+# Two application partitions of 1664 kB
+# 704 kB filesystem
+#
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     36K,     20K,
+otadata,  data, ota,     56K,     8K,
+app0,     app,  ota_0,   64K,     1664K,
+app1,     app,  ota_1,   1728K,   1664K,
+spiffs,   data, spiffs,  3392K,   704K,
diff --git a/user_setups/esp32/partitions_8MB.csv b/user_setups/esp32/partitions_8MB.csv
new file mode 100644
index 00000000..241440b9
--- /dev/null
+++ b/user_setups/esp32/partitions_8MB.csv
@@ -0,0 +1,9 @@
+# Two application partitions of ~2.0 MB
+# 4 MB filesystem
+#
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     36K,   20K,
+otadata,  data, ota,     56K,   8K,
+app0,     app,  ota_0,   64K,   2016K,
+app1,     app,  ota_1,   2080K, 2016K,
+spiffs,   data, spiffs,  4M,    4M,
diff --git a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini
index d6bffca3..53ea2d09 100644
--- a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini
+++ b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini
@@ -8,10 +8,9 @@
 [env:ttgo-esp32-lilygo-pi]
 extends = esp32
 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/partitions_16MB.csv
 
 build_flags =
     ${env.build_flags}