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

Fix merging issues

Browse source
This commit is contained in:
Evgeny Sychov 2016-06-13 10:50:33 -07:00
parent 21b5dce0e9
commit c146ddc697
7 changed files with 1 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/config/config.c
View file

@ -652,12 +652,6 @@ static void resetConf(void)
masterConfig.blackbox_rate_denom = 1;
#endif
#if defined(FURYF3)
masterConfig.blackbox_device = 2;
masterConfig.blackbox_rate_num = 1;
masterConfig.blackbox_rate_denom = 1;
#endif
// alternative defaults settings for COLIBRI RACE targets
#if defined(COLIBRI_RACE)
masterConfig.escAndServoConfig.minthrottle = 1025;
@ -829,7 +823,7 @@ void activateConfig(void)
void validateAndFixConfig(void)
{
if (!(featureConfigured(FEATURE_RX_PARALLEL_PWM) || featureConfigured(FEATURE_RX_PPM) || featureConfigured(FEATURE_RX_SERIAL) || featureConfigured(FEATURE_RX_MSP))) {
featureSet(FEATURE_RX_PARALLEL_PWM);
featureSet(FEATURE_RX_PARALLEL_PWM); // Consider changing the default to PPM
}
if (featureConfigured(FEATURE_RX_PPM)) {