libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[components/drivers][touch]删除多余的touch.h (#7090) 

* [components/drivers][touch]删除多余的touch.h

* 将touc.h替换为rtdevice.h
This commit is contained in:
yangjie11 2023-03-24 23:47:28 +08:00 committed by GitHub
parent 6095d65679
commit b0c247fb59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsp/allwinner/libraries/drivers/touch/drv_touch.h
View File

@ -12,7 +12,6 @@
#include <stddef.h> #include <stddef.h>
#include "rtthread.h" #include "rtthread.h"
#include "rtdevice.h" #include "rtdevice.h"
#include <touch.h>
#define TOUCH_POLL_MODE (1 << 0) #define TOUCH_POLL_MODE (1 << 0)
#define TOUCH_INT_MODE (1 << 1) #define TOUCH_INT_MODE (1 << 1)

1
bsp/allwinner/libraries/drivers/touch/drv_touch_gt9xx.c
View File

@ -13,7 +13,6 @@
*/ */
#include <rtthread.h> #include <rtthread.h>
#include <rtdevice.h> #include <rtdevice.h>
#include <touch.h>
#include "drv_touch.h" #include "drv_touch.h"
#include "string.h" #include "string.h"
#include "drv_pin.h" #include "drv_pin.h"

2
bsp/nuvoton/libraries/ma35/rtt_port/drv_adc.h
View File

@ -17,7 +17,7 @@
#include "nu_adc.h" #include "nu_adc.h"
#if defined(BSP_USING_ADC_TOUCH) #if defined(BSP_USING_ADC_TOUCH)
#include "touch.h" #include <rtdevice.h>
#endif #endif
typedef enum typedef enum

2
bsp/nuvoton/libraries/n9h30/rtt_port/drv_adc.h
View File

@ -17,7 +17,7 @@
#include "nu_adc.h" #include "nu_adc.h"
#if defined(BSP_USING_ADC_TOUCH) #if defined(BSP_USING_ADC_TOUCH)
#include "touch.h" #include <rtdevice.h>
#endif #endif
typedef enum typedef enum

1
bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/adc_touch.c
View File

@ -20,7 +20,6 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/statfs.h> #include <sys/statfs.h>
#include "touch.h"
//#include "drv_adc.h" //#include "drv_adc.h"
#include "adc_touch.h" #include "adc_touch.h"

1
bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.c
View File

@ -14,7 +14,6 @@
#if defined(NU_PKG_USING_ADC_TOUCH_SW) #if defined(NU_PKG_USING_ADC_TOUCH_SW)
#include "rtdevice.h" #include "rtdevice.h"
#include "touch.h"
#include "touch_sw.h" #include "touch_sw.h"
/* Private define ---------------------------------------------------------------*/ /* Private define ---------------------------------------------------------------*/

2
bsp/nuvoton/libraries/nu_packages/ADC_TOUCH/touch_sw.h
View File

@ -14,7 +14,7 @@
#define __TOUCH_SW_H__ #define __TOUCH_SW_H__
#include <rtthread.h> #include <rtthread.h>
#include "touch.h" #include <rtdevice.h>
typedef enum typedef enum
{ {

2
bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili.h
View File

@ -11,7 +11,7 @@
#ifndef __ILI_H__ #ifndef __ILI_H__
#define __ILI_H__ #define __ILI_H__
#include "touch.h" #include <rtdevice.h>
int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg); int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg);

2
bsp/nuvoton/libraries/nu_packages/TPC/ft5446.h
View File

@ -11,7 +11,7 @@
#ifndef __FT5446_H__ #ifndef __FT5446_H__
#define __FT5446_H__ #define __FT5446_H__
#include "touch.h" #include <rtdevice.h>
#define FT_REGITER_LEN 1 #define FT_REGITER_LEN 1
#define FT_MAX_TOUCH 5 #define FT_MAX_TOUCH 5

1
bsp/nuvoton/libraries/nu_packages/TPC/gt911.c
View File

@ -16,7 +16,6 @@
#define DBG_LVL DBG_INFO #define DBG_LVL DBG_INFO
#include <rtdbg.h> #include <rtdbg.h>
#include "touch.h"
#include "gt911.h" #include "gt911.h"
static struct rt_i2c_client gt911_client; static struct rt_i2c_client gt911_client;

2
bsp/nuvoton/libraries/nu_packages/TPC/gt911.h
View File

@ -11,7 +11,7 @@
#ifndef __GT911_H__ #ifndef __GT911_H__
#define __GT911_H__ #define __GT911_H__
#include "touch.h" #include <rtdevice.h>
#define GT911_ADDR_LEN 2 #define GT911_ADDR_LEN 2
#define GT911_REGITER_LEN 2 #define GT911_REGITER_LEN 2

2
bsp/nuvoton/libraries/nu_packages/TPC/ili.h
View File

@ -11,7 +11,7 @@
#ifndef __ILI_H__ #ifndef __ILI_H__
#define __ILI_H__ #define __ILI_H__
#include "touch.h" #include <rtdevice.h>
int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg); int rt_hw_ili_tpc_init(const char *name, struct rt_touch_config *cfg);

2
bsp/nuvoton/libraries/nu_packages/TPC/st1663i.h
View File

@ -11,7 +11,7 @@
#ifndef __ST1663I_H__ #ifndef __ST1663I_H__
#define __ST1663I_H__ #define __ST1663I_H__
#include "touch.h" #include <rtdevice.h>
#define ST_REGITER_LEN 1 #define ST_REGITER_LEN 1
#define ST_MAX_TOUCH 5 #define ST_MAX_TOUCH 5

1
bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c
View File

@ -10,7 +10,6 @@
#include <rtthread.h> #include <rtthread.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
#define THREAD_PRIORITY 5 #define THREAD_PRIORITY 5
#define THREAD_STACK_SIZE 2048 #define THREAD_STACK_SIZE 2048

2
bsp/nuvoton/libraries/nuc980/rtt_port/drv_adc.h
View File

@ -17,7 +17,7 @@
#include "nu_adc.h" #include "nu_adc.h"
#if defined(BSP_USING_ADC_TOUCH) #if defined(BSP_USING_ADC_TOUCH)
#include "touch.h" #include <rtdevice.h>
#endif #endif
typedef enum typedef enum

1
bsp/nuvoton/nk-980iot/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/nk-n9h30/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/numaker-hmi-ma35d1/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/numaker-iot-m467/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/numaker-iot-m487/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/numaker-m032ki/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/numaker-m2354/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/numaker-m467hj/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/nuvoton/numaker-pfm-m487/applications/lvgl/lv_port_indev.c
View File

@ -11,7 +11,6 @@
#include <lvgl.h> #include <lvgl.h>
#include <stdbool.h> #include <stdbool.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
static lv_indev_state_t last_state = LV_INDEV_STATE_REL; static lv_indev_state_t last_state = LV_INDEV_STATE_REL;
static rt_int16_t last_x = 0; static rt_int16_t last_x = 0;

1
bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.c
View File

@ -9,7 +9,6 @@
*/ */
#include <rtthread.h> #include <rtthread.h>
#include <rtdevice.h> #include <rtdevice.h>
#include <touch.h>
#include "mbox.h" #include "mbox.h"
#include "drv_dsi_touch.h" #include "drv_dsi_touch.h"

1
bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.c
View File

@ -10,7 +10,6 @@
#include <rtthread.h> #include <rtthread.h>
#include <rtdevice.h> #include <rtdevice.h>
#include <touch.h>
#include "drv_xpt2046.h" #include "drv_xpt2046.h"
//http://www.lcdwiki.com/MHS-3.5inch_RPi_Display //http://www.lcdwiki.com/MHS-3.5inch_RPi_Display

1
bsp/stm32/stm32f407-atk-explorer/board/ports/touch/drv_touch_xpt.h
View File

@ -13,7 +13,6 @@
#include <rtthread.h> #include <rtthread.h>
#include <rtdevice.h> #include <rtdevice.h>
#include "touch.h"
#ifdef BSP_USING_TOUCH_RES #ifdef BSP_USING_TOUCH_RES

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

@ -10,7 +10,6 @@
*/ */
#include <lvgl.h> #include <lvgl.h>
#include <rtdevice.h> #include <rtdevice.h>
#include <touch.h>
#include <lcd_port.h> #include <lcd_port.h>
#define DBG_TAG "LVGL.port.indev" #define DBG_TAG "LVGL.port.indev"

2
components/drivers/touch/touch.c
View File

@ -8,7 +8,7 @@
* 2019-05-20 tyustli the first version * 2019-05-20 tyustli the first version
*/ */
#include "touch.h" #include <rtdevice.h>
#include <string.h> #include <string.h>
#define DBG_TAG "touch" #define DBG_TAG "touch"

12
components/drivers/touch/touch.h
View File

@ -1,12 +0,0 @@
/*
* Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2019-05-20 tyustli the first version
*/
#include <rtthread.h>
#include <rtdevice.h>