Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Richard 祝发兴 - -IT
rt-thread
提交
552c5568
R
rt-thread
项目概览
Richard 祝发兴 - -IT
/
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,发现更多精彩内容 >>
提交
552c5568
编写于
1月 23, 2021
作者:
T
thread-liu
提交者:
thread-liu
1月 23, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[PWM] Fix the timer clock frequency doubling problem.
上级
e81f1a0e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
49 addition
and
13 deletion
+49
-13
bsp/stm32/libraries/HAL_Drivers/drv_pwm.c
bsp/stm32/libraries/HAL_Drivers/drv_pwm.c
+49
-13
未找到文件。
bsp/stm32/libraries/HAL_Drivers/drv_pwm.c
浏览文件 @
552c5568
...
...
@@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2018-12-13 zylx first version
* 2021-01-23 thread-liu Fix the timer clock frequency doubling problem
*/
#include <board.h>
...
...
@@ -158,6 +159,43 @@ static struct stm32_pwm stm32_pwm_obj[] =
#endif
};
/* APBx timer clocks frequency doubler state related to APB1CLKDivider value */
static
void
pclkx_doubler_get
(
rt_uint32_t
*
pclk1_doubler
,
rt_uint32_t
*
pclk2_doubler
)
{
rt_uint32_t
flatency
=
0
;
RCC_ClkInitTypeDef
RCC_ClkInitStruct
=
{
0
};
RT_ASSERT
(
pclk1_doubler
!=
RT_NULL
);
RT_ASSERT
(
pclk1_doubler
!=
RT_NULL
);
HAL_RCC_GetClockConfig
(
&
RCC_ClkInitStruct
,
&
flatency
);
*
pclk1_doubler
=
1
;
*
pclk2_doubler
=
1
;
#if defined(SOC_SERIES_STM32MP1)
if
(
RCC_ClkInitStruct
.
APB1_Div
!=
RCC_APB1_DIV1
)
{
*
pclk1_doubler
=
2
;
}
if
(
RCC_ClkInitStruct
.
APB2_Div
!=
RCC_APB2_DIV1
)
{
*
pclk2_doubler
=
2
;
}
#else
if
(
RCC_ClkInitStruct
.
APB1CLKDivider
!=
RCC_HCLK_DIV1
)
{
*
pclk1_doubler
=
2
;
}
#if !defined(SOC_SERIES_STM32F0) && !defined(SOC_SERIES_STM32G0)
if
(
RCC_ClkInitStruct
.
APB2CLKDivider
!=
RCC_HCLK_DIV1
)
{
*
pclk2_doubler
=
2
;
}
#endif
#endif
}
static
rt_err_t
drv_pwm_control
(
struct
rt_device_pwm
*
device
,
int
cmd
,
void
*
arg
);
static
struct
rt_pwm_ops
drv_ops
=
{
...
...
@@ -200,6 +238,9 @@ static rt_err_t drv_pwm_get(TIM_HandleTypeDef *htim, struct rt_pwm_configuration
/* Converts the channel number to the channel number of Hal library */
rt_uint32_t
channel
=
0x04
*
(
configuration
->
channel
-
1
);
rt_uint64_t
tim_clock
;
rt_uint32_t
pclk1_doubler
,
pclk2_doubler
;
pclkx_doubler_get
(
&
pclk1_doubler
,
&
pclk2_doubler
);
#if defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7)
if
(
htim
->
Instance
==
TIM9
||
htim
->
Instance
==
TIM10
||
htim
->
Instance
==
TIM11
)
...
...
@@ -212,16 +253,12 @@ static rt_err_t drv_pwm_get(TIM_HandleTypeDef *htim, struct rt_pwm_configuration
#endif
{
#if !defined(SOC_SERIES_STM32F0) && !defined(SOC_SERIES_STM32G0)
tim_clock
=
HAL_RCC_GetPCLK2Freq
()
*
2
;
tim_clock
=
(
rt_uint32_t
)(
HAL_RCC_GetPCLK2Freq
()
*
pclk2_doubler
)
;
#endif
}
else
{
#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32H7)
tim_clock
=
HAL_RCC_GetPCLK1Freq
();
#else
tim_clock
=
HAL_RCC_GetPCLK1Freq
()
*
2
;
#endif
tim_clock
=
(
rt_uint32_t
)(
HAL_RCC_GetPCLK1Freq
()
*
pclk1_doubler
);
}
if
(
__HAL_TIM_GET_CLOCKDIVISION
(
htim
)
==
TIM_CLOCKDIVISION_DIV2
)
...
...
@@ -245,9 +282,12 @@ static rt_err_t drv_pwm_set(TIM_HandleTypeDef *htim, struct rt_pwm_configuration
{
rt_uint32_t
period
,
pulse
;
rt_uint64_t
tim_clock
,
psc
;
rt_uint32_t
pclk1_doubler
,
pclk2_doubler
;
/* Converts the channel number to the channel number of Hal library */
rt_uint32_t
channel
=
0x04
*
(
configuration
->
channel
-
1
);
pclkx_doubler_get
(
&
pclk1_doubler
,
&
pclk2_doubler
);
#if defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7)
if
(
htim
->
Instance
==
TIM9
||
htim
->
Instance
==
TIM10
||
htim
->
Instance
==
TIM11
)
#elif defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32H7)
...
...
@@ -259,16 +299,12 @@ static rt_err_t drv_pwm_set(TIM_HandleTypeDef *htim, struct rt_pwm_configuration
#endif
{
#if !defined(SOC_SERIES_STM32F0) && !defined(SOC_SERIES_STM32G0)
tim_clock
=
HAL_RCC_GetPCLK2Freq
()
*
2
;
tim_clock
=
(
rt_uint32_t
)(
HAL_RCC_GetPCLK2Freq
()
*
pclk2_doubler
)
;
#endif
}
else
{
#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32H7)
tim_clock
=
HAL_RCC_GetPCLK1Freq
();
#else
tim_clock
=
HAL_RCC_GetPCLK1Freq
()
*
2
;
#endif
tim_clock
=
(
rt_uint32_t
)(
HAL_RCC_GetPCLK1Freq
()
*
pclk1_doubler
);
}
/* Convert nanosecond to frequency and duty cycle. 1s = 1 * 1000 * 1000 * 1000 ns */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录