a1012112796/test_rtt_413
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zzc/dev/param_cfg' into main_f413

Browse Source 
* zzc/dev/param_cfg:
  核算can 波特率
This commit is contained in:
a1012112796
2023-11-30 17:34:27 +08:00
parent ec738f7452 130297f5ec
commit 424fbe755c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/HAL_Drivers/drv_can.c
View File

@@ -51,7 +51,7 @@ static const struct stm32_baud_rate_tab can_baud_rate_tab[] =
{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) */
#else /* APB1 50MHz(max) */
static const struct stm32_baud_rate_tab can_baud_rate_tab[] =
{
#ifdef BSP_USING_CAN168M
@@ -59,14 +59,14 @@ static const struct stm32_baud_rate_tab can_baud_rate_tab[] =
#else
{CAN1MBaud, (CAN_SJW_2TQ | CAN_BS1_6TQ | CAN_BS2_3TQ | 5)},
#endif
{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)}
// {CAN800kBaud, (CAN_SJW_2TQ | CAN_BS1_8TQ | CAN_BS2_5TQ | 4)},
{CAN500kBaud, (CAN_SJW_2TQ | CAN_BS1_1TQ | CAN_BS2_3TQ | 2)},
{CAN250kBaud, (CAN_SJW_2TQ | CAN_BS1_1TQ | CAN_BS2_3TQ | 4)},
{CAN125kBaud, (CAN_SJW_2TQ | CAN_BS1_4TQ | CAN_BS2_3TQ | 50)},
{CAN100kBaud, (CAN_SJW_2TQ | CAN_BS1_3TQ | CAN_BS2_6TQ | 50)},
{CAN50kBaud, (CAN_SJW_2TQ | CAN_BS1_1TQ | CAN_BS2_3TQ | 200)},
{CAN20kBaud, (CAN_SJW_2TQ | CAN_BS1_3TQ | CAN_BS2_6TQ | 250)},
{CAN10kBaud, (CAN_SJW_2TQ | CAN_BS1_12TQ | CAN_BS2_7TQ | 250)}
};
#endif
#elif defined (SOC_SERIES_STM32F7)/* APB1 54MHz(max) */