From 55dd527e1074f90b9216507b8fe4d28817c23420 Mon Sep 17 00:00:00 2001 From: Justin Smestad Date: Sat, 26 Jun 2021 17:44:59 -0600 Subject: [PATCH 1/3] Update KConfig to remove LV_ prefix on orientation checks --- lvgl_tft/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index 7059a6c..7c1bd60 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -222,15 +222,15 @@ menu "LVGL TFT Display controller" config LV_TFT_DISPLAY_X_OFFSET depends on LV_TFT_DISPLAY_OFFSETS int - default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) + default 40 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_LANDSCAPE || DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) + default 53 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_PORTRAIT || DISPLAY_ORIENTATION_PORTRAIT_INVERTED) default 0 config LV_TFT_DISPLAY_Y_OFFSET depends on LV_TFT_DISPLAY_OFFSETS int - default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) + default 53 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_LANDSCAPE || DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) + default 40 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_PORTRAIT || DISPLAY_ORIENTATION_PORTRAIT_INVERTED) default 0 From 19087aeb06fb18487c45ef063ff12d2cc3871656 Mon Sep 17 00:00:00 2001 From: Justin Smestad Date: Sat, 26 Jun 2021 17:50:28 -0600 Subject: [PATCH 2/3] Remove SPI guard for TTGO configuration Fixes remaining part of #50 --- lvgl_tft/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index 7c1bd60..709ca5a 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -413,7 +413,7 @@ menu "LVGL TFT Display controller" config LV_FT81X_CONFIG_EVE_EVE2_50G bool "EVE_EVE2_50G" config LV_FT81X_CONFIG_EVE_EVE2_70 - bool "EVE_EVE2_70" + bool "EVE_EVE2_70"/ config LV_FT81X_CONFIG_EVE_EVE2_70G bool "EVE_EVE2_70G" config LV_FT81X_CONFIG_EVE_EVE3_35 @@ -459,8 +459,7 @@ menu "LVGL TFT Display controller" endchoice choice - prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI && \ - !LV_PREDEFINED_DISPLAY_TTGO + prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI default LV_TFT_DISPLAY_SPI_VSPI if LV_PREDEFINED_DISPLAY_TTGO && \ !IDF_TARGET_ESP32S2 default LV_TFT_DISPLAY_SPI_FSPI if IDF_TARGET_ESP32S2 From 82ba726199723b53c7aef30bb02fc01d28c676c0 Mon Sep 17 00:00:00 2001 From: Justin Smestad Date: Sat, 26 Jun 2021 17:50:56 -0600 Subject: [PATCH 3/3] Revert lvgl_tft/Kconfig --- lvgl_tft/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index 709ca5a..580ca54 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -413,7 +413,7 @@ menu "LVGL TFT Display controller" config LV_FT81X_CONFIG_EVE_EVE2_50G bool "EVE_EVE2_50G" config LV_FT81X_CONFIG_EVE_EVE2_70 - bool "EVE_EVE2_70"/ + bool "EVE_EVE2_70" config LV_FT81X_CONFIG_EVE_EVE2_70G bool "EVE_EVE2_70G" config LV_FT81X_CONFIG_EVE_EVE3_35