From 9204d0a34e7876b27195c91801534703822f84c6 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Mon, 10 Apr 2017 09:35:24 +1200 Subject: [PATCH] Fixed conditionals for SPEKTRUM_BIND_PIN. --- src/main/fc/cli.c | 2 +- src/main/fc/fc_init.c | 2 +- src/main/target/SPRACINGF3NEO/target.h | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c index df415e302d..0935a0f934 100755 --- a/src/main/fc/cli.c +++ b/src/main/fc/cli.c @@ -569,7 +569,7 @@ static const clivalue_t valueTable[] = { { "serialrx_provider", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_SERIAL_RX }, PG_RX_CONFIG, offsetof(rxConfig_t, serialrx_provider) }, { "sbus_inversion", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_CONFIG, offsetof(rxConfig_t, sbus_inversion) }, #endif -#ifdef SPEKTRUM_BIND +#ifdef SPEKTRUM_BIND_PIN { "spektrum_sat_bind", VAR_UINT8 | MASTER_VALUE, .config.minmax = { SPEKTRUM_SAT_BIND_DISABLED, SPEKTRUM_SAT_BIND_MAX}, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_sat_bind) }, { "spektrum_sat_bind_autoreset",VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 1 }, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_sat_bind_autoreset) }, #endif diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c index 0baea1564c..9bcc7d2e5c 100644 --- a/src/main/fc/fc_init.c +++ b/src/main/fc/fc_init.c @@ -253,7 +253,7 @@ void init(void) } #endif -#ifdef SPEKTRUM_BIND +#ifdef SPEKTRUM_BIND_PIN if (feature(FEATURE_RX_SERIAL)) { switch (rxConfig()->serialrx_provider) { case SERIALRX_SPEKTRUM1024: diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index ecfc8b282c..424bb1e9b2 100755 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -60,9 +60,10 @@ #define USE_UART3 #define USE_UART4 #define USE_UART5 -#define USE_SOFTSERIAL1 -#define USE_SOFTSERIAL2 -#define SERIAL_PORT_COUNT 8 +//#define USE_SOFTSERIAL1 +//#define USE_SOFTSERIAL2 +//#define SERIAL_PORT_COUNT 8 +#define SERIAL_PORT_COUNT 6 #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10