Browse Source

[stm32][driver] switch HAL_TIM_PWM_Init with HAL_TIM_Base_Init for new CubeMX

Wu Han 5 years ago
parent
commit
2e90a7e5b2
1 changed files with 8 additions and 10 deletions
  1. 8 10
      bsp/stm32/libraries/HAL_Drivers/drv_pwm.c

+ 8 - 10
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;
     }