aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ArduCopter Init: different call to barometer.init based on CONFIG_BARO

Browse Source 
* BMP085 has two arguments, second varying on apm1/apm2
* ms5611 has no arguments
This commit is contained in:
Pat Hickey 2011-11-29 20:36:07 -08:00
parent b055aa6f81
commit 39fe9075d9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ArduCopter/system.pde
View File

@ -244,11 +244,16 @@ static void init_ardupilot()
adc.Init(&timer_scheduler); // APM ADC library initialization
#endif // CONFIG_ADC
#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
barometer.Init(1, true);
#else
barometer.Init(1, false);
#endif // CONFIG_APM_HARDWARE
#if CONFIG_BARO == AP_BARO_MS5611
barometer.init();
#elif CONFIG_BARO == AP_BARO_BMP085
# if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
#warning bmp085 for apm2
barometer.init(1, true);
# else
barometer.init(1, false);
# endif // CONFIG_APM_HARDWARE
#endif // CONFIG_BARO
#endif // HIL_MODE