Merge pull request #4664 from bperry730/fix/st_can_api_freq

theotherjimmy · web-flow · commit a75f93534895 · 2017-07-17T11:06:04.000-05:00
STM32: Fix the CAN initializing to the wrong frequency
diff --git a/targets/TARGET_STM/can_api.c b/targets/TARGET_STM/can_api.c
@@ -85,8 +85,8 @@ void can_init_freq (can_t *obj, PinName rd, PinName td, int hz)
         error("Cannot initialize CAN");
     }
 
-    // Set initial CAN frequency to 100 kb/s
-    if (can_frequency(obj, 100000) != 1) {
+    // Set initial CAN frequency to specified frequency
+    if (can_frequency(obj, hz) != 1) {
         error("Can frequency could not be set\n");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ void can_init_freq (can_t *obj, PinName rd, PinName td, int hz)`
`85`	`85`	`error("Cannot initialize CAN");`
`86`	`86`	`}`
`87`	`87`
`88`		`- // Set initial CAN frequency to 100 kb/s`
`89`		`- if (can_frequency(obj, 100000) != 1) {`
	`88`	`+ // Set initial CAN frequency to specified frequency`
	`89`	`+ if (can_frequency(obj, hz) != 1) {`
`90`	`90`	`error("Can frequency could not be set\n");`
`91`	`91`	`}`
`92`	`92`