From bbffd73e191e07af50673a99ab50f90fe5b97677 Mon Sep 17 00:00:00 2001 From: C47D Date: Wed, 6 Jan 2021 11:19:37 -0600 Subject: [PATCH 1/4] Remove no longer supported configurations --- lvgl_tft/Kconfig | 51 ------------------------------------------------ 1 file changed, 51 deletions(-) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index 3cc90d5..fdc0975 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -494,57 +494,6 @@ menu "LVGL TFT Display controller" depends on !LV_TFT_DISPLAY_CONTROLLER_UC8151D endchoice - - # Display orientation - # This symbol is meant to be used as parameter on the display_set_orientation - # function at init. - config LV_DISPLAY_ORIENTATION - int - default 0 if LV_DISPLAY_ORIENTATION_PORTRAIT - default 1 if LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED - default 2 if LV_DISPLAY_ORIENTATION_LANDSCAPE - default 3 if LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED - - config LV_DISPLAY_WIDTH - int "TFT display width in pixels." if LV_PREDEFINED_DISPLAY_NONE || \ - LV_TFT_DISPLAY_CONTROLLER_FT81X - default 240 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_PORTRAIT) - default 240 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) - default 320 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_LANDSCAPE) - default 320 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 480 if LV_PREDEFINED_DISPLAY_ERTFT0356 || LV_PREDEFINED_DISPLAY_ADA_FEATHERWING - default 64 if ( LV_PREDEFINED_DISPLAY_WEMOS_LOLIN || LV_PREDEFINED_DISPLAY_M5STICK ) && LV_DISPLAY_ORIENTATION_PORTRAIT - default 128 if ( LV_PREDEFINED_DISPLAY_WEMOS_LOLIN || LV_PREDEFINED_DISPLAY_M5STICK ) && LV_DISPLAY_ORIENTATION_LANDSCAPE - default 800 if LV_TFT_DISPLAY_CONTROLLER_FT81X - default 128 if LV_PREDEFINED_DISPLAY_ATAG && LV_DISPLAY_ORIENTATION_PORTRAIT - default 296 if LV_PREDEFINED_DISPLAY_ATAG && LV_DISPLAY_ORIENTATION_LANDSCAPE - default 80 if LV_PREDEFINED_DISPLAY_M5STICKC && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) - default 160 if LV_PREDEFINED_DISPLAY_M5STICKC && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 135 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) - default 240 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 240 if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS - default 320 - - config LV_DISPLAY_HEIGHT - int "TFT display height in pixels." if LV_PREDEFINED_DISPLAY_NONE || \ - LV_TFT_DISPLAY_CONTROLLER_FT81X - default 320 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_PORTRAIT) - default 320 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) - default 240 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_LANDSCAPE) - default 240 if ( LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_WROVER4 ) && (LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 320 if LV_PREDEFINED_DISPLAY_ERTFT0356 || LV_PREDEFINED_DISPLAY_ADA_FEATHERWING - default 128 if ( LV_PREDEFINED_DISPLAY_WEMOS_LOLIN || LV_PREDEFINED_DISPLAY_M5STICK ) && LV_DISPLAY_ORIENTATION_PORTRAIT - default 64 if ( LV_PREDEFINED_DISPLAY_WEMOS_LOLIN || LV_PREDEFINED_DISPLAY_M5STICK ) && LV_DISPLAY_ORIENTATION_LANDSCAPE - default 480 if LV_TFT_DISPLAY_CONTROLLER_FT81X - default 296 if LV_PREDEFINED_DISPLAY_ATAG && LV_DISPLAY_ORIENTATION_PORTRAIT - default 128 if LV_PREDEFINED_DISPLAY_ATAG && LV_DISPLAY_ORIENTATION_LANDSCAPE - default 160 if LV_PREDEFINED_DISPLAY_M5STICKC && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) - default 80 if LV_PREDEFINED_DISPLAY_M5STICKC && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 240 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED) - default 135 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED) - default 240 if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS - default 240 - config LV_TFT_USE_CUSTOM_SPI_CLK_DIVIDER bool "Use custom SPI clock frequency." if LV_TFT_DISPLAY_PROTOCOL_SPI default n From a3c25375a34144280006a003efd54dcaf11467be Mon Sep 17 00:00:00 2001 From: C47D Date: Wed, 6 Jan 2021 12:14:18 -0600 Subject: [PATCH 2/4] Add display orientation choice --- lvgl_tft/Kconfig | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index fdc0975..4081292 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -174,9 +174,29 @@ menu "LVGL TFT Display controller" help Display controller protocol I2C + # Used in display init function to send display orientation commands + choice DISPLAY_ORIENTATION + prompt "Display orientation" + default LV_DISPLAY_ORIENTATION_PORTRAIT + config LV_DISPLAY_ORIENTATION_PORTRAIT + bool "Portrait" + config LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED + bool "Portrait inverted" + config LV_DISPLAY_ORIENTATION_LANDSCAPE + bool "Landscape" + config LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED + bool "Landscaoe inverted" + + config LV_DISPLAY_ORIENTATION + int + default 0 if DISPLAY_ORIENTATION_PORTRAIT + default 1 if DISPLAY_ORIENTATION_PORTRAIT_INVERTED + default 2 if DISPLAY_ORIENTATION_LANDSCAPE + default 3 if DISPLAY_ORIENTATION_LANDSCAPE_INVERTED + config LV_TFT_DISPLAY_OFFSETS bool - help + help Display area doesn't start at address 0 config LV_TFT_DISPLAY_X_OFFSET From d808cb1eff8d4d6867a8dffb2f07eb45d32f7474 Mon Sep 17 00:00:00 2001 From: C47D Date: Wed, 6 Jan 2021 12:22:28 -0600 Subject: [PATCH 3/4] Add missing endchoice --- lvgl_tft/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index 4081292..2862506 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -186,6 +186,7 @@ menu "LVGL TFT Display controller" bool "Landscape" config LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED bool "Landscaoe inverted" + endchoice config LV_DISPLAY_ORIENTATION int From a086bc73d7cc555d6cfa12e610059efcf870b058 Mon Sep 17 00:00:00 2001 From: C47D Date: Wed, 6 Jan 2021 12:25:48 -0600 Subject: [PATCH 4/4] Fix orientation choice --- lvgl_tft/Kconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index 2862506..f55f20a 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -177,14 +177,14 @@ menu "LVGL TFT Display controller" # Used in display init function to send display orientation commands choice DISPLAY_ORIENTATION prompt "Display orientation" - default LV_DISPLAY_ORIENTATION_PORTRAIT - config LV_DISPLAY_ORIENTATION_PORTRAIT + default DISPLAY_ORIENTATION_PORTRAIT + config DISPLAY_ORIENTATION_PORTRAIT bool "Portrait" - config LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED + config DISPLAY_ORIENTATION_PORTRAIT_INVERTED bool "Portrait inverted" - config LV_DISPLAY_ORIENTATION_LANDSCAPE + config DISPLAY_ORIENTATION_LANDSCAPE bool "Landscape" - config LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED + config DISPLAY_ORIENTATION_LANDSCAPE_INVERTED bool "Landscaoe inverted" endchoice