diff options
| author | Bernard Xiong <[email protected]> | 2019-10-28 16:16:35 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-10-28 16:16:35 +0800 |
| commit | 97fcbdeccc7403e92ede8e011ab204d4b2749802 (patch) | |
| tree | 2ce5b60d681909a174513f076f290c2828f38ce2 | |
| parent | f67f1e9058b82d6a3c5942c1afaa500f1721a737 (diff) | |
| parent | d3f8b9b9c14b0c4b79bc67efb8d4ff65f9552f50 (diff) | |
Merge pull request #3155 from z14git/pwm_led
修复pwm初始化时，相应的时钟没有使能的问题
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/drv_pwm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c b/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c index ef89018eca..2c2af0dcc0 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c @@ -323,13 +323,6 @@ static rt_err_t stm32_hw_pwm_init(struct stm32_pwm *device) tim->Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; #endif - if (HAL_TIM_PWM_Init(tim) != HAL_OK) - { - LOG_E("%s pwm init failed", device->name); - result = -RT_ERROR; - goto __exit; - } - if (HAL_TIM_Base_Init(tim) != HAL_OK) { LOG_E("%s time base init failed", device->name); @@ -345,6 +338,13 @@ static rt_err_t stm32_hw_pwm_init(struct stm32_pwm *device) goto __exit; } + if (HAL_TIM_PWM_Init(tim) != HAL_OK) + { + LOG_E("%s pwm init failed", device->name); + result = -RT_ERROR; + goto __exit; + } + master_config.MasterOutputTrigger = TIM_TRGO_RESET; master_config.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; if (HAL_TIMEx_MasterConfigSynchronization(tim, &master_config) != HAL_OK) |