From 034fb5b19480693b1207933b831c13cfadab8447 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 16 Aug 2012 12:53:37 +1000 Subject: [PATCH] APM: fixed hil build --- ArduPlane/sensors.pde | 7 ------- libraries/AP_Baro/AP_Baro_BMP085_hil.cpp | 4 ++++ libraries/AP_Baro/AP_Baro_BMP085_hil.h | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ArduPlane/sensors.pde b/ArduPlane/sensors.pde index cf18fc5629..15bd98228e 100644 --- a/ArduPlane/sensors.pde +++ b/ArduPlane/sensors.pde @@ -1,10 +1,5 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- -// Sensors are not available in HIL_MODE_ATTITUDE -#if HIL_MODE != HIL_MODE_ATTITUDE - -void ReadSCP1000(void) {} - static void init_barometer(void) { barometer.calibrate(mavlink_delay); @@ -37,8 +32,6 @@ static void zero_airspeed(void) gcs_send_text_P(SEVERITY_LOW,PSTR("zero airspeed calibrated")); } -#endif // HIL_MODE != HIL_MODE_ATTITUDE - static void read_battery(void) { if(g.battery_monitoring == 0) { diff --git a/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp b/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp index dbe3180f0a..c59f3ad4cf 100644 --- a/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp +++ b/libraries/AP_Baro/AP_Baro_BMP085_hil.cpp @@ -16,6 +16,10 @@ 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) diff --git a/libraries/AP_Baro/AP_Baro_BMP085_hil.h b/libraries/AP_Baro/AP_Baro_BMP085_hil.h index e6517f2b64..2b9a7b00ff 100644 --- a/libraries/AP_Baro/AP_Baro_BMP085_hil.h +++ b/libraries/AP_Baro/AP_Baro_BMP085_hil.h @@ -25,6 +25,7 @@ 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__