Commit 7e7612b0 authored by Valentin Platzgummer's avatar Valentin Platzgummer

smart rtl removed from guidedActionsController

parent 7427e2f7
...@@ -27,7 +27,6 @@ import QGroundControl.FlightMap 1.0 ...@@ -27,7 +27,6 @@ import QGroundControl.FlightMap 1.0
Item { Item {
id: _root id: _root
property var wimaController
property var missionController property var missionController
property var confirmDialog property var confirmDialog
property var actionList property var actionList
...@@ -132,7 +131,6 @@ Item { ...@@ -132,7 +131,6 @@ Item {
property bool showLandAbort: _guidedActionsEnabled && _vehicleFlying && _fixedWingOnApproach property bool showLandAbort: _guidedActionsEnabled && _vehicleFlying && _fixedWingOnApproach
property bool showGotoLocation: _guidedActionsEnabled && _vehicleFlying property bool showGotoLocation: _guidedActionsEnabled && _vehicleFlying
property bool showActionList: _guidedActionsEnabled && (showStartMission || showResumeMission || showChangeAlt || showLandAbort) property bool showActionList: _guidedActionsEnabled && (showStartMission || showResumeMission || showChangeAlt || showLandAbort)
property bool wimaEnabled: wimaController.enableWimaController.value
// Note: The '_missionItemCount - 2' is a hack to not trigger resume mission when a mission ends with an RTL item // Note: The '_missionItemCount - 2' is a hack to not trigger resume mission when a mission ends with an RTL item
property bool showResumeMission: _activeVehicle && !_vehicleArmed && _vehicleWasFlying && _missionAvailable && _resumeMissionIndex > 0 && (_resumeMissionIndex < _missionItemCount - 2) property bool showResumeMission: _activeVehicle && !_vehicleArmed && _vehicleWasFlying && _missionAvailable && _resumeMissionIndex > 0 && (_resumeMissionIndex < _missionItemCount - 2)
...@@ -558,14 +556,6 @@ Item { ...@@ -558,14 +556,6 @@ Item {
break break
case actionROI: case actionROI:
_activeVehicle.guidedModeROI(actionData) _activeVehicle.guidedModeROI(actionData)
case actionForceUpload:
wimaController.forceUpload()
break
case actionSmartRTLPathConfirm:
wimaController.executeSmartRTL()
break
case actionSmartRTLRequestConfirm:
wimaController.initSmartRTL()
break break
default: default:
console.warn(qsTr("Internal error: unknown actionCode"), actionCode) console.warn(qsTr("Internal error: unknown actionCode"), actionCode)
......
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