From c76b336545dfc8f1e0af294a0cbf03e6c698442d Mon Sep 17 00:00:00 2001
From: mikep1998 <44448320+mikep1998@users.noreply.github.com>
Date: Sun, 11 Jul 2021 00:38:41 -0700
Subject: [PATCH] Fix compile error with Berry defined. (#12616)

* Update xdrv_54_lvgl.ino

Fix compile error with LVGL define and without USE_BERRY defined

* Update xdrv_54_lvgl.ino

Fix compile error without Berry define.

* GPIO_XPT2046_CS is not specific to ILI9341

GPIO_XPT2046_CS is not specific to ILI9341 it is also used with ILI9488
---
 tasmota/tasmota_template.h | 4 +++-
 tasmota/xdrv_54_lvgl.ino   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 6db361c33..c7b901e26 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -471,10 +471,12 @@ const uint16_t kGpioNiceList[] PROGMEM = {
 #ifdef USE_DISPLAY_ILI9341
   AGPIO(GPIO_ILI9341_CS),
   AGPIO(GPIO_ILI9341_DC),
+#endif  // USE_DISPLAY_ILI9341
+
 #ifdef USE_XPT2046
   AGPIO(GPIO_XPT2046_CS),     // XPT2046 SPI Chip Select
 #endif
-#endif  // USE_DISPLAY_ILI9341
+
 #ifdef USE_DISPLAY_ILI9488
   AGPIO(GPIO_ILI9488_CS),
 #endif  // USE_DISPLAY_ILI9488
diff --git a/tasmota/xdrv_54_lvgl.ino b/tasmota/xdrv_54_lvgl.ino
index 0601ccd6b..68522a823 100644
--- a/tasmota/xdrv_54_lvgl.ino
+++ b/tasmota/xdrv_54_lvgl.ino
@@ -401,11 +401,11 @@ void start_lvgl(const char * uconfig) {
 #ifdef USE_BERRY
   lv_obj_set_style_local_bg_color(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, lv_color_from_uint32(USE_LVGL_BG_DEFAULT));
   lv_obj_set_style_local_bg_opa(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
-#endif
 
 #if LV_USE_LOG
   lv_log_register_print_cb(lvbe_debug);
 #endif // LV_USE_LOG
+#endif
 
 #ifdef USE_UFILESYS
   // Add file system mapping