Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7c2e97d2
Commit
7c2e97d2
authored
Aug 29, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change method signature to remove unused vars
parent
02eeddda
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
Vehicle.cc
src/Vehicle/Vehicle.cc
+1
-1
MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.cc
+3
-9
MAVLinkProtocol.h
src/comm/MAVLinkProtocol.h
+1
-1
No files found.
src/Vehicle/Vehicle.cc
View file @
7c2e97d2
...
...
@@ -821,7 +821,7 @@ void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message)
// Give the plugin a chance to adjust
_firmwarePlugin
->
adjustOutgoingMavlinkMessage
(
this
,
&
message
);
_mavlink
->
sendMessage
(
link
,
message
,
_mavlink
->
getSystemId
(),
_mavlink
->
getComponentId
()
);
_mavlink
->
sendMessage
(
link
,
message
);
_messagesSent
++
;
emit
messagesSentChanged
();
}
...
...
src/comm/MAVLinkProtocol.cc
View file @
7c2e97d2
...
...
@@ -253,7 +253,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
{
mavlink_message_t
msg
;
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)
// Only forward this message to the other links,
// 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()
return
0
;
}
/**
* @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
)
void
MAVLinkProtocol
::
sendMessage
(
LinkInterface
*
link
,
mavlink_message_t
message
)
{
mavlink_status_t
*
mavlinkStatus
=
mavlink_get_channel_status
(
link
->
getMavlinkChannel
());
switch
(
QGroundControlQmlGlobal
::
mavlinkVersion
()
->
rawValue
().
toInt
())
{
...
...
src/comm/MAVLinkProtocol.h
View file @
7c2e97d2
...
...
@@ -129,7 +129,7 @@ public:
/// Suspend/Restart logging during replay.
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
virtual
void
setToolbox
(
QGCToolbox
*
toolbox
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment