Rationalised target.h files by moving common items into common.h

This commit is contained in:
Martin Budden 2017-02-21 08:07:33 +00:00
parent 9baa9b7e12
commit d148ffcaa6
19 changed files with 34 additions and 86 deletions

View File

@ -18,7 +18,6 @@
#pragma once #pragma once
#define TARGET_BOARD_IDENTIFIER "AR32" // AiR32 #define TARGET_BOARD_IDENTIFIER "AR32" // AiR32
#define USE_CLI
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
@ -87,7 +86,6 @@
#define M25P16_CS_PIN PB12 #define M25P16_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define M25P16_SPI_INSTANCE SPI2
#undef GPS
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

View File

@ -85,8 +85,6 @@
#define LED_STRIP #define LED_STRIP
#define GPS
#define DEFAULT_FEATURES FEATURE_VBAT #define DEFAULT_FEATURES FEATURE_VBAT
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS

View File

@ -64,8 +64,6 @@
#define LED_STRIP #define LED_STRIP
#undef GPS
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART2, PA3 // USART2, PA3
#define BIND_PIN PA3 #define BIND_PIN PA3

View File

@ -103,7 +103,6 @@
//#define SONAR_ECHO_PIN PB0 //#define SONAR_ECHO_PIN PB0
//#define SONAR_TRIGGER_PIN PB5 //#define SONAR_TRIGGER_PIN PB5
#undef GPS
#undef MAG #undef MAG
#ifdef CC3D_OPBL #ifdef CC3D_OPBL

View File

@ -134,7 +134,6 @@
#define SERIALRX_UART SERIAL_PORT_USART3 #define SERIALRX_UART SERIAL_PORT_USART3
// *************** Others ************************** // *************** Others **************************
#define DISPLAY
#define LED_STRIP #define LED_STRIP
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

View File

@ -82,7 +82,6 @@
#define SERIALRX_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART2
#define RX_CHANNELS_TAER #define RX_CHANNELS_TAER
#undef GPS
#undef USE_SERVOS #undef USE_SERVOS
#define USE_QUAD_MIXER_ONLY #define USE_QUAD_MIXER_ONLY

View File

@ -18,7 +18,6 @@
#pragma once #pragma once
#define TARGET_BOARD_IDENTIFIER "MOTO" // MotoLab #define TARGET_BOARD_IDENTIFIER "MOTO" // MotoLab
#define USE_CLI
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
#define TARGET_CONFIG #define TARGET_CONFIG
@ -87,7 +86,6 @@
#define M25P16_CS_PIN PB12 #define M25P16_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define M25P16_SPI_INSTANCE SPI2
#undef GPS
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

View File

@ -143,8 +143,6 @@
#define LED_STRIP #define LED_STRIP
#undef GPS
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART2, PA3 // USART2, PA3
#define BIND_PIN PA3 #define BIND_PIN PA3

View File

@ -58,8 +58,6 @@
//#define SONAR_ECHO_PIN PB1 //#define SONAR_ECHO_PIN PB1
//#define SONAR_TRIGGER_PIN PB0 //#define SONAR_TRIGGER_PIN PB0
#undef GPS
#define USB_IO #define USB_IO
#define USB_CABLE_DETECTION #define USB_CABLE_DETECTION
#define USB_DETECT_PIN PB5 #define USB_DETECT_PIN PB5

View File

@ -18,7 +18,6 @@
#pragma once #pragma once
#define TARGET_BOARD_IDENTIFIER "PIKO" // Furious FPV Piko BLX #define TARGET_BOARD_IDENTIFIER "PIKO" // Furious FPV Piko BLX
#define USE_CLI
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
#define TARGET_CONFIG #define TARGET_CONFIG
@ -71,11 +70,6 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2
#define TELEMETRY
#define BLACKBOX
#define SERIAL_RX
#define USE_SERVOS
#define BOARD_HAS_VOLTAGE_DIVIDER #define BOARD_HAS_VOLTAGE_DIVIDER
#define USE_ADC #define USE_ADC
#define ADC_INSTANCE ADC2 #define ADC_INSTANCE ADC2

View File

@ -106,8 +106,6 @@
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
#define USE_SERVOS
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_VBAT | FEATURE_RSSI_ADC | FEATURE_OSD) #define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_VBAT | FEATURE_RSSI_ADC | FEATURE_OSD)

View File

@ -114,13 +114,6 @@
#define NAV_AUTO_MAG_DECLINATION #define NAV_AUTO_MAG_DECLINATION
#define NAV_GPS_GLITCH_DETECTION #define NAV_GPS_GLITCH_DETECTION
#define NAV_MAX_WAYPOINTS 60 #define NAV_MAX_WAYPOINTS 60
#define GPS
#define BLACKBOX
#define TELEMETRY
#define SERIAL_RX
#define AUTOTUNE
#define USE_SERVOS
#define USE_CLI
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART3, // USART3,

View File

@ -83,13 +83,6 @@
#define VBAT_ADC_PIN PA6 #define VBAT_ADC_PIN PA6
#define RSSI_ADC_PIN PA5 #define RSSI_ADC_PIN PA5
#define GPS
#define BLACKBOX
#define TELEMETRY
#define SERIAL_RX
#define USE_SERVOS
#define USE_CLI
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART2, PA3 // USART2, PA3
#define BIND_PIN PA3 #define BIND_PIN PA3

View File

@ -138,12 +138,6 @@
#define TRANSPONDER_IRQ DMA1_Channel6_IRQn #define TRANSPONDER_IRQ DMA1_Channel6_IRQn
#define TRANSPONDER_DMA_TC_FLAG DMA1_FLAG_TC6 #define TRANSPONDER_DMA_TC_FLAG DMA1_FLAG_TC6
#define TRANSPONDER_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER #define TRANSPONDER_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER
#define BLACKBOX
#define GPS
#define SERIAL_RX
#define TELEMETRY
#define USE_SERVOS
#define USE_CLI
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define DEFAULT_RX_FEATURE FEATURE_RX_PPM

View File

@ -147,8 +147,6 @@
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
#define USE_SERVOS
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART3, PB11 // USART3, PB11
#define BIND_PIN PB11 #define BIND_PIN PB11

View File

@ -159,8 +159,6 @@
#define OSD #define OSD
#undef GPS
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define DEFAULT_RX_FEATURE FEATURE_RX_PPM
#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY | FEATURE_OSD) #define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY | FEATURE_OSD)

View File

@ -31,47 +31,30 @@
#define I2C1_OVERCLOCK true #define I2C1_OVERCLOCK true
#define I2C2_OVERCLOCK true #define I2C2_OVERCLOCK true
#ifdef STM32F7 #ifdef STM32F1
#define I2C3_OVERCLOCK true #define MINIMAL_CLI
#define I2C4_OVERCLOCK true // Using RX DMA disables the use of receive callbacks
#define TELEMETRY_IBUS #define USE_UART1_RX_DMA
#define USE_UART1_TX_DMA
#endif
#ifdef STM32F3
#define MINIMAL_CLI
#define USE_DSHOT
#endif #endif
/****************************
STM32 F4 specific settings.
****************************/
#ifdef STM32F4 #ifdef STM32F4
#define USE_DSHOT #define USE_DSHOT
#define I2C3_OVERCLOCK true #define I2C3_OVERCLOCK true
#define TELEMETRY_IBUS #define TELEMETRY_IBUS
#endif #endif
#ifdef STM32F3 #ifdef STM32F7
#define USE_DSHOT #define I2C3_OVERCLOCK true
#undef GPS #define I2C4_OVERCLOCK true
#define MINIMAL_CLI #define TELEMETRY_IBUS
#endif #endif
#ifdef STM32F1
// Using RX DMA disables the use of receive callbacks
#define USE_UART1_RX_DMA
#define USE_UART1_TX_DMA
#define MINIMAL_CLI
#endif
#define SERIAL_RX
#define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol
#define USE_SERIALRX_SPEKTRUM // SRXL, DSM2 and DSMX protocol
#define USE_SERIALRX_SBUS // Frsky and Futaba receivers
#define USE_SERIALRX_IBUS // FlySky and Turnigy receivers
#define USE_SERIALRX_SUMD // Graupner Hott protocol
#define USE_SERIALRX_SUMH // Graupner legacy protocol
#define USE_SERIALRX_XBUS // JR
#define USE_CLI
#define USE_PWM
#define USE_PPM
#if defined(STM32F4) || defined(STM32F7) #if defined(STM32F4) || defined(STM32F7)
#define TASK_GYROPID_DESIRED_PERIOD 125 #define TASK_GYROPID_DESIRED_PERIOD 125
#define SCHEDULER_DELAY_LIMIT 10 #define SCHEDULER_DELAY_LIMIT 10
@ -86,32 +69,44 @@
#define DEFAULT_AUX_CHANNEL_COUNT 6 #define DEFAULT_AUX_CHANNEL_COUNT 6
#endif #endif
#define USE_CLI
#define USE_PPM
#define USE_PWM
#define SERIAL_RX
#define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol
#define USE_SERIALRX_IBUS // FlySky and Turnigy receivers
#define USE_SERIALRX_SBUS // Frsky and Futaba receivers
#define USE_SERIALRX_SPEKTRUM // SRXL, DSM2 and DSMX protocol
#define USE_SERIALRX_SUMD // Graupner Hott protocol
#define USE_SERIALRX_SUMH // Graupner legacy protocol
#define USE_SERIALRX_XBUS // JR
#if (FLASH_SIZE > 64) #if (FLASH_SIZE > 64)
#define BLACKBOX #define BLACKBOX
#define GPS
#define TELEMETRY #define TELEMETRY
#define TELEMETRY_FRSKY #define TELEMETRY_FRSKY
#define TELEMETRY_HOTT #define TELEMETRY_HOTT
#define TELEMETRY_LTM #define TELEMETRY_LTM
#define TELEMETRY_SMARTPORT #define TELEMETRY_SMARTPORT
#define USE_SERVOS
#define USE_RESOURCE_MGMT #define USE_RESOURCE_MGMT
#define USE_SERVOS
#endif #endif
#if (FLASH_SIZE > 128) #if (FLASH_SIZE > 128)
#define GPS
#define CMS #define CMS
#define USE_DASHBOARD
#define USE_MSP_DISPLAYPORT
#define TELEMETRY_CRSF #define TELEMETRY_CRSF
#define TELEMETRY_SRXL
#define TELEMETRY_JETIEXBUS #define TELEMETRY_JETIEXBUS
#define TELEMETRY_MAVLINK #define TELEMETRY_MAVLINK
#define TELEMETRY_SRXL
#define USE_DASHBOARD
#define USE_MSP_DISPLAYPORT
#define USE_RX_MSP #define USE_RX_MSP
#define USE_SERIALRX_JETIEXBUS #define USE_SERIALRX_JETIEXBUS
#define USE_SENSOR_NAMES
#define VTX_COMMON #define VTX_COMMON
#define VTX_CONTROL #define VTX_CONTROL
#define VTX_SMARTAUDIO #define VTX_SMARTAUDIO
#define VTX_TRAMP #define VTX_TRAMP
#define USE_SENSOR_NAMES
#endif #endif

View File

@ -26,7 +26,7 @@
#define MAG #define MAG
#define BARO #define BARO
#define GPS #define GPS
#define DISPLAY #define USE_DASHBOARD
#define TELEMETRY #define TELEMETRY
#define LED_STRIP #define LED_STRIP
#define USE_SERVOS #define USE_SERVOS

View File

@ -23,7 +23,7 @@
#define MAG #define MAG
#define BARO #define BARO
#define GPS #define GPS
#define DISPLAY #define USE_DASHBOARD
#define SERIAL_RX #define SERIAL_RX
#define USE_RX_MSP #define USE_RX_MSP
#define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol #define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol