Skip to content

Q
qgroundcontrol
Commit e3cc9524 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #1605 from Austriker/firefly-airspeed 

VTOL tilt-rotor airspeed sensor
parents d5a21e16 c6142848
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
v1.0 @ e7061376
Subproject commit 7ae438b86ea983e95af5f092e45a5d0f9d093c74 Subproject commit e70613763e5aff1eda5a2336bf25f7f6df92858e
src/AutoPilotPlugins/PX4/SensorsComponent.cc
View file @ e3cc9524
...@@ -89,7 +89,8 @@ QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const ...@@ -89,7 +89,8 @@ QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const
triggers << "CAL_MAG0_ID" << "CAL_GYRO0_ID" << "CAL_ACC0_ID"; 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_DUOROTOR ||
_uas->getSystemType() == MAV_TYPE_VTOL_QUADROTOR) { _uas->getSystemType() == MAV_TYPE_VTOL_QUADROTOR ||
_uas->getSystemType() == MAV_TYPE_VTOL_TILTROTOR) {
triggers << "SENS_DPRES_OFF"; triggers << "SENS_DPRES_OFF";
} }
...@@ -117,7 +118,8 @@ QUrl SensorsComponent::summaryQmlSource(void) const ...@@ -117,7 +118,8 @@ QUrl SensorsComponent::summaryQmlSource(void) const
qDebug() << _uas->getSystemType(); 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_DUOROTOR ||
_uas->getSystemType() == MAV_TYPE_VTOL_QUADROTOR) { _uas->getSystemType() == MAV_TYPE_VTOL_QUADROTOR ||
_uas->getSystemType() == MAV_TYPE_VTOL_TILTROTOR) {
summaryQml = "qrc:/qml/SensorsComponentSummaryFixedWing.qml"; summaryQml = "qrc:/qml/SensorsComponentSummaryFixedWing.qml";
} else { } else {
summaryQml = "qrc:/qml/SensorsComponentSummary.qml"; summaryQml = "qrc:/qml/SensorsComponentSummary.qml";
......
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
View file @ e3cc9524
...@@ -431,7 +431,8 @@ bool SensorsComponentController::fixedWing(void) ...@@ -431,7 +431,8 @@ bool SensorsComponentController::fixedWing(void)
Q_ASSERT(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_DUOROTOR ||
uas->getSystemType() == MAV_TYPE_VTOL_QUADROTOR; uas->getSystemType() == MAV_TYPE_VTOL_QUADROTOR ||
uas->getSystemType() == MAV_TYPE_VTOL_TILTROTOR;
} }
void SensorsComponentController::_updateAndEmitShowOrientationCalArea(bool show) void SensorsComponentController::_updateAndEmitShowOrientationCalArea(bool show)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment