diff options
author | Julian Oes <julian@oes.ch> | 2014-04-21 17:36:59 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-04-21 17:36:59 +0200 |
commit | c3c0328e8bb9211580dbe5a52ecb23e0452cb402 (patch) | |
tree | 0c449cb2733f3c6cbfc5593e38929fea34152c11 /src/modules/mavlink/mavlink_main.cpp | |
parent | 488785250f4f1fa3c2f6d1e3283fd8eabb6b3144 (diff) | |
download | px4-firmware-c3c0328e8bb9211580dbe5a52ecb23e0452cb402.tar.gz px4-firmware-c3c0328e8bb9211580dbe5a52ecb23e0452cb402.tar.bz2 px4-firmware-c3c0328e8bb9211580dbe5a52ecb23e0452cb402.zip |
navigator: lot's of cleanup (WIP)
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
-rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 36d47b7ee..c60c85495 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -872,7 +872,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; - /* TODO: also save param2 (repeat count) */ + mission_item->do_jump_repeat_count = mavlink_mission_item->param2; break; default: mission_item->acceptance_radius = mavlink_mission_item->param2; @@ -889,6 +889,9 @@ int Mavlink::map_mavlink_mission_item_to_mission_item(const mavlink_mission_item // mission_item->index = mavlink_mission_item->seq; mission_item->origin = ORIGIN_MAVLINK; + /* reset DO_JUMP count */ + mission_item->do_jump_current_count = 0; + return OK; } @@ -908,7 +911,7 @@ int Mavlink::map_mission_item_to_mavlink_mission_item(const struct mission_item_ case NAV_CMD_DO_JUMP: mavlink_mission_item->param1 = mission_item->do_jump_mission_index; - /* TODO: also save param2 (repeat count) */ + mavlink_mission_item->param2 = mission_item->do_jump_repeat_count; break; default: |