libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-21 00:27:19 +08:00
Code Issues Releases Wiki Activity

[update] format code

Browse Source
This commit is contained in:
thread-liu 2020-06-24 12:52:34 +08:00
parent c9db3a070f
commit a84d575314
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bsp/stm32/libraries/HAL_Drivers/drv_dac.c
View File

@ -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;

4
components/drivers/include/drivers/dac.h
View File

@ -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);

4
components/drivers/misc/dac.c
View File

@ -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);
}