zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

battery: make battery states not sticky 

Signed-off-by: RomanBapst <bapstroman@gmail.com>
sbg
RomanBapst 5 years ago committed by Roman Bapst
parent
1c30b10585
commit
e360dd34f9
1 changed files with 6 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/lib/battery/battery.cpp

9
src/lib/battery/battery.cpp
Unescape View File

@ -210,14 +210,17 @@ Battery::determineWarning(bool connected)
{ {
if (connected) { if (connected) {
// propagate warning state only if the state is higher, otherwise remain in current warning state // propagate warning state only if the state is higher, otherwise remain in current warning state
if (_remaining < _param_bat_emergen_thr.get() || (_warning == battery_status_s::BATTERY_WARNING_EMERGENCY)) { if (_remaining < _param_bat_emergen_thr.get()) {
_warning = battery_status_s::BATTERY_WARNING_EMERGENCY; _warning = battery_status_s::BATTERY_WARNING_EMERGENCY;
} else if (_remaining < _param_bat_crit_thr.get() || (_warning == battery_status_s::BATTERY_WARNING_CRITICAL)) { } else if (_remaining < _param_bat_crit_thr.get()) {
_warning = battery_status_s::BATTERY_WARNING_CRITICAL; _warning = battery_status_s::BATTERY_WARNING_CRITICAL;
} else if (_remaining < _param_bat_low_thr.get() || (_warning == battery_status_s::BATTERY_WARNING_LOW)) { } else if (_remaining < _param_bat_low_thr.get()) {
_warning = battery_status_s::BATTERY_WARNING_LOW; _warning = battery_status_s::BATTERY_WARNING_LOW;
} else {
_warning = battery_status_s::BATTERY_WARNING_NONE;
} }
} }
} }

Write Preview
Loading…
Cancel
Save