Browse Source

Fix calls to MAVLink API

QGC4.4
Lorenz Meier 9 years ago
parent
commit
6834b51057
  1. 2
      src/Vehicle/Vehicle.cc
  2. 4
      src/comm/MAVLinkProtocol.cc

2
src/Vehicle/Vehicle.cc

@ -792,7 +792,7 @@ void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message) @@ -792,7 +792,7 @@ void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message)
_firmwarePlugin->adjustOutgoingMavlinkMessage(this, &message);
static const uint8_t messageKeys[256] = MAVLINK_MESSAGE_CRCS;
mavlink_finalize_message_chan(&message, _mavlink->getSystemId(), _mavlink->getComponentId(), link->getMavlinkChannel(), message.len, messageKeys[message.msgid]);
mavlink_finalize_message_chan(&message, _mavlink->getSystemId(), _mavlink->getComponentId(), link->getMavlinkChannel(), message.len, message.len, messageKeys[message.msgid]);
// Write message into buffer, prepending start sign
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];

4
src/comm/MAVLinkProtocol.cc

@ -446,7 +446,7 @@ void MAVLinkProtocol::_sendMessage(LinkInterface* link, mavlink_message_t messag @@ -446,7 +446,7 @@ void MAVLinkProtocol::_sendMessage(LinkInterface* link, mavlink_message_t messag
static uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
// Rewriting header to ensure correct link ID is set
static uint8_t messageKeys[256] = MAVLINK_MESSAGE_CRCS;
mavlink_finalize_message_chan(&message, this->getSystemId(), this->getComponentId(), link->getMavlinkChannel(), message.len, messageKeys[message.msgid]);
mavlink_finalize_message_chan(&message, this->getSystemId(), this->getComponentId(), link->getMavlinkChannel(), message.len, message.len, messageKeys[message.msgid]);
// Write message into buffer, prepending start sign
int len = mavlink_msg_to_send_buffer(buffer, &message);
// If link is connected
@ -469,7 +469,7 @@ void MAVLinkProtocol::_sendMessage(LinkInterface* link, mavlink_message_t messag @@ -469,7 +469,7 @@ void MAVLinkProtocol::_sendMessage(LinkInterface* link, mavlink_message_t messag
static uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
// Rewriting header to ensure correct link ID is set
static uint8_t messageKeys[256] = MAVLINK_MESSAGE_CRCS;
mavlink_finalize_message_chan(&message, systemid, componentid, link->getMavlinkChannel(), message.len, messageKeys[message.msgid]);
mavlink_finalize_message_chan(&message, systemid, componentid, link->getMavlinkChannel(), message.len, message.len, messageKeys[message.msgid]);
// Write message into buffer, prepending start sign
int len = mavlink_msg_to_send_buffer(buffer, &message);
// If link is connected

Loading…
Cancel
Save