Merge pull request #2454 from martinbudden/bf_target_h_rationalisation2

Moved LED_STRIP definition to common.h
This commit is contained in:
Martin Budden 2017-02-21 16:20:31 +00:00 committed by GitHub
commit b240fb4c0f
54 changed files with 22 additions and 82 deletions

View File

@ -96,8 +96,6 @@
//#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2
#define LED_STRIP
#define SPEKTRUM_BIND
// USART2, PB4
#define BIND_PIN PB4

View File

@ -83,8 +83,6 @@
#define ADC_INSTANCE ADC2
#define VBAT_ADC_PIN PA4
#define LED_STRIP
#define DEFAULT_FEATURES FEATURE_VBAT
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -61,9 +61,6 @@
#define RSSI_ADC_PIN PA1
#define EXTERNAL1_ADC_PIN PA5
#define LED_STRIP
#define SPEKTRUM_BIND
// USART2, PA3
#define BIND_PIN PA3

View File

@ -127,8 +127,6 @@
#define SERIALRX_UART SERIAL_PORT_USART2
#define RX_CHANNELS_TAER
#define LED_STRIP
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
// IO - stm32f303cc in 48pin package

View File

@ -152,9 +152,6 @@
#define RSSI_ADC_PIN PC4
#define EXTERNAL1_ADC_GPIO_PIN PC5
// LED strip configuration using RC5 pin.
#define LED_STRIP
#define SPEKTRUM_BIND
// USART2, PA3
#define BIND_PIN PA3

View File

@ -143,8 +143,6 @@
#define CURRENT_METER_ADC_PIN PC1
#define RSSI_ADC_GPIO_PIN PC2
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define DEFAULT_FEATURES (FEATURE_BLACKBOX)

View File

@ -120,8 +120,6 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL

View File

@ -146,7 +146,6 @@
#define CURRENT_METER_ADC_PIN PC2
#define USE_ESC_SENSOR
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

View File

@ -110,7 +110,6 @@
//#undef USE_SERVOS
#undef BARO
#undef SONAR
#undef LED_STRIP
#undef USE_SERIAL_4WAY_BLHELI_INTERFACE
//#undef USE_SERIALRX_SPEKTRUM // SRXL, DSM2 and DSMX protocol
//#undef USE_SERIALRX_SBUS // Frsky and Futaba receivers
@ -121,6 +120,7 @@
#undef USE_SERIALRX_XBUS // JR
#endif
#undef LED_STRIP
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
// IO - from schematics

View File

@ -109,6 +109,8 @@
#define RSSI_ADC_PIN PC2
#define EXTERNAL1_ADC_PIN PC3
#undef LED_STRIP
// IO - assuming 303 in 64pin package, TODO
#define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff

View File

@ -120,8 +120,6 @@
#define I2C3_SCL PA8
#define I2C3_SDA PC9
#define LED_STRIP
// alternative defaults for Colibri/Gemini target
#define TARGET_CONFIG

View File

@ -116,8 +116,6 @@
#define RSSI_ADC_PIN PC2
#define EXTERNAL1_ADC_PIN PC3
#define LED_STRIP
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_FAILSAFE | FEATURE_AIRMODE | FEATURE_LED_STRIP)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -127,7 +127,6 @@
#define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW
#define LED_STRIP
#define USE_ESC_SENSOR
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM

View File

@ -93,6 +93,8 @@
#define VBAT_ADC_PIN PC4
#define CURRENT_METER_ADC_PIN PC5
#undef LED_STRIP
#define DEFAULT_FEATURES (FEATURE_VBAT)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SPEKTRUM2048

View File

@ -140,6 +140,8 @@
#define CURRENT_METER_ADC_PIN PC2
#define RSSI_ADC_PIN PC1
#undef LED_STRIP
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_BLACKBOX)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -134,8 +134,6 @@
#define SERIALRX_UART SERIAL_PORT_USART3
// *************** Others **************************
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define USE_SERIAL_4WAY_BLHELI_INTERFACE

View File

@ -147,8 +147,6 @@
#define RSSI_ADC_PIN PA1
#define CURRENT_METER_ADC_PIN PA2
#define LED_STRIP
#define SONAR
#define SONAR_ECHO_PIN PB1
#define SONAR_TRIGGER_PIN PB0

View File

@ -170,8 +170,6 @@
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define SPEKTRUM_BIND

View File

@ -137,6 +137,8 @@
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#undef LED_STRIP
#define DEFAULT_FEATURES (FEATURE_BLACKBOX)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -89,8 +89,6 @@
#define RSSI_ADC_PIN PA1
#define VBAT_ADC_PIN PA2
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_BLACKBOX)

View File

@ -78,11 +78,14 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2
#undef LED_STRIP
#define SPEKTRUM_BIND
// USART3,
#define BIND_PIN PB11
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
/*
#define USE_SERIAL_4WAY_BLHELI_BOOTLOADER
#define USE_SERIAL_4WAY_SK_BOOTLOADER

View File

@ -95,7 +95,6 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2
#define LED_STRIP
#define WS2811_PIN PA8
#define WS2811_TIMER TIM1
#define WS2811_DMA_CHANNEL DMA1_Channel2

View File

@ -128,8 +128,6 @@
#define RSSI_ADC_PIN PC1
#define RSSI_ADC_CHANNEL ADC_Channel_11
#define LED_STRIP
#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_OSD)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -48,6 +48,7 @@
#define ACC
#define USE_ACC_MPU6050
#define ACC_MPU6050_ALIGN CW90_DEG
#undef LED_STRIP
#else
#define GYRO
#define USE_GYRO_MPU6050
@ -56,8 +57,6 @@
#define ACC
#define USE_ACC_MPU6050
#define ACC_MPU6050_ALIGN CW180_DEG
#define LED_STRIP
#endif
#define USE_VCP

View File

@ -123,9 +123,6 @@
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS
#define LED_STRIP
#define SPEKTRUM_BIND
// USART3 Rx, PB11
#define BIND_PIN PB11

View File

@ -147,8 +147,6 @@
#define RSSI_ADC_PIN PC2
#define EXTERNAL1_ADC_PIN PC3
#define LED_STRIP
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART2

View File

@ -69,8 +69,6 @@
#define USE_I2C
#define I2C_DEVICE (I2CDEV_2)
#define LED_STRIP
#define SPEKTRUM_BIND
// USART2, PA3
#define BIND_PIN PA3

View File

@ -96,7 +96,6 @@
//#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2
#define LED_STRIP
#define USE_ESC_SENSOR
#define SPEKTRUM_BIND

View File

@ -113,8 +113,6 @@
#undef USE_UART1_TX_DMA
#endif
#define LED_STRIP
//#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL

View File

@ -141,8 +141,6 @@
#define RSSI_ADC_PIN PA1
#define EXTERNAL1_ADC_PIN PA5
#define LED_STRIP
#define SPEKTRUM_BIND
// USART2, PA3
#define BIND_PIN PA3

View File

@ -120,8 +120,6 @@
#define VBAT_ADC_PIN PC3
//#define USE_ESC_SENSOR
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define DEFAULT_FEATURES FEATURE_BLACKBOX

View File

@ -144,8 +144,6 @@
#define CURRENT_METER_ADC_PIN PC0
#define RSSI_ADC_GPIO_PIN PC3
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define DEFAULT_FEATURES (FEATURE_BLACKBOX)

View File

@ -152,8 +152,6 @@
//#define RSSI_ADC_PIN PB1
//#define ADC_INSTANCE ADC3
#define LED_STRIP
#define TRANSPONDER
#define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT

View File

@ -165,8 +165,6 @@
#define USE_ESC_SENSOR
#define LED_STRIP
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_VBAT | FEATURE_OSD)

View File

@ -76,8 +76,6 @@
#define CURRENT_METER_ADC_PIN PB2
#define VBAT_ADC_PIN PA5
#define LED_STRIP
#define TRANSPONDER
#define TRANSPONDER_GPIO GPIOA
#define TRANSPONDER_GPIO_AHB_PERIPHERAL RCC_AHBPeriph_GPIOA

View File

@ -100,8 +100,6 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PA6
#define LED_STRIP
#define OSD
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT

View File

@ -103,8 +103,6 @@
#define CURRENT_METER_ADC_PIN PB2
#define RSSI_ADC_PIN PA6
#define LED_STRIP // LED strip configuration using PWM motor output pin 5.
#define DEFAULT_FEATURES FEATURE_VBAT
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -187,8 +187,6 @@
#define VBAT_ADC_CHANNEL ADC_Channel_13
#endif
#define LED_STRIP
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#if defined(PODIUMF4)
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -78,6 +78,8 @@
#define USE_I2C
#define I2C_DEVICE (I2CDEV_3)
#undef LED_STRIP
#define USE_ADC
#define CURRENT_METER_ADC_PIN PA7
#define VBAT_ADC_PIN PA6

View File

@ -124,7 +124,6 @@
#define VBAT_ADC_PIN PA4
#define CURRENT_METER_ADC_PIN PA5
#define VBAT_SCALE_DEFAULT 119
#define LED_STRIP
#define TRANSPONDER
#define TRANSPONDER_GPIO GPIOA

View File

@ -86,8 +86,6 @@
#define VBAT_ADC_PIN PB2
#define VBAT_SCALE_DEFAULT 77
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_BLACKBOX)

View File

@ -133,6 +133,8 @@
// Performance logging for SD card operations:
// #define AFATFS_USE_INTROSPECTIVE_LOGGING
#undef LED_STRIP
#define BOARD_HAS_VOLTAGE_DIVIDER
#define USE_ADC
#define ADC_INSTANCE ADC1

View File

@ -89,8 +89,6 @@
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define LED_STRIP
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
#define SPEKTRUM_BIND

View File

@ -121,6 +121,8 @@
#define VBAT_ADC_PIN PC3
#define CURRENT_METER_ADC_PIN PC2
#undef LED_STRIP
#define DEFAULT_FEATURES FEATURE_BLACKBOX
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -177,8 +177,6 @@
#undef USE_UART1_TX_DMA
#endif
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM

View File

@ -141,8 +141,6 @@
#define CURRENT_METER_ADC_PIN PA5
#endif
#define LED_STRIP
#define TRANSPONDER
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

View File

@ -169,8 +169,6 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2
#define LED_STRIP
#define TRANSPONDER
#define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT

View File

@ -143,7 +143,6 @@
#define CURRENT_METER_ADC_PIN PC2
#define RSSI_ADC_PIN PC0
#define LED_STRIP
#define USE_LED_STRIP_ON_DMA1_CHANNEL2
#define WS2811_PIN PA8
#define WS2811_TIMER TIM1

View File

@ -174,8 +174,6 @@
#define USE_ESC_SENSOR
#define LED_STRIP
#define SPEKTRUM_BIND
#define BIND_PIN PA3 // USART2, PA3

View File

@ -100,7 +100,6 @@
#define ADC_INSTANCE ADC3
#define VBAT_SCALE_DEFAULT 100
#define LED_STRIP
#define WS2811_PIN PA8
#define WS2811_TIMER TIM1
#define WS2811_DMA_CHANNEL DMA1_Channel2

View File

@ -157,6 +157,8 @@
#define RSSI_ADC_PIN PB1
#define CURRENT_METER_ADC_PIN PA5
#undef LED_STRIP
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_SOFTSERIAL | FEATURE_TELEMETRY)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -110,8 +110,6 @@
#undef USE_UART1_TX_DMA
#endif
#define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM

View File

@ -141,7 +141,6 @@
#define RSSI_ADC_GPIO_PIN PC0
#define USE_ESC_TELEMETRY
#define LED_STRIP
// Default configuration
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

View File

@ -83,6 +83,7 @@
#if (FLASH_SIZE > 64)
#define BLACKBOX
#define LED_STRIP
#define TELEMETRY
#define TELEMETRY_FRSKY
#define TELEMETRY_HOTT