aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink/waypoints.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-10-06 14:18:28 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-10-06 14:18:28 +0200
commitd1871bd7bb9ae9eefdf1ada56fc3f57428e689eb (patch)
tree73b47d4b3b7d89ec9ced5323f4465c5d98a268a9 /src/modules/mavlink/waypoints.c
parent90c4664dce0e3613e545eabb208aa5fbb02d90e9 (diff)
downloadpx4-firmware-d1871bd7bb9ae9eefdf1ada56fc3f57428e689eb.tar.gz
px4-firmware-d1871bd7bb9ae9eefdf1ada56fc3f57428e689eb.tar.bz2
px4-firmware-d1871bd7bb9ae9eefdf1ada56fc3f57428e689eb.zip
State machine fixes for HIL
Diffstat (limited to 'src/modules/mavlink/waypoints.c')
-rw-r--r--src/modules/mavlink/waypoints.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/mavlink/waypoints.c b/src/modules/mavlink/waypoints.c
index 97472c233..f03fe4fdf 100644
--- a/src/modules/mavlink/waypoints.c
+++ b/src/modules/mavlink/waypoints.c
@@ -307,7 +307,9 @@ void check_waypoints_reached(uint64_t now, const struct vehicle_global_position_
{
static uint16_t counter;
- if (!global_pos->valid && !local_pos->xy_valid) {
+ if ((!global_pos->valid && !local_pos->xy_valid) ||
+ /* no waypoint */
+ wpm->size == 0) {
/* nothing to check here, return */
return;
}