diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-07 21:45:45 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-07 21:45:45 +0200 |
| commit | fc2bfb828f0f2ba681da1b33addd03698db4b679 (patch) | |
| tree | a133e82429f186e8b7b727092944777f4d0b6d42 /src/modules/commander/commander.cpp | |
| parent | 38c3e68976c8dc167b4d1e5d24792401fc7cc7d3 (diff) | |
| parent | e4628fbed641496704011b0c488a36ed05b45d5f (diff) | |
| download | px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.tar.gz px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.tar.bz2 px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.zip | |
Merge remote-tracking branch 'px4/master' into mavlink_broadcast
Diffstat (limited to 'src/modules/commander/commander.cpp')
| -rw-r--r-- | src/modules/commander/commander.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 06f7ae6cc..69a45a02f 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -118,8 +118,7 @@ extern struct system_load_s system_load; #define STICK_ON_OFF_COUNTER_LIMIT (STICK_ON_OFF_HYSTERESIS_TIME_MS*COMMANDER_MONITORING_LOOPSPERMSEC) #define POSITION_TIMEOUT 1000000 /**< consider the local or global position estimate invalid after 1s */ -#define RC_TIMEOUT 100000 -#define RC_TIMEOUT_HIL 500000 +#define RC_TIMEOUT 500000 #define DIFFPRESS_TIMEOUT 2000000 #define PRINT_INTERVAL 5000000 @@ -1109,16 +1108,8 @@ int commander_thread_main(int argc, char *argv[]) } } - - /* - * XXX workaround: - * Prevent RC loss in HIL when sensors.cpp is only publishing sp_man at a low rate (e.g. 30Hz) - * which can trigger RC loss if the computer/simulator lags. - */ - uint64_t rc_timeout = status.hil_state == HIL_STATE_ON ? RC_TIMEOUT_HIL : RC_TIMEOUT; - /* start RC input check */ - if (!status.rc_input_blocked && sp_man.timestamp != 0 && 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; |