1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00

Inconsitant conditional compile directives in config.c. Added BLACKBOX global condirtion.

This commit is contained in:
Anders Hoglund 2016-06-24 13:07:44 +02:00
parent 3c33e9c5c0
commit 99e1411e71

View file

@ -623,6 +623,8 @@ static void resetConf(void)
memcpy(masterConfig.transponderData, &defaultTransponderData, sizeof(defaultTransponderData)); memcpy(masterConfig.transponderData, &defaultTransponderData, sizeof(defaultTransponderData));
#endif #endif
#ifdef BLACKBOX
#if defined(ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT) #if defined(ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT)
featureSet(FEATURE_BLACKBOX); featureSet(FEATURE_BLACKBOX);
masterConfig.blackbox_device = BLACKBOX_DEVICE_FLASH; masterConfig.blackbox_device = BLACKBOX_DEVICE_FLASH;
@ -636,6 +638,8 @@ static void resetConf(void)
masterConfig.blackbox_rate_num = 1; masterConfig.blackbox_rate_num = 1;
masterConfig.blackbox_rate_denom = 1; masterConfig.blackbox_rate_denom = 1;
#endif // BLACKBOX
// alternative defaults settings for COLIBRI RACE targets // alternative defaults settings for COLIBRI RACE targets
#if defined(COLIBRI_RACE) #if defined(COLIBRI_RACE)
masterConfig.escAndServoConfig.minthrottle = 1025; masterConfig.escAndServoConfig.minthrottle = 1025;