replace all specific SPI names with SPIx_HOST

This commit is contained in:
arktrin 2021-12-13 14:31:09 +03:00
parent 31a5733c8d
commit 23ee5be93b
2 changed files with 13 additions and 18 deletions

View file

@ -64,14 +64,12 @@ extern "C" {
#define ENABLE_TOUCH_INPUT CONFIG_LV_ENABLE_TOUCH #define ENABLE_TOUCH_INPUT CONFIG_LV_ENABLE_TOUCH
#if defined (CONFIG_LV_TFT_DISPLAY_SPI_HSPI) #if defined (CONFIG_LV_TFT_DISPLAY_SPI1_HOST)
#define TFT_SPI_HOST HSPI_HOST #define TFT_SPI_HOST SPI1_HOST
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_VSPI) #elif defined (CONFIG_LV_TFT_DISPLAY_SPI2_HOST)
#define TFT_SPI_HOST VSPI_HOST #define TFT_SPI_HOST SPI2_HOST
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_FSPI) #elif defined (CONFIG_LV_TFT_DISPLAY_SPI3_HOST)
#define TFT_SPI_HOST FSPI_HOST #define TFT_SPI_HOST SPI3_HOST
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI2)
#define TFT_SPI_HOST SPI2_HOST
#endif #endif
#if defined (CONFIG_LV_TFT_DISPLAY_SPI_HALF_DUPLEX) #if defined (CONFIG_LV_TFT_DISPLAY_SPI_HALF_DUPLEX)

View file

@ -469,20 +469,17 @@ menu "LVGL TFT Display controller"
choice choice
prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI
default LV_TFT_DISPLAY_SPI_VSPI if LV_PREDEFINED_DISPLAY_TTGO && \ default LV_TFT_DISPLAY_SPI3_HOST if LV_PREDEFINED_DISPLAY_TTGO && \
!IDF_TARGET_ESP32S2 !IDF_TARGET_ESP32S2
default LV_TFT_DISPLAY_SPI_FSPI if IDF_TARGET_ESP32S2
help help
Select the SPI Bus the TFT Display is attached to. Select the SPI Bus the TFT Display is attached to.
config LV_TFT_DISPLAY_SPI_HSPI config LV_TFT_DISPLAY_SPI1_HOST
bool "HSPI" if IDF_TARGET_ESP32 bool "SPI1_HOST"
config LV_TFT_DISPLAY_SPI_VSPI config LV_TFT_DISPLAY_SPI2_HOST
bool "VSPI" if IDF_TARGET_ESP32 bool "SPI2_HOST"
config LV_TFT_DISPLAY_SPI_FSPI config LV_TFT_DISPLAY_SPI3_HOST
bool "FSPI" if IDF_TARGET_ESP32S2 bool "SPI3_HOST"
config LV_TFT_DISPLAY_SPI2
bool "SPI2" if IDF_TARGET_ESP32C3
endchoice endchoice
choice choice