Merge branch 'master' into ili9163c
This commit is contained in:
commit
06e52d6093
32 changed files with 204 additions and 81 deletions
|
@ -21,6 +21,10 @@ menu "LVGL TFT Display controller"
|
|||
bool "M5Stack"
|
||||
select LV_TFT_DISPLAY_CONTROLLER_ILI9341
|
||||
select LV_TFT_DISPLAY_PROTOCOL_SPI
|
||||
config LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
bool "M5Core2"
|
||||
select LV_TFT_DISPLAY_CONTROLLER_ILI9341
|
||||
select LV_TFT_DISPLAY_PROTOCOL_SPI
|
||||
config LV_PREDEFINED_DISPLAY_M5STICK
|
||||
bool "M5Stick"
|
||||
select LV_TFT_DISPLAY_CONTROLLER_SH1107
|
||||
|
@ -595,7 +599,7 @@ menu "LVGL TFT Display controller"
|
|||
If text is backwards on your display, try enabling this.
|
||||
|
||||
config LV_INVERT_COLORS
|
||||
bool "Invert colors in display" if LV_TFT_DISPLAY_CONTROLLER_ILI9341 || LV_TFT_DISPLAY_CONTROLLER_ST7735S || LV_TFT_DISPLAY_CONTROLLER_ILI9481 || LV_TFT_DISPLAY_CONTROLLER_ST7789 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 || LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_HX8357 || LV_TFT_DISPLAY_CONTROLLER_ILI9163C
|
||||
bool "Invert colors in display" if LV_TFT_DISPLAY_CONTROLLER_ILI9341 || LV_TFT_DISPLAY_CONTROLLER_ST7735S || LV_TFT_DISPLAY_CONTROLLER_ILI9481 || LV_TFT_DISPLAY_CONTROLLER_ST7789 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 || LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_HX8357 || LV_TFT_DISPLAY_CONTROLLER_GC9A01 || LV_TFT_DISPLAY_CONTROLLER_ILI9163C
|
||||
default y if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICKC
|
||||
help
|
||||
If the colors look inverted on your display, try enabling this.
|
||||
|
@ -772,6 +776,7 @@ menu "LVGL TFT Display controller"
|
|||
default 23 if LV_PREDEFINED_DISPLAY_WROVER4
|
||||
default 23 if LV_PREDEFINED_DISPLAY_ATAG
|
||||
default 23 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
|
||||
default 23 if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
default 15 if LV_PREDEFINED_DISPLAY_M5STICKC
|
||||
default 18 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
|
||||
default 23 if LV_PREDEFINED_PINS_TKOALA
|
||||
|
@ -786,6 +791,7 @@ menu "LVGL TFT Display controller"
|
|||
config LV_DISPLAY_USE_SPI_MISO
|
||||
bool "GPIO for MISO (Master In Slave Out)" if LV_TFT_DISPLAY_PROTOCOL_SPI
|
||||
default y if LV_PREDEFINED_PINS_TKOALA
|
||||
default y if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
help
|
||||
Enable the MISO signal to control the display. You can disable
|
||||
it when the display does not need MISO signal to be controlled.
|
||||
|
@ -797,6 +803,7 @@ menu "LVGL TFT Display controller"
|
|||
range 0 43 if IDF_TARGET_ESP32S2
|
||||
|
||||
default 19 if LV_PREDEFINED_PINS_TKOALA
|
||||
default 38 if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
default 0
|
||||
|
||||
help
|
||||
|
@ -839,6 +846,7 @@ menu "LVGL TFT Display controller"
|
|||
range 0 43 if IDF_TARGET_ESP32S2
|
||||
|
||||
default 18 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
|
||||
default 18 if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
default 13 if LV_PREDEFINED_DISPLAY_M5STICKC
|
||||
default 18 if LV_PREDEFINED_DISPLAY_ATAG
|
||||
default 19 if LV_PREDEFINED_DISPLAY_WROVER4
|
||||
|
@ -867,6 +875,7 @@ menu "LVGL TFT Display controller"
|
|||
|
||||
default 5 if LV_PREDEFINED_PINS_38V1
|
||||
default 14 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
|
||||
default 5 if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
default 5 if LV_PREDEFINED_DISPLAY_M5STICKC
|
||||
default 22 if LV_PREDEFINED_DISPLAY_WROVER4
|
||||
default 15 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
|
||||
|
@ -896,6 +905,7 @@ menu "LVGL TFT Display controller"
|
|||
default 19 if LV_PREDEFINED_PINS_38V1
|
||||
default 17 if LV_PREDEFINED_PINS_38V4
|
||||
default 27 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
|
||||
default 15 if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
default 23 if LV_PREDEFINED_DISPLAY_M5STICKC
|
||||
default 21 if LV_PREDEFINED_DISPLAY_WROVER4
|
||||
default 21 if LV_PREDEFINED_DISPLAY_WT32_SC01
|
||||
|
@ -909,8 +919,22 @@ menu "LVGL TFT Display controller"
|
|||
help
|
||||
Configure the display DC pin here.
|
||||
|
||||
config LV_DISP_USE_RST
|
||||
bool "Use a GPIO for resetting the display" if LV_TFT_DISPLAY_PROTOCOL_SPI
|
||||
default n if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
default y
|
||||
help
|
||||
Enable display reset control. Set this if the reset pin of the
|
||||
display is connected to the host. If this is not set, then it is
|
||||
the user's responsibility to ensure that the display is reset
|
||||
before initialisation.
|
||||
You may want to disable this option because the reset pin is not
|
||||
connected, or is connected to an external component such as the
|
||||
power management IC.
|
||||
|
||||
config LV_DISP_PIN_RST
|
||||
int "GPIO for Reset" if LV_TFT_DISPLAY_PROTOCOL_SPI && !LV_DISP_ST7789_SOFT_RESET
|
||||
depends on LV_DISP_USE_RST
|
||||
range 0 39 if IDF_TARGET_ESP32
|
||||
range 0 43 if IDF_TARGET_ESP32S2
|
||||
|
||||
|
@ -946,6 +970,7 @@ menu "LVGL TFT Display controller"
|
|||
( LV_PREDEFINED_DISPLAY_NONE && ! ( LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 ) ) \
|
||||
|| LV_PREDEFINED_DISPLAY_RPI_MPI3501
|
||||
default y if LV_PREDEFINED_DISPLAY_M5STACK
|
||||
default n if LV_PREDEFINED_DISPLAY_M5CORE2
|
||||
default y if LV_PREDEFINED_DISPLAY_WROVER4
|
||||
default y if LV_PREDEFINED_DISPLAY_ERTFT0356
|
||||
default y if LV_PREDEFINED_DISPLAY_TTGO
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue