Commit 7c2e97d2 authored by Don Gagne's avatar Don Gagne

Change method signature to remove unused vars

parent 02eeddda
...@@ -821,7 +821,7 @@ void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message) ...@@ -821,7 +821,7 @@ void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message)
// Give the plugin a chance to adjust // Give the plugin a chance to adjust
_firmwarePlugin->adjustOutgoingMavlinkMessage(this, &message); _firmwarePlugin->adjustOutgoingMavlinkMessage(this, &message);
_mavlink->sendMessage(link, message, _mavlink->getSystemId(), _mavlink->getComponentId()); _mavlink->sendMessage(link, message);
_messagesSent++; _messagesSent++;
emit messagesSentChanged(); emit messagesSentChanged();
} }
......
...@@ -253,7 +253,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b) ...@@ -253,7 +253,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
{ {
mavlink_message_t msg; mavlink_message_t msg;
mavlink_msg_ping_pack(getSystemId(), getComponentId(), &msg, ping.time_usec, ping.seq, message.sysid, message.compid); mavlink_msg_ping_pack(getSystemId(), getComponentId(), &msg, ping.time_usec, ping.seq, message.sysid, message.compid);
sendMessage(link, msg, getSystemId(), getComponentId()); sendMessage(link, msg);
} }
} }
...@@ -394,7 +394,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b) ...@@ -394,7 +394,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
// Only forward this message to the other links, // Only forward this message to the other links,
// not the link the message was received on // not the link the message was received on
if (currLink && currLink != link) sendMessage(currLink, message, message.sysid, message.compid); if (currLink && currLink != link) sendMessage(currLink, message);
} }
} }
} }
...@@ -426,13 +426,7 @@ int MAVLinkProtocol::getComponentId() ...@@ -426,13 +426,7 @@ int MAVLinkProtocol::getComponentId()
return 0; return 0;
} }
/** void MAVLinkProtocol::sendMessage(LinkInterface* link, mavlink_message_t message)
* @param link the link to send the message over
* @param message message to send
* @param systemid id of the system the message is originating from
* @param componentid id of the component the message is originating from
*/
void MAVLinkProtocol::sendMessage(LinkInterface* link, mavlink_message_t message, quint8 systemid, quint8 componentid)
{ {
mavlink_status_t* mavlinkStatus = mavlink_get_channel_status(link->getMavlinkChannel()); mavlink_status_t* mavlinkStatus = mavlink_get_channel_status(link->getMavlinkChannel());
switch (QGroundControlQmlGlobal::mavlinkVersion()->rawValue().toInt()) { switch (QGroundControlQmlGlobal::mavlinkVersion()->rawValue().toInt()) {
......
...@@ -129,7 +129,7 @@ public: ...@@ -129,7 +129,7 @@ public:
/// Suspend/Restart logging during replay. /// Suspend/Restart logging during replay.
void suspendLogForReplay(bool suspend); void suspendLogForReplay(bool suspend);
void sendMessage(LinkInterface* link, mavlink_message_t message, quint8 systemid, quint8 componentid); void sendMessage(LinkInterface* link, mavlink_message_t message);
// Override from QGCTool // Override from QGCTool
virtual void setToolbox(QGCToolbox *toolbox); virtual void setToolbox(QGCToolbox *toolbox);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment