diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-02-01 13:54:39 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-02-01 13:54:39 +0100 |
commit | 48f777d071652e382f930a4554ed809a60b7b0c5 (patch) | |
tree | 545c83dcb7affa279e4903fd9139438fcf351467 /src/modules/navigator/navigator_main.cpp | |
parent | c2911cbecf06b18d581fd3e5407a1f525bd63d4b (diff) | |
download | px4-firmware-48f777d071652e382f930a4554ed809a60b7b0c5.tar.gz px4-firmware-48f777d071652e382f930a4554ed809a60b7b0c5.tar.bz2 px4-firmware-48f777d071652e382f930a4554ed809a60b7b0c5.zip |
commander sets vstatus.condition_landed = false for fw systems (until we have a landing detector): solves multiple issues with the state machine in the navigator app
Diffstat (limited to 'src/modules/navigator/navigator_main.cpp')
-rw-r--r-- | src/modules/navigator/navigator_main.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 114776327..3ef2009c7 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -1443,14 +1443,7 @@ Navigator::check_mission_item_reached() } if (_mission_item.nav_cmd == NAV_CMD_LAND) { - if (_vstatus.is_rotary_wing) { - return _vstatus.condition_landed; - - } else { - /* For fw there is currently no landing detector: - * make sure control is not stopped when overshooting the landing waypoint */ - return false; - } + return _vstatus.condition_landed; } /* XXX TODO count turns */ |