aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-08-23 13:25:50 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-08-23 13:25:50 +0200
commitffd2fa7386f9fe3ab017d98a2b0e8e21b0975833 (patch)
tree29da6eb87c5f1f59e3956d76aa6e8ea41123ab36
parentcc12e6051d1ae8100c035e935fe6dd1a453ce887 (diff)
downloadpx4-firmware-ffd2fa7386f9fe3ab017d98a2b0e8e21b0975833.tar.gz
px4-firmware-ffd2fa7386f9fe3ab017d98a2b0e8e21b0975833.tar.bz2
px4-firmware-ffd2fa7386f9fe3ab017d98a2b0e8e21b0975833.zip
commander: fix check for rc && gps loss
-rw-r--r--src/modules/commander/commander.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 692e5e8ec..c4b76b391 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -1598,8 +1598,8 @@ int commander_thread_main(int argc, char *argv[])
status.main_state == MAIN_STATE_MANUAL ||
status.main_state == MAIN_STATE_ALTCTL ||
status.main_state == MAIN_STATE_POSCTL) &&
- ((status.rc_signal_lost && status.rc_signal_lost) ||
- (status.rc_signal_lost && status.gps_failure_cmd))) {
+ ((status.rc_signal_lost && status.gps_failure) ||
+ (status.rc_signal_lost_cmd && status.gps_failure_cmd))) {
armed.force_failsafe = true;
status_changed = true;
warnx("Flight termination because of RC signal loss && gps failure");