From 83ac74367ccbfd730c013d14e95e81703afed67d Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Thu, 22 Feb 2018 11:57:33 +0100 Subject: [PATCH] Battery: move member initialization values to class declaration --- src/modules/systemlib/battery.cpp | 7 ------- src/modules/systemlib/battery.h | 14 +++++++------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/modules/systemlib/battery.cpp b/src/modules/systemlib/battery.cpp index 242856904c..778708d017 100644 --- a/src/modules/systemlib/battery.cpp +++ b/src/modules/systemlib/battery.cpp @@ -53,13 +53,6 @@ Battery::Battery() : _low_thr(this, "LOW_THR"), _crit_thr(this, "CRIT_THR"), _emergency_thr(this, "EMERGEN_THR"), - _voltage_filtered_v(-1.f), - _current_filtered_a(-1.f), - _discharged_mah(0.f), - _discharged_mah_loop(0.f), - _remaining_voltage(1.f), - _remaining(2.f), - _scale(1.f), _warning(battery_status_s::BATTERY_WARNING_NONE), _last_timestamp(0) { diff --git a/src/modules/systemlib/battery.h b/src/modules/systemlib/battery.h index 3bf25593ae..8fbb8b9735 100644 --- a/src/modules/systemlib/battery.h +++ b/src/modules/systemlib/battery.h @@ -113,13 +113,13 @@ private: control::BlockParamFloat _crit_thr; control::BlockParamFloat _emergency_thr; - float _voltage_filtered_v; - float _current_filtered_a; - float _discharged_mah; - float _discharged_mah_loop; - float _remaining_voltage; ///< normalized battery charge level remaining based on voltage - float _remaining; ///< normalized battery charge level, selected based on config param - float _scale; + float _voltage_filtered_v = -1.f; + float _current_filtered_a = -1.f; + float _discharged_mah = 0.f; + float _discharged_mah_loop = 0.f; + float _remaining_voltage = 1.f; ///< normalized battery charge level remaining based on voltage + float _remaining = 2.f; ///< normalized battery charge level, selected based on config param + float _scale = 1.f; uint8_t _warning; hrt_abstime _last_timestamp; };