From f8962d24393c5b1fc7ba009226cb3c9a51426173 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 5 Jan 2015 22:27:54 +1100
Subject: [PATCH] AntennaTracker: updates for new AP_Baro API
---
AntennaTracker/AntennaTracker.pde | 16 +---------------
AntennaTracker/sensors.pde | 2 +-
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/AntennaTracker/AntennaTracker.pde b/AntennaTracker/AntennaTracker.pde
index a79b0df0b..4cf2c2b4b 100644
--- a/AntennaTracker/AntennaTracker.pde
+++ b/AntennaTracker/AntennaTracker.pde
@@ -117,21 +117,7 @@ void gcs_send_text_fmt(const prog_char_t *fmt, ...);
////////////////////////////////////////////////////////////////////////////////
static AP_GPS gps;
-#if CONFIG_BARO == HAL_BARO_BMP085
-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
+static AP_Baro barometer;
#if CONFIG_COMPASS == HAL_COMPASS_PX4
static AP_Compass_PX4 compass;
diff --git a/AntennaTracker/sensors.pde b/AntennaTracker/sensors.pde
index 0f35b210a..55bc647c2 100644
--- a/AntennaTracker/sensors.pde
+++ b/AntennaTracker/sensors.pde
@@ -10,7 +10,7 @@ static void init_barometer(void)
// read the barometer and return the updated altitude in meters
static void update_barometer(void)
{
- barometer.read();
+ barometer.update();
}
--
GitLab