Adapt lvgl for using ft6206 model touch screen[stm32f469-st-disco] (#6153)

* Adapt lvgl for using ft6206 model touch screen

bsp/stm32/stm32f469-st-disco/applications/lvgl/lv_port_indev.c

@@ -5,19 +5,23 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2022-07-07     liYony       The first version
+ * 2022-07-07     liYony       The first version (FT6336)
+ * 2022-07-08     liYony       Add FT6206
  */
 #include <lvgl.h>
 #include <rtdevice.h>
+#include <touch.h>
 #include <lcd_port.h>
 
 #define DBG_TAG    "LVGL.port.indev"
 #define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
 
-/* Include the package header files you are using */
+/* Add the include file of the package you are using */
 #ifdef BSP_USING_TOUCH_FT6X36
-#include "ft6236.h"
+#include <ft6236.h>
+#elif defined(BSP_USING_TOUCH_FT6206)
+#include <ft6206.h>
 #endif /* BSP_USING_TOUCH_FT6X36 */
 
 /* Touch chip connection information */
@@ -42,6 +46,9 @@ static void input_read(lv_indev_drv_t *indev_drv, lv_indev_data_t *data)
 #ifdef BSP_USING_TOUCH_FT6X36
     data->point.x = read_data->y_coordinate;
     data->point.y = LCD_HEIGHT - read_data->x_coordinate;
+#elif defined(BSP_USING_TOUCH_FT6206)
+    data->point.x = read_data->x_coordinate;
+    data->point.y = LCD_HEIGHT - read_data->y_coordinate;
 #endif /* BSP_USING_TOUCH_FT6X36 */
 
     if (read_data->event == RT_TOUCH_EVENT_DOWN)
@@ -68,9 +75,11 @@ static int lv_hw_touch_init(void)
 {
     struct rt_touch_config cfg;
 
-#ifdef BSP_USING_TOUCH_FT6X36
     cfg.dev_name = BSP_TOUCH_I2C_BUS_NAME;
+#ifdef BSP_USING_TOUCH_FT6X36
     rt_hw_ft6236_init(TOUCH_DEV_NAME, &cfg, BSP_TOUCH_I2C_RESET_PIN);
+#elif defined(BSP_USING_TOUCH_FT6206)
+    rt_hw_ft6206_init(TOUCH_DEV_NAME, &cfg);
 #endif /* BSP_USING_TOUCH_FT6X36 */
 
     touch_dev = rt_device_find(TOUCH_DEV_NAME);

bsp/stm32/stm32f469-st-disco/board/Kconfig

@@ -85,28 +85,20 @@ menu "Onboard Peripheral Drivers"
         
     config BSP_USING_TOUCH
         bool "Enable touch screen"
+        select BSP_USING_I2C1
+        select PKG_USING_TOUCH_DRIVERS
     
     choice
         prompt "Touch IC type"
         depends on BSP_USING_TOUCH
-        default BSP_CHOICE_TOUCH_FT6X36
+        default BSP_USING_TOUCH_FT6X36
 
         config BSP_USING_TOUCH_FT6206
-            bool "FT6206"
-            select BSP_USING_I2C1
-            if BSP_USING_TOUCH_FT6206
-                config BSP_TOUCH_INT_PIN
-                    int # "Touch IC interrupt pin"
-                    default 149
-                config BSP_TOUCH_I2C_NAME
-                    string # "I2C Bus Name"
-                    default "i2c1"
-            endif
+            bool "FT6206"            
+            select PKG_USING_FT6206
 
         config BSP_USING_TOUCH_FT6X36
             bool "FT6x36"
-            select BSP_USING_I2C1
-            select PKG_USING_TOUCH_DRIVERS
             select PKG_USING_FT6236
     endchoice  
 

bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript

@@ -1,14 +0,0 @@
-from building import *
-
-cwd     = GetCurrentDir()
-src     = []
-
-if GetDepend(['BSP_USING_TOUCH_FT6206']):
-    src    += Glob('drv_touch.c')
-    src    += Glob('drv_touch_ft6206.c')
-
-CPPPATH = [cwd]
-
-group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

bsp/stm32/stm32f469-st-disco/board/ports/touch/drv_touch.h

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2006-2022, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2018-02-08     Zhangyihong  the first version
- */
-
-#ifndef __DRV_TOUCH_H__
-#define __DRV_TOUCH_H__
-
-#include "rtthread.h"
-#include "rtdevice.h"
-
-#define TOUCH_DBG_LEVEL DBG_LOG
-
-#define IIC_RETRY_NUM 2
-
-#define TOUCH_EVENT_UP      (0x01)
-#define TOUCH_EVENT_DOWN    (0x02)
-#define TOUCH_EVENT_MOVE    (0x03)
-#define TOUCH_EVENT_NONE    (0x80)
-
-struct touch_message
-{
-    rt_uint16_t x;
-    rt_uint16_t y;
-    rt_uint8_t event;
-};
-typedef struct touch_message *touch_msg_t;
-
-struct touch_ops
-{
-    void (* isr_enable)(rt_bool_t);
-    rt_err_t (* read_point)(touch_msg_t);
-    void (* init)(struct rt_i2c_bus_device *);
-    void (* deinit)(void);
-};
-typedef struct touch_ops *touch_ops_t;
-
-struct touch_drivers
-{
-    rt_list_t       list;
-    unsigned char   address;
-    rt_bool_t (*probe)(struct rt_i2c_bus_device *i2c_bus);
-    rt_sem_t        isr_sem;
-    touch_ops_t     ops;
-    void           *user_data;
-};
-typedef struct touch_drivers *touch_drv_t;
-
-extern void rt_touch_drivers_register(touch_drv_t drv);
-#endif