Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Baro: avoid some float conversion warnings

This commit is contained in:
Andrew Tridgell 2014-07-08 20:26:54 +10:00
parent 6b87c9fdf7
commit 74c3b404ee
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Baro/AP_Baro.cpp
View File

@ -181,7 +181,7 @@ float AP_Baro::get_altitude(void)
// assumes standard atmosphere lapse rate
float AP_Baro::get_EAS2TAS(void)
{
if ((fabs(_altitude - _last_altitude_EAS2TAS) < 100.0f) && (_EAS2TAS != 0.0f)) {
if ((fabsf(_altitude - _last_altitude_EAS2TAS) < 100.0f) && (_EAS2TAS != 0.0f)) {
// not enough change to require re-calculating
return _EAS2TAS;
}

4
libraries/AP_Baro/AP_Baro_BMP085.cpp
View File

@ -291,8 +291,8 @@ void AP_Baro_BMP085::Calculate()
_count++;
if (_count == 254) {
_temp_sum *= 0.5;
_press_sum *= 0.5;
_temp_sum *= 0.5f;
_press_sum *= 0.5f;
_count /= 2;
}
}

6
libraries/AP_Baro/AP_Baro_HIL.cpp
View File

@ -60,7 +60,7 @@ static void SimpleAtmosphere(
const float GMR = 34.163195f; // gas constant
float h=alt*REARTH/(alt+REARTH); // geometric to geopotential altitude
if (h<11.0)
if (h<11.0f)
{ // Troposphere
theta=(288.15f-6.5f*h)/288.15f;
delta=powf(theta, GMR/6.5f);
@ -80,9 +80,9 @@ void AP_Baro_HIL::setHIL(float altitude_msl)
float sigma, delta, theta;
const float p0 = 101325;
SimpleAtmosphere(altitude_msl*0.001, sigma, delta, theta);
SimpleAtmosphere(altitude_msl*0.001f, sigma, delta, theta);
float p = p0 * delta;
float T = 303.16 * theta - 273.16; // Assume 30 degrees at sea level - converted to degrees Kelvin
float T = 303.16f * theta - 273.16f; // Assume 30 degrees at sea level - converted to degrees Kelvin
setHIL(p, T);
}