OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged in tomasz_wozniak/nuttx/stm_build_fix_PWM_TIM2 (pull request #493) 

Build break fix: define PWM_TIM2_CH1CFG for channel 1 PWM

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Tomasz Wozniak 2017-09-26 19:45:45 +00:00 committed by Gregory Nutt
parent 4e3c159145 96d6bc9376
commit 9bc65f4686
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/stm32/stm32_pwm.h
View File

@ -174,7 +174,7 @@
#ifdef CONFIG_STM32_TIM2_CHANNEL1
# ifdef CONFIG_STM32_TIM2_CH1OUT
# define PWM_TIM2_CH1CFG GPIO_TIM2_CH1OUT
# define PWM_TIM2_CH1CFG GPIO_TIM2_CH1OUT_1
# else
# define PWM_TIM2_CH1CFG 0
# endif
@ -754,7 +754,7 @@
# elif CONFIG_STM32_TIM2_CHANNEL == 1
# define CONFIG_STM32_TIM2_CHANNEL1 1
# define CONFIG_STM32_TIM2_CH1MODE CONFIG_STM32_TIM2_CHMODE
# define PWM_TIM2_CH1CFG GPIO_TIM2_CH1OUT
# define PWM_TIM2_CH1CFG GPIO_TIM2_CH1OUT_1
# elif CONFIG_STM32_TIM2_CHANNEL == 2
# define CONFIG_STM32_TIM2_CHANNEL2 1
# define CONFIG_STM32_TIM2_CH2MODE CONFIG_STM32_TIM2_CHMODE