Commit 6e1232db authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5053 from DonLakeFlyer/FlightTesting

Fixes from flight testing
parents 59a15139 c929855e
...@@ -167,11 +167,8 @@ QGCView { ...@@ -167,11 +167,8 @@ QGCView {
message: qsTr("Do you want to remove the mission from the vehicle?") message: qsTr("Do you want to remove the mission from the vehicle?")
function accept() { function accept() {
_missionController.removeAllFromVehicle() _planMasterController.removeAllFromVehicle()
_geoFenceController.removeAllFromVehicle()
_rallyPointController.removeAllFromVehicle()
hideDialog() hideDialog()
} }
} }
} }
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
"shortDescription": "Gimbal yaw rotation.", "shortDescription": "Gimbal yaw rotation.",
"type": "double", "type": "double",
"units": "deg", "units": "deg",
"min": 0.0, "min": -180.0,
"max": 360.0, "max": 180.0,
"decimalPlaces": 0, "decimalPlaces": 0,
"defaultValue": 0 "defaultValue": 0
} }
......
...@@ -321,7 +321,7 @@ int MissionController::insertComplexMissionItem(QString itemName, QGeoCoordinate ...@@ -321,7 +321,7 @@ int MissionController::insertComplexMissionItem(QString itemName, QGeoCoordinate
CameraSection* cameraSection = settingsItem->cameraSection(); CameraSection* cameraSection = settingsItem->cameraSection();
if (!cameraSection->specifyGimbal()) { if (!cameraSection->specifyGimbal()) {
cameraSection->setSpecifyGimbal(true); cameraSection->setSpecifyGimbal(true);
cameraSection->gimbalYaw()->setRawValue(-90.0); cameraSection->gimbalPitch()->setRawValue(-90.0);
} }
} }
} else if (itemName == _fwLandingMissionItemName) { } else if (itemName == _fwLandingMissionItemName) {
...@@ -371,7 +371,7 @@ void MissionController::removeMissionItem(int index) ...@@ -371,7 +371,7 @@ void MissionController::removeMissionItem(int index)
if (_controllerVehicle->firmwarePlugin()->hasGimbal(_controllerVehicle, rollSupported, pitchSupported, yawSupported) && pitchSupported) { if (_controllerVehicle->firmwarePlugin()->hasGimbal(_controllerVehicle, rollSupported, pitchSupported, yawSupported) && pitchSupported) {
MissionSettingsItem* settingsItem = _visualItems->value<MissionSettingsItem*>(0); MissionSettingsItem* settingsItem = _visualItems->value<MissionSettingsItem*>(0);
CameraSection* cameraSection = settingsItem->cameraSection(); 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); cameraSection->setSpecifyGimbal(false);
} }
} }
......
...@@ -132,7 +132,7 @@ Rectangle { ...@@ -132,7 +132,7 @@ Rectangle {
id: progressBar id: progressBar
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: 2 height: 4
width: _controllerProgressPct * parent.width width: _controllerProgressPct * parent.width
color: qgcPal.colorGreen color: qgcPal.colorGreen
visible: false visible: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment