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
3ca7ef53
Commit
3ca7ef53
authored
Jun 24, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No continue mission when disarmed
This is a partial workaround to testing using SITL where plane never lands
parent
45d9249b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+2
-2
No files found.
src/FlightDisplay/GuidedActionsController.qml
View file @
3ca7ef53
...
...
@@ -101,7 +101,7 @@ Item {
property
bool
showTakeoff
:
_guidedActionsEnabled
&&
_activeVehicle
.
takeoffVehicleSupported
&&
!
_vehicleFlying
property
bool
showLand
:
_guidedActionsEnabled
&&
_activeVehicle
.
guidedModeSupported
&&
_vehicleArmed
&&
!
_activeVehicle
.
fixedWing
&&
!
_vehicleInLandMode
property
bool
showStartMission
:
_guidedActionsEnabled
&&
_missionAvailable
&&
!
_missionActive
&&
!
_vehicleFlying
property
bool
showContinueMission
:
_guidedActionsEnabled
&&
_missionAvailable
&&
!
_missionActive
&&
_vehicleFlying
&&
(
_currentMissionIndex
<
missionController
.
visualItems
.
count
-
1
)
property
bool
showContinueMission
:
_guidedActionsEnabled
&&
_missionAvailable
&&
!
_missionActive
&&
_vehicle
Armed
&&
_vehicle
Flying
&&
(
_currentMissionIndex
<
missionController
.
visualItems
.
count
-
1
)
property
bool
showPause
:
_guidedActionsEnabled
&&
_vehicleArmed
&&
_activeVehicle
.
pauseVehicleSupported
&&
_vehicleFlying
&&
!
_vehiclePaused
property
bool
showChangeAlt
:
_guidedActionsEnabled
&&
_vehicleFlying
&&
_activeVehicle
.
guidedModeSupported
&&
_vehicleArmed
&&
!
_missionActive
property
bool
showOrbit
:
_guidedActionsEnabled
&&
!
_hideOrbit
&&
_vehicleFlying
&&
_activeVehicle
.
orbitModeSupported
&&
!
_missionActive
...
...
@@ -135,7 +135,7 @@ Item {
//Handy code for debugging state problems
property
bool
__debugGuidedStates
:
false
property
bool
__guidedModeSupported
:
_activeVehicle
?
_activeVehicle
.
guidedModeSupported
:
false
property
bool
__pauseVehicleSupported
:
_activeVehicle
?
_activeVehicle
.
pauseVehicleSupported
:
false
property
bool
__pauseVehicleSupported
:
_activeVehicle
?
_activeVehicle
.
pauseVehicleSupported
:
false
property
bool
__flightMode
:
_flightMode
function
_outputState
()
{
...
...
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