From 10cc05c8ed892e2212e914d98f96d69f6db1c907 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 5 Apr 2019 09:06:32 +1100 Subject: [PATCH] AC_Baro: add floating point constant designators --- libraries/AP_Baro/AP_Baro_DPS280.cpp | 4 ++-- libraries/AP_Baro/AP_Baro_HIL.cpp | 2 +- libraries/AP_Baro/AP_Baro_ICM20789.cpp | 2 +- libraries/AP_Baro/AP_Baro_LPS2XH.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro_DPS280.cpp b/libraries/AP_Baro/AP_Baro_DPS280.cpp index 32df78f16a..4a1735f22c 100644 --- a/libraries/AP_Baro/AP_Baro_DPS280.cpp +++ b/libraries/AP_Baro/AP_Baro_DPS280.cpp @@ -164,13 +164,13 @@ void AP_Baro_DPS280::calculate_PT(int32_t UT, int32_t UP, float &pressure, float { const struct dps280_cal &cal = calibration; // scaling for 16x oversampling - const float scaling_16 = 1.0/253952; + const float scaling_16 = 1.0f/253952; float temp_scaled; float press_scaled; temp_scaled = float(UT) * scaling_16; - temperature = cal.C0 * 0.5 + cal.C1 * temp_scaled; + temperature = cal.C0 * 0.5f + cal.C1 * temp_scaled; press_scaled = float(UP) * scaling_16; diff --git a/libraries/AP_Baro/AP_Baro_HIL.cpp b/libraries/AP_Baro/AP_Baro_HIL.cpp index b31d113cfe..52de181fb8 100644 --- a/libraries/AP_Baro/AP_Baro_HIL.cpp +++ b/libraries/AP_Baro/AP_Baro_HIL.cpp @@ -74,7 +74,7 @@ void AP_Baro::SimpleUnderWaterAtmosphere( // \f$T(D)\approx\frac{S}{1.8 \cdot 10^{-4} \cdot S \cdot T + 1}\f$ const float seaTempSurface = 15.0f; // Celsius const float S = seaTempSurface * 0.338f; - theta = 1.0f / ((1.8e-4) * S * (alt * 1e3) + 1.0f); + theta = 1.0f / ((1.8e-4f) * S * (alt * 1e3f) + 1.0f); } /* diff --git a/libraries/AP_Baro/AP_Baro_ICM20789.cpp b/libraries/AP_Baro/AP_Baro_ICM20789.cpp index 07c2315f28..88989ebf1d 100644 --- a/libraries/AP_Baro/AP_Baro_ICM20789.cpp +++ b/libraries/AP_Baro/AP_Baro_ICM20789.cpp @@ -296,7 +296,7 @@ static struct { void AP_Baro_ICM20789::convert_data(uint32_t Praw, uint32_t Traw) { // temperature is easy - float T = -45 + (175.0 / (1U<<16)) * Traw; + float T = -45 + (175.0f / (1U<<16)) * Traw; // pressure involves a few more calculations float P = get_pressure(Praw, Traw); diff --git a/libraries/AP_Baro/AP_Baro_LPS2XH.cpp b/libraries/AP_Baro/AP_Baro_LPS2XH.cpp index f5ee8840bc..6c2ce7cffe 100644 --- a/libraries/AP_Baro/AP_Baro_LPS2XH.cpp +++ b/libraries/AP_Baro/AP_Baro_LPS2XH.cpp @@ -224,7 +224,7 @@ void AP_Baro_LPS2XH::_update_temperature(void) WITH_SEMAPHORE(_sem); if (_lps2xh_type == BARO_LPS25H) { - _temperature=((float)(Temp_Reg_s16/480)+42.5); + _temperature=((float)(Temp_Reg_s16/480)+42.5f); } if (_lps2xh_type == BARO_LPS22H) { _temperature=(float)(Temp_Reg_s16/100); @@ -237,7 +237,7 @@ void AP_Baro_LPS2XH::_update_pressure(void) uint8_t pressure[3]; _dev->read_registers(PRESS_OUT_XL_ADDR, pressure, 3); int32_t Pressure_Reg_s32 = ((uint32_t)pressure[2]<<16)|((uint32_t)pressure[1]<<8)|(uint32_t)pressure[0]; - int32_t Pressure_mb = Pressure_Reg_s32 * (100.0 / 4096); // scale for pa + int32_t Pressure_mb = Pressure_Reg_s32 * (100.0f / 4096); // scale for pa WITH_SEMAPHORE(_sem); _pressure = Pressure_mb;