Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 10:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

ArduPlane: update AP_Baro construtors and initializers

Browse Source
This commit is contained in:
Pat Hickey 2011-12-08 22:48:22 -08:00
parent 067724b4f1
commit 85b82e75f6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ArduPlane/ArduPlane.pde
View File

@ -137,7 +137,17 @@ static AP_ADC_ADS7844 adc;
AP_Baro_BMP085_HIL barometer; AP_Baro_BMP085_HIL barometer;
AP_Compass_HIL compass; AP_Compass_HIL compass;
#else #else
static AP_Baro_BMP085 barometer;
#if CONFIG_BARO == AP_BARO_BMP085
# if CONFIG_HARDWARE == CONFIG_HARDWARE_APM2
static AP_Baro_BMP085 barometer(true);
# else
static AP_Baro_BMP085 barometer(false);
# endif
#elif CONFIG_BARO == AP_BARO_MS5611
static AP_Baro_MS5611 barometer;
#endif
static AP_Compass_HMC5843 compass(Parameters::k_param_compass); static AP_Compass_HMC5843 compass(Parameters::k_param_compass);
#endif #endif

6
ArduPlane/system.pde
View File

@ -177,11 +177,7 @@ static void init_ardupilot()
adc.Init(&timer_scheduler); // APM ADC library initialization adc.Init(&timer_scheduler); // APM ADC library initialization
#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2 barometer.init(&timer_scheduler);
barometer.Init(1, true);
#else
barometer.Init(1, false);
#endif
if (g.compass_enabled==true) { if (g.compass_enabled==true) {
compass.set_orientation(MAG_ORIENTATION); // set compass's orientation on aircraft compass.set_orientation(MAG_ORIENTATION); // set compass's orientation on aircraft