diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:46:04 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:46:04 +0200 |
| commit | 411eb1f4ef4a273bebb7a46ae095756f8619aa55 (patch) | |
| tree | 91e25b847be774f24a5ad6a0964cb08364264659 /src/modules/mavlink | |
| parent | 20728e83f5acc52c5b96d6bdb93767375562dbe2 (diff) | |
| parent | 7efc6703ead0abc63b38719e26741e0407331abc (diff) | |
| download | px4-firmware-411eb1f4ef4a273bebb7a46ae095756f8619aa55.tar.gz px4-firmware-411eb1f4ef4a273bebb7a46ae095756f8619aa55.tar.bz2 px4-firmware-411eb1f4ef4a273bebb7a46ae095756f8619aa55.zip | |
Merge branch 'fw_autoland' of github.com:PX4/Firmware into fw_autoland
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/waypoints.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/mavlink/waypoints.c b/src/modules/mavlink/waypoints.c index adaf81404..7e4a2688f 100644 --- a/src/modules/mavlink/waypoints.c +++ b/src/modules/mavlink/waypoints.c @@ -398,13 +398,13 @@ void check_waypoints_reached(uint64_t now, const struct vehicle_global_position_ if (time_elapsed) { - if (cur_wp->autocontinue) { + /* safeguard against invalid missions with last wp autocontinue on */ + if (wpm->current_active_wp_id == wpm->size - 1) { + /* stop handling missions here */ + cur_wp->autocontinue = false; + } - /* safeguard against invalid missions with last wp autocontinue on */ - if (wpm->current_active_wp_id == wpm->size - 1) { - /* stop handling missions here */ - cur_wp->autocontinue = false; - } + if (cur_wp->autocontinue) { cur_wp->current = 0; |