From 53e85a51bb7400a645cc514946cb97fa1a30258c Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 16 Apr 2019 11:13:05 -0700 Subject: [PATCH] No camera commands for ArduPilot --- src/MissionManager/FixedWingLandingComplexItem.cc | 6 ++++++ src/PlanView/FWLandingPatternEditor.qml | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc index db3ad990a..bb4188306 100644 --- a/src/MissionManager/FixedWingLandingComplexItem.cc +++ b/src/MissionManager/FixedWingLandingComplexItem.cc @@ -100,6 +100,12 @@ FixedWingLandingComplexItem::FixedWingLandingComplexItem(Vehicle* vehicle, bool connect(this, &FixedWingLandingComplexItem::altitudesAreRelativeChanged, this, &FixedWingLandingComplexItem::coordinateHasRelativeAltitudeChanged); connect(this, &FixedWingLandingComplexItem::altitudesAreRelativeChanged, this, &FixedWingLandingComplexItem::exitCoordinateHasRelativeAltitudeChanged); + if (vehicle->apmFirmware()) { + // ArduPilot does not support camera commands + _stopTakingVideoFact.setRawValue(false); + _stopTakingPhotosFact.setRawValue(false); + } + if (_valueSetIsDistanceFact.rawValue().toBool()) { _recalcFromHeadingAndDistanceChange(); } else { diff --git a/src/PlanView/FWLandingPatternEditor.qml b/src/PlanView/FWLandingPatternEditor.qml index 2bfbd1e70..fd3ed3f89 100644 --- a/src/PlanView/FWLandingPatternEditor.qml +++ b/src/PlanView/FWLandingPatternEditor.qml @@ -32,11 +32,15 @@ Rectangle { //property real availableWidth ///< Width for control //property var missionItem ///< Mission Item for editor + property var _masterControler: masterController + property var _missionController: _masterControler.missionController + property var _missionVehicle: _masterControler.controllerVehicle property real _margin: ScreenTools.defaultFontPixelWidth / 2 property real _spacer: ScreenTools.defaultFontPixelWidth / 2 property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property string _setToVehicleHeadingStr: qsTr("Set to vehicle heading") property string _setToVehicleLocationStr: qsTr("Set to vehicle location") + property bool _showCameraSection: !_missionVehicle.apmFirmware ExclusiveGroup { id: distanceGlideGroup } @@ -166,15 +170,16 @@ Rectangle { } SectionHeader { - id: cameraSection - text: qsTr("Camera") + id: cameraSection + text: qsTr("Camera") + visible: _showCameraSection } Column { anchors.left: parent.left anchors.right: parent.right spacing: _margin - visible: cameraSection.checked + visible: _showCameraSection && cameraSection.checked Item { width: 1; height: _spacer } -- 2.22.0