ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4801 from bcostm/fix_can_issue_4763 

STM32 CAN: Fix issue with speed function calculation
pull/4935/head
Jimmy Brisson 2017-08-14 11:36:17 -05:00 committed by GitHub
parent 097720670e cef5133092
commit 2766e56e3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
targets/TARGET_STM/can_api.c
View File

@ -180,10 +180,10 @@ static unsigned int can_speed(unsigned int pclk, unsigned int cclk, unsigned cha
}
if (hit) {
btr = ((timing_pts[bits][1] << 20) & 0x00700000)
| ((timing_pts[bits][0] << 16) & 0x000F0000)
| ((psjw << 24) & 0x0000C000)
| ((brp << 0) & 0x000003FF);
btr = ((timing_pts[bits][1] << CAN_BTR_TS2_Pos) & CAN_BTR_TS2) |
((timing_pts[bits][0] << CAN_BTR_TS1_Pos) & CAN_BTR_TS1) |
((psjw << CAN_BTR_SJW_Pos) & CAN_BTR_SJW) |
((brp << CAN_BTR_BRP_Pos) & CAN_BTR_BRP);
} else {
btr = 0xFFFFFFFF;
}