From f38843278d8ea04d1c5524f57423ab162b01d83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 17 Jan 2017 18:57:02 +0100 Subject: [PATCH] voted_sensors_update: make msl_pressure static const --- src/modules/sensors/voted_sensors_update.cpp | 7 +++++-- src/modules/sensors/voted_sensors_update.h | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/sensors/voted_sensors_update.cpp b/src/modules/sensors/voted_sensors_update.cpp index e270d9a75b..a1ec637493 100644 --- a/src/modules/sensors/voted_sensors_update.cpp +++ b/src/modules/sensors/voted_sensors_update.cpp @@ -50,6 +50,9 @@ using namespace sensors; using namespace DriverFramework; + +const double VotedSensorsUpdate::_msl_pressure = 101.325f; + VotedSensorsUpdate::VotedSensorsUpdate(const Parameters ¶meters) : _parameters(parameters) { @@ -816,10 +819,10 @@ void VotedSensorsUpdate::baro_poll(struct sensor_combined_s &raw) const double R = 287.05; /* ideal gas constant in J/kg/K */ /* current pressure at MSL in kPa */ - double p1 = _msl_pressure / 1000.0; + const double p1 = _msl_pressure; /* measured pressure in kPa */ - double p = 0.001f * _last_best_baro_pressure; + const double p = 0.001f * _last_best_baro_pressure; /* * Solve: diff --git a/src/modules/sensors/voted_sensors_update.h b/src/modules/sensors/voted_sensors_update.h index 1891cec99e..29872a19ef 100644 --- a/src/modules/sensors/voted_sensors_update.h +++ b/src/modules/sensors/voted_sensors_update.h @@ -276,9 +276,7 @@ private: float _baro_offset[SENSOR_COUNT_MAX]; /**< offsets to be added to the raw baro pressure data after scale factor correction */ float _baro_scale[SENSOR_COUNT_MAX]; /**< scale factor corrections to be applied to the raw barp pressure data before offsets are added */ - /* altitude conversion calibration */ - unsigned _msl_pressure; /* in Pa */ - + static const double _msl_pressure; /** average sea-level pressure in kPa */ };