mirror of https://github.com/ARMmbed/mbed-os.git
[STM32L4] Handle higher range pwm periods
As first reported on STM32F3 family in #1682, we need to cope with periods in the seconds range as well. This is fixed here in the same way as was done for STM32F3 by using the pre-scaler.pull/2103/head
parent
6eab29cc09
commit
6dc9501153
|
@ -42,6 +42,7 @@ extern "C" {
|
|||
struct pwmout_s {
|
||||
PWMName pwm;
|
||||
PinName pin;
|
||||
uint32_t prescaler;
|
||||
uint32_t period;
|
||||
uint32_t pulse;
|
||||
uint8_t channel;
|
||||
|
|
|
@ -77,6 +77,7 @@ void pwmout_init(pwmout_t* obj, PinName pin)
|
|||
obj->pin = pin;
|
||||
obj->period = 0;
|
||||
obj->pulse = 0;
|
||||
obj->prescaler = 1;
|
||||
|
||||
pwmout_period_us(obj, 20000); // 20 ms per default
|
||||
}
|
||||
|
@ -104,7 +105,7 @@ void pwmout_write(pwmout_t* obj, float value)
|
|||
|
||||
// Configure channels
|
||||
sConfig.OCMode = TIM_OCMODE_PWM1;
|
||||
sConfig.Pulse = obj->pulse;
|
||||
sConfig.Pulse = obj->pulse / obj->prescaler;
|
||||
sConfig.OCPolarity = TIM_OCPOLARITY_HIGH;
|
||||
sConfig.OCNPolarity = TIM_OCNPOLARITY_HIGH;
|
||||
sConfig.OCFastMode = TIM_OCFAST_ENABLE;
|
||||
|
@ -168,22 +169,39 @@ void pwmout_period_us(pwmout_t* obj, int us)
|
|||
|
||||
SystemCoreClockUpdate();
|
||||
|
||||
TimHandle.Init.Period = us - 1;
|
||||
TimHandle.Init.Prescaler = (uint16_t)(SystemCoreClock / 1000000) - 1; // 1 us tick
|
||||
TimHandle.Init.ClockDivision = 0;
|
||||
TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
|
||||
TimHandle.Init.RepetitionCounter = 0;
|
||||
/* To make it simple, we use to possible prescaler values which lead to:
|
||||
* pwm unit = 1us, period/pulse can be from 1us to 65535us
|
||||
* or
|
||||
* pwm unit = 500us, period/pulse can be from 500us to ~32.76sec
|
||||
* Be careful that all the channels of a PWM shares the same prescaler
|
||||
*/
|
||||
if (us > 0xFFFF) {
|
||||
obj->prescaler = 500;
|
||||
} else {
|
||||
obj->prescaler = 1;
|
||||
}
|
||||
TimHandle.Init.Prescaler = ((SystemCoreClock / 1000000) * obj->prescaler) - 1;
|
||||
|
||||
if (TimHandle.Init.Prescaler > 0xFFFF)
|
||||
error("PWM: out of range prescaler");
|
||||
|
||||
TimHandle.Init.Period = (us - 1) / obj->prescaler;
|
||||
if (TimHandle.Init.Period > 0xFFFF)
|
||||
error("PWM: out of range period");
|
||||
|
||||
TimHandle.Init.ClockDivision = 0;
|
||||
TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
|
||||
|
||||
if (HAL_TIM_PWM_Init(&TimHandle) != HAL_OK) {
|
||||
error("Cannot initialize PWM\n");
|
||||
}
|
||||
|
||||
// Set duty cycle again
|
||||
pwmout_write(obj, dc);
|
||||
|
||||
// Save for future use
|
||||
obj->period = us;
|
||||
|
||||
// Set duty cycle again
|
||||
pwmout_write(obj, dc);
|
||||
|
||||
__HAL_TIM_ENABLE(&TimHandle);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue