Browse Source

AP_Baro: make get_temperature() a const function

mission-4.1.18
Andrew Tridgell 10 years ago
parent
commit
8b794602d1
  1. 2
      libraries/AP_Baro/AP_Baro.h
  2. 2
      libraries/AP_Baro/AP_Baro_BMP085.cpp
  3. 2
      libraries/AP_Baro/AP_Baro_BMP085.h
  4. 2
      libraries/AP_Baro/AP_Baro_HIL.cpp
  5. 2
      libraries/AP_Baro/AP_Baro_HIL.h
  6. 2
      libraries/AP_Baro/AP_Baro_MS5611.cpp
  7. 2
      libraries/AP_Baro/AP_Baro_MS5611.h
  8. 2
      libraries/AP_Baro/AP_Baro_PX4.cpp
  9. 2
      libraries/AP_Baro/AP_Baro_PX4.h
  10. 2
      libraries/AP_Baro/AP_Baro_VRBRAIN.cpp
  11. 2
      libraries/AP_Baro/AP_Baro_VRBRAIN.h

2
libraries/AP_Baro/AP_Baro.h

@ -35,7 +35,7 @@ public: @@ -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) {}

2
libraries/AP_Baro/AP_Baro_BMP085.cpp

@ -181,7 +181,7 @@ float AP_Baro_BMP085::get_pressure() { @@ -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;
}

2
libraries/AP_Baro/AP_Baro_BMP085.h

@ -34,7 +34,7 @@ public: @@ -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;

2
libraries/AP_Baro/AP_Baro_HIL.cpp

@ -94,6 +94,6 @@ float AP_Baro_HIL::get_pressure() { @@ -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;
}

2
libraries/AP_Baro/AP_Baro_HIL.h

@ -18,7 +18,7 @@ public: @@ -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);
};

2
libraries/AP_Baro/AP_Baro_MS5611.cpp

@ -486,7 +486,7 @@ float AP_Baro_MS5611::get_pressure() @@ -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;

2
libraries/AP_Baro/AP_Baro_MS5611.h

@ -86,7 +86,7 @@ public: @@ -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". */

2
libraries/AP_Baro/AP_Baro_PX4.cpp

@ -79,7 +79,7 @@ float AP_Baro_PX4::get_pressure() { @@ -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;
}

2
libraries/AP_Baro/AP_Baro_PX4.h

@ -11,7 +11,7 @@ public: @@ -11,7 +11,7 @@ public:
bool init();
uint8_t read();
float get_pressure();
float get_temperature();
float get_temperature() const;
private:
float _temperature;

2
libraries/AP_Baro/AP_Baro_VRBRAIN.cpp

@ -79,7 +79,7 @@ float AP_Baro_VRBRAIN::get_pressure() { @@ -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;
}

2
libraries/AP_Baro/AP_Baro_VRBRAIN.h

@ -11,7 +11,7 @@ public: @@ -11,7 +11,7 @@ public:
bool init();
uint8_t read();
float get_pressure();
float get_temperature();
float get_temperature() const;
private:
float _temperature;

Loading…
Cancel
Save