Merge branch 'master' into develop
Resolving conflicts
This commit is contained in:
commit
ef108457c7
3 changed files with 13 additions and 28 deletions
|
@ -469,8 +469,9 @@ menu "LVGL TFT Display controller"
|
|||
|
||||
choice
|
||||
prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI
|
||||
default LV_TFT_DISPLAY_SPI2_HOST if LV_PREDEFINED_DISPLAY_TTGO
|
||||
default LV_TFT_DISPLAY_SPI3_HOST if !LV_PREDEFINED_DISPLAY_TTGO
|
||||
default LV_TFT_DISPLAY_SPI2_HOST
|
||||
help
|
||||
Select the SPI Bus the TFT Display is attached to.
|
||||
|
||||
config LV_TFT_DISPLAY_SPI2_HOST
|
||||
bool "SPI2_HOST"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue