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

Merge pull request #1101 from andre92/patch-1

Browse source 
Change baro detect order
This commit is contained in:
J Blackman 2016-09-05 03:03:22 +10:00 • committed by GitHub
commit f0af282240
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/sensors/initialisation.c
View file

@ -460,21 +460,20 @@ static void detectBaro(baroSensor_e baroHardwareToUse)
switch (baroHardware) { switch (baroHardware) {
case BARO_DEFAULT: case BARO_DEFAULT:
; // fallthough ; // fallthough
case BARO_MS5611:
#ifdef USE_BARO_MS5611
if (ms5611Detect(&baro)) {
baroHardware = BARO_MS5611;
break;
}
#endif
; // fallthough
case BARO_BMP085: case BARO_BMP085:
#ifdef USE_BARO_BMP085 #ifdef USE_BARO_BMP085
if (bmp085Detect(bmp085Config, &baro)) { if (bmp085Detect(bmp085Config, &baro)) {
baroHardware = BARO_BMP085; baroHardware = BARO_BMP085;
break; break;
} }
#endif
; // fallthough
case BARO_MS5611:
#ifdef USE_BARO_MS5611
if (ms5611Detect(&baro)) {
baroHardware = BARO_MS5611;
break;
}
#endif #endif
; // fallthough ; // fallthough
case BARO_BMP280: case BARO_BMP280:
@ -484,6 +483,7 @@ static void detectBaro(baroSensor_e baroHardwareToUse)
break; break;
} }
#endif #endif
; // fallthough
case BARO_NONE: case BARO_NONE:
baroHardware = BARO_NONE; baroHardware = BARO_NONE;
break; break;