From 8b794602d10e2f452454322f5b0526a2dfb714bf Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 12 Nov 2014 11:23:28 +1100 Subject: [PATCH] AP_Baro: make get_temperature() a const function --- libraries/AP_Baro/AP_Baro.h | 2 +- libraries/AP_Baro/AP_Baro_BMP085.cpp | 2 +- libraries/AP_Baro/AP_Baro_BMP085.h | 2 +- libraries/AP_Baro/AP_Baro_HIL.cpp | 2 +- libraries/AP_Baro/AP_Baro_HIL.h | 2 +- libraries/AP_Baro/AP_Baro_MS5611.cpp | 2 +- libraries/AP_Baro/AP_Baro_MS5611.h | 2 +- libraries/AP_Baro/AP_Baro_PX4.cpp | 2 +- libraries/AP_Baro/AP_Baro_PX4.h | 2 +- libraries/AP_Baro/AP_Baro_VRBRAIN.cpp | 2 +- libraries/AP_Baro/AP_Baro_VRBRAIN.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro.h b/libraries/AP_Baro/AP_Baro.h index c14cb74f84..43859b71dd 100644 --- a/libraries/AP_Baro/AP_Baro.h +++ b/libraries/AP_Baro/AP_Baro.h @@ -35,7 +35,7 @@ public: virtual float get_pressure() = 0; // temperature in degrees C - virtual float get_temperature() = 0; + virtual float get_temperature() const = 0; // accumulate a reading - overridden in some drivers virtual void accumulate(void) {} diff --git a/libraries/AP_Baro/AP_Baro_BMP085.cpp b/libraries/AP_Baro/AP_Baro_BMP085.cpp index 5c2e54ee80..569375c9d9 100644 --- a/libraries/AP_Baro/AP_Baro_BMP085.cpp +++ b/libraries/AP_Baro/AP_Baro_BMP085.cpp @@ -181,7 +181,7 @@ float AP_Baro_BMP085::get_pressure() { return Press; } -float AP_Baro_BMP085::get_temperature() { +float AP_Baro_BMP085::get_temperature() const { return Temp; } diff --git a/libraries/AP_Baro/AP_Baro_BMP085.h b/libraries/AP_Baro/AP_Baro_BMP085.h index aa5bccfee5..bc53ddab8e 100644 --- a/libraries/AP_Baro/AP_Baro_BMP085.h +++ b/libraries/AP_Baro/AP_Baro_BMP085.h @@ -34,7 +34,7 @@ public: uint8_t read(); void accumulate(void); float get_pressure(); - float get_temperature(); + float get_temperature() const; private: int32_t RawPress; diff --git a/libraries/AP_Baro/AP_Baro_HIL.cpp b/libraries/AP_Baro/AP_Baro_HIL.cpp index a2152cd407..c9e2773035 100644 --- a/libraries/AP_Baro/AP_Baro_HIL.cpp +++ b/libraries/AP_Baro/AP_Baro_HIL.cpp @@ -94,6 +94,6 @@ float AP_Baro_HIL::get_pressure() { return Press; } -float AP_Baro_HIL::get_temperature() { +float AP_Baro_HIL::get_temperature() const { return Temp; } diff --git a/libraries/AP_Baro/AP_Baro_HIL.h b/libraries/AP_Baro/AP_Baro_HIL.h index abe60d5b1a..9853bf2211 100644 --- a/libraries/AP_Baro/AP_Baro_HIL.h +++ b/libraries/AP_Baro/AP_Baro_HIL.h @@ -18,7 +18,7 @@ public: bool init(); uint8_t read(); float get_pressure(); - float get_temperature(); + float get_temperature() const; void setHIL(float altitude_msl); void setHIL(float pressure, float temperature); }; diff --git a/libraries/AP_Baro/AP_Baro_MS5611.cpp b/libraries/AP_Baro/AP_Baro_MS5611.cpp index 21ffdcecc5..8f3eecef21 100644 --- a/libraries/AP_Baro/AP_Baro_MS5611.cpp +++ b/libraries/AP_Baro/AP_Baro_MS5611.cpp @@ -486,7 +486,7 @@ float AP_Baro_MS5611::get_pressure() return Press; } -float AP_Baro_MS5611::get_temperature() +float AP_Baro_MS5611::get_temperature() const { // temperature in degrees C units return Temp; diff --git a/libraries/AP_Baro/AP_Baro_MS5611.h b/libraries/AP_Baro/AP_Baro_MS5611.h index 27ed852967..959dcb2ba7 100644 --- a/libraries/AP_Baro/AP_Baro_MS5611.h +++ b/libraries/AP_Baro/AP_Baro_MS5611.h @@ -86,7 +86,7 @@ public: bool init(); uint8_t read(); float get_pressure(); // in mbar*100 units - float get_temperature(); // in celsius degrees + float get_temperature() const; // in celsius degrees /* Serial port drivers to pass to "init". */ diff --git a/libraries/AP_Baro/AP_Baro_PX4.cpp b/libraries/AP_Baro/AP_Baro_PX4.cpp index a192e2891d..24d046215c 100644 --- a/libraries/AP_Baro/AP_Baro_PX4.cpp +++ b/libraries/AP_Baro/AP_Baro_PX4.cpp @@ -79,7 +79,7 @@ float AP_Baro_PX4::get_pressure() { return _pressure; } -float AP_Baro_PX4::get_temperature() { +float AP_Baro_PX4::get_temperature() const { return _temperature; } diff --git a/libraries/AP_Baro/AP_Baro_PX4.h b/libraries/AP_Baro/AP_Baro_PX4.h index 669bda5f44..c9f7a5b752 100644 --- a/libraries/AP_Baro/AP_Baro_PX4.h +++ b/libraries/AP_Baro/AP_Baro_PX4.h @@ -11,7 +11,7 @@ public: bool init(); uint8_t read(); float get_pressure(); - float get_temperature(); + float get_temperature() const; private: float _temperature; diff --git a/libraries/AP_Baro/AP_Baro_VRBRAIN.cpp b/libraries/AP_Baro/AP_Baro_VRBRAIN.cpp index c65cdb0122..ef27b63be7 100644 --- a/libraries/AP_Baro/AP_Baro_VRBRAIN.cpp +++ b/libraries/AP_Baro/AP_Baro_VRBRAIN.cpp @@ -79,7 +79,7 @@ float AP_Baro_VRBRAIN::get_pressure() { return _pressure; } -float AP_Baro_VRBRAIN::get_temperature() { +float AP_Baro_VRBRAIN::get_temperature() const { return _temperature; } diff --git a/libraries/AP_Baro/AP_Baro_VRBRAIN.h b/libraries/AP_Baro/AP_Baro_VRBRAIN.h index cd5bc923a7..794cddc87c 100644 --- a/libraries/AP_Baro/AP_Baro_VRBRAIN.h +++ b/libraries/AP_Baro/AP_Baro_VRBRAIN.h @@ -11,7 +11,7 @@ public: bool init(); uint8_t read(); float get_pressure(); - float get_temperature(); + float get_temperature() const; private: float _temperature;