rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4526 from mikeller/cleanup_bind_pin 

Cleaned up usages of SPEKTRUM_BIND_PIN / BINDPLUG_PIN / RX_FLYSKY_BIND_PIN.
This commit is contained in:
Martin Budden 2017-11-10 07:37:45 +00:00 committed by GitHub
parent 9c77db811b cf29e0cec7
commit 8b334e5674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/rx/flysky.c
View File

@ -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;

2
src/main/target/ALIENFLIGHTF1/target.h
View File

@ -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

4
src/main/target/ALIENWHOOP/target.h
View File

@ -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

4
src/main/target/BETAFLIGHTF4/target.h
View File

@ -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)))

1
src/main/target/CJMCU/target.h
View File

@ -107,7 +107,6 @@
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define USE_RX_MSP
#define USE_SPEKTRUM_BIND
#endif //USE_RX_NRF24

2
src/main/target/EACHIF3/target.h
View File

@ -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

2
src/main/target/MICROSCISKY/target.h
View File

@ -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

4
src/main/target/MOTOLABF4/target.h
View File

@ -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

2
src/main/target/NAZE/target.h
View File

@ -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