Skip to content

Commit 23ee5be

Browse files
committed
replace all specific SPI names with SPIx_HOST
1 parent 31a5733 commit 23ee5be

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

lvgl_spi_conf.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,12 @@ extern "C" {
6464

6565
#define ENABLE_TOUCH_INPUT CONFIG_LV_ENABLE_TOUCH
6666

67-
#if defined (CONFIG_LV_TFT_DISPLAY_SPI_HSPI)
68-
#define TFT_SPI_HOST HSPI_HOST
69-
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_VSPI)
70-
#define TFT_SPI_HOST VSPI_HOST
71-
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_FSPI)
72-
#define TFT_SPI_HOST FSPI_HOST
73-
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI2)
74-
#define TFT_SPI_HOST SPI2_HOST
67+
#if defined (CONFIG_LV_TFT_DISPLAY_SPI1_HOST)
68+
#define TFT_SPI_HOST SPI1_HOST
69+
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI2_HOST)
70+
#define TFT_SPI_HOST SPI2_HOST
71+
#elif defined (CONFIG_LV_TFT_DISPLAY_SPI3_HOST)
72+
#define TFT_SPI_HOST SPI3_HOST
7573
#endif
7674

7775
#if defined (CONFIG_LV_TFT_DISPLAY_SPI_HALF_DUPLEX)

lvgl_tft/Kconfig

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -469,20 +469,17 @@ menu "LVGL TFT Display controller"
469469

470470
choice
471471
prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI
472-
default LV_TFT_DISPLAY_SPI_VSPI if LV_PREDEFINED_DISPLAY_TTGO && \
472+
default LV_TFT_DISPLAY_SPI3_HOST if LV_PREDEFINED_DISPLAY_TTGO && \
473473
!IDF_TARGET_ESP32S2
474-
default LV_TFT_DISPLAY_SPI_FSPI if IDF_TARGET_ESP32S2
475474
help
476475
Select the SPI Bus the TFT Display is attached to.
477476

478-
config LV_TFT_DISPLAY_SPI_HSPI
479-
bool "HSPI" if IDF_TARGET_ESP32
480-
config LV_TFT_DISPLAY_SPI_VSPI
481-
bool "VSPI" if IDF_TARGET_ESP32
482-
config LV_TFT_DISPLAY_SPI_FSPI
483-
bool "FSPI" if IDF_TARGET_ESP32S2
484-
config LV_TFT_DISPLAY_SPI2
485-
bool "SPI2" if IDF_TARGET_ESP32C3
477+
config LV_TFT_DISPLAY_SPI1_HOST
478+
bool "SPI1_HOST"
479+
config LV_TFT_DISPLAY_SPI2_HOST
480+
bool "SPI2_HOST"
481+
config LV_TFT_DISPLAY_SPI3_HOST
482+
bool "SPI3_HOST"
486483
endchoice
487484

488485
choice

0 commit comments

Comments
 (0)