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

Cleanup sonar support for Naze/Flip32/Olimexino. Add Sonar

Browse source 
documentation.
This commit is contained in:
Dominic Clifton 2014-08-13 22:01:39 +01:00
parent 74ef19bc34
commit d0338eac19
8 changed files with 108 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -458,7 +458,7 @@ void validateAndFixConfig(void)
featureClear(FEATURE_RX_PPM);
}
if (feature(FEATURE_RX_PARALLEL_PWM)) {
if (feature(FEATURE_CURRENT_METER)) {
#if defined(STM32F10X_MD)
// rssi adc needs the same ports
featureClear(FEATURE_RSSI_ADC);
@ -471,7 +471,6 @@ void validateAndFixConfig(void)
featureClear(FEATURE_LED_STRIP);
#endif
// software serial needs free PWM ports
featureClear(FEATURE_SOFTSERIAL);
}
@ -484,6 +483,17 @@ void validateAndFixConfig(void)
}
#endif
#if defined(NAZE) && defined(SONAR)
if (feature(FEATURE_RX_PARALLEL_PWM) && feature(FEATURE_SONAR) && feature(FEATURE_CURRENT_METER)) {
featureClear(FEATURE_CURRENT_METER);
}
#endif
#if defined(OLIMEXINO) && defined(SONAR)
if (feature(FEATURE_SONAR) && feature(FEATURE_CURRENT_METER)) {
featureClear(FEATURE_CURRENT_METER);
}
#endif
useRxConfig(&masterConfig.rxConfig);