diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-05 15:29:46 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-05 15:29:46 +0400 |
| commit | 0b45e01db9deb5b6fdb07920403e270bc1b32b63 (patch) | |
| tree | a2ab61addf5b9e49175753dd4efc2b13d2a4e2d3 /src/modules/commander | |
| parent | 60355b4e6c0a6916084442d0557cacd74b008b82 (diff) | |
| parent | 3b5e6f98338fded2cbe7be1c301dc2698f7239aa (diff) | |
| download | px4-firmware-0b45e01db9deb5b6fdb07920403e270bc1b32b63.tar.gz px4-firmware-0b45e01db9deb5b6fdb07920403e270bc1b32b63.tar.bz2 px4-firmware-0b45e01db9deb5b6fdb07920403e270bc1b32b63.zip | |
Merge branch 'failsafe_sbus_cleanup' into rc_timeout
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 7e469c9c1..73e1a1792 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1121,7 +1121,7 @@ int commander_thread_main(int argc, char *argv[]) } /* start RC input check */ - if (!status.rc_input_blocked && !sp_man.signal_lost && hrt_absolute_time() < sp_man.timestamp + RC_TIMEOUT) { + if (!status.rc_input_blocked && sp_man.timestamp != 0 && hrt_absolute_time() < sp_man.timestamp + RC_TIMEOUT) { /* handle the case where RC signal was regained */ if (!status.rc_signal_found_once) { status.rc_signal_found_once = true; |