zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Us MAV_COMP_ID_AUTOPILOT1 instead of MAV_COMP_ID_MISSIONPLANNER

QGC4.4
Don Gagne 7 years ago
parent
0a205d71f7
commit
c7b1880c42
2 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/MissionManager/PlanManager.cc
  2. 8
      src/comm/MockLinkMissionItemHandler.cc

16
src/MissionManager/PlanManager.cc
Unescape View File

@ -114,7 +114,7 @@ void PlanManager::_writeMissionCount(void)
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&message, &message,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_writeMissionItems.count(), _writeMissionItems.count(),
_planType); _planType);
@ -157,7 +157,7 @@ void PlanManager::_requestList(void)
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&message, &message,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_planType); _planType);
_vehicle->sendMessageOnLink(_dedicatedLink, message); _vehicle->sendMessageOnLink(_dedicatedLink, message);
@ -296,7 +296,7 @@ void PlanManager::_readTransactionComplete(void)
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&message, &message,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
MAV_MISSION_ACCEPTED, MAV_MISSION_ACCEPTED,
_planType); _planType);
@ -354,7 +354,7 @@ void PlanManager::_requestNextMissionItem(void)
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&message, &message,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_itemIndicesToRead[0], _itemIndicesToRead[0],
_planType); _planType);
} else { } else {
@ -363,7 +363,7 @@ void PlanManager::_requestNextMissionItem(void)
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&message, &message,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_itemIndicesToRead[0], _itemIndicesToRead[0],
_planType); _planType);
} }
@ -536,7 +536,7 @@ void PlanManager::_handleMissionRequest(const mavlink_message_t& message, bool m
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&messageOut, &messageOut,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
missionRequest.seq, missionRequest.seq,
item->frame(), item->frame(),
item->command(), item->command(),
@ -556,7 +556,7 @@ void PlanManager::_handleMissionRequest(const mavlink_message_t& message, bool m
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&messageOut, &messageOut,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
missionRequest.seq, missionRequest.seq,
item->frame(), item->frame(),
item->command(), item->command(),
@ -897,7 +897,7 @@ void PlanManager::_removeAllWorker(void)
_dedicatedLink->mavlinkChannel(), _dedicatedLink->mavlinkChannel(),
&message, &message,
_vehicle->id(), _vehicle->id(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_planType); _planType);
_vehicle->sendMessageOnLink(_vehicle->priorityLink(), message); _vehicle->sendMessageOnLink(_vehicle->priorityLink(), message);
_startAckTimeout(AckMissionClearAll); _startAckTimeout(AckMissionClearAll);

8
src/comm/MockLinkMissionItemHandler.cc
Unescape View File

@ -156,7 +156,7 @@ void MockLinkMissionItemHandler::_handleMissionRequestList(const mavlink_message
mavlink_message_t responseMsg; mavlink_message_t responseMsg;
mavlink_msg_mission_count_pack_chan(_mockLink->vehicleId(), mavlink_msg_mission_count_pack_chan(_mockLink->vehicleId(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_mockLink->mavlinkChannel(), _mockLink->mavlinkChannel(),
&responseMsg, // Outgoing message &responseMsg, // Outgoing message
msg.sysid, // Target is original sender msg.sysid, // Target is original sender
@ -224,7 +224,7 @@ void MockLinkMissionItemHandler::_handleMissionRequest(const mavlink_message_t&
} }
mavlink_msg_mission_item_pack_chan(_mockLink->vehicleId(), mavlink_msg_mission_item_pack_chan(_mockLink->vehicleId(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_mockLink->mavlinkChannel(), _mockLink->mavlinkChannel(),
&responseMsg, // Outgoing message &responseMsg, // Outgoing message
msg.sysid, // Target is original sender msg.sysid, // Target is original sender
@ -310,7 +310,7 @@ void MockLinkMissionItemHandler::_requestNextMissionItem(int sequenceNumber)
mavlink_message_t message; mavlink_message_t message;
mavlink_msg_mission_request_pack_chan(_mockLink->vehicleId(), mavlink_msg_mission_request_pack_chan(_mockLink->vehicleId(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_mockLink->mavlinkChannel(), _mockLink->mavlinkChannel(),
&message, &message,
_mavlinkProtocol->getSystemId(), _mavlinkProtocol->getSystemId(),
@ -332,7 +332,7 @@ void MockLinkMissionItemHandler::_sendAck(MAV_MISSION_RESULT ackType)
mavlink_message_t message; mavlink_message_t message;
mavlink_msg_mission_ack_pack_chan(_mockLink->vehicleId(), mavlink_msg_mission_ack_pack_chan(_mockLink->vehicleId(),
MAV_COMP_ID_MISSIONPLANNER, MAV_COMP_ID_AUTOPILOT1,
_mockLink->mavlinkChannel(), _mockLink->mavlinkChannel(),
&message, &message,
_mavlinkProtocol->getSystemId(), _mavlinkProtocol->getSystemId(),

Write Preview
Loading…
Cancel
Save