summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Han <[email protected]>2019-08-15 13:38:44 +0800
committerWu Han <[email protected]>2019-08-15 13:38:44 +0800
commit2e90a7e5b2a984a5fdba24564e930a74a97bb01b (patch)
tree69bd28e534044f34c89ab57d15f7719fb3c173df
parent6a1e12f178ad82032d4171b0289b72cffcf32aa0 (diff)
[stm32][driver] switch HAL_TIM_PWM_Init with HAL_TIM_Base_Init for new CubeMX
-rw-r--r--bsp/stm32/libraries/HAL_Drivers/drv_pwm.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c b/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c
index e1078b5d20..247c8f88fe 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c
@@ -314,9 +314,6 @@ static rt_err_t stm32_hw_pwm_init(struct stm32_pwm *device)
tim = (TIM_HandleTypeDef *)&device->tim_handle;
- /* enable timer clock */
- HAL_TIM_PWM_MspInit(tim);
-
/* configure the timer to pwm mode */
tim->Init.Prescaler = 0;
tim->Init.CounterMode = TIM_COUNTERMODE_UP;
@@ -325,24 +322,25 @@ static rt_err_t stm32_hw_pwm_init(struct stm32_pwm *device)
#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32L4)
tim->Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
#endif
- if (HAL_TIM_Base_Init(tim) != HAL_OK)
+
+ if (HAL_TIM_PWM_Init(tim) != HAL_OK)
{
- LOG_E("%s time base init failed", device->name);
+ LOG_E("%s pwm init failed", device->name);
result = -RT_ERROR;
goto __exit;
}
- clock_config.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
- if (HAL_TIM_ConfigClockSource(tim, &clock_config) != HAL_OK)
+ if (HAL_TIM_Base_Init(tim) != HAL_OK)
{
- LOG_E("%s clock init failed", device->name);
+ LOG_E("%s time base init failed", device->name);
result = -RT_ERROR;
goto __exit;
}
- if (HAL_TIM_PWM_Init(tim) != HAL_OK)
+ clock_config.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+ if (HAL_TIM_ConfigClockSource(tim, &clock_config) != HAL_OK)
{
- LOG_E("%s pwm init failed", device->name);
+ LOG_E("%s clock init failed", device->name);
result = -RT_ERROR;
goto __exit;
}