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
325daa81
Commit
325daa81
authored
May 13, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1563 from DonLakeFlyer/VTOLFixedWing
VTOL must report as fixed wing
parents
35ec0a14
9195c0f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
SensorsComponent.cc
src/AutoPilotPlugins/PX4/SensorsComponent.cc
+6
-2
SensorsComponentController.cc
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
+3
-1
No files found.
src/AutoPilotPlugins/PX4/SensorsComponent.cc
View file @
325daa81
...
...
@@ -87,7 +87,9 @@ QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const
QStringList
triggers
;
triggers
<<
"CAL_MAG0_ID"
<<
"CAL_GYRO0_ID"
<<
"CAL_ACC0_ID"
;
if
(
_uas
->
getSystemType
()
==
MAV_TYPE_FIXED_WING
)
{
if
(
_uas
->
getSystemType
()
==
MAV_TYPE_FIXED_WING
||
_uas
->
getSystemType
()
==
MAV_TYPE_VTOL_DUOROTOR
||
_uas
->
getSystemType
()
==
MAV_TYPE_VTOL_QUADROTOR
)
{
triggers
<<
"SENS_DPRES_OFF"
;
}
...
...
@@ -123,7 +125,9 @@ QUrl SensorsComponent::summaryQmlSource(void) const
QString
summaryQml
;
qDebug
()
<<
_uas
->
getSystemType
();
if
(
_uas
->
getSystemType
()
==
MAV_TYPE_FIXED_WING
)
{
if
(
_uas
->
getSystemType
()
==
MAV_TYPE_FIXED_WING
||
_uas
->
getSystemType
()
==
MAV_TYPE_VTOL_DUOROTOR
||
_uas
->
getSystemType
()
==
MAV_TYPE_VTOL_QUADROTOR
)
{
summaryQml
=
"qrc:/qml/SensorsComponentSummaryFixedWing.qml"
;
}
else
{
summaryQml
=
"qrc:/qml/SensorsComponentSummary.qml"
;
...
...
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
View file @
325daa81
...
...
@@ -408,7 +408,9 @@ bool SensorsComponentController::fixedWing(void)
{
UASInterface
*
uas
=
_autopilot
->
uas
();
Q_ASSERT
(
uas
);
return
uas
->
getSystemType
()
==
MAV_TYPE_FIXED_WING
;
return
uas
->
getSystemType
()
==
MAV_TYPE_FIXED_WING
||
uas
->
getSystemType
()
==
MAV_TYPE_VTOL_DUOROTOR
||
uas
->
getSystemType
()
==
MAV_TYPE_VTOL_QUADROTOR
;
}
void
SensorsComponentController
::
_updateAndEmitShowOrientationCalArea
(
bool
show
)
...
...
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