Merge pull request #3880 from adustm/fix_can2_only

0xc0170 · web-flow · commit b2726470f633 · 2017-03-06T16:57:57.000Z
DISCO_F469NI: allow the use of CAN2 instance when CAN1 is not activated
diff --git a/targets/TARGET_STM/can_api.c b/targets/TARGET_STM/can_api.c
@@ -43,6 +43,7 @@ void can_init(can_t *obj, PinName rd, PinName td)
     }
 #if defined(CAN2_BASE) && (CAN_NUM == 2)
     else if (obj->can == CAN_2) {
+        __HAL_RCC_CAN1_CLK_ENABLE(); // needed to set filters
         __HAL_RCC_CAN2_CLK_ENABLE();
         obj->index = 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ void can_init(can_t *obj, PinName rd, PinName td)`
`43`	`43`	`}`
`44`	`44`	`#if defined(CAN2_BASE) && (CAN_NUM == 2)`
`45`	`45`	`else if (obj->can == CAN_2) {`
	`46`	`+ __HAL_RCC_CAN1_CLK_ENABLE(); // needed to set filters`
`46`	`47`	`__HAL_RCC_CAN2_CLK_ENABLE();`
`47`	`48`	`obj->index = 1;`
`48`	`49`	`}`