From b5273fa886659051716599a2bc099ee064a5a8c0 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Thu, 14 Apr 2022 21:03:16 +0200
Subject: [PATCH] Split lip_deps and lib_ignore into v1 and v2

---
 user_setups/esp32/_esp32.ini                       | 8 +++++---
 user_setups/esp32/az-touch-mod-esp32_ili9341.ini   | 2 ++
 user_setups/esp32/d1-mini-esp32_ili9341.ini        | 2 ++
 user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini | 5 ++---
 user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini | 7 +++----
 user_setups/esp32/d1-r32-waveshare_ili9486.ini     | 5 ++++-
 user_setups/esp32/lanbon_l8.ini                    | 3 ++-
 user_setups/esp32/wt32-sc01.ini                    | 3 +++
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index e122470b..933b416b 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -54,15 +54,13 @@ lib_ignore =
     XPT2046_Touchscreen
     Adafruit BusIO
     Adafruit GFX Library
+    ESP32 BLE Arduino
     sstaub/Ticker
     lv_drv_fsmc_ili9341
     lv_drivers
     AXP192
-    LittleFS_esp32    ; for v2
 
 lib_deps =
-    ;lorol/LittleFS_esp32@^1.0.6   ; for v1
-    ${tft_espi.lib_deps}
     git+https://github.com/fvanroie/ConsoleInput.git#dev
 
 extra_scripts =
@@ -102,6 +100,8 @@ board_build.filesystem = littlefs
 monitor_filters = esp32_exception_decoder
 extra_scripts =
     ${esp32.extra_scripts}
+lib_deps = lorol/LittleFS_esp32@^1.0.6   ; for v1
+lib_ignore =
 
 [esp32_4mb]
 extends = esp32, arduino_esp32_v1
@@ -135,6 +135,8 @@ board_build.filesystem = littlefs
 monitor_filters = esp32_exception_decoder
 extra_scripts =
     ${esp32.extra_scripts}
+lib_deps =
+lib_ignore = LittleFS_esp32    ; for v2
 
 [esp32_4mb_v2]
 extends = esp32, arduino_esp32_v2
diff --git a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
index 6440c181..c0ef07ad 100644
--- a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
+++ b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
@@ -33,11 +33,13 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
 
 [env:az-touch-mod-esp32_ili9341_4MB]
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index d13035ca..40698f04 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -30,9 +30,11 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
index 34a37f32..85136cd9 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
@@ -52,13 +52,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ; bodmer/TFT_eSPI @ 2.4.32
+    ${arduino_esp32_v2.lib_deps}
     ; ${tft_espi.lib_deps}
-    ; lorol/LittleFS_esp32@^1.0.6   ; for v1
     ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
-    TFT_eSPI
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
index 5f6bcea0..dc16739c 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
@@ -51,13 +51,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ; bodmer/TFT_eSPI @ 2.4.32
+    ${arduino_esp32_v2.lib_deps}
     ; ${tft_espi.lib_deps}
-    ; lorol/LittleFS_esp32@^1.0.6   ; for v1
     ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ;${esp32.lib_ignore}
-    TFT_eSPI
+    ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/d1-r32-waveshare_ili9486.ini b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
index bd8b4619..9a64ef0c 100644
--- a/user_setups/esp32/d1-r32-waveshare_ili9486.ini
+++ b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
@@ -40,9 +40,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
+    ; ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
-;endregion
+    ${arduino_esp32_v2.lib_ignore}
+;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/lanbon_l8.ini b/user_setups/esp32/lanbon_l8.ini
index 59053f2f..f851fdc8 100644
--- a/user_setups/esp32/lanbon_l8.ini
+++ b/user_setups/esp32/lanbon_l8.ini
@@ -57,14 +57,15 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v1.lib_deps}
     ${lovyangfx.lib_deps}
     ;${tft_espi.lib_deps}
     ; FT6336U is 6x faster then FocalTech Library
     ;git+https://github.com/lewisxhe/FocalTech_Library.git
     ${ft6336.lib_deps}
-    lorol/LittleFS_esp32@^1.0.6   ; for v1
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v1.lib_ignore}
 ;endregion
diff --git a/user_setups/esp32/wt32-sc01.ini b/user_setups/esp32/wt32-sc01.ini
index 422f5ac3..b6e56c02 100644
--- a/user_setups/esp32/wt32-sc01.ini
+++ b/user_setups/esp32/wt32-sc01.ini
@@ -39,12 +39,15 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
+    ; ${lovyangfx.lib_deps}
     ${ft6336.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
 
 [env:wt32-sc01_4MB]