diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-22 01:40:27 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-22 01:40:27 +0200 |
| commit | 42e9c84d50bcfe3298b0d88bb35a42acdc51d5a2 (patch) | |
| tree | 92d14a08389679d6dfedfd5227e5aa21c3e63f1b /src/modules/commander | |
| parent | 706d08055d2bf63d16c72e86cd60f0e33a20bc4f (diff) | |
| parent | af336603517a32b86481c5f57d9be51657eb3f0d (diff) | |
| download | px4-firmware-42e9c84d50bcfe3298b0d88bb35a42acdc51d5a2.tar.gz px4-firmware-42e9c84d50bcfe3298b0d88bb35a42acdc51d5a2.tar.bz2 px4-firmware-42e9c84d50bcfe3298b0d88bb35a42acdc51d5a2.zip | |
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
Diffstat (limited to 'src/modules/commander')
| -rw-r--r-- | src/modules/commander/commander.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index e39cc5fe7..8ecd4e840 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -919,7 +919,7 @@ int commander_thread_main(int argc, char *argv[]) orb_copy(ORB_ID(battery_status), battery_sub, &battery); /* only consider battery voltage if system has been running 2s and battery voltage is valid */ - if (status.hil_state == HIL_STATE_OFF && hrt_absolute_time() > start_time + 2000000 && battery.voltage_filtered_v > 0.0f) { + if (hrt_absolute_time() > start_time + 2000000 && battery.voltage_filtered_v > 0.0f) { status.battery_voltage = battery.voltage_filtered_v; status.battery_current = battery.current_a; status.condition_battery_voltage_valid = true; |