From fcb228c0a82f366a0f853bb3accd64ec6e3a0dda Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Fri, 29 Apr 2022 11:15:04 +0200
Subject: [PATCH] Moved to Arduino v2

---
 user_setups/esp32/d1-mini-esp32_ili9341.ini |  6 +++---
 user_setups/esp32/lolin-d32-pro_ili9341.ini |  4 +++-
 user_setups/esp32/m5stack_core2.ini         | 12 ++++--------
 user_setups/esp32/makerfabs-tft35-cap.ini   | 12 ++++--------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index b07f7919..40698f04 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:d1-mini-esp32_ili9341]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = wemos_d1_mini32
 
 build_flags =
@@ -30,11 +30,11 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ${arduino_esp32_v1.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
-    ${arduino_esp32_v1.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 9edd262e..4a6d2ba5 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -8,7 +8,7 @@
 ; !! This board already defines TFT_CS, TFT_DC and TFT_RST !!
 
 [env:lolin-d32-pro_ili9341]
-extends = esp32_16mb
+extends = esp32_16mb_v2
 board = lolin_d32_pro
 
 build_flags =
@@ -33,9 +33,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/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini
index a9e4f44c..f3602068 100644
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:m5stack-core2]
-extends = esp32_16mb
+extends = esp32_16mb_v2
 board = esp32dev
 
 build_flags =
@@ -36,17 +36,13 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${ft6336.lib_deps}
     https://github.com/fvanroie/M5Core2.git#AXP192
 
 lib_ignore =
     ${env.lib_ignore}
-    GxTFT
-    XPT2046_Touchscreen
-    Adafruit BusIO
-    Adafruit GFX Library
-    sstaub/Ticker
-    lv_drv_fsmc_ili9341
-    lv_drivers
+    ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
diff --git a/user_setups/esp32/makerfabs-tft35-cap.ini b/user_setups/esp32/makerfabs-tft35-cap.ini
index 4319cf75..4687fb06 100644
--- a/user_setups/esp32/makerfabs-tft35-cap.ini
+++ b/user_setups/esp32/makerfabs-tft35-cap.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:makerfabs-tft35-cap]
-extends = esp32_16mb
+extends = esp32_16mb_v2
 board = esp32dev
 
 build_flags =
@@ -40,16 +40,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${ft6336.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    GxTFT
-    XPT2046_Touchscreen
-    Adafruit BusIO
-    Adafruit GFX Library
-    sstaub/Ticker
-    lv_drv_fsmc_ili9341
-    lv_drivers
+    ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion