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
246bb3e8
Commit
246bb3e8
authored
May 24, 2014
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Threading improvements
parent
e972eb38
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.cc
+1
-0
QGCFlightGearLink.cc
src/comm/QGCFlightGearLink.cc
+3
-0
QGCJSBSimLink.cc
src/comm/QGCJSBSimLink.cc
+1
-0
QGCXPlaneLink.cc
src/comm/QGCXPlaneLink.cc
+7
-6
No files found.
src/comm/MAVLinkProtocol.cc
View file @
246bb3e8
...
...
@@ -65,6 +65,7 @@ MAVLinkProtocol::MAVLinkProtocol() :
m_authKey
=
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
;
loadSettings
();
moveToThread
(
this
);
heartbeatTimer
.
moveToThread
(
this
);
// Start heartbeat timer, emitting a heartbeat at the configured rate
connect
(
&
heartbeatTimer
,
SIGNAL
(
timeout
()),
this
,
SLOT
(
sendHeartbeat
()));
heartbeatTimer
.
start
(
1000
/
heartbeatRate
);
...
...
src/comm/QGCFlightGearLink.cc
View file @
246bb3e8
...
...
@@ -80,12 +80,15 @@ void QGCFlightGearLink::run()
if
(
!
mav
)
return
;
socket
=
new
QUdpSocket
(
this
);
socket
->
moveToThread
(
this
);
connectState
=
socket
->
bind
(
host
,
port
);
QObject
::
connect
(
socket
,
SIGNAL
(
readyRead
()),
this
,
SLOT
(
readBytes
()));
process
=
new
QProcess
(
this
);
process
->
moveToThread
(
this
);
terraSync
=
new
QProcess
(
this
);
terraSync
->
moveToThread
(
this
);
connect
(
mav
,
SIGNAL
(
hilControlsChanged
(
quint64
,
float
,
float
,
float
,
float
,
quint8
,
quint8
)),
this
,
SLOT
(
updateControls
(
quint64
,
float
,
float
,
float
,
float
,
quint8
,
quint8
)));
connect
(
this
,
SIGNAL
(
hilStateChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)),
mav
,
SLOT
(
sendHilState
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)));
...
...
src/comm/QGCJSBSimLink.cc
View file @
246bb3e8
...
...
@@ -75,6 +75,7 @@ void QGCJSBSimLink::run()
if
(
!
mav
)
return
;
socket
=
new
QUdpSocket
(
this
);
socket
->
moveToThread
(
this
);
connectState
=
socket
->
bind
(
host
,
port
);
QObject
::
connect
(
socket
,
SIGNAL
(
readyRead
()),
this
,
SLOT
(
readBytes
()));
...
...
src/comm/QGCXPlaneLink.cc
View file @
246bb3e8
...
...
@@ -154,18 +154,19 @@ void QGCXPlaneLink::run()
if
(
connectState
)
return
;
socket
=
new
QUdpSocket
(
this
);
socket
->
moveToThread
(
this
);
connectState
=
socket
->
bind
(
localHost
,
localPort
);
if
(
!
connectState
)
return
;
QObject
::
connect
(
socket
,
SIGNAL
(
readyRead
()),
this
,
SLOT
(
readBytes
()));
connect
(
mav
,
SIGNAL
(
hilControlsChanged
(
quint64
,
float
,
float
,
float
,
float
,
quint8
,
quint8
)),
this
,
SLOT
(
updateControls
(
quint64
,
float
,
float
,
float
,
float
,
quint8
,
quint8
)));
connect
(
mav
,
SIGNAL
(
hilActuatorsChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)),
this
,
SLOT
(
updateActuators
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)));
connect
(
mav
,
SIGNAL
(
hilControlsChanged
(
quint64
,
float
,
float
,
float
,
float
,
quint8
,
quint8
)),
this
,
SLOT
(
updateControls
(
quint64
,
float
,
float
,
float
,
float
,
quint8
,
quint8
))
,
Qt
::
QueuedConnection
);
connect
(
mav
,
SIGNAL
(
hilActuatorsChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)),
this
,
SLOT
(
updateActuators
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
))
,
Qt
::
QueuedConnection
);
connect
(
this
,
SIGNAL
(
hilGroundTruthChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)),
mav
,
SLOT
(
sendHilGroundTruth
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)));
connect
(
this
,
SIGNAL
(
hilStateChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)),
mav
,
SLOT
(
sendHilState
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)));
connect
(
this
,
SIGNAL
(
sensorHilGpsChanged
(
quint64
,
double
,
double
,
double
,
int
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
int
)),
mav
,
SLOT
(
sendHilGps
(
quint64
,
double
,
double
,
double
,
int
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
int
)));
connect
(
this
,
SIGNAL
(
sensorHilRawImuChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
quint32
)),
mav
,
SLOT
(
sendHilSensors
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
quint32
)));
connect
(
this
,
SIGNAL
(
hilGroundTruthChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)),
mav
,
SLOT
(
sendHilGroundTruth
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
))
,
Qt
::
QueuedConnection
);
connect
(
this
,
SIGNAL
(
hilStateChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
)),
mav
,
SLOT
(
sendHilState
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
double
,
double
,
double
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
))
,
Qt
::
QueuedConnection
);
connect
(
this
,
SIGNAL
(
sensorHilGpsChanged
(
quint64
,
double
,
double
,
double
,
int
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
int
)),
mav
,
SLOT
(
sendHilGps
(
quint64
,
double
,
double
,
double
,
int
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
int
))
,
Qt
::
QueuedConnection
);
connect
(
this
,
SIGNAL
(
sensorHilRawImuChanged
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
quint32
)),
mav
,
SLOT
(
sendHilSensors
(
quint64
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
float
,
quint32
))
,
Qt
::
QueuedConnection
);
UAS
*
uas
=
dynamic_cast
<
UAS
*>
(
mav
);
if
(
uas
)
...
...
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