Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Multiple stm32l4 timer fixes:

Browse Source 
- too many parentheses when calculating max chan count (???)
- channel 4 does not have a complementary output
This commit is contained in:
Sebastien Lorquet
2016-10-14 12:50:45 +02:00
parent 4195692bb4
commit f7e0a36f55
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32l4/stm32l4_pwm.c
+2 -2
View File
@@ -1206,7 +1206,7 @@ static int stm32l4pwm_timer(FAR struct stm32l4_pwmtimer_s *priv,
*/ */
ccer &= ~(ATIM_CCER_CC1NE | ATIM_CCER_CC1NP | ATIM_CCER_CC2NE | ATIM_CCER_CC2NP | ccer &= ~(ATIM_CCER_CC1NE | ATIM_CCER_CC1NP | ATIM_CCER_CC2NE | ATIM_CCER_CC2NP |
ATIM_CCER_CC3NE | ATIM_CCER_CC3NP | ATIM_CCER_CC4NP); ATIM_CCER_CC3NE | ATIM_CCER_CC3NP);
/* Reset the output compare and output compare N IDLE State */ /* Reset the output compare and output compare N IDLE State */
@@ -1225,7 +1225,7 @@ static int stm32l4pwm_timer(FAR struct stm32l4_pwmtimer_s *priv,
else else
#endif #endif
{ {
ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP | ATIM_CCER_CC4NP); ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP);
} }
/* Save the modified register values */ /* Save the modified register values */
arch/arm/src/stm32l4/stm32l4_pwm.h
+1 -1
View File
@@ -422,7 +422,7 @@
PWM_MAX(PWM_TIM8_NCHANNELS, \ PWM_MAX(PWM_TIM8_NCHANNELS, \
PWM_MAX(PWM_TIM15_NCHANNELS, \ PWM_MAX(PWM_TIM15_NCHANNELS, \
PWM_MAX(PWM_TIM16_NCHANNELS, \ PWM_MAX(PWM_TIM16_NCHANNELS, \
PWM_TIM17_NCHANNELS)))))))))))))) PWM_TIM17_NCHANNELS))))))))
#else #else