diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-18 10:38:51 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-18 10:38:51 +0200 |
| commit | 40610c7d484d077dc10726628c3adbe01edd91df (patch) | |
| tree | b3a285719db6e717c7b6365b830d0d98e710ca8b /src/modules/mavlink | |
| parent | 95aba0d70eae6a9aba55d31f223b852df1f82dcb (diff) | |
| download | px4-firmware-40610c7d484d077dc10726628c3adbe01edd91df.tar.gz px4-firmware-40610c7d484d077dc10726628c3adbe01edd91df.tar.bz2 px4-firmware-40610c7d484d077dc10726628c3adbe01edd91df.zip | |
Fixes, but approach needs proper design
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; |