Commit 79173dcb authored by DonLakeFlyer's avatar DonLakeFlyer

Allow altitude change with Pause command

parent 9b7cfd25
...@@ -66,7 +66,7 @@ Item { ...@@ -66,7 +66,7 @@ Item {
property string setWaypointMessage: qsTr("Adjust current waypoint to %1.").arg(_actionData) property string setWaypointMessage: qsTr("Adjust current waypoint to %1.").arg(_actionData)
readonly property string orbitMessage: qsTr("Orbit the vehicle around the current location.") readonly property string orbitMessage: qsTr("Orbit the vehicle around the current location.")
readonly property string landAbortMessage: qsTr("Abort the landing sequence.") readonly property string landAbortMessage: qsTr("Abort the landing sequence.")
readonly property string pauseMessage: qsTr("Pause the vehicle at it's current position.") readonly property string pauseMessage: qsTr("Pause the vehicle at it's current position, adjusting altitude up or down as needed.")
readonly property string mvPauseMessage: qsTr("Pause all vehicles at their current position.") readonly property string mvPauseMessage: qsTr("Pause all vehicles at their current position.")
readonly property string vtolTransitionFwdMessage: qsTr("Transition VTOL to fixed wing flight.") readonly property string vtolTransitionFwdMessage: qsTr("Transition VTOL to fixed wing flight.")
readonly property string vtolTransitionMRMessage: qsTr("Transition VTOL to multi-rotor flight.") readonly property string vtolTransitionMRMessage: qsTr("Transition VTOL to multi-rotor flight.")
...@@ -295,6 +295,8 @@ Item { ...@@ -295,6 +295,8 @@ Item {
confirmDialog.title = pauseTitle confirmDialog.title = pauseTitle
confirmDialog.message = pauseMessage confirmDialog.message = pauseMessage
confirmDialog.hideTrigger = Qt.binding(function() { return !showPause }) confirmDialog.hideTrigger = Qt.binding(function() { return !showPause })
altitudeSlider.reset()
altitudeSlider.visible = true
break; break;
case actionMVPause: case actionMVPause:
confirmDialog.title = pauseTitle confirmDialog.title = pauseTitle
...@@ -376,6 +378,7 @@ Item { ...@@ -376,6 +378,7 @@ Item {
break break
case actionPause: case actionPause:
_activeVehicle.pauseVehicle() _activeVehicle.pauseVehicle()
_activeVehicle.guidedModeChangeAltitude(actionData)
break break
case actionMVPause: case actionMVPause:
rgVehicle = QGroundControl.multiVehicleManager.vehicles rgVehicle = QGroundControl.multiVehicleManager.vehicles
......
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