aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-06-15 15:36:32 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-06-15 15:36:32 +0200
commit171ea5e12b784606ce4f7b3c31031bc4b2a45de4 (patch)
tree05f45202f55292f60bcf02ec007ee72e23a19659 /src/modules
parent80e95c628c9ca3b6c4e504b4f2defcd3684f2b28 (diff)
parent9772aa5814eb2f0d864e89814f5be2cf9f136eda (diff)
downloadpx4-firmware-171ea5e12b784606ce4f7b3c31031bc4b2a45de4.tar.gz
px4-firmware-171ea5e12b784606ce4f7b3c31031bc4b2a45de4.tar.bz2
px4-firmware-171ea5e12b784606ce4f7b3c31031bc4b2a45de4.zip
Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/mavlink/mavlink_main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 3a656ae4d..d7cf45351 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -900,6 +900,7 @@ int Mavlink::map_mavlink_mission_item_to_mission_item(const mavlink_mission_item
break;
case MAV_CMD_DO_JUMP:
mission_item->do_jump_mission_index = mavlink_mission_item->param1;
+ mission_item->do_jump_current_count = 0;
mission_item->do_jump_repeat_count = mavlink_mission_item->param2;
break;
default: