From 31a5733c8d49f3885ce282cb1c534133fcf72240 Mon Sep 17 00:00:00 2001 From: arktrin Date: Sun, 5 Dec 2021 17:01:36 +0300 Subject: [PATCH 1/2] Fix SPI configuration for ESP32-C3 and ESP32-S2 ESP32-C3 and ESP32-S2 do not have VSPI or HSPI --- lvgl_spi_conf.h | 6 ++---- lvgl_tft/Kconfig | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lvgl_spi_conf.h b/lvgl_spi_conf.h index 2c62c94..f3d4a3d 100644 --- a/lvgl_spi_conf.h +++ b/lvgl_spi_conf.h @@ -65,15 +65,13 @@ extern "C" { #define ENABLE_TOUCH_INPUT CONFIG_LV_ENABLE_TOUCH #if defined (CONFIG_LV_TFT_DISPLAY_SPI_HSPI) -#if defined (CONFIG_IDF_TARGET_ESP32C3) -#define TFT_SPI_HOST SPI2_HOST -#else #define TFT_SPI_HOST HSPI_HOST -#endif #elif defined (CONFIG_LV_TFT_DISPLAY_SPI_VSPI) #define TFT_SPI_HOST VSPI_HOST #elif defined (CONFIG_LV_TFT_DISPLAY_SPI_FSPI) #define TFT_SPI_HOST FSPI_HOST +#elif defined (CONFIG_LV_TFT_DISPLAY_SPI2) +#define TFT_SPI_HOST SPI2_HOST #endif #if defined (CONFIG_LV_TFT_DISPLAY_SPI_HALF_DUPLEX) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index b700894..6ccf055 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -476,11 +476,13 @@ menu "LVGL TFT Display controller" Select the SPI Bus the TFT Display is attached to. config LV_TFT_DISPLAY_SPI_HSPI - bool "HSPI" + bool "HSPI" if IDF_TARGET_ESP32 config LV_TFT_DISPLAY_SPI_VSPI - bool "VSPI" if !IDF_TARGET_ESP32S2 + bool "VSPI" if IDF_TARGET_ESP32 config LV_TFT_DISPLAY_SPI_FSPI bool "FSPI" if IDF_TARGET_ESP32S2 + config LV_TFT_DISPLAY_SPI2 + bool "SPI2" if IDF_TARGET_ESP32C3 endchoice choice From 23ee5be93bbfa823acfea2bae686c38d6379b35e Mon Sep 17 00:00:00 2001 From: arktrin Date: Mon, 13 Dec 2021 14:31:09 +0300 Subject: [PATCH 2/2] replace all specific SPI names with SPIx_HOST --- lvgl_spi_conf.h | 14 ++++++-------- lvgl_tft/Kconfig | 17 +++++++---------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/lvgl_spi_conf.h b/lvgl_spi_conf.h index f3d4a3d..cab94d7 100644 --- a/lvgl_spi_conf.h +++ b/lvgl_spi_conf.h @@ -64,14 +64,12 @@ extern "C" { #define ENABLE_TOUCH_INPUT CONFIG_LV_ENABLE_TOUCH -#if defined (CONFIG_LV_TFT_DISPLAY_SPI_HSPI) -#define TFT_SPI_HOST HSPI_HOST -#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_VSPI) -#define TFT_SPI_HOST VSPI_HOST -#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_FSPI) -#define TFT_SPI_HOST FSPI_HOST -#elif defined (CONFIG_LV_TFT_DISPLAY_SPI2) -#define TFT_SPI_HOST SPI2_HOST +#if defined (CONFIG_LV_TFT_DISPLAY_SPI1_HOST) +#define TFT_SPI_HOST SPI1_HOST +#elif defined (CONFIG_LV_TFT_DISPLAY_SPI2_HOST) +#define TFT_SPI_HOST SPI2_HOST +#elif defined (CONFIG_LV_TFT_DISPLAY_SPI3_HOST) +#define TFT_SPI_HOST SPI3_HOST #endif #if defined (CONFIG_LV_TFT_DISPLAY_SPI_HALF_DUPLEX) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index 6ccf055..b55f1f1 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -469,20 +469,17 @@ menu "LVGL TFT Display controller" choice 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 - default LV_TFT_DISPLAY_SPI_FSPI if IDF_TARGET_ESP32S2 help Select the SPI Bus the TFT Display is attached to. - config LV_TFT_DISPLAY_SPI_HSPI - bool "HSPI" if IDF_TARGET_ESP32 - config LV_TFT_DISPLAY_SPI_VSPI - bool "VSPI" if IDF_TARGET_ESP32 - config LV_TFT_DISPLAY_SPI_FSPI - bool "FSPI" if IDF_TARGET_ESP32S2 - config LV_TFT_DISPLAY_SPI2 - bool "SPI2" if IDF_TARGET_ESP32C3 + config LV_TFT_DISPLAY_SPI1_HOST + bool "SPI1_HOST" + config LV_TFT_DISPLAY_SPI2_HOST + bool "SPI2_HOST" + config LV_TFT_DISPLAY_SPI3_HOST + bool "SPI3_HOST" endchoice choice