Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
289cf155
R
rt-thread
项目概览
BaiXuePrincess
/
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,发现更多精彩内容 >>
未验证
提交
289cf155
编写于
12月 09, 2021
作者:
G
guo
提交者:
GitHub
12月 09, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5347 from rtthread-bot/rtt_bot
[update] RT-Thread Robot automatic submission
上级
fd9eea2f
9bbb74af
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
1 deletion
+19
-1
bsp/stm32/libraries/HAL_Drivers/drv_can.c
bsp/stm32/libraries/HAL_Drivers/drv_can.c
+19
-1
未找到文件。
bsp/stm32/libraries/HAL_Drivers/drv_can.c
浏览文件 @
289cf155
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
* 2019-03-27 YLZ support double can channels, support stm32F4xx (only Legacy mode).
* 2019-03-27 YLZ support double can channels, support stm32F4xx (only Legacy mode).
* 2019-06-17 YLZ port to new STM32F1xx HAL V1.1.3.
* 2019-06-17 YLZ port to new STM32F1xx HAL V1.1.3.
* 2021-02-02 YuZhe XU fix bug in filter config
* 2021-02-02 YuZhe XU fix bug in filter config
* 2021-8-25 SVCHAO The baud rate is configured according to the different APB1 frequencies.
f4-series only.
*/
*/
#include "drv_can.h"
#include "drv_can.h"
...
@@ -34,7 +36,22 @@ static const struct stm32_baud_rate_tab can_baud_rate_tab[] =
...
@@ -34,7 +36,22 @@ static const struct stm32_baud_rate_tab can_baud_rate_tab[] =
{
CAN20kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_8TQ
|
CAN_BS2_3TQ
|
150
)},
{
CAN20kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_8TQ
|
CAN_BS2_3TQ
|
150
)},
{
CAN10kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_8TQ
|
CAN_BS2_3TQ
|
300
)}
{
CAN10kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_8TQ
|
CAN_BS2_3TQ
|
300
)}
};
};
#elif defined (SOC_SERIES_STM32F4)
/* APB1 45MHz(max) */
#elif defined (SOC_SERIES_STM32F4)
/* 42MHz or 45MHz */
#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx)|| defined(STM32F417xx) ||\
defined(STM32F401xC) || defined(STM32F401xE)
/* 42MHz(max) */
static
const
struct
stm32_baud_rate_tab
can_baud_rate_tab
[]
=
{
{
CAN1MBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_4TQ
|
3
)},
{
CAN800kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_8TQ
|
CAN_BS2_5TQ
|
4
)},
{
CAN500kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
6
)},
{
CAN250kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
12
)},
{
CAN125kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
24
)},
{
CAN100kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
30
)},
{
CAN50kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
60
)},
{
CAN20kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
150
)},
{
CAN10kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
300
)}
};
#else
/* APB1 45MHz(max) */
static
const
struct
stm32_baud_rate_tab
can_baud_rate_tab
[]
=
static
const
struct
stm32_baud_rate_tab
can_baud_rate_tab
[]
=
{
{
{
CAN1MBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
3
)},
{
CAN1MBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
3
)},
...
@@ -47,6 +64,7 @@ static const struct stm32_baud_rate_tab can_baud_rate_tab[] =
...
@@ -47,6 +64,7 @@ static const struct stm32_baud_rate_tab can_baud_rate_tab[] =
{
CAN20kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
150
)},
{
CAN20kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
150
)},
{
CAN10kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
300
)}
{
CAN10kBaud
,
(
CAN_SJW_2TQ
|
CAN_BS1_9TQ
|
CAN_BS2_5TQ
|
300
)}
};
};
#endif
#elif defined (SOC_SERIES_STM32F7)
/* APB1 54MHz(max) */
#elif defined (SOC_SERIES_STM32F7)
/* APB1 54MHz(max) */
static
const
struct
stm32_baud_rate_tab
can_baud_rate_tab
[]
=
static
const
struct
stm32_baud_rate_tab
can_baud_rate_tab
[]
=
{
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录