Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00
Code Issues Wiki Activity

Feature OSD moved to defaults features to enable, not just if OSD is compiled in

Browse source
This commit is contained in:
blckmn 2017-02-20 03:36:46 +11:00
parent 14a7c805c1
commit 90e862b97a
8 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/config.c
View file

@ -578,6 +578,7 @@ void createDefaultConfig(master_t *config)
intFeatureClearAll(featuresPtr); intFeatureClearAll(featuresPtr);
intFeatureSet(DEFAULT_RX_FEATURE | FEATURE_FAILSAFE , featuresPtr); intFeatureSet(DEFAULT_RX_FEATURE | FEATURE_FAILSAFE , featuresPtr);
#ifdef DEFAULT_FEATURES #ifdef DEFAULT_FEATURES
intFeatureSet(DEFAULT_FEATURES, featuresPtr); intFeatureSet(DEFAULT_FEATURES, featuresPtr);
#endif #endif
@ -594,7 +595,6 @@ void createDefaultConfig(master_t *config)
#endif #endif
#ifdef OSD #ifdef OSD
intFeatureSet(FEATURE_OSD, featuresPtr);
osdResetConfig(&config->osdProfile); osdResetConfig(&config->osdProfile);
#endif #endif

2
src/main/target/BETAFLIGHTF3/target.h
View file

@ -127,7 +127,7 @@
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART2
#define SBUS_TELEMETRY_UART SERIAL_PORT_USART1 #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 SPEKTRUM_BIND
#define BIND_PIN UART2_RX_PIN #define BIND_PIN UART2_RX_PIN

1
src/main/target/FISHDRONEF4/target.h
View file

@ -133,7 +133,6 @@
// *************** Others ************************** // *************** Others **************************
#define DISPLAY #define DISPLAY
#define LED_STRIP #define LED_STRIP
#define OSD
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

2
src/main/target/KAKUTEF4/target.h
View file

@ -128,7 +128,7 @@
#define LED_STRIP #define LED_STRIP
#define LED_STRIP_TIMER TIM5 #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 DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART3 #define SERIALRX_UART SERIAL_PORT_USART3

2
src/main/target/KIWIF4/target.h
View file

@ -116,7 +116,7 @@
#define RSSI_ADC_PIN PC2 #define RSSI_ADC_PIN PC2
#define CURRENT_METER_ADC_PIN PC3 #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 DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS

2
src/main/target/OMNIBUS/target.h
View file

@ -158,7 +158,7 @@
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM #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 BUTTONS
#define BUTTON_A_PIN PB1 #define BUTTON_A_PIN PB1

2
src/main/target/OMNIBUSF4/target.h
View file

@ -165,7 +165,7 @@
#define LED_STRIP #define LED_STRIP
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #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 #define AVOID_UART1_FOR_PWM_PPM

2
src/main/target/RACEBASE/target.h
View file

@ -106,7 +106,7 @@
#define USE_SERVOS #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) #define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_VBAT | FEATURE_RSSI_ADC | FEATURE_OSD)
#define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_SERIAL_4WAY_BLHELI_INTERFACE