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
08d06d2c
Commit
08d06d2c
authored
Nov 12, 2014
by
Julian Oes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
UAS.h
src/uas/UAS.h
+3
-1
UASControlWidget.cc
src/ui/uas/UASControlWidget.cc
+1
-1
No files found.
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
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