Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-24 16:11:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

boards: Update configs and params about FT5X06

Browse Source 
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 <wangjianyu3@xiaomi.com>
This commit is contained in:
wangjianyu3
2025-07-05 01:28:17 +08:00
committed by Alan C. Assis
parent 770d4a6c86
commit 5671765acd
24 changed files with 80 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/Kconfig
+1 -1
View File
@@ -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
boards/arm/imxrt/imxrt1060-evk/Kconfig
+4
View File
@@ -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
boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
+1 -2
View File
@@ -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
boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c
+7 -1
View File
@@ -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
boards/arm/imxrt/imxrt1064-evk/Kconfig
+4
View File
@@ -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
boards/arm/imxrt/imxrt1064-evk/configs/lvgl/defconfig
+1 -2
View File
@@ -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
boards/arm/imxrt/imxrt1064-evk/src/imxrt_ft5x06.c
+7 -1
View File
@@ -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
boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig
+6 -1
View File
@@ -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
boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig
+1 -1
View File
@@ -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"
boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig
+1 -1
View File
@@ -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
boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
+1 -1
View File
@@ -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"
boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
+1 -1
View File
@@ -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
boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
+1 -1
View File
@@ -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
boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c
+7 -1
View File
@@ -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
boards/arm/stm32f7/stm32f746g-disco/Kconfig
+4
View File
@@ -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
boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig
+1 -1
View File
@@ -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
boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c
+7 -1
View File
@@ -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 =
boards/arm/stm32h7/stm32h745i-disco/Kconfig
+4
View File
@@ -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
boards/arm/stm32h7/stm32h745i-disco/configs/lvgl/defconfig
+1 -2
View File
@@ -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
boards/arm/stm32h7/stm32h745i-disco/configs/touchtest/defconfig
+1 -2
View File
@@ -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"
boards/arm/stm32h7/stm32h745i-disco/src/stm32_ft5x06.c
+7 -1
View File
@@ -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
boards/arm/stm32h7/stm32h750b-dk/Kconfig
+4
View File
@@ -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
boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig
+1 -2
View File
@@ -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
boards/arm/stm32h7/stm32h750b-dk/src/stm32_ft5x06.c
+7 -1
View File
@@ -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