Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
码匠许师傅
rt-thread
提交
20a6f14e
R
rt-thread
项目概览
码匠许师傅
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
20a6f14e
编写于
12月 25, 2022
作者:
mysterywolf
提交者:
mysterywolf
12月 26, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use PIN_IRQ_PIN_NONE to replace RT_PIN_NONE
上级
2570fab0
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
15 addition
and
18 deletion
+15
-18
bsp/allwinner/libraries/drivers/touch/drv_touch.c
bsp/allwinner/libraries/drivers/touch/drv_touch.c
+1
-1
bsp/nuvoton/numaker-iot-m467/board/board_dev.c
bsp/nuvoton/numaker-iot-m467/board/board_dev.c
+1
-1
bsp/nuvoton/numaker-iot-m487/board/board_dev.c
bsp/nuvoton/numaker-iot-m487/board/board_dev.c
+2
-2
bsp/nuvoton/numaker-m467hj/board/board_dev.c
bsp/nuvoton/numaker-m467hj/board/board_dev.c
+1
-1
bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
+2
-2
bsp/stm32/stm32l475-atk-pandora/board/ports/sensor_port.c
bsp/stm32/stm32l475-atk-pandora/board/ports/sensor_port.c
+3
-3
components/drivers/include/drivers/sensor.h
components/drivers/include/drivers/sensor.h
+0
-1
components/drivers/include/drivers/touch.h
components/drivers/include/drivers/touch.h
+0
-2
components/drivers/sensor/sensor.c
components/drivers/sensor/sensor.c
+2
-2
components/drivers/touch/touch.c
components/drivers/touch/touch.c
+3
-3
未找到文件。
bsp/allwinner/libraries/drivers/touch/drv_touch.c
浏览文件 @
20a6f14e
...
...
@@ -264,7 +264,7 @@ int rt_touch_init(void)
else
if
(
TOUCH_POLL_MODE
==
current_driver
->
check_mode
)
{
rt_thread_t
thread
;
irq_pin
=
RT
_PIN_NONE
;
// No interrupt pins are used
irq_pin
=
PIN_IRQ
_PIN_NONE
;
// No interrupt pins are used
thread
=
rt_thread_create
(
"touch"
,
touch_poll_entry
,
RT_NULL
,
2048
,
16
,
20
);
if
(
thread
==
RT_NULL
)
{
...
...
bsp/nuvoton/numaker-iot-m467/board/board_dev.c
浏览文件 @
20a6f14e
...
...
@@ -167,7 +167,7 @@ int rt_hw_nct7717u_port(void)
struct
rt_sensor_config
cfg
;
cfg
.
intf
.
dev_name
=
"i2c2"
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
return
rt_hw_nct7717u_init
(
"nct7717u"
,
&
cfg
);
}
...
...
bsp/nuvoton/numaker-iot-m487/board/board_dev.c
浏览文件 @
20a6f14e
...
...
@@ -159,7 +159,7 @@ int rt_hw_max31875_port(void)
cfg
.
intf
.
dev_name
=
"i2c1"
;
cfg
.
intf
.
user_data
=
(
void
*
)
MAX31875_I2C_SLAVE_ADR_R0
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
rt_hw_max31875_init
(
"max31875"
,
&
cfg
);
return
0
;
...
...
@@ -175,7 +175,7 @@ int rt_hw_bmx055_port(void)
struct
rt_sensor_config
cfg
;
cfg
.
intf
.
dev_name
=
"i2c2"
;
cfg
.
intf
.
user_data
=
(
void
*
)
0
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
rt_hw_bmx055_init
(
"bmx055"
,
&
cfg
);
return
0
;
...
...
bsp/nuvoton/numaker-m467hj/board/board_dev.c
浏览文件 @
20a6f14e
...
...
@@ -347,7 +347,7 @@ int rt_hw_nct7717u_port(void)
struct
rt_sensor_config
cfg
;
cfg
.
intf
.
dev_name
=
"i2c2"
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
return
rt_hw_nct7717u_init
(
"nct7717u"
,
&
cfg
);
}
...
...
bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
浏览文件 @
20a6f14e
...
...
@@ -183,7 +183,7 @@ int rt_hw_max31875_port(void)
cfg
.
intf
.
dev_name
=
"i2c1"
;
cfg
.
intf
.
user_data
=
(
void
*
)
MAX31875_I2C_SLAVE_ADR_R0
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
rt_hw_max31875_init
(
"max31875"
,
&
cfg
);
return
0
;
...
...
@@ -199,7 +199,7 @@ int rt_hw_mpu6500_port(void)
cfg
.
intf
.
dev_name
=
"i2c2"
;
cfg
.
intf
.
user_data
=
(
void
*
)
MPU6XXX_ADDR_DEFAULT
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
rt_hw_mpu6xxx_init
(
"mpu"
,
&
cfg
);
return
0
;
...
...
bsp/stm32/stm32l475-atk-pandora/board/ports/sensor_port.c
浏览文件 @
20a6f14e
...
...
@@ -20,7 +20,7 @@ static int rt_hw_icm20608_port(void)
cfg
.
intf
.
dev_name
=
"i2c3"
;
cfg
.
intf
.
type
=
RT_SENSOR_INTF_I2C
;
cfg
.
intf
.
arg
=
(
void
*
)
MPU6XXX_ADDR_DEFAULT
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
rt_hw_mpu6xxx_init
(
"icm"
,
&
cfg
);
...
...
@@ -39,7 +39,7 @@ static int rt_hw_ap3216c_port(void)
cfg
.
intf
.
dev_name
=
"i2c3"
;
cfg
.
intf
.
type
=
RT_SENSOR_INTF_I2C
;
cfg
.
intf
.
arg
=
RT_NULL
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
rt_hw_ap3216c_init
(
"ap3216c"
,
&
cfg
);
...
...
@@ -58,7 +58,7 @@ static int rt_hw_aht10_port(void)
cfg
.
intf
.
dev_name
=
"i2c4"
;
cfg
.
intf
.
type
=
RT_SENSOR_INTF_I2C
;
cfg
.
intf
.
arg
=
(
void
*
)
AHT10_I2C_ADDR
;
cfg
.
irq_pin
.
pin
=
RT
_PIN_NONE
;
cfg
.
irq_pin
.
pin
=
PIN_IRQ
_PIN_NONE
;
rt_hw_aht10_init
(
"aht10"
,
&
cfg
);
...
...
components/drivers/include/drivers/sensor.h
浏览文件 @
20a6f14e
...
...
@@ -25,7 +25,6 @@ extern "C" {
#define rt_sensor_get_ts() rt_tick_get()
/* API for the sensor to get the timestamp */
#endif
#define RT_PIN_NONE 0xFFFF
/* RT PIN NONE */
#define RT_DEVICE_FLAG_FIFO_RX 0x200
/* Flag to use when the sensor is open by fifo mode */
#define RT_SENSOR_MODULE_MAX (3)
/* The maximum number of members of a sensor module */
...
...
components/drivers/include/drivers/touch.h
浏览文件 @
20a6f14e
...
...
@@ -24,8 +24,6 @@ extern "C" {
#define rt_touch_get_ts() rt_tick_get()
/* API for the touch to get the timestamp */
#endif
#define RT_PIN_NONE 0xFFFF
/* RT PIN NONE */
/* Touch vendor types */
#define RT_TOUCH_VENDOR_UNKNOWN (0)
/* unknown */
#define RT_TOUCH_VENDOR_GT (1)
/* GTxx series */
...
...
components/drivers/sensor/sensor.c
浏览文件 @
20a6f14e
...
...
@@ -96,7 +96,7 @@ static void _irq_callback(void *args)
/* Sensor interrupt initialization function */
static
rt_err_t
_sensor_irq_init
(
rt_sensor_t
sensor
)
{
if
(
sensor
->
config
.
irq_pin
.
pin
==
RT
_PIN_NONE
)
if
(
sensor
->
config
.
irq_pin
.
pin
==
PIN_IRQ
_PIN_NONE
)
{
return
-
RT_EINVAL
;
}
...
...
@@ -269,7 +269,7 @@ static rt_err_t _sensor_close(rt_device_t dev)
if
(
RT_SENSOR_MODE_GET_FETCH
(
sensor
->
info
.
mode
)
!=
RT_SENSOR_MODE_FETCH_POLLING
)
{
/* Sensor disable interrupt */
if
(
sensor
->
config
.
irq_pin
.
pin
!=
RT
_PIN_NONE
)
if
(
sensor
->
config
.
irq_pin
.
pin
!=
PIN_IRQ
_PIN_NONE
)
{
rt_pin_irq_enable
(
sensor
->
config
.
irq_pin
.
pin
,
RT_FALSE
);
}
...
...
components/drivers/touch/touch.c
浏览文件 @
20a6f14e
...
...
@@ -43,7 +43,7 @@ static void touch_irq_callback(void *param)
static
rt_err_t
rt_touch_irq_init
(
rt_touch_t
touch
)
{
#ifdef RT_TOUCH_PIN_IRQ
if
(
touch
->
config
.
irq_pin
.
pin
==
RT
_PIN_NONE
)
if
(
touch
->
config
.
irq_pin
.
pin
==
PIN_IRQ
_PIN_NONE
)
{
return
-
RT_EINVAL
;
}
...
...
@@ -73,7 +73,7 @@ static rt_err_t rt_touch_irq_init(rt_touch_t touch)
static
void
rt_touch_irq_enable
(
rt_touch_t
touch
)
{
#ifdef RT_TOUCH_PIN_IRQ
if
(
touch
->
config
.
irq_pin
.
pin
!=
RT
_PIN_NONE
)
if
(
touch
->
config
.
irq_pin
.
pin
!=
PIN_IRQ
_PIN_NONE
)
{
rt_pin_irq_enable
(
touch
->
config
.
irq_pin
.
pin
,
RT_TRUE
);
}
...
...
@@ -86,7 +86,7 @@ static void rt_touch_irq_enable(rt_touch_t touch)
static
void
rt_touch_irq_disable
(
rt_touch_t
touch
)
{
#ifdef RT_TOUCH_PIN_IRQ
if
(
touch
->
config
.
irq_pin
.
pin
!=
RT
_PIN_NONE
)
if
(
touch
->
config
.
irq_pin
.
pin
!=
PIN_IRQ
_PIN_NONE
)
{
rt_pin_irq_enable
(
touch
->
config
.
irq_pin
.
pin
,
RT_FALSE
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录