Merge pull request #4897 from DonLakeFlyer/MavlinkUpdate

Mavlink submodule update

Merge pull request #4897 from DonLakeFlyer/MavlinkUpdate
Mavlink submodule update
3d42c3a7 · Don Gagne · GitHub · 1baa72ac · 4860591d · fb411385
Commit 3d42c3a7 authored Apr 04, 2017 by Don Gagne Committed by GitHub Apr 04, 2017
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

v2.0 libs/mavlink/include/mavlink/v2.0 +1 -1

MockLinkMissionItemHandler.cc src/comm/MockLinkMissionItemHandler.cc +7 -5

No files found.
--- a/v2.0 @ fb411385
+++ b/v2.0 @ fb411385
-Subproject commit b5aaac46c4819bab0f80d4d071ae9a8fec439676
+Subproject commit fb411385d5f00300ab5d04c5adb08e7e17670d58
--- a/src/comm/MockLinkMissionItemHandler.cc
+++ b/src/comm/MockLinkMissionItemHandler.cc
@@ -113,7 +113,8 @@ void MockLinkMissionItemHandler::_handleMissionRequestList(const mavlink_message
                                            &responseMsg,               // Outgoing message
                                            msg.sysid,                  // Target is original sender
                                            msg.compid,                 // Target is original sender
-                                            itemCount);              // Number of mission items
+                                            itemCount,                  // Number of mission items
+                                            MAV_MISSION_TYPE_MISSION);
        _mockLink->respondWithMavlinkMessage(responseMsg);
    }
 }
@@ -175,7 +176,8 @@ void MockLinkMissionItemHandler::_handleMissionRequest(const mavlink_message_t&
                                               item.current,
                                               item.autocontinue,
                                               item.param1, item.param2, item.param3, item.param4,
-                                               item.x, item.y, item.z);
+                                               item.x, item.y, item.z,
+                                               MAV_MISSION_TYPE_MISSION);
            _mockLink->respondWithMavlinkMessage(responseMsg);
        }
    }