diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index a0ffa437d7..4a098709c9 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -1674,22 +1674,12 @@ void handleBlackbox(timeUs_t currentTimeUs) } } -static bool canUseBlackboxWithCurrentConfiguration(void) -{ -#ifdef USE_SDCARD - return feature(FEATURE_BLACKBOX) && - !(blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD && !feature(FEATURE_SDCARD)); -#else - return feature(FEATURE_BLACKBOX); -#endif -} - /** * Call during system startup to initialize the blackbox. */ void initBlackbox(void) { - if (canUseBlackboxWithCurrentConfiguration()) { + if (blackboxConfig()->device) { blackboxSetState(BLACKBOX_STATE_STOPPED); } else { blackboxSetState(BLACKBOX_STATE_DISABLED); diff --git a/src/main/blackbox/blackbox.h b/src/main/blackbox/blackbox.h index 95db665747..44269c5b44 100644 --- a/src/main/blackbox/blackbox.h +++ b/src/main/blackbox/blackbox.h @@ -24,14 +24,14 @@ #include "config/parameter_group.h" typedef enum BlackboxDevice { - BLACKBOX_DEVICE_SERIAL = 0, + BLACKBOX_DEVICE_NONE = 0, #ifdef USE_FLASHFS BLACKBOX_DEVICE_FLASH = 1, #endif #ifdef USE_SDCARD BLACKBOX_DEVICE_SDCARD = 2, #endif - + BLACKBOX_DEVICE_SERIAL = 3 } BlackboxDevice_e; typedef struct blackboxConfig_s { diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c index 870f5d2e3b..edfb2e8700 100644 --- a/src/main/cms/cms_menu_blackbox.c +++ b/src/main/cms/cms_menu_blackbox.c @@ -77,14 +77,12 @@ static long cmsx_EraseFlash(displayPort_t *pDisplay, const void *ptr) #endif // USE_FLASHFS static const char * const cmsx_BlackboxDeviceNames[] = { - "SERIAL", + "NONE", "FLASH ", - "SDCARD" + "SDCARD", + "SERIAL" }; -static bool featureRead = false; - -static uint8_t cmsx_FeatureBlackbox; static uint8_t blackboxConfig_rate_denom; static uint8_t cmsx_BlackboxDevice; @@ -171,10 +169,6 @@ static long cmsx_Blackbox_onEnter(void) cmsx_Blackbox_GetDeviceStatus(); cmsx_BlackboxDevice = blackboxConfig()->device; - if (!featureRead) { - cmsx_FeatureBlackbox = feature(FEATURE_BLACKBOX) ? 1 : 0; - featureRead = true; - } blackboxConfig_rate_denom = blackboxConfig()->rate_denom; return 0; } @@ -193,20 +187,12 @@ static long cmsx_Blackbox_onExit(const OSD_Entry *self) static long cmsx_Blackbox_FeatureWriteback(void) { - if (featureRead) { - if (cmsx_FeatureBlackbox) - featureSet(FEATURE_BLACKBOX); - else - featureClear(FEATURE_BLACKBOX); - } - return 0; } static OSD_Entry cmsx_menuBlackboxEntries[] = { { "-- BLACKBOX --", OME_Label, NULL, NULL, 0}, - { "ENABLED", OME_Bool, NULL, &cmsx_FeatureBlackbox, 0 }, { "DEVICE", OME_TAB, NULL, &cmsx_BlackboxDeviceTable, 0 }, { "(STATUS)", OME_String, NULL, &cmsx_BlackboxStatus, 0 }, { "(USED)", OME_String, NULL, &cmsx_BlackboxDeviceStorageUsed, 0 }, diff --git a/src/main/config/config_eeprom.h b/src/main/config/config_eeprom.h index bd586459c9..7b46e94955 100644 --- a/src/main/config/config_eeprom.h +++ b/src/main/config/config_eeprom.h @@ -20,7 +20,7 @@ #include #include -#define EEPROM_CONF_VERSION 158 +#define EEPROM_CONF_VERSION 159 bool isEEPROMContentValid(void); bool loadEEPROM(void); diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c index f5a32df9e2..4aa17e24e5 100755 --- a/src/main/fc/cli.c +++ b/src/main/fc/cli.c @@ -146,7 +146,7 @@ static const char * const featureNames[] = { "SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE", "SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM", "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD", - "BLACKBOX", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE", + "UNUSED", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE", "SDCARD", "VTX", "RX_SPI", "SOFTSPI", "ESC_SENSOR", NULL }; diff --git a/src/main/fc/config.c b/src/main/fc/config.c index ac222cfebe..32a57e2d7b 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -598,7 +598,6 @@ void createDefaultConfig(master_t *config) #ifndef USE_PARAMETER_GROUPS #ifdef USE_SDCARD - intFeatureSet(FEATURE_SDCARD, featuresPtr); resetsdcardConfig(&config->sdcardConfig); #endif @@ -756,10 +755,8 @@ void createDefaultConfig(master_t *config) #ifndef USE_PARAMETER_GROUPS #ifdef BLACKBOX #if defined(ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT) - intFeatureSet(FEATURE_BLACKBOX, featuresPtr); config->blackboxConfig.device = BLACKBOX_DEVICE_FLASH; #elif defined(ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT) - intFeatureSet(FEATURE_BLACKBOX, featuresPtr); config->blackboxConfig.device = BLACKBOX_DEVICE_SDCARD; #else config->blackboxConfig.device = BLACKBOX_DEVICE_SERIAL; diff --git a/src/main/fc/config.h b/src/main/fc/config.h index ea7d3b5815..e53ad91092 100644 --- a/src/main/fc/config.h +++ b/src/main/fc/config.h @@ -52,11 +52,11 @@ typedef enum { FEATURE_LED_STRIP = 1 << 16, FEATURE_DASHBOARD = 1 << 17, FEATURE_OSD = 1 << 18, - FEATURE_BLACKBOX = 1 << 19, + FEATURE_BLACKBOX_UNUSED = 1 << 19, FEATURE_CHANNEL_FORWARDING = 1 << 20, FEATURE_TRANSPONDER = 1 << 21, FEATURE_AIRMODE = 1 << 22, - FEATURE_SDCARD = 1 << 23, + FEATURE_SDCARD_UNUSED = 1 << 23, FEATURE_VTX = 1 << 24, FEATURE_RX_SPI = 1 << 25, FEATURE_SOFTSPI = 1 << 26, diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c index 665114d4a8..57b5c30f12 100644 --- a/src/main/fc/fc_core.c +++ b/src/main/fc/fc_core.c @@ -171,7 +171,7 @@ void mwDisarm(void) DISABLE_ARMING_FLAG(ARMED); #ifdef BLACKBOX - if (feature(FEATURE_BLACKBOX)) { + if (blackboxConfig()->device) { finishBlackbox(); } #endif @@ -545,7 +545,7 @@ static void subTaskMainSubprocesses(timeUs_t currentTimeUs) #endif #ifdef BLACKBOX - if (!cliMode && feature(FEATURE_BLACKBOX)) { + if (!cliMode && blackboxConfig()->device) { handleBlackbox(currentTimeUs); } #else diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c index 334152bf1d..81e4b0493f 100644 --- a/src/main/fc/fc_init.c +++ b/src/main/fc/fc_init.c @@ -501,7 +501,7 @@ void init(void) #endif #ifdef USE_SDCARD - if (feature(FEATURE_SDCARD) && blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) { + if (blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) { sdcardInsertionDetectInit(); sdcard_init(sdcardConfig()->useDma); afatfs_init(); diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index 389d171843..232a00c1da 100755 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -371,12 +371,10 @@ void initActiveBoxIds(void) #endif #ifdef BLACKBOX - if (feature(FEATURE_BLACKBOX)) { - activeBoxIds[activeBoxIdCount++] = BOXBLACKBOX; + activeBoxIds[activeBoxIdCount++] = BOXBLACKBOX; #ifdef USE_FLASHFS - activeBoxIds[activeBoxIdCount++] = BOXBLACKBOXERASE; + activeBoxIds[activeBoxIdCount++] = BOXBLACKBOXERASE; #endif - } #endif activeBoxIds[activeBoxIdCount++] = BOXFPVANGLEMIX; diff --git a/src/main/fc/rc_adjustments.c b/src/main/fc/rc_adjustments.c index 8058ad8079..3c42dbdd77 100644 --- a/src/main/fc/rc_adjustments.c +++ b/src/main/fc/rc_adjustments.c @@ -60,7 +60,7 @@ static void blackboxLogInflightAdjustmentEvent(adjustmentFunction_e adjustmentFu UNUSED(adjustmentFunction); UNUSED(newValue); #else - if (feature(FEATURE_BLACKBOX)) { + if (blackboxConfig()->device) { flightLogEvent_inflightAdjustment_t eventData; eventData.adjustmentFunction = adjustmentFunction; eventData.newValue = newValue; @@ -77,7 +77,7 @@ static void blackboxLogInflightAdjustmentEventFloat(adjustmentFunction_e adjustm UNUSED(adjustmentFunction); UNUSED(newFloatValue); #else - if (feature(FEATURE_BLACKBOX)) { + if (blackboxConfig()->device) { flightLogEvent_inflightAdjustment_t eventData; eventData.adjustmentFunction = adjustmentFunction; eventData.newFloatValue = newFloatValue; diff --git a/src/main/io/osd.c b/src/main/io/osd.c index 75beff6261..597b3f9cd0 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -752,7 +752,7 @@ static void osdShowStats(void) sprintf(buff, "%c%d.%01d%c", alt < 0 ? '-' : ' ', abs(alt / 100), abs((alt % 100) / 10), osdGetAltitudeSymbol()); displayWrite(osdDisplayPort, 22, top++, buff); - if (feature(FEATURE_BLACKBOX) && blackboxConfig()->device != BLACKBOX_DEVICE_SERIAL) { + if (blackboxConfig()->device && blackboxConfig()->device != BLACKBOX_DEVICE_SERIAL) { displayWrite(osdDisplayPort, 2, top, "BLACKBOX :"); osdGetBlackboxStatusString(buff, 10); displayWrite(osdDisplayPort, 22, top++, buff); diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index 54fc5ed8a8..21c14173f1 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -160,7 +160,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES (FEATURE_MOTOR_STOP | FEATURE_BLACKBOX) +#define DEFAULT_FEATURES (FEATURE_MOTOR_STOP) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART2 #define RX_CHANNELS_TAER diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index 7d840db126..634bb0610b 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -173,7 +173,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES (FEATURE_MOTOR_STOP | FEATURE_BLACKBOX) +#define DEFAULT_FEATURES (FEATURE_MOTOR_STOP) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART2 #define RX_CHANNELS_TAER diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h index da211bf964..c6299cae4b 100644 --- a/src/main/target/ANYFCF7/target.h +++ b/src/main/target/ANYFCF7/target.h @@ -142,7 +142,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h index 7fef249b0a..f4ab811472 100644 --- a/src/main/target/BEEROTORF4/target.h +++ b/src/main/target/BEEROTORF4/target.h @@ -145,7 +145,7 @@ #define TRANSPONDER -#define DEFAULT_FEATURES ( FEATURE_BLACKBOX | FEATURE_SDCARD | FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_AIRMODE ) +#define DEFAULT_FEATURES ( FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_AIRMODE ) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART2 diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index 3ee8fa1b38..4ec9b06927 100755 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -126,7 +126,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_TELEMETRY | FEATURE_OSD) +#define DEFAULT_FEATURES (FEATURE_TELEMETRY | FEATURE_OSD) #define SPEKTRUM_BIND_PIN UART2_RX_PIN diff --git a/src/main/target/BLUEJAYF4/config.c b/src/main/target/BLUEJAYF4/config.c index 008badd389..bb507f3c6f 100644 --- a/src/main/target/BLUEJAYF4/config.c +++ b/src/main/target/BLUEJAYF4/config.c @@ -45,7 +45,7 @@ void targetConfiguration(void) } if (hardwareRevision == BJF4_MINI_REV3A || hardwareRevision == BJF4_REV1) { - featureClear(FEATURE_SDCARD); + blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE; } if (hardwareRevision == BJF4_MINI_REV3A) { @@ -57,10 +57,8 @@ void targetValidateConfiguration(void) { /* make sure the SDCARD cannot be turned on */ if (hardwareRevision == BJF4_MINI_REV3A || hardwareRevision == BJF4_REV1) { - featureClear(FEATURE_SDCARD); - if (blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) { - blackboxConfigMutable()->device = BLACKBOX_DEVICE_FLASH; + blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE; } } } diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index fb725f4c04..a807a6f538 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -148,7 +148,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART6 diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h index 7d47898118..47f1a60ceb 100644 --- a/src/main/target/COLIBRI/target.h +++ b/src/main/target/COLIBRI/target.h @@ -125,7 +125,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h index 7887779d77..4fed5a79fb 100644 --- a/src/main/target/F4BY/target.h +++ b/src/main/target/F4BY/target.h @@ -141,7 +141,6 @@ #undef LED_STRIP -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h index c7c6418a29..e4146ea2c9 100644 --- a/src/main/target/FISHDRONEF4/target.h +++ b/src/main/target/FISHDRONEF4/target.h @@ -127,7 +127,7 @@ #define RSSI_ADC_PIN PC1 // *************** FEATURES ************************ -#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_BLACKBOX | FEATURE_VTX) +#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_VTX) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART3 diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index 161652c940..e408e25033 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -149,7 +149,6 @@ #define SONAR_ECHO_PIN PB1 #define SONAR_TRIGGER_PIN PB0 -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define SPEKTRUM_BIND_PIN UART3_RX_PIN diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 37934ebb86..28c2990160 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -166,7 +166,6 @@ #define RSSI_ADC_PIN PC2 #define CURRENT_METER_ADC_PIN PC3 -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h index 06df3b8622..83de9e286e 100644 --- a/src/main/target/FURYF7/target.h +++ b/src/main/target/FURYF7/target.h @@ -138,7 +138,6 @@ #undef LED_STRIP -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h index aeaaa712b3..275642d368 100644 --- a/src/main/target/IMPULSERCF3/target.h +++ b/src/main/target/IMPULSERCF3/target.h @@ -89,7 +89,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART2 diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h index f6d06a59fd..a72867e8b4 100644 --- a/src/main/target/ISHAPEDF3/target.h +++ b/src/main/target/ISHAPEDF3/target.h @@ -105,7 +105,6 @@ #define WS2811_TIMER_GPIO_AF GPIO_AF_6 #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define SPEKTRUM_BIND_PIN UART3_RX_PIN diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index 513b437352..059a369a81 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -128,7 +128,7 @@ #define RSSI_ADC_PIN PC1 #define RSSI_ADC_CHANNEL ADC_Channel_11 -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_OSD) +#define DEFAULT_FEATURES (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 91df8e07ab..628351d081 100644 --- a/src/main/target/KIWIF4/target.h +++ b/src/main/target/KIWIF4/target.h @@ -135,7 +135,7 @@ #define RSSI_ADC_PIN PC2 #define CURRENT_METER_ADC_PIN PC3 -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_OSD) +#define DEFAULT_FEATURES (FEATURE_OSD) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index 3cdd44561a..c2ca8fed7a 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -152,9 +152,9 @@ #ifdef LUXV2_RACE #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES ( FEATURE_BLACKBOX | FEATURE_TELEMETRY ) +#define DEFAULT_FEATURES (FEATURE_TELEMETRY) #else -#define DEFAULT_FEATURES FEATURE_TELEMETRY +#define DEFAULT_FEATURES (FEATURE_TELEMETRY) #endif #define SPEKTRUM_BIND_PIN UART1_RX_PIN diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h index 53b60d6091..2c5c754431 100644 --- a/src/main/target/NERO/target.h +++ b/src/main/target/NERO/target.h @@ -121,7 +121,6 @@ //#define USE_ESC_SENSOR #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART6 diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h index 49c4c5870f..2741fcc0b4 100644 --- a/src/main/target/NUCLEOF7/target.h +++ b/src/main/target/NUCLEOF7/target.h @@ -143,7 +143,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #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 842654a359..7f182448ac 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -161,7 +161,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_OSD) +#define DEFAULT_FEATURES (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 c8fb0cbce0..9b73f62d4c 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -191,9 +191,9 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define AVOID_UART1_FOR_PWM_PPM #if defined(CL_RACINGF4) -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_TELEMETRY | FEATURE_OSD ) +#define DEFAULT_FEATURES (FEATURE_TELEMETRY | FEATURE_OSD ) #else -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_OSD) +#define DEFAULT_FEATURES (FEATURE_OSD) #endif #define SPEKTRUM_BIND_PIN UART1_RX_PIN diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 0b81f21d13..665cc54ffa 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -238,8 +238,6 @@ #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART6 #define DEFAULT_FEATURES FEATURE_TELEMETRY -#else -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #endif #define SPEKTRUM_BIND_PIN UART3_RX_PIN diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h index 8e942e45f4..bddc8e6bb5 100644 --- a/src/main/target/SINGULARITY/target.h +++ b/src/main/target/SINGULARITY/target.h @@ -89,7 +89,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT -#define DEFAULT_FEATURES (FEATURE_BLACKBOX) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_UART SERIAL_PORT_USART2 diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h index 98e42f7674..f7f761ea43 100644 --- a/src/main/target/SIRINFPV/target.h +++ b/src/main/target/SIRINFPV/target.h @@ -150,7 +150,7 @@ #define SPEKTRUM_BIND_PIN UART3_RX_PIN #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_RX_SERIAL | FEATURE_OSD | FEATURE_VTX) +#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_OSD | FEATURE_VTX) #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h index 46a7be6dce..5b9f570310 100644 --- a/src/main/target/SPARKY2/target.h +++ b/src/main/target/SPARKY2/target.h @@ -121,7 +121,6 @@ #undef LED_STRIP -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART3 diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index a564b9c5ef..332b06ec83 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -182,7 +182,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) +#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) #define SPEKTRUM_BIND_PIN UART3_RX_PIN diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h index 15c1ced144..0ecff9cdca 100755 --- a/src/main/target/SPRACINGF3EVO/target.h +++ b/src/main/target/SPRACINGF3EVO/target.h @@ -149,7 +149,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) +#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) #define SPEKTRUM_BIND_PIN UART3_RX_PIN diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h index 9572c421f4..ea3cd18c6d 100644 --- a/src/main/target/SPRACINGF3MINI/target.h +++ b/src/main/target/SPRACINGF3MINI/target.h @@ -176,7 +176,6 @@ #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #ifndef TINYBEEF3 -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define BUTTONS #define BUTTON_A_PIN PB1 diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index 2d4a00996c..3aa363b92e 100755 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -160,7 +160,7 @@ #define OSD #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_SDCARD | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) +#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY) #define BUTTONS #define BUTTON_A_PIN PD2 diff --git a/src/main/target/TINYFISH/target.h b/src/main/target/TINYFISH/target.h index 8d5544513e..90b31b31b6 100644 --- a/src/main/target/TINYFISH/target.h +++ b/src/main/target/TINYFISH/target.h @@ -117,7 +117,7 @@ #define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH2_HANDLER #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL -#define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_TELEMETRY) +#define DEFAULT_FEATURES ( FEATURE_TELEMETRY ) #define TARGET_CONFIG #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h index b382b15702..90fd89d5ca 100644 --- a/src/main/target/X_RACERSPI/target.h +++ b/src/main/target/X_RACERSPI/target.h @@ -114,7 +114,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define SPEKTRUM_BIND_PIN UART3_RX_PIN diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h index e05de6c50b..4cb7f333bf 100644 --- a/src/main/target/YUPIF4/target.h +++ b/src/main/target/YUPIF4/target.h @@ -150,7 +150,6 @@ // Default configuration #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -#define DEFAULT_FEATURES FEATURE_BLACKBOX #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART6