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
0690559b
Commit
0690559b
authored
Jul 18, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for multi-vehicle variants
parent
98221f29
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
0 deletions
+27
-0
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+27
-0
No files found.
src/FlightDisplay/GuidedActionsController.qml
View file @
0690559b
...
...
@@ -64,6 +64,7 @@ Item {
readonly
property
string
orbitMessage
:
qsTr
(
"
Orbit the vehicle around the current location.
"
)
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
mvPauseMessage
:
qsTr
(
"
Pause all vehicles at their current position.
"
)
readonly
property
int
actionRTL
:
1
readonly
property
int
actionLand
:
2
...
...
@@ -81,6 +82,8 @@ Item {
readonly
property
int
actionResumeMission
:
14
readonly
property
int
actionResumeMissionReady
:
15
readonly
property
int
actionPause
:
16
readonly
property
int
actionMVPause
:
17
readonly
property
int
actionMVStartMission
:
18
property
bool
showEmergenyStop
:
!
_hideEmergenyStop
&&
_activeVehicle
&&
_vehicleArmed
&&
_vehicleFlying
property
bool
showArm
:
_activeVehicle
&&
!
_vehicleArmed
...
...
@@ -195,6 +198,11 @@ Item {
confirmDialog
.
message
=
startMissionMessage
confirmDialog
.
hideTrigger
=
Qt
.
binding
(
function
()
{
return
!
showStartMission
})
break
;
case
actionMVStartMission
:
confirmDialog
.
title
=
startMissionTitle
confirmDialog
.
message
=
startMissionMessage
confirmDialog
.
hideTrigger
=
true
break
;
case
actionContinueMission
:
confirmDialog
.
title
=
continueMissionTitle
confirmDialog
.
message
=
continueMissionMessage
...
...
@@ -251,6 +259,11 @@ Item {
confirmDialog
.
message
=
pauseMessage
confirmDialog
.
hideTrigger
=
Qt
.
binding
(
function
()
{
return
!
showPause
})
break
;
case
actionMVPause
:
confirmDialog
.
title
=
pauseTitle
confirmDialog
.
message
=
mvPauseMessage
confirmDialog
.
hideTrigger
=
true
break
;
default
:
console
.
warn
(
"
Unknown actionCode
"
,
actionCode
)
return
...
...
@@ -281,6 +294,13 @@ Item {
case
actionContinueMission
:
_activeVehicle
.
startMission
()
break
case
actionMVStartMission
:
var
rgVehicle
=
QGroundControl
.
multiVehicleManager
.
vehicles
for
(
var
i
=
0
;
i
<
rgVehicle
.
count
;
i
++
)
{
var
vehicle
=
rgVehicle
.
get
(
i
)
vehicle
.
startMission
()
}
break
case
actionArm
:
_activeVehicle
.
armed
=
true
break
...
...
@@ -308,6 +328,13 @@ Item {
case
actionPause
:
_activeVehicle
.
pauseVehicle
()
break
case
actionMVPause
:
var
rgVehicle
=
QGroundControl
.
multiVehicleManager
.
vehicles
for
(
var
i
=
0
;
i
<
rgVehicle
.
count
;
i
++
)
{
var
vehicle
=
rgVehicle
.
get
(
i
)
vehicle
.
pauseVehicle
()
}
break
default
:
console
.
warn
(
qsTr
(
"
Internal error: unknown actionCode
"
),
actionCode
)
break
...
...
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