Merge pull request #6823 from jflyper/bfdev-sprf7dual-target-cleanup

SPRACINGF7DUAL: Move board specific to config.c
This commit is contained in:
Michael Keller 2018-09-25 09:49:00 +12:00 committed by GitHub
commit c2747eed94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions

View File

@ -55,13 +55,20 @@
#include "config_helper.h" #include "config_helper.h"
#define GPS_UART SERIAL_PORT_USART3
#define TELEMETRY_UART SERIAL_PORT_UART5 #define TELEMETRY_UART SERIAL_PORT_UART5
#ifdef USE_TELEMETRY
static targetSerialPortFunction_t targetSerialPortFunction[] = { static targetSerialPortFunction_t targetSerialPortFunction[] = {
{ TELEMETRY_UART, FUNCTION_TELEMETRY_SMARTPORT }, #ifdef USE_GPS
}; { GPS_UART, FUNCTION_GPS },
#endif #endif
#ifdef USE_TELEMETRY
{ TELEMETRY_UART, FUNCTION_TELEMETRY_SMARTPORT },
#endif
#if !defined(USE_GPS) && !defined(USE_TELEMETRY)
{ SERIAL_PORT_NONE, FUNCTION_NONE },
#endif
};
void targetConfiguration(void) void targetConfiguration(void)
{ {

View File

@ -201,8 +201,6 @@
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_LED_STRIP) #define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_LED_STRIP)
#define GPS_UART SERIAL_PORT_USART3
#define SERIALRX_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART2
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS