Merge branch 'master' into feature/add_st7796s

This commit is contained in:
Carlos Diaz 2021-01-15 00:07:27 -06:00 committed by GitHub
commit fbdc247c25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 272 additions and 176 deletions

View file

@ -183,9 +183,30 @@ 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 DISPLAY_ORIENTATION_PORTRAIT
config DISPLAY_ORIENTATION_PORTRAIT
bool "Portrait"
config DISPLAY_ORIENTATION_PORTRAIT_INVERTED
bool "Portrait inverted"
config DISPLAY_ORIENTATION_LANDSCAPE
bool "Landscape"
config DISPLAY_ORIENTATION_LANDSCAPE_INVERTED
bool "Landscape inverted"
endchoice
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
@ -468,101 +489,6 @@ menu "LVGL TFT Display controller"
bool "I2C PORT 1"
endchoice
choice
prompt "Display orientation"
depends on LV_TFT_DISPLAY_CONTROLLER_ILI9341 || \
LV_TFT_DISPLAY_CONTROLLER_ILI9481 || \
LV_TFT_DISPLAY_CONTROLLER_ILI9486 || \
LV_TFT_DISPLAY_CONTROLLER_ILI9488 || \
LV_TFT_DISPLAY_CONTROLLER_SH1107 || \
LV_TFT_DISPLAY_CONTROLLER_SSD1306 || \
LV_TFT_DISPLAY_CONTROLLER_FT81X || \
LV_TFT_DISPLAY_CONTROLLER_ST7789 || \
LV_TFT_DISPLAY_CONTROLLER_GC9A01 || \
LV_TFT_DISPLAY_CONTROLLER_ST7735S || \
LV_TFT_DISPLAY_CONTROLLER_IL3820 || \
LV_TFT_DISPLAY_CONTROLLER_RA8875 || \
LV_TFT_DISPLAY_CONTROLLER_JD79653A || \
LV_TFT_DISPLAY_CONTROLLER_UC8151D || \
LV_TFT_DISPLAY_CONTROLLER_ST7796S
default LV_DISPLAY_ORIENTATION_LANDSCAPE \
if !LV_TFT_DISPLAY_CONTROLLER_JD79653A || \
!LV_TFT_DISPLAY_CONTROLLER_UC8151D
default LV_DISPLAY_ORIENTATION_PORTRAIT if LV_TFT_DISPLAY_CONTROLLER_JD79653A || LV_TFT_DISPLAY_CONTROLLER_UC8151D
help
Display orientation.
config LV_DISPLAY_ORIENTATION_PORTRAIT
bool "Portrait"
config LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED
bool "Inverted Portrait"
depends on !LV_TFT_DISPLAY_CONTROLLER_IL3820
config LV_DISPLAY_ORIENTATION_LANDSCAPE
bool "Landscape"
depends on !LV_TFT_DISPLAY_CONTROLLER_JD79653A
depends on !LV_TFT_DISPLAY_CONTROLLER_UC8151D
config LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED
bool "Inverted Landscape"
depends on !LV_TFT_DISPLAY_CONTROLLER_IL3820
depends on !LV_TFT_DISPLAY_CONTROLLER_JD79653A
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_WT32_SC01 && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
default 320 if LV_PREDEFINED_DISPLAY_WT32_SC01 && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_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 480 if LV_PREDEFINED_DISPLAY_WT32_SC01 && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
default 320 if LV_PREDEFINED_DISPLAY_WT32_SC01 && (LV_DISPLAY_ORIENTATION_LANDSCAPE || 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