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
ffe57cb7
Commit
ffe57cb7
authored
Oct 03, 2012
by
Thomas Gubler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(re)enabled xplane hil (flightgear hil and xplane hil should both work)
parent
9eb77d2e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
5 deletions
+24
-5
UAS.cc
src/uas/UAS.cc
+19
-2
UAS.h
src/uas/UAS.h
+3
-1
UASView.cc
src/ui/uas/UASView.cc
+2
-2
No files found.
src/uas/UAS.cc
View file @
ffe57cb7
...
...
@@ -97,7 +97,7 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
paramManager
(
NULL
),
attitudeStamped
(
false
),
lastAttitude
(
0
),
simulation
(
new
QGC
FlightGear
Link
(
this
)),
simulation
(
new
QGC
XPlane
Link
(
this
)),
isLocalPositionKnown
(
false
),
isGlobalPositionKnown
(
false
),
systemIsArmed
(
false
),
...
...
@@ -2592,7 +2592,24 @@ bool UAS::emergencyKILL()
/**
* If enabled, connect the fligth gear link.
*/
void
UAS
::
enableHil
(
bool
enable
)
void
UAS
::
enableHilFlightGear
(
bool
enable
)
{
// Connect Flight Gear Link
if
(
enable
)
{
simulation
=
new
QGCFlightGearLink
(
this
);
startHil
();
}
else
{
stopHil
();
}
}
/**
* If enabled, connect the fligth gear link.
*/
void
UAS
::
enableHilXPlane
(
bool
enable
)
{
// Connect Flight Gear Link
if
(
enable
)
...
...
src/uas/UAS.h
View file @
ffe57cb7
...
...
@@ -528,7 +528,9 @@ public slots:
void
go
();
/** @brief Enable / disable HIL */
void
enableHil
(
bool
enable
);
void
enableHilFlightGear
(
bool
enable
);
void
enableHilXPlane
(
bool
enable
);
/** @brief Send the full HIL state to the MAV */
...
...
src/ui/uas/UASView.cc
View file @
ffe57cb7
...
...
@@ -122,8 +122,8 @@ UASView::UASView(UASInterface* uas, QWidget *parent) :
connect
(
removeAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
deleteLater
()));
connect
(
renameAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
rename
()));
connect
(
selectAction
,
SIGNAL
(
triggered
()),
uas
,
SLOT
(
setSelected
()));
connect
(
hilAction
,
SIGNAL
(
triggered
(
bool
)),
uas
,
SLOT
(
enableHil
(
bool
)));
connect
(
hilXAction
,
SIGNAL
(
triggered
(
bool
)),
uas
,
SLOT
(
enableHil
(
bool
)));
connect
(
hilAction
,
SIGNAL
(
triggered
(
bool
)),
uas
,
SLOT
(
enableHil
FlightGear
(
bool
)));
connect
(
hilXAction
,
SIGNAL
(
triggered
(
bool
)),
uas
,
SLOT
(
enableHil
XPlane
(
bool
)));
connect
(
selectAirframeAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
selectAirframe
()));
connect
(
setBatterySpecsAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
setBatterySpecs
()));
connect
(
uas
,
SIGNAL
(
systemRemoved
()),
this
,
SLOT
(
deleteLater
()));
...
...
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