Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Merge branch 'master' into development

Browse source
This commit is contained in:
borisbstyle 2016-10-12 10:15:13 +02:00
commit aaafd4f661
9 changed files with 34 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/main.c
View file

@ -232,7 +232,10 @@ void init(void)
dmaInit();
#if defined(AVOID_UART2_FOR_PWM_PPM)
#if defined(AVOID_UART1_FOR_PWM_PPM)
serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL),
feature(FEATURE_RX_PPM) || feature(FEATURE_RX_PARALLEL_PWM) ? SERIAL_PORT_USART1 : SERIAL_PORT_NONE);
#elif defined(AVOID_UART2_FOR_PWM_PPM)
serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL),
feature(FEATURE_RX_PPM) || feature(FEATURE_RX_PARALLEL_PWM) ? SERIAL_PORT_USART2 : SERIAL_PORT_NONE);
#elif defined(AVOID_UART3_FOR_PWM_PPM)