From e5332a3aad19a399194bcf31add3bcacf3e2c130 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Wed, 9 Mar 2022 15:52:42 +0100
Subject: [PATCH] TFT_eSPI not compatible with Arduino v2

---
 .vscode/extensions.json                         |  3 +++
 .../esp32/d1-r32-unoshield_ili9341_adc.ini      | 17 ++++++++++++++++-
 .../esp32/d1-r32-unoshield_ili9486_adc.ini      | 17 ++++++++++++++++-
 user_setups/esp32/yeacreate-nscreen32.ini       |  4 ++--
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 9a44568a..d2311d2d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,5 +4,8 @@
     "recommendations": [
         "ms-vscode.cpptools",
         "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
     ]
 }
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
index c092a60b..a5ba4ee2 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:d1-r32-unoshield_ili9341_adc]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
@@ -46,3 +46,18 @@ build_flags =
 
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+
+;region -- Library options -------------------------------
+lib_deps =
+    ${env.lib_deps}
+    ${esp32.lib_deps}
+    bodmer/TFT_eSPI @ 2.4.32
+    ; ${tft_espi.lib_deps}
+    ; https://github.com/lovyan03/LovyanGFX.git#1be6600
+    lorol/LittleFS_esp32@^1.0.6   ; for v1
+
+lib_ignore =
+    ${env.lib_ignore}
+    ;${esp32.lib_ignore}
+    ; TFT_eSPI
+;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 766a4c3e..b092869a 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:d1-r32-unoshield_ili9486_adc]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
@@ -45,3 +45,18 @@ build_flags =
 
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+
+;region -- Library options -------------------------------
+lib_deps =
+    ${env.lib_deps}
+    ${esp32.lib_deps}
+    bodmer/TFT_eSPI @ 2.4.32
+    ; ${tft_espi.lib_deps}
+    ; https://github.com/lovyan03/LovyanGFX.git#1be6600
+    lorol/LittleFS_esp32@^1.0.6   ; for v1
+
+lib_ignore =
+    ${env.lib_ignore}
+    ;${esp32.lib_ignore}
+    ; TFT_eSPI
+;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/yeacreate-nscreen32.ini b/user_setups/esp32/yeacreate-nscreen32.ini
index 2b92d03c..bbcbd3dc 100644
--- a/user_setups/esp32/yeacreate-nscreen32.ini
+++ b/user_setups/esp32/yeacreate-nscreen32.ini
@@ -17,8 +17,8 @@ build_flags =
     -D HASP_MODEL="YeaCreate Nscreen32"
 
 ;region -- TFT_eSPI build options ------------------------
-    ;-D USER_SETUP_LOADED=1
-    -D LGFX_USE_V1=1
+    -D USER_SETUP_LOADED=1
+    ;-D LGFX_USE_V1=1
     -D ST7796_DRIVER=1
     -D ESP32_PARALLEL=1
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree