From 4c60f5fc4fa5e11be393361c3406b115804e8b17 Mon Sep 17 00:00:00 2001 From: C47D Date: Thu, 4 Feb 2021 00:17:54 -0600 Subject: [PATCH 1/2] tft: Handle ESP32S2 idf target --- lvgl_tft/Kconfig | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig index f20b9fd..2b407bb 100644 --- a/lvgl_tft/Kconfig +++ b/lvgl_tft/Kconfig @@ -728,7 +728,9 @@ menu "LVGL TFT Display controller" config LV_DISP_SPI_MOSI int "GPIO for MOSI (Master Out Slave In)" if LV_TFT_DISPLAY_PROTOCOL_SPI - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + 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 @@ -753,7 +755,9 @@ menu "LVGL TFT Display controller" config LV_DISP_SPI_MISO int "GPIO for MISO (Master In Slave Out)" if LV_TFT_DISPLAY_PROTOCOL_SPI depends on LV_DISPLAY_USE_SPI_MISO - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 19 if LV_PREDEFINED_PINS_TKOALA default 0 @@ -772,7 +776,9 @@ menu "LVGL TFT Display controller" config LV_DISP_SPI_IO2 int "GPIO for Quad SPI IO2/WP" if LV_TFT_DISPLAY_PROTOCOL_SPI depends on LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO - range -1 39 + range -1 39 if IDF_TARGET_ESP32 + range -1 43 if IDF_TARGET_ESP32S2 + default 22 if LV_PREDEFINED_PINS_TKOALA && LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO default -1 help @@ -781,7 +787,9 @@ menu "LVGL TFT Display controller" config LV_DISP_SPI_IO3 int "GPIO for Quad SPI IO3/HD" if LV_TFT_DISPLAY_PROTOCOL_SPI depends on LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO - range -1 39 + range -1 39 if IDF_TARGET_ESP32 + range -1 43 if IDF_TARGET_ESP32S2 + default 21 if LV_PREDEFINED_PINS_TKOALA && LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO default -1 help @@ -789,7 +797,9 @@ menu "LVGL TFT Display controller" config LV_DISP_SPI_CLK int "GPIO for CLK (SCK / Serial Clock)" if LV_TFT_DISPLAY_PROTOCOL_SPI - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 18 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK default 13 if LV_PREDEFINED_DISPLAY_M5STICKC default 18 if LV_PREDEFINED_DISPLAY_ATAG @@ -814,7 +824,9 @@ menu "LVGL TFT Display controller" config LV_DISP_SPI_CS int "GPIO for CS (Slave Select)" if LV_TFT_DISPLAY_PROTOCOL_SPI depends on LV_DISPLAY_USE_SPI_CS - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 5 if LV_PREDEFINED_PINS_38V1 default 14 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK default 5 if LV_PREDEFINED_DISPLAY_M5STICKC @@ -839,7 +851,9 @@ menu "LVGL TFT Display controller" config LV_DISP_PIN_DC int "GPIO for DC (Data / Command)" if LV_TFT_DISPLAY_PROTOCOL_SPI - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + depends on LV_DISPLAY_USE_DC default 19 if LV_PREDEFINED_PINS_38V1 default 17 if LV_PREDEFINED_PINS_38V4 @@ -859,7 +873,9 @@ menu "LVGL TFT Display controller" config LV_DISP_PIN_RST int "GPIO for Reset" if LV_TFT_DISPLAY_PROTOCOL_SPI - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 18 if LV_PREDEFINED_PINS_38V1 default 25 if LV_PREDEFINED_PINS_38V4 default 33 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK @@ -878,7 +894,9 @@ menu "LVGL TFT Display controller" config LV_DISP_PIN_BUSY int "GPIO for Busy" if LV_TFT_DISPLAY_CONTROLLER_IL3820 || LV_TFT_DISPLAY_CONTROLLER_JD79653A || LV_TFT_DISPLAY_CONTROLLER_UC8151D - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 35 if LV_TFT_DISPLAY_CONTROLLER_IL3820 || LV_TFT_DISPLAY_CONTROLLER_JD79653A || LV_TFT_DISPLAY_CONTROLLER_UC8151D default 35 @@ -914,7 +932,9 @@ menu "LVGL TFT Display controller" config LV_DISP_PIN_BCKL int "GPIO for Backlight Control" depends on LV_ENABLE_BACKLIGHT_CONTROL - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 23 if LV_PREDEFINED_PINS_38V1 default 26 if LV_PREDEFINED_PINS_38V4 default 32 if LV_PREDEFINED_DISPLAY_M5STACK @@ -932,7 +952,9 @@ menu "LVGL TFT Display controller" config LV_DISP_PIN_SDA int "GPIO for I2C SDA" if LV_TFT_DISPLAY_PROTOCOL_I2C - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 5 if LV_PREDEFINED_DISPLAY_WEMOS_LOLIN default 5 @@ -941,7 +963,9 @@ menu "LVGL TFT Display controller" config LV_DISP_PIN_SCL int "GPIO for I2C SCL" if LV_TFT_DISPLAY_PROTOCOL_I2C - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 4 if LV_PREDEFINED_DISPLAY_WEMOS_LOLIN default 4 From d8ff17a7c743410839aeb25a6038a38ee1c9400f Mon Sep 17 00:00:00 2001 From: C47D Date: Thu, 4 Feb 2021 00:22:03 -0600 Subject: [PATCH 2/2] touch: Handle ESP32S2 idf target --- lvgl_touch/Kconfig | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/lvgl_touch/Kconfig b/lvgl_touch/Kconfig index 659cf02..edd1dab 100644 --- a/lvgl_touch/Kconfig +++ b/lvgl_touch/Kconfig @@ -96,7 +96,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_MISO int prompt "GPIO for MISO (Master In Slave Out)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 35 if LV_PREDEFINED_PINS_38V1 default 19 help @@ -105,7 +107,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_MOSI int prompt "GPIO for MOSI (Master Out Slave In)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 32 if LV_PREDEFINED_PINS_38V1 default 23 help @@ -113,7 +117,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_CLK int "GPIO for CLK (SCK / Serial Clock)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 26 if LV_PREDEFINED_PINS_38V1 default 18 help @@ -121,7 +127,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_CS int "GPIO for CS (Slave Select)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 33 if LV_PREDEFINED_PINS_38V1 default 5 help @@ -129,7 +137,9 @@ menu "LVGL Touch controller" config LV_TOUCH_PIN_IRQ int "GPIO for IRQ (Interrupt Request)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 27 if LV_PREDEFINED_PINS_38V4 default 25 help @@ -199,14 +209,18 @@ menu "LVGL Touch controller" config LV_TOUCH_I2C_SDA int prompt "GPIO for SDA (I2C)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 21 help Configure the I2C touchpanel SDA pin here. config LV_TOUCH_I2C_SCL int "GPIO for clock signal SCL (I2C)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 22 help Configure the I2C touchpanel SCL pin here. @@ -238,7 +252,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_MISO int prompt "GPIO for MISO (Master In Slave Out)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 35 if LV_PREDEFINED_PINS_38V1 default 19 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING default 19 @@ -249,7 +265,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_MOSI int prompt "GPIO for MOSI (Master Out Slave In)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 32 if LV_PREDEFINED_PINS_38V1 default 18 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING default 23 @@ -259,7 +277,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_CLK int "GPIO for CLK (SCK / Serial Clock)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 26 if LV_PREDEFINED_PINS_38V1 default 5 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING default 18 @@ -268,7 +288,9 @@ menu "LVGL Touch controller" config LV_TOUCH_SPI_CS int "GPIO for CS (Slave Select)" - range 0 39 + range 0 39 if IDF_TARGET_ESP32 + range 0 43 if IDF_TARGET_ESP32S2 + default 33 if LV_PREDEFINED_PINS_38V1 default 32 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING default 5