From cf29e0cec7feb76c3076d25efb7dbdbfbd36317a Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Fri, 10 Nov 2017 16:17:58 +1300
Subject: [PATCH] Cleaned up usages of SPEKTRUM_BIND_PIN / BINDPLUG_PIN /
 RX_FLYSKY_BIND_PIN.

---
 src/main/rx/flysky.c                   | 8 ++++----
 src/main/target/ALIENFLIGHTF1/target.h | 2 --
 src/main/target/ALIENWHOOP/target.h    | 4 +---
 src/main/target/BETAFLIGHTF4/target.h  | 4 ----
 src/main/target/CJMCU/target.h         | 1 -
 src/main/target/EACHIF3/target.h       | 2 +-
 src/main/target/MICROSCISKY/target.h   | 2 --
 src/main/target/MOTOLABF4/target.h     | 4 ----
 src/main/target/NAZE/target.h          | 2 --
 9 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/main/rx/flysky.c b/src/main/rx/flysky.c
index 1fd11bb57f..f0a5630339 100644
--- a/src/main/rx/flysky.c
+++ b/src/main/rx/flysky.c
@@ -354,9 +354,9 @@ void flySkyInit (const struct rxConfig_s *rxConfig, struct rxRuntimeConfig_s *rx
         PG_RESET(flySkyConfig);
     }
 
-    IO_t bindIO = IOGetByTag(IO_TAG(RX_FLYSKY_BIND_PIN));
-    IOInit(bindIO, OWNER_RX_SPI_CS, 0);
-    IOConfigGPIO(bindIO, IOCFG_IPU);
+    IO_t bindPin = IOGetByTag(IO_TAG(BINDPLUG_PIN));
+    IOInit(bindPin, OWNER_RX_SPI_CS, 0);
+    IOConfigGPIO(bindPin, IOCFG_IPU);
 
     uint8_t startRxChannel;
 
@@ -375,7 +375,7 @@ void flySkyInit (const struct rxConfig_s *rxConfig, struct rxRuntimeConfig_s *rx
         A7105Config(flySkyRegs, sizeof(flySkyRegs));
     }
 
-    if ( !IORead(bindIO) || flySkyConfig()->txId == 0) {
+    if ( !IORead(bindPin) || flySkyConfig()->txId == 0) {
         bound = false;
     } else {
         bound = true;
diff --git a/src/main/target/ALIENFLIGHTF1/target.h b/src/main/target/ALIENFLIGHTF1/target.h
index 0e680e4ce8..ee79f66019 100644
--- a/src/main/target/ALIENFLIGHTF1/target.h
+++ b/src/main/target/ALIENFLIGHTF1/target.h
@@ -62,8 +62,6 @@
 #define RSSI_ADC_PIN            PA1
 #define EXTERNAL1_ADC_PIN       PA5
 
-#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/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h
index c89bd86a05..2187c8ec15 100644
--- a/src/main/target/ALIENWHOOP/target.h
+++ b/src/main/target/ALIENWHOOP/target.h
@@ -184,11 +184,9 @@
  */
 /* Assume Spektrum following defines inherited from common_fc_pre.h:
 //#define USE_SERIALRX_SPEKTRUM
-//#define USE_SPEKTRUM_BIND
-//#define USE_SPEKTRUM_BIND_PLUG
 */
+
 #define BINDPLUG_PIN            PC13 // PC13 Current Limited (3 mA). Not suitable for LED/Beeper
-#define SPEKTRUM_BIND_PIN       UART3_RX_PIN
 #define SERIALRX_UART           SERIAL_PORT_USART3
 #define RX_CHANNELS_TAER        //RX_CHANNELS_AETR
 #define SERIALRX_PROVIDER       SERIALRX_SPEKTRUM1024 //SERIALRX_SBUS
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index 745c8e5763..62888ad128 100755
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -133,10 +133,6 @@
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 #define DEFAULT_FEATURES        ( FEATURE_TELEMETRY | FEATURE_OSD )
 
-#define USE_SPEKTRUM_BIND
-// USART3,
-#define BIND_PIN                PB11
-
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
 #define TARGET_IO_PORTA (0xffff & ~(BIT(14)|BIT(13)))
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index 2928c2ecbe..4e9b7b7cd2 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -107,7 +107,6 @@
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
 #define USE_RX_MSP
-#define USE_SPEKTRUM_BIND
 
 #endif //USE_RX_NRF24
 
diff --git a/src/main/target/EACHIF3/target.h b/src/main/target/EACHIF3/target.h
index 0d8bdba180..267aa2719c 100644
--- a/src/main/target/EACHIF3/target.h
+++ b/src/main/target/EACHIF3/target.h
@@ -60,7 +60,7 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 #define RX_NSS_PIN              SPI2_NSS_PIN
-#define RX_FLYSKY_BIND_PIN      PA1
+#define BINDPLUG_PIN            PA1
 
 
 #define USE_I2C
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index 47e967dad4..2e16f01373 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -70,8 +70,6 @@
 #define USE_I2C_DEVICE_2
 #define I2C_DEVICE              (I2CDEV_2)
 
-#define USE_SPEKTRUM_BIND
-
 #define BRUSHED_MOTORS
 #define DEFAULT_FEATURES        FEATURE_MOTOR_STOP
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h
index 8addc6378f..40b103a46c 100644
--- a/src/main/target/MOTOLABF4/target.h
+++ b/src/main/target/MOTOLABF4/target.h
@@ -153,10 +153,6 @@
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
 #define CURRENT_METER_SCALE_DEFAULT 140
 
-// USART5 Rx, PD2
-#define USE_SPEKTRUM_BIND
-#define BIND_PIN    UART5_RX_PIN
-
 #define TARGET_IO_PORTA 0xffff
 #define TARGET_IO_PORTB 0xffff
 #define TARGET_IO_PORTC 0xffff
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 36c672028c..8194bed764 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -147,8 +147,6 @@
 #define RSSI_ADC_PIN            PA1
 #define EXTERNAL1_ADC_PIN       PA5
 
-#define USE_SPEKTRUM_BIND_PIN
-
 #define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
 
 // IO - assuming all IOs on 48pin package