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
bc44ca91
Commit
bc44ca91
authored
May 12, 2015
by
Don Gagne
Browse files
VTOL must report as fixed wing
parent
886b40b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/PX4/SensorsComponent.cc
View file @
bc44ca91
...
...
@@ -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 @
bc44ca91
...
...
@@ -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
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