From 48fb7f8159cd68944add4032385aeed55b087a5c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 May 2015 12:35:03 +1000 Subject: [PATCH] AP_BARO: revert AP_Math class change --- libraries/AP_Baro/AP_Baro.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro.cpp b/libraries/AP_Baro/AP_Baro.cpp index 84f112a753..15253df81a 100644 --- a/libraries/AP_Baro/AP_Baro.cpp +++ b/libraries/AP_Baro/AP_Baro.cpp @@ -197,7 +197,7 @@ float AP_Baro::get_altitude_difference(float base_pressure, float pressure) cons float AP_Baro::get_EAS2TAS(void) { float altitude = get_altitude(); - if ((fabsf(altitude - _last_altitude_EAS2TAS) < 100.0f) && !AP_Math::is_zero(_EAS2TAS)) { + if ((fabsf(altitude - _last_altitude_EAS2TAS) < 100.0f) && !is_zero(_EAS2TAS)) { // not enough change to require re-calculating return _EAS2TAS; } @@ -318,13 +318,13 @@ void AP_Baro::update(void) // last 0.5 seconds uint32_t now = hal.scheduler->millis(); for (uint8_t i=0; i<_num_sensors; i++) { - sensors[i].healthy = (now - sensors[i].last_update_ms < 500) && !AP_Math::is_zero(sensors[i].pressure); + sensors[i].healthy = (now - sensors[i].last_update_ms < 500) && !is_zero(sensors[i].pressure); } for (uint8_t i=0; i<_num_sensors; i++) { if (sensors[i].healthy) { // update altitude calculation - if (AP_Math::is_zero(sensors[i].ground_pressure)) { + if (is_zero(sensors[i].ground_pressure)) { sensors[i].ground_pressure = sensors[i].pressure; } sensors[i].altitude = get_altitude_difference(sensors[i].ground_pressure, sensors[i].pressure);