Merge pull request #11007 from SiliconLabs/fix/fpga_tests/pwm

Arto Kinnunen · web-flow · commit 01484a222673 · 2019-07-15T15:43:46.000+03:00
Fix PWM output on Silicon Labs targets for large pulsewidths
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/pwmout_api.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/pwmout_api.c
@@ -342,13 +342,13 @@ void pwmout_pulsewidth(pwmout_t *obj, float seconds)
 
 void pwmout_pulsewidth_ms(pwmout_t *obj, int ms)
 {
-    uint16_t width_cycles = (uint16_t) ((REFERENCE_FREQUENCY >> pwm_prescaler_div) * ms) / 1000;
+    uint16_t width_cycles = (uint16_t) (((REFERENCE_FREQUENCY >> pwm_prescaler_div) * ms) / 1000);
     TIMER_CompareBufSet(PWM_TIMER, obj->channel, width_cycles);
 }
 
 void pwmout_pulsewidth_us(pwmout_t *obj, int us)
 {
-    uint16_t width_cycles = (uint16_t) ((REFERENCE_FREQUENCY >> pwm_prescaler_div) * us) / 1000000;
+    uint16_t width_cycles = (uint16_t) (((uint64_t)(REFERENCE_FREQUENCY >> pwm_prescaler_div) * (uint64_t)us) / 1000000UL);
     TIMER_CompareBufSet(PWM_TIMER, obj->channel, width_cycles);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -342,13 +342,13 @@ void pwmout_pulsewidth(pwmout_t *obj, float seconds)`
`342`	`342`
`343`	`343`	`void pwmout_pulsewidth_ms(pwmout_t *obj, int ms)`
`344`	`344`	`{`
`345`		`- uint16_t width_cycles = (uint16_t) ((REFERENCE_FREQUENCY >> pwm_prescaler_div) * ms) / 1000;`
	`345`	`+ uint16_t width_cycles = (uint16_t) (((REFERENCE_FREQUENCY >> pwm_prescaler_div) * ms) / 1000);`
`346`	`346`	`TIMER_CompareBufSet(PWM_TIMER, obj->channel, width_cycles);`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`void pwmout_pulsewidth_us(pwmout_t *obj, int us)`
`350`	`350`	`{`
`351`		`- uint16_t width_cycles = (uint16_t) ((REFERENCE_FREQUENCY >> pwm_prescaler_div) * us) / 1000000;`
	`351`	`+ uint16_t width_cycles = (uint16_t) (((uint64_t)(REFERENCE_FREQUENCY >> pwm_prescaler_div) * (uint64_t)us) / 1000000UL);`
`352`	`352`	`TIMER_CompareBufSet(PWM_TIMER, obj->channel, width_cycles);`
`353`	`353`	`}`
`354`	`354`