From 90fd7283fa2d2632ec931678618a60cfbf7067dc Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Mon, 24 Apr 2017 15:07:49 -0700 Subject: [PATCH 1/4] Taller progress indicator for better visibility --- src/PlanView/PlanToolBar.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml index d76a52f..1d48050 100644 --- a/src/PlanView/PlanToolBar.qml +++ b/src/PlanView/PlanToolBar.qml @@ -132,7 +132,7 @@ Rectangle { id: progressBar anchors.left: parent.left anchors.bottom: parent.bottom - height: 2 + height: 4 width: _controllerProgressPct * parent.width color: qgcPal.colorGreen visible: false From 56eb78192b3cb30c415606d1606871dfe4dc1b97 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Mon, 24 Apr 2017 15:08:04 -0700 Subject: [PATCH 2/4] Survey item setting yaw instead of pitch --- src/MissionManager/MissionController.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index d1e4f9b..7f98d0d 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -321,7 +321,7 @@ int MissionController::insertComplexMissionItem(QString itemName, QGeoCoordinate CameraSection* cameraSection = settingsItem->cameraSection(); if (!cameraSection->specifyGimbal()) { cameraSection->setSpecifyGimbal(true); - cameraSection->gimbalYaw()->setRawValue(-90.0); + cameraSection->gimbalPitch()->setRawValue(-90.0); } } } else if (itemName == _fwLandingMissionItemName) { @@ -371,7 +371,7 @@ void MissionController::removeMissionItem(int index) if (_controllerVehicle->firmwarePlugin()->hasGimbal(_controllerVehicle, rollSupported, pitchSupported, yawSupported) && pitchSupported) { MissionSettingsItem* settingsItem = _visualItems->value(0); CameraSection* cameraSection = settingsItem->cameraSection(); - if (cameraSection->specifyGimbal() && cameraSection->gimbalYaw()->rawValue().toDouble() == -90.0 && cameraSection->gimbalPitch()->rawValue().toDouble() == 0.0) { + if (cameraSection->specifyGimbal() && cameraSection->gimbalPitch()->rawValue().toDouble() == -90.0 && cameraSection->gimbalYaw()->rawValue().toDouble() == 0.0) { cameraSection->setSpecifyGimbal(false); } } From b9a25328f9fac2454001ecd0763f043c03e309c2 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Mon, 24 Apr 2017 15:08:17 -0700 Subject: [PATCH 3/4] Gimbal yaw from -180 <-> 180 degrees --- src/MissionManager/CameraSection.FactMetaData.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/CameraSection.FactMetaData.json b/src/MissionManager/CameraSection.FactMetaData.json index c259465..5726fd9 100644 --- a/src/MissionManager/CameraSection.FactMetaData.json +++ b/src/MissionManager/CameraSection.FactMetaData.json @@ -40,8 +40,8 @@ "shortDescription": "Gimbal yaw rotation.", "type": "double", "units": "deg", - "min": 0.0, - "max": 360.0, + "min": -180.0, + "max": 180.0, "decimalPlaces": 0, "defaultValue": 0 } From c929855e49ec821933bd67997d71104b0bb2cecf Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Mon, 24 Apr 2017 15:08:28 -0700 Subject: [PATCH 4/4] Fix removeAllFromVehicle after flight ends --- src/FlightDisplay/FlightDisplayView.qml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index b8c96f8..4eaa767 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -167,11 +167,8 @@ QGCView { message: qsTr("Do you want to remove the mission from the vehicle?") function accept() { - _missionController.removeAllFromVehicle() - _geoFenceController.removeAllFromVehicle() - _rallyPointController.removeAllFromVehicle() + _planMasterController.removeAllFromVehicle() hideDialog() - } } }