Merge pull request #1713 from BartSX/stm32f4_can

0xc0170 · 0xc0170 · commit a97cf280f3f1 · 2016-05-09T12:31:39.000-05:00
[STM32F4 family] Assign CAN filter number properly
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/can_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/can_api.c
@@ -31,6 +31,7 @@ static can_irq_handler irq_handler;
 
 void can_init(can_t *obj, PinName rd, PinName td) 
 {
+    uint32_t filter_number;
     CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD);
     CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD);
     obj->can = (CANName)pinmap_merge(can_rd, can_td);
@@ -71,7 +72,10 @@ void can_init(can_t *obj, PinName rd, PinName td)
     if (HAL_CAN_Init(&CanHandle) != HAL_OK) {
        error("Cannot initialize CAN");
     }
-    can_filter(obj, 0, 0, CANStandard, 0);
+
+    filter_number = (obj->can == CAN_1) ? 0 : 14;
+
+    can_filter(obj, 0, 0, CANStandard, filter_number);
 }
 
 void can_irq_init(can_t *obj, can_irq_handler handler, uint32_t id) 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ static can_irq_handler irq_handler;`
`31`	`31`
`32`	`32`	`void can_init(can_t *obj, PinName rd, PinName td)`
`33`	`33`	`{`
	`34`	`+ uint32_t filter_number;`
`34`	`35`	`CANName can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD);`
`35`	`36`	`CANName can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD);`
`36`	`37`	`obj->can = (CANName)pinmap_merge(can_rd, can_td);`
`@@ -71,7 +72,10 @@ void can_init(can_t *obj, PinName rd, PinName td)`
`71`	`72`	`if (HAL_CAN_Init(&CanHandle) != HAL_OK) {`
`72`	`73`	`error("Cannot initialize CAN");`
`73`	`74`	`}`
`74`		`- can_filter(obj, 0, 0, CANStandard, 0);`
	`75`	`+`
	`76`	`+ filter_number = (obj->can == CAN_1) ? 0 : 14;`
	`77`	`+`
	`78`	`+ can_filter(obj, 0, 0, CANStandard, filter_number);`
`75`	`79`	`}`
`76`	`80`
`77`	`81`	`void can_irq_init(can_t *obj, can_irq_handler handler, uint32_t id)`