diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-07 17:19:38 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-07 17:19:38 +0200 |
| commit | c88f34b1297617262fc9bfa56f3b20f1553164f2 (patch) | |
| tree | 26a25694d6db75bab73afa0fdaa02ca36b036497 /src | |
| parent | e70604ea95dd667a93a3adeaf8218d52697f27ec (diff) | |
| parent | 13b6dffb2e719219ffccccd6681d36e695165aa5 (diff) | |
| download | px4-firmware-c88f34b1297617262fc9bfa56f3b20f1553164f2.tar.gz px4-firmware-c88f34b1297617262fc9bfa56f3b20f1553164f2.tar.bz2 px4-firmware-c88f34b1297617262fc9bfa56f3b20f1553164f2.zip | |
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/navigator/rtl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/modules/navigator/rtl.cpp b/src/modules/navigator/rtl.cpp index dde35d5b6..8888c6b62 100644 --- a/src/modules/navigator/rtl.cpp +++ b/src/modules/navigator/rtl.cpp @@ -90,8 +90,7 @@ RTL::update(struct position_setpoint_triplet_s *pos_sp_triplet) } if ((_rtl_state == RTL_STATE_CLIMB - || _rtl_state == RTL_STATE_RETURN - || _rtl_state == RTL_STATE_DESCEND) + || _rtl_state == RTL_STATE_RETURN) && is_mission_item_reached()) { advance_rtl(); set_rtl_item(pos_sp_triplet); |