diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-23 15:25:13 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-23 15:25:13 +0200 |
commit | dc8a0b291a8de863ea8746a6d8ddf5127d1ea609 (patch) | |
tree | 9c5115cfa3eebfc1ac6e7100ae3cbccb7fcebc30 /src | |
parent | 2998685a3ac593c7b5341f684491e5faef3cc564 (diff) | |
parent | 320c97c498cc6e8f2634f88147f0ef15ca9b24e3 (diff) | |
download | px4-firmware-dc8a0b291a8de863ea8746a6d8ddf5127d1ea609.tar.gz px4-firmware-dc8a0b291a8de863ea8746a6d8ddf5127d1ea609.tar.bz2 px4-firmware-dc8a0b291a8de863ea8746a6d8ddf5127d1ea609.zip |
Merge branch 'mpc_local_pos' into mpc_rc
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/navigator/navigator_main.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 56983a0c3..29b82fe75 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -733,6 +733,13 @@ Navigator::task_main() } } + /* check if waypoint has been reached in MISSION, RTL and LAND modes */ + if (myState == NAV_STATE_MISSION || myState == NAV_STATE_RTL || myState == NAV_STATE_LAND) { + if (check_mission_item_reached()) { + on_mission_item_reached(); + } + } + } else { /* navigator shouldn't act */ dispatch(EVENT_NONE_REQUESTED); |