Merge pull request #7993 from evva-sfw/hotfix/efm32_hal_pwmout_set_period_fix

Cruz Monrreal · web-flow · commit 7d54df66b1b0 · 2018-09-20T13:42:04.000-05:00
Fix EFM32 pwmout hal function pwmout_period
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/pwmout_api.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/pwmout_api.c
@@ -302,7 +302,7 @@ void pwmout_period(pwmout_t *obj, float seconds)
     }
 
     //Check if anything changed
-    if(((PWM_TIMER->CTRL & ~_TIMER_CTRL_PRESC_MASK) == (pwm_prescaler_div << _TIMER_CTRL_PRESC_SHIFT)) && (TIMER_TopGet(PWM_TIMER) == cycles)) return;
+    if(((PWM_TIMER->CTRL & _TIMER_CTRL_PRESC_MASK) == (pwm_prescaler_div << _TIMER_CTRL_PRESC_SHIFT)) && (TIMER_TopGet(PWM_TIMER) == cycles)) return;
 
     //Save previous period for recalculation of duty cycles
     uint32_t previous_period_cycles = PWM_TIMER->TOPB;

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ void pwmout_period(pwmout_t *obj, float seconds)`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`//Check if anything changed`
`305`		`- if(((PWM_TIMER->CTRL & ~_TIMER_CTRL_PRESC_MASK) == (pwm_prescaler_div << _TIMER_CTRL_PRESC_SHIFT)) && (TIMER_TopGet(PWM_TIMER) == cycles)) return;`
	`305`	`+ if(((PWM_TIMER->CTRL & _TIMER_CTRL_PRESC_MASK) == (pwm_prescaler_div << _TIMER_CTRL_PRESC_SHIFT)) && (TIMER_TopGet(PWM_TIMER) == cycles)) return;`
`306`	`306`
`307`	`307`	`//Save previous period for recalculation of duty cycles`
`308`	`308`	`uint32_t previous_period_cycles = PWM_TIMER->TOPB;`