andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #878. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10471 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-08-24 11:26:41 +00:00
parent db035833f5
commit 7426edd2a2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
os/hal/ports/STM32/LLD/CANv1/hal_can_lld.c
View File

@ -162,14 +162,13 @@ static void can_lld_set_filters(CANDriver* canp,
#endif #endif
canp->can->FM1R = 0; canp->can->FM1R = 0;
canp->can->FFA1R = 0; canp->can->FFA1R = 0;
#if STM32_CAN_USE_CAN2
if(canp == &CAND1) {
canp->can->FS1R = 1 | (1 << can2sb);
canp->can->FA1R = 1 | (1 << can2sb);
}
#else
canp->can->FS1R = 1; canp->can->FS1R = 1;
canp->can->FA1R = 1; canp->can->FA1R = 1;
#if STM32_CAN_USE_CAN2
if(canp == &CAND1) {
canp->can->FS1R |= 1 << can2sb;
canp->can->FA1R |= 1 << can2sb;
}
#endif #endif
} }
canp->can->FMR &= ~CAN_FMR_FINIT; canp->can->FMR &= ~CAN_FMR_FINIT;

2
readme.txt
View File

@ -93,6 +93,8 @@
dependencies and configuration directories. This makes possible dependencies and configuration directories. This makes possible
to have multiple non-conflicting makefiles in the same project. to have multiple non-conflicting makefiles in the same project.
Updated the various platform.mk implementing "smart build" mode. Updated the various platform.mk implementing "smart build" mode.
- HAL: Fixed invalid STM32 CAN3 filters initialization (bug #878)
(backported to 17.6.1).
- HAL: Fixed missing CAN definitions in STM32L432 registry entry (bug #877) - HAL: Fixed missing CAN definitions in STM32L432 registry entry (bug #877)
(backported to 17.6.1). (backported to 17.6.1).
- HAL: Fixed missing STM32_TIM_MAX_CHANNELS definition in STM32L0 registry - HAL: Fixed missing STM32_TIM_MAX_CHANNELS definition in STM32L0 registry