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

Merge pull request #1291 from nathantsoi/fix/obf4-shared-rx

Browse source 
optionally guard uart1 for ppm, depends on #1290
This commit is contained in:
J Blackman 2016-10-12 11:30:38 +11:00 • committed by GitHub
commit d928356fab
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/drivers/serial_uart.c
View file

@ -97,8 +97,12 @@ serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback,
{
uartPort_t *s = NULL;
if (USARTx == USART1) {
if (false) {
#ifdef USE_UART1
} else if (USARTx == USART1) {
s = serialUART1(baudRate, mode, options);
#endif
#ifdef USE_UART2
} else if (USARTx == USART2) {
s = serialUART2(baudRate, mode, options);

5
src/main/main.c
View file

@ -224,7 +224,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)

2
src/main/target/OMNIBUSF4/target.h
View file

@ -136,6 +136,8 @@
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_RX_SERIAL)
#define AVOID_UART1_FOR_PWM_PPM
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
#define TARGET_IO_PORTA 0xffff