From 7d8903a8bfa69defac9941a2c5f1fee240a5e381 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 18 Aug 2012 16:32:06 +1000 Subject: [PATCH] AP_Baro: the HIL baro needs to inherit calibrate() from the parent class this was what caused the renorm errors --- libraries/AP_Baro/AP_Baro_BMP085_hil.cpp | 5 ----- libraries/AP_Baro/AP_Baro_BMP085_hil.h | 1 - 2 files changed, 6 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp b/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp index c59f3ad4cf..3802ac1c31 100644 --- a/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp +++ b/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp @@ -16,11 +16,6 @@ bool AP_Baro_BMP085_HIL::init(AP_PeriodicProcess * scheduler) return true; } -void AP_Baro_BMP085_HIL::calibrate(void (*callback)(unsigned long t)) -{ - // nothing to do -} - // Read the sensor. This is a state machine // We read one time Temperature (state = 1) and then 4 times Pressure (states 2-5) uint8_t AP_Baro_BMP085_HIL::read() diff --git a/libraries/AP_Baro/AP_Baro_BMP085_hil.h b/libraries/AP_Baro/AP_Baro_BMP085_hil.h index 2b9a7b00ff..e6517f2b64 100644 --- a/libraries/AP_Baro/AP_Baro_BMP085_hil.h +++ b/libraries/AP_Baro/AP_Baro_BMP085_hil.h @@ -25,7 +25,6 @@ public: int32_t get_raw_pressure(); int32_t get_raw_temp(); void setHIL(float Temp, float Press); - void calibrate(void (*callback)(unsigned long t)); }; #endif // __AP_BARO_BMP085_HIL_H__