diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-22 11:10:48 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-22 11:10:48 +0200 |
| commit | fd56c15a20c1728fde7fb3e975819dfe748caf1c (patch) | |
| tree | c6e7f6b667501ff1d867b43b398260379c70699d /src/modules/commander | |
| parent | d41a01483a9a1e61c12492501bf975021595b3a6 (diff) | |
| parent | aefea1a95d221e541be219d9fec7eece3c72fd50 (diff) | |
| download | px4-firmware-fd56c15a20c1728fde7fb3e975819dfe748caf1c.tar.gz px4-firmware-fd56c15a20c1728fde7fb3e975819dfe748caf1c.tar.bz2 px4-firmware-fd56c15a20c1728fde7fb3e975819dfe748caf1c.zip | |
Merge remote-tracking branch 'px4/master' into navigator_cleanup
Conflicts:
ROMFS/px4fmu_common/init.d/rcS
src/modules/mavlink/mavlink_main.cpp
src/modules/mavlink/mavlink_messages.cpp
src/modules/mavlink/module.mk
src/modules/sdlog2/sdlog2_messages.h
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 c2d24a883..f1c245991 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -969,7 +969,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; |