diff options
| author | Julian Oes <julian@oes.ch> | 2013-11-20 13:17:49 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-11-20 13:17:49 +0100 |
| commit | c33d61693519ee48f50e49fa086602f52eab47ec (patch) | |
| tree | 9c1028e93fe34d275594b6d0edec95afdd985b4a /src/modules/mavlink | |
| parent | a27c7e831945f0a6b95b50b9ac68364b28a49362 (diff) | |
| parent | 37ef10ceead77876108847e31f56ae68015f5784 (diff) | |
| download | px4-firmware-c33d61693519ee48f50e49fa086602f52eab47ec.tar.gz px4-firmware-c33d61693519ee48f50e49fa086602f52eab47ec.tar.bz2 px4-firmware-c33d61693519ee48f50e49fa086602f52eab47ec.zip | |
Merge remote-tracking branch 'thomasgubler_private/fw_autoland_att_tecs' into navigator_wip_merge_test
Conflicts:
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/missionlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/mavlink/missionlib.c b/src/modules/mavlink/missionlib.c index 9b1d3c51a..a7f9a6acf 100644 --- a/src/modules/mavlink/missionlib.c +++ b/src/modules/mavlink/missionlib.c @@ -276,7 +276,7 @@ void mavlink_missionlib_current_waypoint_changed(uint16_t index, float param1, next_setpoint_index = index + 1; } - while (next_setpoint_index < wpm->size - 1) { + while (next_setpoint_index < wpm->size) { if (wpm->waypoints[next_setpoint_index].frame == (int)MAV_FRAME_GLOBAL && (wpm->waypoints[next_setpoint_index].command == (int)MAV_CMD_NAV_WAYPOINT || wpm->waypoints[next_setpoint_index].command == (int)MAV_CMD_NAV_LOITER_TURNS || |