This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5671765acdebd95487b28159276bb345d536056e Author: wangjianyu3 <wangjian...@xiaomi.com> AuthorDate: Sat Jul 5 01:28:17 2025 +0800 boards: Update configs and params about FT5X06 Add touchscreen swap configuration for boards and enable it for defconfig that enables `FT5X06_SWAPXY`. Refresh configurations to delete the deprecated `FT5X06_NPOLLWAITERS` and `FT5X06_SWAPXY`. Signed-off-by: wangjianyu3 <wangjian...@xiaomi.com> --- boards/Kconfig | 2 +- boards/arm/imxrt/imxrt1060-evk/Kconfig | 4 ++++ boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig | 3 +-- boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c | 8 +++++++- boards/arm/imxrt/imxrt1064-evk/Kconfig | 4 ++++ boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig | 3 +-- boards/arm/imxrt/imxrt1064-evk/src/imxrt_ft5x06.c | 8 +++++++- boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig | 7 ++++++- boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig | 2 +- boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig | 2 +- boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig | 2 +- boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig | 2 +- boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig | 2 +- boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c | 8 +++++++- boards/arm/stm32f7/stm32f746g-disco/Kconfig | 4 ++++ boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig | 2 +- boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c | 8 +++++++- boards/arm/stm32h7/stm32h745i-disco/Kconfig | 4 ++++ boards/arm/stm32h7/stm32h745i-disco/configs/lvgl/defconfig | 3 +-- boards/arm/stm32h7/stm32h745i-disco/configs/touchtest/defconfig | 3 +-- boards/arm/stm32h7/stm32h745i-disco/src/stm32_ft5x06.c | 8 +++++++- boards/arm/stm32h7/stm32h750b-dk/Kconfig | 4 ++++ boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig | 3 +-- boards/arm/stm32h7/stm32h750b-dk/src/stm32_ft5x06.c | 8 +++++++- 24 files changed, 80 insertions(+), 24 deletions(-) diff --git a/boards/Kconfig b/boards/Kconfig index 13ca936f4c..6b1bbfdac7 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -4327,7 +4327,7 @@ endif if ARCH_BOARD_STM32H745I_DISCO source "boards/arm/stm32h7/stm32h745i-disco/Kconfig" endif -if ARCH_BOARD_STM32H750B_DB +if ARCH_BOARD_STM32H750B_DK source "boards/arm/stm32h7/stm32h750b-dk/Kconfig" endif if ARCH_BOARD_LINUM_STM32H753BI diff --git a/boards/arm/imxrt/imxrt1060-evk/Kconfig b/boards/arm/imxrt/imxrt1060-evk/Kconfig index e84ad2c14c..2c88b42db5 100644 --- a/boards/arm/imxrt/imxrt1060-evk/Kconfig +++ b/boards/arm/imxrt/imxrt1060-evk/Kconfig @@ -17,4 +17,8 @@ config IMXRT1060_EVK_QSPI_FLASH endchoice # Boot Flash +config IMXRT1060_EVK_TOUCHSCREEN_SWAPXY + bool "IMXRT1060 EVK Touchscreen sway X/Y" + depends on INPUT_TOUCHSCREEN + endif diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig index e22eb8917c..91aed44ff7 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig @@ -21,14 +21,13 @@ CONFIG_BUILTIN=y CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_LVGLDEMO=y CONFIG_FS_PROCFS=y -CONFIG_FT5X06_NPOLLWAITERS=8 CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_FT5X06_THRESHX=9 CONFIG_FT5X06_THRESHY=15 CONFIG_GRAPHICS_LVGL=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_IMXRT1060_EVK_TOUCHSCREEN_SWAPXY=y CONFIG_IMXRT_GPIO1_0_15_IRQ=y CONFIG_IMXRT_GPIO_IRQ=y CONFIG_IMXRT_LCD=y diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c index d3b0a9ce0f..5bbf489fb6 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c @@ -80,7 +80,13 @@ static const struct ft5x06_config_s g_ft5x06_config = .clear = imxrt_ft5x06_clear, #endif .wakeup = imxrt_ft5x06_wakeup, - .nreset = imxrt_ft5x06_nreset + .nreset = imxrt_ft5x06_nreset, + .lower = + { +#ifdef CONFIG_IMXRT1060_EVK_TOUCHSCREEN_SWAPXY + .flags = TOUCH_FLAG_SWAPXY, +#endif + }, }; #ifndef CONFIG_FT5X06_POLLMODE diff --git a/boards/arm/imxrt/imxrt1064-evk/Kconfig b/boards/arm/imxrt/imxrt1064-evk/Kconfig index 119d7a772d..42e552f910 100644 --- a/boards/arm/imxrt/imxrt1064-evk/Kconfig +++ b/boards/arm/imxrt/imxrt1064-evk/Kconfig @@ -24,4 +24,8 @@ config IMXRT1064_EVK_SDRAM ---help--- Activate DCD configuration of SDRAM +config IMXRT1064_EVK_TOUCHSCREEN_SWAPXY + bool "IMXRT1064 EVK Touchscreen sway X/Y" + depends on INPUT_TOUCHSCREEN + endif diff --git a/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig index 985b3240f1..58de0530bb 100644 --- a/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig +++ b/boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig @@ -21,14 +21,13 @@ CONFIG_BUILTIN=y CONFIG_DRIVERS_VIDEO=y CONFIG_EXAMPLES_LVGLDEMO=y CONFIG_FS_PROCFS=y -CONFIG_FT5X06_NPOLLWAITERS=8 CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_FT5X06_THRESHX=9 CONFIG_FT5X06_THRESHY=15 CONFIG_GRAPHICS_LVGL=y CONFIG_IDLETHREAD_STACKSIZE=2048 +CONFIG_IMXRT1064_EVK_TOUCHSCREEN_SWAPXY=y CONFIG_IMXRT_EDMA=y CONFIG_IMXRT_GPIO1_0_15_IRQ=y CONFIG_IMXRT_GPIO_IRQ=y diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_ft5x06.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_ft5x06.c index bb49d1ad62..588dcaa263 100644 --- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_ft5x06.c +++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_ft5x06.c @@ -80,7 +80,13 @@ static const struct ft5x06_config_s g_ft5x06_config = .clear = imxrt_ft5x06_clear, #endif .wakeup = imxrt_ft5x06_wakeup, - .nreset = imxrt_ft5x06_nreset + .nreset = imxrt_ft5x06_nreset, + .lower = + { +#ifdef CONFIG_IMXRT1064_EVK_TOUCHSCREEN_SWAPXY + .flags = TOUCH_FLAG_SWAPXY, +#endif + }, }; #ifndef CONFIG_FT5X06_POLLMODE diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig index fba3ae0dc1..59d3eb737e 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig @@ -3,5 +3,10 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -if ARCH_BOARD_LPCXPRESSO +if ARCH_BOARD_LPCXPRESSO_LPC54628 + +config ARCH_BOARD_LPCXPRESSO_LPC54628_TOUCHSCREEN_SWAPXY + bool "LPCXPRESSO LPC54628 Touchscreen sway X/Y" + depends on INPUT_TOUCHSCREEN + endif diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig index 584e9aaae5..31fdf4303f 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y @@ -27,7 +28,6 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_GRAPHICS_PDCURSES=y CONFIG_I2CTOOL_MAXBUS=9 CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig index 514e39cd3b..ed6324f1f1 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y @@ -24,7 +25,6 @@ CONFIG_EXAMPLES_LVGLDEMO=y CONFIG_FS_PROCFS=y CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_GRAPHICS_LVGL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig index 8508aedabc..a74fabf0b3 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y @@ -26,7 +27,6 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INIT_ENTRYPOINT="nxwm_main" diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig index f9925d1278..8a20380501 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y @@ -23,7 +24,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_FT5X06_THRESHX=8 CONFIG_FT5X06_THRESHY=8 CONFIG_GRAPHICS_TWM4NX=y diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig index 3bd0c8804e..7c9172c2ab 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y @@ -23,7 +24,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_FT5X06_THRESHX=8 CONFIG_FT5X06_THRESHY=8 CONFIG_GRAPHICS_TWM4NX=y diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c index 02bcacf6c2..ffd3bda91a 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c @@ -76,7 +76,13 @@ static const struct ft5x06_config_s g_ft5x06_config = .clear = lpc54_ft5x06_clear, #endif .wakeup = lpc54_ft5x06_wakeup, - .nreset = lpc54_ft5x06_nreset + .nreset = lpc54_ft5x06_nreset, + .lower = + { +#ifdef CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628_TOUCHSCREEN_SWAPXY + .flags = TOUCH_FLAG_SWAPXY, +#endif + }, }; #ifndef CONFIG_FT5X06_POLLMODE diff --git a/boards/arm/stm32f7/stm32f746g-disco/Kconfig b/boards/arm/stm32f7/stm32f746g-disco/Kconfig index 24d699d9cf..40785710b6 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/Kconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/Kconfig @@ -17,4 +17,8 @@ config STM32F746GDISCO_FLASH ---help--- Configures an MTD device for use with the onboard flash +config STM32F746GDISCO_TOUCHSCREEN_SWAPXY + bool "STM32F746G DISCO Touchscreen sway X/Y" + depends on INPUT_TOUCHSCREEN + endif # ARCH_BOARD_STM32F746G_DISCO diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig index 97f99c32b5..b5be48bd47 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig @@ -34,7 +34,6 @@ CONFIG_EXAMPLES_FB=y CONFIG_EXAMPLES_LVGLDEMO=y CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_GRAPHICS_LVGL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -61,6 +60,7 @@ CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y +CONFIG_STM32F746GDISCO_TOUCHSCREEN_SWAPXY=y CONFIG_STM32F7_FMC=y CONFIG_STM32F7_I2C3=y CONFIG_STM32F7_LTDC=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c index 17153bc48e..94b43bd981 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c @@ -103,7 +103,13 @@ static const struct ft5x06_config_s g_ft5x06_config = .clear = stm32_ft5x06_clear, #endif .wakeup = stm32_ft5x06_wakeup, - .nreset = stm32_ft5x06_nreset + .nreset = stm32_ft5x06_nreset, + .lower = + { +#ifdef CONFIG_STM32F746GDISCO_TOUCHSCREEN_SWAPXY + .flags = TOUCH_FLAG_SWAPXY, +#endif + }, }; static struct stm32_ft5x06_config_s g_priv_config = diff --git a/boards/arm/stm32h7/stm32h745i-disco/Kconfig b/boards/arm/stm32h7/stm32h745i-disco/Kconfig index d850d66e8c..a6c7642bf0 100644 --- a/boards/arm/stm32h7/stm32h745i-disco/Kconfig +++ b/boards/arm/stm32h7/stm32h745i-disco/Kconfig @@ -5,4 +5,8 @@ if ARCH_BOARD_STM32H745I_DISCO +config ARCH_BOARD_STM32H745I_DISCO_TOUCHSCREEN_SWAPXY + bool "STM32H745I DISCO Touchscreen sway X/Y" + depends on INPUT_TOUCHSCREEN + endif # ARCH_BOARD_STM32H745I_DISCO diff --git a/boards/arm/stm32h7/stm32h745i-disco/configs/lvgl/defconfig b/boards/arm/stm32h7/stm32h745i-disco/configs/lvgl/defconfig index 566892360f..8479594746 100644 --- a/boards/arm/stm32h7/stm32h745i-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32h7/stm32h745i-disco/configs/lvgl/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32h745i-disco" CONFIG_ARCH_BOARD_STM32H745I_DISCO=y +CONFIG_ARCH_BOARD_STM32H745I_DISCO_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="stm32h7" CONFIG_ARCH_CHIP_STM32H745XI=y CONFIG_ARCH_CHIP_STM32H7=y @@ -31,10 +32,8 @@ CONFIG_EXAMPLES_FB=y CONFIG_EXAMPLES_LVGLDEMO=y CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_FS_PROCFS=y -CONFIG_FT5X06_NPOLLWAITERS=8 CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_FT5X06_THRESHX=9 CONFIG_FT5X06_THRESHY=15 CONFIG_GRAPHICS_LVGL=y diff --git a/boards/arm/stm32h7/stm32h745i-disco/configs/touchtest/defconfig b/boards/arm/stm32h7/stm32h745i-disco/configs/touchtest/defconfig index 62364e7e24..6a180d605e 100644 --- a/boards/arm/stm32h7/stm32h745i-disco/configs/touchtest/defconfig +++ b/boards/arm/stm32h7/stm32h745i-disco/configs/touchtest/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32h745i-disco" CONFIG_ARCH_BOARD_STM32H745I_DISCO=y +CONFIG_ARCH_BOARD_STM32H745I_DISCO_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="stm32h7" CONFIG_ARCH_CHIP_STM32H745XI=y CONFIG_ARCH_CHIP_STM32H7=y @@ -24,10 +25,8 @@ CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_FS_PROCFS=y -CONFIG_FT5X06_NPOLLWAITERS=8 CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_FT5X06_THRESHX=9 CONFIG_FT5X06_THRESHY=15 CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32h7/stm32h745i-disco/src/stm32_ft5x06.c b/boards/arm/stm32h7/stm32h745i-disco/src/stm32_ft5x06.c index 1c77b3d194..97c65c5a65 100644 --- a/boards/arm/stm32h7/stm32h745i-disco/src/stm32_ft5x06.c +++ b/boards/arm/stm32h7/stm32h745i-disco/src/stm32_ft5x06.c @@ -104,7 +104,13 @@ static const struct ft5x06_config_s g_ft5x06_config = .clear = stm32_ft5x06_clear, #endif .wakeup = stm32_ft5x06_wakeup, - .nreset = stm32_ft5x06_nreset + .nreset = stm32_ft5x06_nreset, + .lower = + { +#ifdef CONFIG_ARCH_BOARD_STM32H745I_DISCO_TOUCHSCREEN_SWAPXY + .flags = TOUCH_FLAG_SWAPXY, +#endif + }, }; #ifndef CONFIG_FT5X06_POLLMODE diff --git a/boards/arm/stm32h7/stm32h750b-dk/Kconfig b/boards/arm/stm32h7/stm32h750b-dk/Kconfig index 68542f0f61..9b4de6f4bd 100644 --- a/boards/arm/stm32h7/stm32h750b-dk/Kconfig +++ b/boards/arm/stm32h7/stm32h750b-dk/Kconfig @@ -5,4 +5,8 @@ if ARCH_BOARD_STM32H750B_DK +config ARCH_BOARD_STM32H750B_DK_TOUCHSCREEN_SWAPXY + bool "STM32H750B DK Touchscreen sway X/Y" + depends on INPUT_TOUCHSCREEN + endif # ARCH_BOARD_STM32H750B_DK diff --git a/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig b/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig index 5ba22bfab6..96da5dc884 100644 --- a/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig +++ b/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32h750b-dk" CONFIG_ARCH_BOARD_STM32H750B_DK=y +CONFIG_ARCH_BOARD_STM32H750B_DK_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="stm32h7" CONFIG_ARCH_CHIP_STM32H750B=y CONFIG_ARCH_CHIP_STM32H7=y @@ -32,10 +33,8 @@ CONFIG_EXAMPLES_FB=y CONFIG_EXAMPLES_LVGLDEMO=y CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_FS_PROCFS=y -CONFIG_FT5X06_NPOLLWAITERS=8 CONFIG_FT5X06_POLLMODE=y CONFIG_FT5X06_SINGLEPOINT=y -CONFIG_FT5X06_SWAPXY=y CONFIG_FT5X06_THRESHX=9 CONFIG_FT5X06_THRESHY=15 CONFIG_GRAPHICS_LVGL=y diff --git a/boards/arm/stm32h7/stm32h750b-dk/src/stm32_ft5x06.c b/boards/arm/stm32h7/stm32h750b-dk/src/stm32_ft5x06.c index 3cedc84a39..60c33e8bda 100644 --- a/boards/arm/stm32h7/stm32h750b-dk/src/stm32_ft5x06.c +++ b/boards/arm/stm32h7/stm32h750b-dk/src/stm32_ft5x06.c @@ -102,7 +102,13 @@ static const struct ft5x06_config_s g_ft5x06_config = .clear = stm32_ft5x06_clear, #endif .wakeup = stm32_ft5x06_wakeup, - .nreset = stm32_ft5x06_nreset + .nreset = stm32_ft5x06_nreset, + .lower = + { +#ifdef CONFIG_ARCH_BOARD_STM32H750B_DK_TOUCHSCREEN_SWAPXY + .flags = TOUCH_FLAG_SWAPXY, +#endif + }, }; #ifndef CONFIG_FT5X06_POLLMODE