Browse Source

No camera commands for ArduPilot

QGC4.4
Don Gagne 6 years ago
parent
commit
53e85a51bb
  1. 6
      src/MissionManager/FixedWingLandingComplexItem.cc
  2. 7
      src/PlanView/FWLandingPatternEditor.qml

6
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::coordinateHasRelativeAltitudeChanged);
connect(this, &FixedWingLandingComplexItem::altitudesAreRelativeChanged, this, &FixedWingLandingComplexItem::exitCoordinateHasRelativeAltitudeChanged); 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()) { if (_valueSetIsDistanceFact.rawValue().toBool()) {
_recalcFromHeadingAndDistanceChange(); _recalcFromHeadingAndDistanceChange();
} else { } else {

7
src/PlanView/FWLandingPatternEditor.qml

@ -32,11 +32,15 @@ Rectangle {
//property real availableWidth ///< Width for control //property real availableWidth ///< Width for control
//property var missionItem ///< Mission Item for editor //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 _margin: ScreenTools.defaultFontPixelWidth / 2
property real _spacer: ScreenTools.defaultFontPixelWidth / 2 property real _spacer: ScreenTools.defaultFontPixelWidth / 2
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string _setToVehicleHeadingStr: qsTr("Set to vehicle heading") property string _setToVehicleHeadingStr: qsTr("Set to vehicle heading")
property string _setToVehicleLocationStr: qsTr("Set to vehicle location") property string _setToVehicleLocationStr: qsTr("Set to vehicle location")
property bool _showCameraSection: !_missionVehicle.apmFirmware
ExclusiveGroup { id: distanceGlideGroup } ExclusiveGroup { id: distanceGlideGroup }
@ -168,13 +172,14 @@ Rectangle {
SectionHeader { SectionHeader {
id: cameraSection id: cameraSection
text: qsTr("Camera") text: qsTr("Camera")
visible: _showCameraSection
} }
Column { Column {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: _margin spacing: _margin
visible: cameraSection.checked visible: _showCameraSection && cameraSection.checked
Item { width: 1; height: _spacer } Item { width: 1; height: _spacer }

Loading…
Cancel
Save