diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h index 33fb04fb8..317f1a940 100644 --- a/src/main/target/AIR32/target.h +++ b/src/main/target/AIR32/target.h @@ -96,8 +96,6 @@ //#define CURRENT_METER_ADC_PIN PA5 #define RSSI_ADC_PIN PB2 -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h index f91f87b3a..3872e070b 100755 --- a/src/main/target/AIRHEROF3/target.h +++ b/src/main/target/AIRHEROF3/target.h @@ -88,8 +88,6 @@ #define SERIALRX_UART SERIAL_PORT_USART2 #define RX_CHANNELS_TAER -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/ALIENFLIGHTF1/target.h b/src/main/target/ALIENFLIGHTF1/target.h index 596b4f47a..53a411a08 100644 --- a/src/main/target/ALIENFLIGHTF1/target.h +++ b/src/main/target/ALIENFLIGHTF1/target.h @@ -62,8 +62,8 @@ #define RSSI_ADC_PIN PA1 #define EXTERNAL1_ADC_PIN PA5 -#define SPEKTRUM_BIND_PIN PA3 - +#define USE_SPEKTRUM_BIND +#define USE_SPEKTRUM_BIND_PLUG #define BINDPLUG_PIN PB5 #define DEFAULT_FEATURES FEATURE_MOTOR_STOP diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h index f0ce648bc..41bf66172 100644 --- a/src/main/target/ALIENFLIGHTF3/target.h +++ b/src/main/target/ALIENFLIGHTF3/target.h @@ -114,8 +114,6 @@ // LED strip configuration. #define LED_STRIP -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define BINDPLUG_PIN PB12 #define DEFAULT_FEATURES FEATURE_MOTOR_STOP diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index bb7b3329d..d149a32e7 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -162,8 +162,6 @@ // LED strip configuration. #define LED_STRIP -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define BINDPLUG_PIN PB2 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index 7e07c3867..685d99775 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -171,8 +171,6 @@ // LED strip configuration. #define LED_STRIP -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define BINDPLUG_PIN PB2 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index cc8885449..fb617e44f 100755 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -127,8 +127,6 @@ #define SBUS_TELEMETRY_UART SERIAL_PORT_USART1 #define DEFAULT_FEATURES (FEATURE_TELEMETRY | FEATURE_OSD) -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index a9ec2522b..e6d7e7b1f 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -152,8 +152,6 @@ #define USE_SERIAL_4WAY_BLHELI_INTERFACE -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC 0xffff diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h index d03e0aa67..23e3af7c4 100644 --- a/src/main/target/CC3D/target.h +++ b/src/main/target/CC3D/target.h @@ -93,8 +93,6 @@ #define VBAT_ADC_PIN PA0 #define RSSI_ADC_PIN PB0 -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE //#define SONAR diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h index 84d573b88..e75e2a7b9 100644 --- a/src/main/target/CJMCU/target.h +++ b/src/main/target/CJMCU/target.h @@ -107,7 +107,7 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define USE_RX_MSP -#define SPEKTRUM_BIND_PIN PA3 // UART2, PA3 +#define USE_SPEKTRUM_BIND #endif //USE_RX_NRF24 diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h index 8ddfe2e40..c76ca7bc5 100644 --- a/src/main/target/CLRACINGF4/target.h +++ b/src/main/target/CLRACINGF4/target.h @@ -122,8 +122,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_FEATURES ( FEATURE_OSD ) #define CURRENT_METER_SCALE_DEFAULT 250 -#define SPEKTRUM_BIND_PIN UART6_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA (0xffff & ~(BIT(14)|BIT(13))) diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h index 62ab3fe00..12da28684 100644 --- a/src/main/target/CLRACINGF7/target.h +++ b/src/main/target/CLRACINGF7/target.h @@ -120,7 +120,6 @@ // LED strip configuration. #define LED_STRIP -#define SPEKTRUM_BIND_PIN UART6_RX_PIN #define BINDPLUG_PIN PB2 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h index a59e827ab..519f61c14 100644 --- a/src/main/target/DOGE/target.h +++ b/src/main/target/DOGE/target.h @@ -130,8 +130,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // !!TODO - check the TARGET_IO_PORTs are correct diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h index 91280a0fa..2e6f518e9 100644 --- a/src/main/target/F4BY/target.h +++ b/src/main/target/F4BY/target.h @@ -146,8 +146,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define SPEKTRUM_BIND_PIN UART6_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h index 5e5069d0c..d754e40d6 100644 --- a/src/main/target/FF_FORTINIF4/target.h +++ b/src/main/target/FF_FORTINIF4/target.h @@ -103,8 +103,6 @@ #define SERIAL_PORT_COUNT 5 //SPECKTRUM BIND -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define CMS #define USE_MSP_DISPLAYPORT /*---------------------------------*/ diff --git a/src/main/target/FF_PIKOBLX/target.h b/src/main/target/FF_PIKOBLX/target.h index 2b7d9ed72..b42237047 100644 --- a/src/main/target/FF_PIKOBLX/target.h +++ b/src/main/target/FF_PIKOBLX/target.h @@ -94,12 +94,6 @@ #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART3 -#if defined(FF_RADIANCE) -#define SPEKTRUM_BIND_PIN UART2_RX_PIN -#else -#define SPEKTRUM_BIND_PIN UART3_RX_PIN -#endif - #define TRANSPONDER #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h index ab0cb499c..4d34b84f1 100644 --- a/src/main/target/FF_PIKOF4/target.h +++ b/src/main/target/FF_PIKOF4/target.h @@ -98,8 +98,6 @@ #define UART6_TX_PIN PC6 #define SERIAL_PORT_COUNT 4 -//SPECKTRUM BIND -#define SPEKTRUM_BIND_PIN UART3_RX_PIN #define CMS #define USE_MSP_DISPLAYPORT diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h index 550666518..9e73b2566 100644 --- a/src/main/target/FRSKYF3/target.h +++ b/src/main/target/FRSKYF3/target.h @@ -138,8 +138,6 @@ #define TELEMETRY_UART SERIAL_PORT_USART3 #define SERIALRX_UART SERIAL_PORT_USART2 -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h index 26b83a916..82674200d 100644 --- a/src/main/target/FRSKYF4/target.h +++ b/src/main/target/FRSKYF4/target.h @@ -123,8 +123,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_FEATURES (FEATURE_OSD) #define AVOID_UART1_FOR_PWM_PPM -#define SPEKTRUM_BIND_PIN UART1_RX_PIN - #define SERIALRX_PROVIDER SERIALRX_SBUS #define TELEMETRY_UART SERIAL_PORT_USART6 #define SERIALRX_UART SERIAL_PORT_USART1 diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index 5a9d89384..5785dde8d 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -169,8 +169,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_ESC_SENSOR diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 182b662e3..69d47398c 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -179,8 +179,6 @@ #define SERIALRX_UART SERIAL_PORT_USART1 #define SERIALRX_PROVIDER SERIALRX_SBUS -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h index 335d1513a..96fa4bb4a 100644 --- a/src/main/target/FURYF7/target.h +++ b/src/main/target/FURYF7/target.h @@ -138,7 +138,11 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS -#define SPEKTRUM_BIND_PIN PB11 +// XXX To target maintainer: +// USE_SPEKTRUM_BIND is enabled for this target, and it will use +// RX (or TX if half-duplex) pin of the UART the receiver is connected. +// If PB11 is critical for this target, please resurrect this line. +//#define SPEKTRUM_BIND_PIN PB11 #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h index f63687d56..5efa651d0 100644 --- a/src/main/target/IMPULSERCF3/target.h +++ b/src/main/target/IMPULSERCF3/target.h @@ -91,8 +91,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART2 -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h index 41a478ffa..18454b71b 100644 --- a/src/main/target/IRCFUSIONF3/target.h +++ b/src/main/target/IRCFUSIONF3/target.h @@ -81,8 +81,6 @@ #undef LED_STRIP -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE /* diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h index 2367ef215..3d3040bdc 100644 --- a/src/main/target/ISHAPEDF3/target.h +++ b/src/main/target/ISHAPEDF3/target.h @@ -105,8 +105,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h index 46e7b3c44..0509f4640 100644 --- a/src/main/target/KISSFC/target.h +++ b/src/main/target/KISSFC/target.h @@ -101,8 +101,6 @@ #define AVOID_UART2_FOR_PWM_PPM -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC 0xffff diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h index 0f7248572..ce2130349 100644 --- a/src/main/target/KIWIF4/target.h +++ b/src/main/target/KIWIF4/target.h @@ -178,8 +178,6 @@ #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART1 -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index fea3621ee..d8b8d4e12 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -157,8 +157,6 @@ #define DEFAULT_FEATURES (FEATURE_TELEMETRY) #endif -#define SPEKTRUM_BIND_PIN UART1_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_ESCSERIAL diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h index 7c2431aa4..ab0db600f 100644 --- a/src/main/target/MICROSCISKY/target.h +++ b/src/main/target/MICROSCISKY/target.h @@ -70,7 +70,7 @@ #define USE_I2C_DEVICE_2 #define I2C_DEVICE (I2CDEV_2) -#define SPEKTRUM_BIND_PIN PA3 +#define USE_SPEKTRUM_BIND #define BRUSHED_MOTORS #define DEFAULT_FEATURES FEATURE_MOTOR_STOP diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index f9e0d681f..c9c60b6f5 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -98,8 +98,6 @@ #define USE_ESC_SENSOR -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h index 0e249af07..38caeb8f0 100755 --- a/src/main/target/MULTIFLITEPICO/target.h +++ b/src/main/target/MULTIFLITEPICO/target.h @@ -123,8 +123,6 @@ #define SERIALRX_UART SERIAL_PORT_USART3 #define RX_CHANNELS_TAER -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define BINDPLUG_PIN PA13 #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h index 1de6785bf..4c24d3f37 100644 --- a/src/main/target/NAZE/target.h +++ b/src/main/target/NAZE/target.h @@ -146,7 +146,7 @@ #define RSSI_ADC_PIN PA1 #define EXTERNAL1_ADC_PIN PA5 -#define SPEKTRUM_BIND_PIN PA3 +#define USE_SPEKTRUM_BIND_PIN #define DEFAULT_RX_FEATURE FEATURE_RX_PPM diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h index 3106be009..225f3c03c 100644 --- a/src/main/target/NERO/target.h +++ b/src/main/target/NERO/target.h @@ -128,8 +128,6 @@ #define USE_SERIAL_4WAY_BLHELI_INTERFACE -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC 0xffff diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index 50f3e3a75..d929657e6 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -169,11 +169,6 @@ //#define AVOID_UART3_FOR_PWM_PPM // Disable this for using UART3 -#define USE_SPEKTRUM_BIND -#define USE_SPEKTRUM_BIND_PLUG -//#define SPEKTRUM_BIND_PIN NONE // Place holder -//#define BINDPLUG_PIN NONE // Place holder - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 377507483..4be0de971 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -189,8 +189,6 @@ #define DEFAULT_FEATURES (FEATURE_OSD) #define AVOID_UART1_FOR_PWM_PPM -#define SPEKTRUM_BIND_PIN UART1_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA (0xffff & ~(BIT(14)|BIT(13))) diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h index 93f1e3730..2aa351b0d 100644 --- a/src/main/target/RCEXPLORERF3/target.h +++ b/src/main/target/RCEXPLORERF3/target.h @@ -109,8 +109,6 @@ #define NAV_GPS_GLITCH_DETECTION #define NAV_MAX_WAYPOINTS 60 -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 0c3926c7e..c9ddb3d1a 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -258,8 +258,6 @@ #define DEFAULT_FEATURES FEATURE_TELEMETRY #endif -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h index 67c178b5b..178d782f6 100644 --- a/src/main/target/REVONANO/target.h +++ b/src/main/target/REVONANO/target.h @@ -84,8 +84,6 @@ #define VBAT_ADC_PIN PA6 #define RSSI_ADC_PIN PA5 -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC 0xffff diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h index b83c875a1..62b2830b1 100644 --- a/src/main/target/RG_SSD_F3/target.h +++ b/src/main/target/RG_SSD_F3/target.h @@ -144,8 +144,6 @@ #define USE_SERIAL_4WAY_BLHELI_INTERFACE -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - // IO - stm32f303rc in 64pin package #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h index 34fbef33f..4d2a62ea7 100644 --- a/src/main/target/SINGULARITY/target.h +++ b/src/main/target/SINGULARITY/target.h @@ -92,8 +92,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART2 -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h index 52b68f9cb..287612fb0 100644 --- a/src/main/target/SIRINFPV/target.h +++ b/src/main/target/SIRINFPV/target.h @@ -148,8 +148,6 @@ #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_OSD) diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h index ef2fb481f..8730eb926 100644 --- a/src/main/target/SPARKY/target.h +++ b/src/main/target/SPARKY/target.h @@ -90,8 +90,6 @@ #define USE_SERIAL_4WAY_BLHELI_INTERFACE -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - //#define SONAR //#define SONAR_ECHO_PIN PB1 //#define SONAR_TRIGGER_PIN PA2 diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index baf48775e..b2c5f4875 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -189,8 +189,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h index 80da46617..19c19b478 100755 --- a/src/main/target/SPRACINGF3EVO/target.h +++ b/src/main/target/SPRACINGF3EVO/target.h @@ -172,8 +172,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h index eefad2699..cc6af1328 100644 --- a/src/main/target/SPRACINGF3MINI/target.h +++ b/src/main/target/SPRACINGF3MINI/target.h @@ -186,8 +186,6 @@ #define BINDPLUG_PIN BUTTON_B_PIN #endif -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC (BIT(13)|BIT(14)|BIT(15)) diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index de917c859..3986fcc09 100755 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -184,8 +184,6 @@ #define BUTTONS // Physically located on the optional OSD/VTX board. #define BUTTON_A_PIN PD2 -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - // FIXME While it's possible to use the button on the OSD/VTX board for binding enabling it here will break binding unless you have the OSD/VTX connected. //#define BINDPLUG_PIN BUTTON_A_PIN diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h index 256e1a31c..0065aa4d3 100644 --- a/src/main/target/SPRACINGF4EVO/target.h +++ b/src/main/target/SPRACINGF4EVO/target.h @@ -176,8 +176,6 @@ #define TELEMETRY_UART SERIAL_PORT_UART5 #define SERIALRX_PROVIDER SERIALRX_SBUS -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h index 04b18fde1..01960602e 100644 --- a/src/main/target/SPRACINGF4NEO/target.h +++ b/src/main/target/SPRACINGF4NEO/target.h @@ -214,8 +214,6 @@ #define BUTTON_A_PIN PB8 #endif -#define SPEKTRUM_BIND_PIN UART2_RX_PIN - // FIXME While it's possible to use the button on the OSD/VTX board for binding enabling it here will break binding unless you have the OSD/VTX connected. //#define BINDPLUG_PIN BUTTON_A_PIN diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index 460e8c1d9..a5fefed4d 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -175,8 +175,6 @@ #define USE_ESC_SENSOR -#define SPEKTRUM_BIND_PIN PA3 // USART2, PA3 - #define SONAR #define SONAR_TRIGGER_PIN PB0 #define SONAR_ECHO_PIN PB1 diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h index 814cd2acb..20a96924a 100644 --- a/src/main/target/VRRACE/target.h +++ b/src/main/target/VRRACE/target.h @@ -165,10 +165,6 @@ //#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -/* -#define SPEKTRUM_BIND_PIN PB11 -*/ - #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h index 5984c6acc..8762fac96 100644 --- a/src/main/target/X_RACERSPI/target.h +++ b/src/main/target/X_RACERSPI/target.h @@ -115,8 +115,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define SPEKTRUM_BIND_PIN UART3_RX_PIN - #define USE_SERIAL_4WAY_BLHELI_INTERFACE // IO - stm32f303cc in 48pin package diff --git a/src/main/target/common_fc_pre.h b/src/main/target/common_fc_pre.h index 47a6c182e..3f86f13b5 100644 --- a/src/main/target/common_fc_pre.h +++ b/src/main/target/common_fc_pre.h @@ -125,7 +125,7 @@ #ifdef USE_SERIALRX_SPEKTRUM #define USE_SPEKTRUM_BIND -#define USE_SPEKTRUM_BINDPIN +#define USE_SPEKTRUM_BIND_PLUG #endif #endif