From 90e862b97a74de202db1dacccf6f47d08eb1e023 Mon Sep 17 00:00:00 2001 From: blckmn Date: Mon, 20 Feb 2017 03:36:46 +1100 Subject: [PATCH] Feature OSD moved to defaults features to enable, not just if OSD is compiled in --- src/main/fc/config.c | 2 +- src/main/target/BETAFLIGHTF3/target.h | 2 +- src/main/target/FISHDRONEF4/target.h | 1 - src/main/target/KAKUTEF4/target.h | 2 +- src/main/target/KIWIF4/target.h | 2 +- src/main/target/OMNIBUS/target.h | 2 +- src/main/target/OMNIBUSF4/target.h | 2 +- src/main/target/RACEBASE/target.h | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/fc/config.c b/src/main/fc/config.c index ca92f76978..a5eda79532 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -578,6 +578,7 @@ void createDefaultConfig(master_t *config) intFeatureClearAll(featuresPtr); intFeatureSet(DEFAULT_RX_FEATURE | FEATURE_FAILSAFE , featuresPtr); + #ifdef DEFAULT_FEATURES intFeatureSet(DEFAULT_FEATURES, featuresPtr); #endif @@ -594,7 +595,6 @@ void createDefaultConfig(master_t *config) #endif #ifdef OSD - intFeatureSet(FEATURE_OSD, featuresPtr); osdResetConfig(&config->osdProfile); #endif diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index cd94249f4d..47e24e8642 100755 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -127,7 +127,7 @@ #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART2 #define SBUS_TELEMETRY_UART SERIAL_PORT_USART1 -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_CURRENT_METER | FEATURE_TELEMETRY ) +#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_CURRENT_METER | FEATURE_TELEMETRY | FEATURE_OSD) #define SPEKTRUM_BIND #define BIND_PIN UART2_RX_PIN diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h index 08f693d2aa..8b95355670 100644 --- a/src/main/target/FISHDRONEF4/target.h +++ b/src/main/target/FISHDRONEF4/target.h @@ -133,7 +133,6 @@ // *************** Others ************************** #define DISPLAY #define LED_STRIP -#define OSD #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index 421d32539d..ede437af79 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -128,7 +128,7 @@ #define LED_STRIP #define LED_STRIP_TIMER TIM5 -#define DEFAULT_FEATURES FEATURE_BLACKBOX +#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_OSD) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART3 diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h index 46b3fb28ea..07fd9b314a 100644 --- a/src/main/target/KIWIF4/target.h +++ b/src/main/target/KIWIF4/target.h @@ -116,7 +116,7 @@ #define RSSI_ADC_PIN PC2 #define CURRENT_METER_ADC_PIN PC3 -#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_BLACKBOX) +#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_BLACKBOX | FEATURE_OSD) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index bde8cd793c..6b53a64306 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -158,7 +158,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_CURRENT_METER | FEATURE_BLACKBOX) +#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_CURRENT_METER | FEATURE_BLACKBOX | FEATURE_OSD) #define BUTTONS #define BUTTON_A_PIN PB1 diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 0ad2aff3b4..fce1f04d06 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -165,7 +165,7 @@ #define LED_STRIP #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_VBAT) +#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_VBAT | FEATURE_OSD) #define AVOID_UART1_FOR_PWM_PPM diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h index 8c78e237dd..3694240080 100755 --- a/src/main/target/RACEBASE/target.h +++ b/src/main/target/RACEBASE/target.h @@ -106,7 +106,7 @@ #define USE_SERVOS #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL -#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_VBAT | FEATURE_RSSI_ADC) +#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_VBAT | FEATURE_RSSI_ADC | FEATURE_OSD) #define USE_SERIAL_4WAY_BLHELI_INTERFACE