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
c64082ad
Commit
c64082ad
authored
Apr 12, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pile of guided state fixes
parent
f5372ca1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
19 deletions
+31
-19
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+31
-19
No files found.
src/FlightDisplay/GuidedActionsController.qml
View file @
c64082ad
...
...
@@ -78,29 +78,41 @@ Item {
readonly
property
int
actionResumeMissionReady
:
14
readonly
property
int
actionPause
:
15
property
bool
showEmergenyStop
:
!
_hideEmergenyStop
&&
_activeVehicle
&&
_
activeVehicle
.
a
rmed
&&
_activeVehicle
.
flying
property
bool
showDisarm
:
_activeVehicle
&&
_
activeVehicle
.
a
rmed
&&
!
_activeVehicle
.
flying
property
bool
showRTL
:
_activeVehicle
&&
_
activeVehicle
.
a
rmed
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
flying
&&
!
_vehicleInRTLMode
property
bool
showEmergenyStop
:
!
_hideEmergenyStop
&&
_activeVehicle
&&
_
vehicleA
rmed
&&
_activeVehicle
.
flying
property
bool
showDisarm
:
_activeVehicle
&&
_
vehicleA
rmed
&&
!
_activeVehicle
.
flying
property
bool
showRTL
:
_activeVehicle
&&
_
vehicleA
rmed
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
flying
&&
!
_vehicleInRTLMode
property
bool
showTakeoff
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
!
_activeVehicle
.
flying
&&
!
_activeVehicle
.
fixedWing
property
bool
showLand
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_
activeVehicle
.
a
rmed
&&
!
_activeVehicle
.
fixedWing
&&
!
_vehicleInLandMode
property
bool
showLand
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_
vehicleA
rmed
&&
!
_activeVehicle
.
fixedWing
&&
!
_vehicleInLandMode
property
bool
showStartMission
:
_activeVehicle
&&
_missionAvailable
&&
!
_missionActive
property
bool
showResumeMission
:
_activeVehicle
&&
!
_activeVehicle
.
flying
&&
_missionAvailable
&&
_resumeMissionIndex
>
0
property
bool
showPause
:
_activeVehicle
&&
_
activeVehicle
.
a
rmed
&&
_activeVehicle
.
pauseVehicleSupported
&&
_activeVehicle
.
flying
&&
!
_vehiclePaused
property
bool
showChangeAlt
:
(
_activeVehicle
&&
_activeVehicle
.
flying
)
&&
_activeVehicle
.
guidedModeSupported
&&
_
activeVehicle
.
a
rmed
&&
!
_missionActive
property
bool
showOrbit
:
!
_hideOrbit
&&
_activeVehicle
&&
_activeVehicle
.
flying
&&
_activeVehicle
.
orbitModeSupported
&&
_
activeVehicle
.
a
rmed
&&
!
_missionActive
property
bool
showPause
:
_activeVehicle
&&
_
vehicleA
rmed
&&
_activeVehicle
.
pauseVehicleSupported
&&
_activeVehicle
.
flying
&&
!
_vehiclePaused
property
bool
showChangeAlt
:
(
_activeVehicle
&&
_activeVehicle
.
flying
)
&&
_activeVehicle
.
guidedModeSupported
&&
_
vehicleA
rmed
&&
!
_missionActive
property
bool
showOrbit
:
!
_hideOrbit
&&
_activeVehicle
&&
_activeVehicle
.
flying
&&
_activeVehicle
.
orbitModeSupported
&&
_
vehicleA
rmed
&&
!
_missionActive
property
bool
showLandAbort
:
_activeVehicle
&&
_activeVehicle
.
flying
&&
_activeVehicle
.
fixedWing
property
bool
showGotoLocation
:
_activeVehicle
&&
_activeVehicle
.
guidedMode
&&
_activeVehicle
.
flying
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
bool
_missionAvailable
:
missionController
.
containsItems
property
bool
_missionActive
:
_activeVehicle
?
_activeVehicle
.
flightMode
===
_activeVehicle
.
missionFlightMode
:
false
property
bool
_vehiclePaused
:
_activeVehicle
?
_activeVehicle
.
flightMode
===
_activeVehicle
.
pauseFlightMode
:
false
property
bool
_vehicleInRTLMode
:
_activeVehicle
?
_activeVehicle
.
flightMode
===
_activeVehicle
.
rtlFlightMode
:
false
property
bool
_vehicleInLandMode
:
_activeVehicle
?
_activeVehicle
.
flightMode
===
_activeVehicle
.
landFlightMode
:
false
property
int
_resumeMissionIndex
:
missionController
.
resumeMissionIndex
property
bool
_hideEmergenyStop
:
!
QGroundControl
.
corePlugin
.
options
.
guidedBarShowEmergencyStop
property
bool
_hideOrbit
:
!
QGroundControl
.
corePlugin
.
options
.
guidedBarShowOrbit
property
var
_actionData
onShowStartMissionChanged
:
console
.
log
(
showStartMission
,
_activeVehicle
,
_missionAvailable
,
_missionActive
,
_vehicleArmed
,
_vehicleInLandMode
,
_vehicleInRTLMode
)
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
string
_flightMode
:
_activeVehicle
?
_activeVehicle
.
flightMode
:
""
property
bool
_missionAvailable
:
missionController
.
containsItems
property
bool
_missionActive
:
_activeVehicle
?
_vehicleArmed
&&
(
_vehicleInLandMode
||
_vehicleInRTLMode
||
_vehicleInMissionMode
)
:
false
property
bool
_vehicleArmed
:
_activeVehicle
?
_activeVehicle
.
armed
:
false
property
bool
_vehiclePaused
:
false
property
bool
_vehicleInMissionMode
:
false
property
bool
_vehicleInRTLMode
:
false
property
bool
_vehicleInLandMode
:
false
property
int
_resumeMissionIndex
:
missionController
.
resumeMissionIndex
property
bool
_hideEmergenyStop
:
!
QGroundControl
.
corePlugin
.
options
.
guidedBarShowEmergencyStop
property
bool
_hideOrbit
:
!
QGroundControl
.
corePlugin
.
options
.
guidedBarShowOrbit
property
var
_actionData
on_FlightModeChanged
:
{
_vehiclePaused
=
_flightMode
===
_activeVehicle
.
pauseFlightMode
_vehicleInRTLMode
=
_flightMode
===
_activeVehicle
.
rtlFlightMode
_vehicleInLandMode
=
_flightMode
===
_activeVehicle
.
landFlightMode
_vehicleInMissionMode
=
_flightMode
===
_activeVehicle
.
missionFlightMode
// Must be last to get correct signalling for showStartMission popups
}
// Called when an action is about to be executed in order to confirm
function
confirmAction
(
actionCode
,
actionData
)
{
...
...
@@ -203,10 +215,10 @@ Item {
_activeVehicle
.
startMission
()
break
case
actionArm
:
_
activeVehicle
.
a
rmed
=
true
_
vehicleA
rmed
=
true
break
case
actionDisarm
:
_
activeVehicle
.
a
rmed
=
false
_
vehicleA
rmed
=
false
break
case
actionEmergencyStop
:
_activeVehicle
.
emergencyStop
()
...
...
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