From ea78d5598076e2a0a858196ad2329964e0d9eb44 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Tue, 16 Feb 2021 17:04:46 +0100
Subject: [PATCH] Cahnges to arduino environment

---
 platformio.ini                              | 13 +++++++++++--
 user_setups/esp32/lolin-d32-pro_ili9341.ini | 10 ++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 602d9c17..f1528970 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -74,8 +74,8 @@ lib_deps =
     git+https://github.com/fvanroie/ConsoleInput.git
     ;git+https://github.com/andrethomas/TasmotaSlave.git
     ;git+https://github.com/fvanroie/lv_components.git
-    git+https://github.com/lvgl/lvgl.git
-    ;lvgl/lvgl @ ^7.7.2                 ; from PIO library
+    ;git+https://github.com/lvgl/lvgl.git
+    lvgl/lvgl @^7.10.1              ; from PIO library
     ;bodmer/TFT_eSPI @ 2.3.4           ; Tft SPI drivers EXACT version 2.3.5 has compile error
     git+https://github.com/Bodmer/TFT_eSPI.git
     ; ------ Unused / Test libraries
@@ -92,6 +92,15 @@ extra_scripts = tools/copy_fw.py    ; tools/pre:extra_script.py
 ; -- Platform specific build flags
 [esp32]
 framework = arduino
+platform = espressif32
+board = lolin_d32_pro
+;upload_port = COM6      ; To change the port, use platform_override.ini
+;monitor_port = COM6     ; To change the port, use platform_override.ini
+monitor_filters = esp32_exception_decoder
+board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
+check_tool = cppcheck
+check_flags = --enable=all
+
 build_flags =
     ${env.build_flags}
     -D HTTP_UPLOAD_BUFLEN=1024      ; lower http upload buffer
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index c2d22b36..dae78b4a 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -8,14 +8,7 @@
 ; !! This board already defines TFT_CS, TFT_DC and TFT_RST !!
 
 [env:lolind32pro-lolintft24]
-platform = espressif32
-board = lolin_d32_pro
-;upload_port = COM6      ; To change the port, use platform_override.ini
-;monitor_port = COM6     ; To change the port, use platform_override.ini
-monitor_filters = esp32_exception_decoder
-board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
-check_tool = cppcheck
-check_flags = --enable=all
+extends = esp32
 
 build_flags =
     ${env.build_flags}
@@ -25,6 +18,7 @@ build_flags =
 ;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
+    -D USE_TFT_ESPI
     ; The board already defines the macros for the TFT connector:
     ;-D TFT_DC=27   ; Defined by board, don't redefine !!
     ;-D TFT_CS=14   ; Defined by board, don't redefine !!