From e9a8697a2c3bfcd082405466fc493145d4eed729 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Sun, 24 Apr 2022 03:41:47 +0200
Subject: [PATCH] Fix Arduino v2.0.3-RC1 dependencies

---
 user_setups/esp32/az-touch-mod-esp32_ili9341.ini | 8 ++++----
 user_setups/esp32/esp32-one.ini                  | 2 ++
 user_setups/esp32/esp32-touchdown.ini            | 2 ++
 user_setups/esp32/huzzah32-featherwing-24.ini    | 6 ++++--
 user_setups/esp32/huzzah32-featherwing-35.ini    | 6 ++++--
 user_setups/esp32/ttgo-t7-v1.5_ili9341.ini       | 2 ++
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
index 9344511a..c0ef07ad 100644
--- a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
+++ b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
@@ -33,17 +33,17 @@ 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
 
 [env:az-touch-mod-esp32_ili9341_4MB]
-extends = az-touch-mod-esp32_ili9341, esp32_4mb
+extends = az-touch-mod-esp32_ili9341, esp32_4mb_v2
 
 [env:az-touch-mod-esp32_ili9341_8MB]
-extends = az-touch-mod-esp32_ili9341, esp32_8mb
\ No newline at end of file
+extends = az-touch-mod-esp32_ili9341, esp32_8mb_v2
\ No newline at end of file
diff --git a/user_setups/esp32/esp32-one.ini b/user_setups/esp32/esp32-one.ini
index 4814efb7..03a8d6e1 100644
--- a/user_setups/esp32/esp32-one.ini
+++ b/user_setups/esp32/esp32-one.ini
@@ -44,11 +44,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
 
 
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index fb9ed43d..8d83c533 100644
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@@ -44,10 +44,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}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/huzzah32-featherwing-24.ini b/user_setups/esp32/huzzah32-featherwing-24.ini
index 5c169042..39ce47b5 100644
--- a/user_setups/esp32/huzzah32-featherwing-24.ini
+++ b/user_setups/esp32/huzzah32-featherwing-24.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:huzzah32-featherwing-24]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = featheresp32
 
 build_flags =
@@ -30,9 +30,11 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${stmpe610.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
diff --git a/user_setups/esp32/huzzah32-featherwing-35.ini b/user_setups/esp32/huzzah32-featherwing-35.ini
index 851efe93..4a14fb9d 100644
--- a/user_setups/esp32/huzzah32-featherwing-35.ini
+++ b/user_setups/esp32/huzzah32-featherwing-35.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:huzzah32-featherwing-35]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = featheresp32
 
 build_flags =
@@ -31,9 +31,11 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ${stmpe610.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
diff --git a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
index f6ae2fef..10a24a1b 100644
--- a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
+++ b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
@@ -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