From 00e51f4fe22561da43d119fdb931d39b7371b028 Mon Sep 17 00:00:00 2001 From: Laurent MEUNIER Date: Wed, 29 Jun 2016 10:59:59 +0200 Subject: [PATCH] [STM32F0] 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. --- .../TARGET_STM32F0/common_objects.h | 1 + .../TARGET_STM/TARGET_STM32F0/pwmout_api.c | 34 +++++++++++++++---- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F0/common_objects.h b/hal/targets/hal/TARGET_STM/TARGET_STM32F0/common_objects.h index f2d09cd2a4..e2e7903613 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F0/common_objects.h +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F0/common_objects.h @@ -42,6 +42,7 @@ extern "C" { struct pwmout_s { PWMName pwm; PinName pin; + uint32_t prescaler; uint32_t period; uint32_t pulse; }; diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F0/pwmout_api.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F0/pwmout_api.c index d2504ec910..ccb1ec593c 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F0/pwmout_api.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F0/pwmout_api.c @@ -75,6 +75,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 } @@ -101,7 +102,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_DISABLE; @@ -265,18 +266,39 @@ void pwmout_period_us(pwmout_t* obj, int us) { // Update the SystemCoreClock variable SystemCoreClockUpdate(); - TimHandle.Init.Period = us - 1; - TimHandle.Init.Prescaler = (uint16_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick + /* 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; - HAL_TIM_PWM_Init(&TimHandle); - // Set duty cycle again - pwmout_write(obj, dc); + if (HAL_TIM_PWM_Init(&TimHandle) != HAL_OK) { + error("Cannot initialize PWM"); + } // Save for future use obj->period = us; + // Set duty cycle again + pwmout_write(obj, dc); + __HAL_TIM_ENABLE(&TimHandle); }