Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
ffe57cb7
Commit
ffe57cb7
authored
Oct 03, 2012
by
Thomas Gubler
Browse files
(re)enabled xplane hil (flightgear hil and xplane hil should both work)
parent
9eb77d2e
Changes
3
Hide whitespace changes
Inline
Side-by-side
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
Supports
Markdown
0%
Try again
or
attach a new 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