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
88575cd6
Unverified
Commit
88575cd6
authored
May 08, 2020
by
Don Gagne
Committed by
GitHub
May 08, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8739 from DonLakeFlyer/VTOLHoverCruise
Fix VTOL hover determination
parents
aa0d8af6
5ad5e3e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
MissionController.cc
src/MissionManager/MissionController.cc
+3
-1
MissionController.h
src/MissionManager/MissionController.h
+1
-0
No files found.
src/MissionManager/MissionController.cc
View file @
88575cd6
...
...
@@ -1205,6 +1205,7 @@ void MissionController::_recalcFlightPathSegments(void)
FlightPathSegmentHashTable
oldSegmentTable
=
_flightPathSegmentHashTable
;
_missionContainsVTOLTakeoff
=
false
;
_flightPathSegmentHashTable
.
clear
();
_waypointPath
.
clear
();
...
...
@@ -1244,6 +1245,7 @@ void MissionController::_recalcFlightPathSegments(void)
switch
(
command
)
{
case
MAV_CMD_NAV_TAKEOFF
:
case
MAV_CMD_NAV_VTOL_TAKEOFF
:
_missionContainsVTOLTakeoff
=
command
==
MAV_CMD_NAV_VTOL_TAKEOFF
;
if
(
!
linkEndToHome
)
{
// If we still haven't found the first coordinate item and we hit a takeoff command this means the mission starts from the ground.
// Link the first item back to home to show that.
...
...
@@ -1459,7 +1461,7 @@ void MissionController::_recalcMissionFlightStatus()
_resetMissionFlightStatus
();
bool
vtolInHover
=
true
;
bool
vtolInHover
=
_missionContainsVTOLTakeoff
;
bool
linkStartToHome
=
false
;
bool
foundRTL
=
false
;
bool
vehicleYawSpecificallySet
=
false
;
...
...
src/MissionManager/MissionController.h
View file @
88575cd6
...
...
@@ -369,6 +369,7 @@ private:
bool
_isROIBeginCurrentItem
=
false
;
double
_minAMSLAltitude
=
0
;
double
_maxAMSLAltitude
=
0
;
bool
_missionContainsVTOLTakeoff
=
false
;
static
const
char
*
_settingsGroup
;
...
...
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