From aaad1ced2542a17dd6abb44dd5a1ebe150decb5f Mon Sep 17 00:00:00 2001 From: jflyper Date: Mon, 6 Mar 2017 12:44:15 +0900 Subject: [PATCH] COLIBRI_RACE: Drop USE_SOFTSERIALx Per #2542 --- src/main/target/COLIBRI_RACE/target.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h index 42d28fd8a5..a05b5922a2 100755 --- a/src/main/target/COLIBRI_RACE/target.h +++ b/src/main/target/COLIBRI_RACE/target.h @@ -80,10 +80,15 @@ #define USE_UART1 #define USE_UART2 #define USE_UART3 -#define USE_SOFTSERIAL1 -#define USE_SOFTSERIAL2 - -#define SERIAL_PORT_COUNT 6 +// USE_SOFTSERIALx has a conflict with USE_BST that prevents FC from being recognized from configurator +// Drop USE_SOFTSERIALx until resolution is provided. +#ifdef SOFTSERIAL_BST_CONFLICT_RESOLVED +# define USE_SOFTSERIAL1 +# define USE_SOFTSERIAL2 +# define SERIAL_PORT_COUNT 6 +#else +# define SERIAL_PORT_COUNT 4 +#endif #define USE_ESCSERIAL #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1