diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-02-01 11:59:56 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-02-01 11:59:56 +0100 |
| commit | 7bb3197871a90abd47a69706e80aaa9974a7556f (patch) | |
| tree | f69a399a3c1779058e0ef85a626496d55bc966df /src/modules/navigator/navigator_main.cpp | |
| parent | 589f6cdb44642f4b12aef9deffc8af11fa53b026 (diff) | |
| parent | 8897894b19e8de4ad7960a0fa552ed12fc2f0200 (diff) | |
| download | px4-firmware-7bb3197871a90abd47a69706e80aaa9974a7556f.tar.gz px4-firmware-7bb3197871a90abd47a69706e80aaa9974a7556f.tar.bz2 px4-firmware-7bb3197871a90abd47a69706e80aaa9974a7556f.zip | |
Merge remote-tracking branch 'upstream/beta' into beta
Diffstat (limited to 'src/modules/navigator/navigator_main.cpp')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index dace00ec5..114776327 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -689,7 +689,7 @@ Navigator::task_main() if (_vstatus.return_switch == RETURN_SWITCH_RETURN) { /* switch to RTL if not already landed after RTL and home position set */ if (!(_rtl_state == RTL_STATE_DESCEND && (myState == NAV_STATE_READY || myState == NAV_STATE_LAND)) && - _vstatus.condition_home_position_valid) { + _vstatus.condition_home_position_valid) { dispatch(EVENT_RTL_REQUESTED); } @@ -747,7 +747,7 @@ Navigator::task_main() case NAV_STATE_RTL: if (!(_rtl_state == RTL_STATE_DESCEND && (myState == NAV_STATE_READY || myState == NAV_STATE_LAND)) && - _vstatus.condition_home_position_valid) { + _vstatus.condition_home_position_valid) { dispatch(EVENT_RTL_REQUESTED); } @@ -1575,6 +1575,7 @@ Navigator::on_mission_item_reached() if (_rtl_state == RTL_STATE_DESCEND) { /* hovering above home position, land if needed or loiter */ mavlink_log_info(_mavlink_fd, "[navigator] RTL completed"); + if (_mission_item.autocontinue) { dispatch(EVENT_LAND_REQUESTED); |