Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-04 12:43:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: updates for new AP_Baro API

Browse Source
This commit is contained in:
Andrew Tridgell 2015-01-05 22:27:45 +11:00
parent bb6deb4817
commit e575bc264e
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
APMrover2/APMrover2.pde
View File

@ -201,21 +201,7 @@ static AP_GPS gps;
// flight modes convenience array // flight modes convenience array
static AP_Int8 *modes = &g.mode1; static AP_Int8 *modes = &g.mode1;
#if CONFIG_BARO == HAL_BARO_BMP085 static AP_Baro barometer;
static AP_Baro_BMP085 barometer;
#elif CONFIG_BARO == HAL_BARO_PX4
static AP_Baro_PX4 barometer;
#elif CONFIG_BARO == HAL_BARO_VRBRAIN
static AP_Baro_VRBRAIN barometer;
#elif CONFIG_BARO == HAL_BARO_HIL
static AP_Baro_HIL barometer;
#elif CONFIG_BARO == HAL_BARO_MS5611
static AP_Baro_MS5611 barometer(&AP_Baro_MS5611::i2c);
#elif CONFIG_BARO == HAL_BARO_MS5611_SPI
static AP_Baro_MS5611 barometer(&AP_Baro_MS5611::spi);
#else
#error Unrecognized CONFIG_BARO setting
#endif
#if CONFIG_COMPASS == HAL_COMPASS_PX4 #if CONFIG_COMPASS == HAL_COMPASS_PX4
static AP_Compass_PX4 compass; static AP_Compass_PX4 compass;
@ -639,7 +625,7 @@ static void mount_update(void)
static void update_alt() static void update_alt()
{ {
barometer.read(); barometer.update();
if (should_log(MASK_LOG_IMU)) { if (should_log(MASK_LOG_IMU)) {
Log_Write_Baro(); Log_Write_Baro();
} }