Browse Source

VTOL must report as fixed wing

QGC4.4
Don Gagne 10 years ago
parent
commit
d4d5f5bfd1
  1. 8
      src/AutoPilotPlugins/PX4/SensorsComponent.cc
  2. 4
      src/AutoPilotPlugins/PX4/SensorsComponentController.cc

8
src/AutoPilotPlugins/PX4/SensorsComponent.cc

@ -87,7 +87,9 @@ QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const @@ -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 @@ -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";

4
src/AutoPilotPlugins/PX4/SensorsComponentController.cc

@ -408,7 +408,9 @@ bool SensorsComponentController::fixedWing(void) @@ -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)

Loading…
Cancel
Save