fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commander: Do not break out of RTL on stick input change

Browse Source
This commit is contained in:
Lorenz Meier 2017-02-21 13:55:27 +01:00
parent bf06066010
commit 7fc8ee85fa
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/commander/commander.cpp
View File

@ -2522,8 +2522,7 @@ int commander_thread_main(int argc, char *argv[])
// abort landing or auto or loiter if sticks are moved significantly
if (internal_state.main_state == commander_state_s::MAIN_STATE_AUTO_LAND ||
internal_state.main_state == commander_state_s::MAIN_STATE_AUTO_MISSION ||
internal_state.main_state == commander_state_s::MAIN_STATE_AUTO_LOITER ||
internal_state.main_state == commander_state_s::MAIN_STATE_AUTO_RTL) {
internal_state.main_state == commander_state_s::MAIN_STATE_AUTO_LOITER) {
// transition to previous state if sticks are touched
if ((_last_sp_man.timestamp != sp_man.timestamp) &&
((fabsf(sp_man.x) - fabsf(_last_sp_man.x) > min_stick_change) ||