Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yunke120
rt-thread
提交
a84d5753
R
rt-thread
项目概览
yunke120
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a84d5753
编写于
6月 24, 2020
作者:
T
thread-liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[update] format code
上级
c9db3a07
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
9 deletion
+9
-9
bsp/stm32/libraries/HAL_Drivers/drv_dac.c
bsp/stm32/libraries/HAL_Drivers/drv_dac.c
+5
-5
components/drivers/include/drivers/dac.h
components/drivers/include/drivers/dac.h
+2
-2
components/drivers/misc/dac.c
components/drivers/misc/dac.c
+2
-2
未找到文件。
bsp/stm32/libraries/HAL_Drivers/drv_dac.c
浏览文件 @
a84d5753
...
...
@@ -81,7 +81,7 @@ static rt_uint32_t stm32_dac_get_channel(rt_uint32_t channel)
static
rt_err_t
stm32_set_dac_value
(
struct
rt_dac_device
*
device
,
rt_uint32_t
channel
,
rt_uint32_t
*
value
)
{
uint32_t
dac_channel
;
DAC_ChannelConfTypeDef
dac
_ChanConf
;
DAC_ChannelConfTypeDef
DAC
_ChanConf
;
DAC_HandleTypeDef
*
stm32_dac_handler
;
RT_ASSERT
(
device
!=
RT_NULL
);
...
...
@@ -89,7 +89,7 @@ static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t ch
stm32_dac_handler
=
device
->
parent
.
user_data
;
rt_memset
(
&
dac_ChanConf
,
0
,
sizeof
(
dac
_ChanConf
));
rt_memset
(
&
DAC_ChanConf
,
0
,
sizeof
(
DAC
_ChanConf
));
#if defined(SOC_SERIES_STM32MP1)
if
(
channel
<=
2
&&
channel
>
0
)
...
...
@@ -105,11 +105,11 @@ static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t ch
#endif
#if defined(SOC_SERIES_STM32MP1)
dac
_ChanConf
.
DAC_Trigger
=
DAC_TRIGGER_NONE
;
dac
_ChanConf
.
DAC_OutputBuffer
=
DAC_OUTPUTBUFFER_DISABLE
;
DAC
_ChanConf
.
DAC_Trigger
=
DAC_TRIGGER_NONE
;
DAC
_ChanConf
.
DAC_OutputBuffer
=
DAC_OUTPUTBUFFER_DISABLE
;
#endif
/* config dac out channel*/
if
(
HAL_DAC_ConfigChannel
(
stm32_dac_handler
,
&
dac
_ChanConf
,
dac_channel
)
!=
HAL_OK
)
if
(
HAL_DAC_ConfigChannel
(
stm32_dac_handler
,
&
DAC
_ChanConf
,
dac_channel
)
!=
HAL_OK
)
{
LOG_D
(
"Config dac out channel Error!
\n
"
);
return
-
RT_ERROR
;
...
...
components/drivers/include/drivers/dac.h
浏览文件 @
a84d5753
...
...
@@ -29,8 +29,8 @@ typedef struct rt_dac_device *rt_dac_device_t;
typedef
enum
{
RT_
dac
_CMD_ENABLE
,
RT_
dac
_CMD_DISABLE
,
RT_
DAC
_CMD_ENABLE
,
RT_
DAC
_CMD_DISABLE
,
}
rt_dac_cmd_t
;
rt_err_t
rt_hw_dac_register
(
rt_dac_device_t
dac
,
const
char
*
name
,
const
struct
rt_dac_ops
*
ops
,
const
void
*
user_data
);
...
...
components/drivers/misc/dac.c
浏览文件 @
a84d5753
...
...
@@ -47,11 +47,11 @@ static rt_err_t _dac_control(rt_device_t dev, int cmd, void *args)
{
return
-
RT_ENOSYS
;
}
if
(
cmd
==
RT_
dac
_CMD_ENABLE
)
if
(
cmd
==
RT_
DAC
_CMD_ENABLE
)
{
result
=
dac
->
ops
->
enabled
(
dac
,
(
rt_uint32_t
)
args
);
}
else
if
(
cmd
==
RT_
dac
_CMD_DISABLE
)
else
if
(
cmd
==
RT_
DAC
_CMD_DISABLE
)
{
result
=
dac
->
ops
->
disabled
(
dac
,
(
rt_uint32_t
)
args
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录