Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7e7612b0
Commit
7e7612b0
authored
Nov 11, 2020
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
smart rtl removed from guidedActionsController
parent
7427e2f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+0
-10
No files found.
src/FlightDisplay/GuidedActionsController.qml
View file @
7e7612b0
...
...
@@ -27,7 +27,6 @@ import QGroundControl.FlightMap 1.0
Item
{
id
:
_root
property
var
wimaController
property
var
missionController
property
var
confirmDialog
property
var
actionList
...
...
@@ -132,7 +131,6 @@ Item {
property
bool
showLandAbort
:
_guidedActionsEnabled
&&
_vehicleFlying
&&
_fixedWingOnApproach
property
bool
showGotoLocation
:
_guidedActionsEnabled
&&
_vehicleFlying
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
property
bool
showResumeMission
:
_activeVehicle
&&
!
_vehicleArmed
&&
_vehicleWasFlying
&&
_missionAvailable
&&
_resumeMissionIndex
>
0
&&
(
_resumeMissionIndex
<
_missionItemCount
-
2
)
...
...
@@ -558,14 +556,6 @@ Item {
break
case
actionROI
:
_activeVehicle
.
guidedModeROI
(
actionData
)
case
actionForceUpload
:
wimaController
.
forceUpload
()
break
case
actionSmartRTLPathConfirm
:
wimaController
.
executeSmartRTL
()
break
case
actionSmartRTLRequestConfirm
:
wimaController
.
initSmartRTL
()
break
default
:
console
.
warn
(
qsTr
(
"
Internal error: unknown actionCode
"
),
actionCode
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment