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
08d06d2c
Commit
08d06d2c
authored
Nov 12, 2014
by
Julian Oes
Browse files
uas: hack to include HIL bitfield when UAV is in HIL mode but not through QGC
parent
30cfe7e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/uas/UAS.h
View file @
08d06d2c
...
...
@@ -569,8 +569,10 @@ public:
bool
isAuto
();
/** @brief Check if vehicle is armed */
bool
isArmed
()
const
{
return
systemIsArmed
;
}
/** @brief Check if vehicle is in HIL mode */
/** @brief Check if vehicle is
supposed to be
in HIL mode
by the GS
*/
bool
isHilEnabled
()
const
{
return
hilEnabled
;
}
/** @brief Check if vehicle is in HIL mode */
bool
isHilActive
()
const
{
return
base_mode
&
MAV_MODE_FLAG_HIL_ENABLED
;
}
/** @brief Get reference to the waypoint manager **/
UASWaypointManager
*
getWaypointManager
()
{
...
...
src/ui/uas/UASControlWidget.cc
View file @
08d06d2c
...
...
@@ -246,7 +246,7 @@ void UASControlWidget::transmitMode()
UAS
*
uas
=
dynamic_cast
<
UAS
*>
(
uas_iface
);
if
(
uas
->
isHilEnabled
())
{
if
(
uas
->
isHilEnabled
()
||
uas
->
isHilActive
()
)
{
mode
.
baseMode
|=
MAV_MODE_FLAG_HIL_ENABLED
;
}
else
{
mode
.
baseMode
&=
~
MAV_MODE_FLAG_HIL_ENABLED
;
...
...
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