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

Fixed conditionals for SPEKTRUM_BIND_PIN.

Browse source
This commit is contained in:
Michael Keller 2017-04-10 09:35:24 +12:00
parent 0e1dc33371
commit 9204d0a34e
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/cli.c
View file

@ -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) }, { "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) }, { "sbus_inversion", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_CONFIG, offsetof(rxConfig_t, sbus_inversion) },
#endif #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", 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) }, { "spektrum_sat_bind_autoreset",VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 1 }, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_sat_bind_autoreset) },
#endif #endif

2
src/main/fc/fc_init.c
View file

@ -253,7 +253,7 @@ void init(void)
} }
#endif #endif
#ifdef SPEKTRUM_BIND #ifdef SPEKTRUM_BIND_PIN
if (feature(FEATURE_RX_SERIAL)) { if (feature(FEATURE_RX_SERIAL)) {
switch (rxConfig()->serialrx_provider) { switch (rxConfig()->serialrx_provider) {
case SERIALRX_SPEKTRUM1024: case SERIALRX_SPEKTRUM1024:

7
src/main/target/SPRACINGF3NEO/target.h
View file

@ -60,9 +60,10 @@
#define USE_UART3 #define USE_UART3
#define USE_UART4 #define USE_UART4
#define USE_UART5 #define USE_UART5
#define USE_SOFTSERIAL1 //#define USE_SOFTSERIAL1
#define USE_SOFTSERIAL2 //#define USE_SOFTSERIAL2
#define SERIAL_PORT_COUNT 8 //#define SERIAL_PORT_COUNT 8
#define SERIAL_PORT_COUNT 6
#define UART1_TX_PIN PA9 #define UART1_TX_PIN PA9
#define UART1_RX_PIN PA10 #define UART1_RX_PIN PA10