Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 22:05:17 +03:00
Code Issues Wiki Activity

Do proper IOConfigGPIOAF in ppmRxInit and pwmRxInit

Browse source 
Regression after #3991
This commit is contained in:
jflyper 2017-09-19 10:28:24 +09:00
parent c4e47ddede
commit f3f7029e85
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/drivers/rx_pwm.c
View file

@ -385,12 +385,9 @@ void pwmRxInit(const pwmConfig_t *pwmConfig)
IOInit(io, OWNER_PWMINPUT, RESOURCE_INDEX(channel)); IOInit(io, OWNER_PWMINPUT, RESOURCE_INDEX(channel));
#ifdef STM32F1 #ifdef STM32F1
IOConfigGPIO(io, IOCFG_IPD); IOConfigGPIO(io, IOCFG_IPD);
#elif defined(STM32F7)
IOConfigGPIOAF(io, IOCFG_AF_PP, timer->alternateFunction);
#else #else
IOConfigGPIO(io, IOCFG_AF_PP); IOConfigGPIOAF(io, IOCFG_AF_PP, timer->alternateFunction);
#endif #endif
timerConfigure(timer, (uint16_t)PWM_TIMER_PERIOD, PWM_TIMER_1MHZ); timerConfigure(timer, (uint16_t)PWM_TIMER_PERIOD, PWM_TIMER_1MHZ);
timerChCCHandlerInit(&port->edgeCb, pwmEdgeCallback); timerChCCHandlerInit(&port->edgeCb, pwmEdgeCallback);
timerChOvrHandlerInit(&port->overflowCb, pwmOverflowCallback); timerChOvrHandlerInit(&port->overflowCb, pwmOverflowCallback);
@ -442,10 +439,8 @@ void ppmRxInit(const ppmConfig_t *ppmConfig)
IOInit(io, OWNER_PPMINPUT, 0); IOInit(io, OWNER_PPMINPUT, 0);
#ifdef STM32F1 #ifdef STM32F1
IOConfigGPIO(io, IOCFG_IPD); IOConfigGPIO(io, IOCFG_IPD);
#elif defined(STM32F7)
IOConfigGPIOAF(io, IOCFG_AF_PP, timer->alternateFunction);
#else #else
IOConfigGPIO(io, IOCFG_AF_PP); IOConfigGPIOAF(io, IOCFG_AF_PP, timer->alternateFunction);
#endif #endif
timerConfigure(timer, (uint16_t)PPM_TIMER_PERIOD, PWM_TIMER_1MHZ); timerConfigure(timer, (uint16_t)PPM_TIMER_PERIOD, PWM_TIMER_1MHZ);