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
84e92285
Commit
84e92285
authored
Jan 13, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead code
parent
621e754b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
0 additions
and
97 deletions
+0
-97
QGCFlightGearLink.cc
src/comm/QGCFlightGearLink.cc
+0
-13
QGCFlightGearLink.h
src/comm/QGCFlightGearLink.h
+0
-1
QGCHilLink.h
src/comm/QGCHilLink.h
+0
-1
QGCJSBSimLink.cc
src/comm/QGCJSBSimLink.cc
+0
-13
QGCJSBSimLink.h
src/comm/QGCJSBSimLink.h
+0
-1
QGCXPlaneLink.cc
src/comm/QGCXPlaneLink.cc
+0
-64
QGCXPlaneLink.h
src/comm/QGCXPlaneLink.h
+0
-2
UAS.h
src/uas/UAS.h
+0
-2
No files found.
src/comm/QGCFlightGearLink.cc
View file @
84e92285
...
...
@@ -221,19 +221,6 @@ void QGCFlightGearLink::setRemoteHost(const QString& host)
}
void
QGCFlightGearLink
::
updateActuators
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
)
{
Q_UNUSED
(
time
);
Q_UNUSED
(
act1
);
Q_UNUSED
(
act2
);
Q_UNUSED
(
act3
);
Q_UNUSED
(
act4
);
Q_UNUSED
(
act5
);
Q_UNUSED
(
act6
);
Q_UNUSED
(
act7
);
Q_UNUSED
(
act8
);
}
void
QGCFlightGearLink
::
updateControls
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
)
{
// magnetos,aileron,elevator,rudder,throttle\n
...
...
src/comm/QGCFlightGearLink.h
View file @
84e92285
...
...
@@ -103,7 +103,6 @@ public slots:
void
setRemoteHost
(
const
QString
&
host
);
/** @brief Send new control states to the simulation */
void
updateControls
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
);
void
updateActuators
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
);
/** @brief Set the simulator version as text string */
void
setVersion
(
const
QString
&
version
)
{
...
...
src/comm/QGCHilLink.h
View file @
84e92285
...
...
@@ -49,7 +49,6 @@ public slots:
virtual
void
setRemoteHost
(
const
QString
&
host
)
=
0
;
/** @brief Send new control states to the simulation */
virtual
void
updateControls
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
)
=
0
;
virtual
void
updateActuators
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
)
=
0
;
virtual
void
processError
(
QProcess
::
ProcessError
err
)
=
0
;
/** @brief Set the simulator version as text string */
virtual
void
setVersion
(
const
QString
&
version
)
=
0
;
...
...
src/comm/QGCJSBSimLink.cc
View file @
84e92285
...
...
@@ -233,19 +233,6 @@ void QGCJSBSimLink::setRemoteHost(const QString& host)
}
void
QGCJSBSimLink
::
updateActuators
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
)
{
Q_UNUSED
(
time
);
Q_UNUSED
(
act1
);
Q_UNUSED
(
act2
);
Q_UNUSED
(
act3
);
Q_UNUSED
(
act4
);
Q_UNUSED
(
act5
);
Q_UNUSED
(
act6
);
Q_UNUSED
(
act7
);
Q_UNUSED
(
act8
);
}
void
QGCJSBSimLink
::
updateControls
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
)
{
// magnetos,aileron,elevator,rudder,throttle\n
...
...
src/comm/QGCJSBSimLink.h
View file @
84e92285
...
...
@@ -92,7 +92,6 @@ public slots:
void
setRemoteHost
(
const
QString
&
host
);
/** @brief Send new control states to the simulation */
void
updateControls
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
);
void
updateActuators
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
);
// /** @brief Remove a host from broadcasting messages to */
// void removeHost(const QString& host);
// void readPendingDatagrams();
...
...
src/comm/QGCXPlaneLink.cc
View file @
84e92285
...
...
@@ -183,7 +183,6 @@ void QGCXPlaneLink::run()
QObject
::
connect
(
socket
,
&
QUdpSocket
::
readyRead
,
this
,
&
QGCXPlaneLink
::
readBytes
);
connect
(
_vehicle
->
uas
(),
&
UAS
::
hilControlsChanged
,
this
,
&
QGCXPlaneLink
::
updateControls
,
Qt
::
QueuedConnection
);
connect
(
_vehicle
->
uas
(),
&
UAS
::
hilActuatorsChanged
,
this
,
&
QGCXPlaneLink
::
updateActuators
,
Qt
::
QueuedConnection
);
connect
(
this
,
&
QGCXPlaneLink
::
hilGroundTruthChanged
,
_vehicle
->
uas
(),
&
UAS
::
sendHilGroundTruth
,
Qt
::
QueuedConnection
);
connect
(
this
,
&
QGCXPlaneLink
::
hilStateChanged
,
_vehicle
->
uas
(),
&
UAS
::
sendHilState
,
Qt
::
QueuedConnection
);
...
...
@@ -240,7 +239,6 @@ void QGCXPlaneLink::run()
}
disconnect
(
_vehicle
->
uas
(),
&
UAS
::
hilControlsChanged
,
this
,
&
QGCXPlaneLink
::
updateControls
);
disconnect
(
_vehicle
->
uas
(),
&
UAS
::
hilActuatorsChanged
,
this
,
&
QGCXPlaneLink
::
updateActuators
);
disconnect
(
this
,
&
QGCXPlaneLink
::
hilGroundTruthChanged
,
_vehicle
->
uas
(),
&
UAS
::
sendHilGroundTruth
);
disconnect
(
this
,
&
QGCXPlaneLink
::
hilStateChanged
,
_vehicle
->
uas
(),
&
UAS
::
sendHilState
);
...
...
@@ -351,68 +349,6 @@ void QGCXPlaneLink::setRemoteHost(const QString& newHost)
emit
remoteChanged
(
QString
(
"%1:%2"
).
arg
(
remoteHost
.
toString
()).
arg
(
remotePort
));
}
void
QGCXPlaneLink
::
updateActuators
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
)
{
if
(
_vehicle
->
vehicleType
()
==
MAV_TYPE_QUADROTOR
)
// Only update this for multirotors
{
Q_UNUSED
(
time
);
Q_UNUSED
(
act5
);
Q_UNUSED
(
act6
);
Q_UNUSED
(
act7
);
Q_UNUSED
(
act8
);
#pragma pack(push, 1)
struct
payload
{
char
b
[
5
];
int
index
;
float
f
[
8
];
}
p
;
#pragma pack(pop)
p
.
b
[
0
]
=
'D'
;
p
.
b
[
1
]
=
'A'
;
p
.
b
[
2
]
=
'T'
;
p
.
b
[
3
]
=
'A'
;
p
.
b
[
4
]
=
'\0'
;
p
.
index
=
25
;
memset
(
p
.
f
,
0
,
sizeof
(
p
.
f
));
p
.
f
[
0
]
=
act1
;
p
.
f
[
1
]
=
act2
;
p
.
f
[
2
]
=
act3
;
p
.
f
[
3
]
=
act4
;
// XXX the system corrects for the scale onboard, do not scale again
// if (airframeID == AIRFRAME_QUAD_X_MK_10INCH_I2C)
// {
// p.f[0] = act1 / 255.0f;
// p.f[1] = act2 / 255.0f;
// p.f[2] = act3 / 255.0f;
// p.f[3] = act4 / 255.0f;
// }
// else if (airframeID == AIRFRAME_QUAD_X_ARDRONE)
// {
// p.f[0] = act1 / 500.0f;
// p.f[1] = act2 / 500.0f;
// p.f[2] = act3 / 500.0f;
// p.f[3] = act4 / 500.0f;
// }
// else
// {
// p.f[0] = (act1 - 1000.0f) / 1000.0f;
// p.f[1] = (act2 - 1000.0f) / 1000.0f;
// p.f[2] = (act3 - 1000.0f) / 1000.0f;
// p.f[3] = (act4 - 1000.0f) / 1000.0f;
// }
// Throttle
writeBytes
((
const
char
*
)
&
p
,
sizeof
(
p
));
}
}
void
QGCXPlaneLink
::
updateControls
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
)
{
#pragma pack(push, 1)
...
...
src/comm/QGCXPlaneLink.h
View file @
84e92285
...
...
@@ -112,8 +112,6 @@ public slots:
void
setRemoteHost
(
const
QString
&
host
);
/** @brief Send new control states to the simulation */
void
updateControls
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
);
/** @brief Send new motor control states to the simulation */
void
updateActuators
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
);
/** @brief Set the simulator version as text string */
void
setVersion
(
const
QString
&
version
);
/** @brief Set the simulator version as integer */
...
...
src/uas/UAS.h
View file @
84e92285
...
...
@@ -614,8 +614,6 @@ signals:
void
imageReady
(
UASInterface
*
uas
);
/** @brief HIL controls have changed */
void
hilControlsChanged
(
quint64
time
,
float
rollAilerons
,
float
pitchElevator
,
float
yawRudder
,
float
throttle
,
quint8
systemMode
,
quint8
navMode
);
/** @brief HIL actuator outputs have changed */
void
hilActuatorsChanged
(
quint64
time
,
float
act1
,
float
act2
,
float
act3
,
float
act4
,
float
act5
,
float
act6
,
float
act7
,
float
act8
);
void
localXChanged
(
double
val
,
QString
name
);
void
localYChanged
(
double
val
,
QString
name
);
...
...
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