From dc75f67468543ef3f8913b8581447d3a22bca949 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 23 May 2016 14:08:03 -0700 Subject: [PATCH] fixedWing should be pulled directly from Vehicle --- .../PX4/SensorsComponentController.cc | 17 ----------------- .../PX4/SensorsComponentController.h | 4 ---- 2 files changed, 21 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc index 82101968b..0c14a399d 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc +++ b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc @@ -467,23 +467,6 @@ void SensorsComponentController::_refreshParams(void) _autopilot->refreshParametersPrefix(FactSystem::defaultComponentId, "SENS_"); } -bool SensorsComponentController::fixedWing(void) -{ - switch (_vehicle->vehicleType()) { - case MAV_TYPE_FIXED_WING: - case MAV_TYPE_VTOL_DUOROTOR: - case MAV_TYPE_VTOL_QUADROTOR: - case MAV_TYPE_VTOL_TILTROTOR: - case MAV_TYPE_VTOL_RESERVED2: - case MAV_TYPE_VTOL_RESERVED3: - case MAV_TYPE_VTOL_RESERVED4: - case MAV_TYPE_VTOL_RESERVED5: - return true; - default: - return false; - } -} - void SensorsComponentController::_updateAndEmitShowOrientationCalArea(bool show) { _showOrientationCalArea = show; diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentController.h b/src/AutoPilotPlugins/PX4/SensorsComponentController.h index fe9744efa..399de4b3b 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentController.h +++ b/src/AutoPilotPlugins/PX4/SensorsComponentController.h @@ -44,8 +44,6 @@ class SensorsComponentController : public FactPanelController public: SensorsComponentController(void); - Q_PROPERTY(bool fixedWing READ fixedWing CONSTANT) - Q_PROPERTY(QQuickItem* statusLog MEMBER _statusLog) Q_PROPERTY(QQuickItem* progressBar MEMBER _progressBar) @@ -97,8 +95,6 @@ public: Q_INVOKABLE void cancelCalibration(void); Q_INVOKABLE bool usingUDPLink(void); - bool fixedWing(void); - signals: void showGyroCalAreaChanged(void); void showOrientationCalAreaChanged(void); -- 2.22.0