Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 09:45:33 +03:00
Code Issues Wiki Activity

Merge branch 'development' into dzikuvx-mixer-rework

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2018-04-21 13:56:20 +02:00
commit 2b1a1eef1d
55 changed files with 1246 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -492,7 +492,7 @@ void init(void)
adc_params.adcFunctionChannel[ADC_CURRENT] = adcChannelConfig()->adcFunctionChannel[ADC_CURRENT];
}
#if defined(USE_PITOT) && defined(USE_PITOT_ADC)
#if defined(USE_PITOT) && defined(USE_ADC) && defined(USE_PITOT_ADC)
if (pitotmeterConfig()->pitot_hardware == PITOT_ADC || pitotmeterConfig()->pitot_hardware == PITOT_AUTODETECT) {
adc_params.adcFunctionChannel[ADC_AIRSPEED] = adcChannelConfig()->adcFunctionChannel[ADC_AIRSPEED];
}