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
d54a9b0a
Commit
d54a9b0a
authored
Feb 08, 2020
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support both relative and absolute FOLL_ALT_TYPE
parent
be64886c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
APMFollowComponent.qml
src/AutoPilotPlugins/APM/APMFollowComponent.qml
+8
-6
No files found.
src/AutoPilotPlugins/APM/APMFollowComponent.qml
View file @
d54a9b0a
...
...
@@ -49,13 +49,15 @@ SetupPage {
property
int
_followComboMaintainIndex
:
0
property
int
_followComboSpecifyIndex
:
1
property
bool
_followMaintain
:
followPositionCombo
.
currentIndex
===
_followComboMaintainIndex
property
bool
_isFollowMeSetup
:
_followEnabled
.
rawValue
==
1
&&
_followParamsAvailable
&&
_followOffsetType
.
rawValue
==
1
&&
(
_roverFirmware
||
(
!
_roverFirmware
&&
_followAltitudeType
.
rawValue
==
1
))
&&
_followSysId
.
rawValue
==
0
property
bool
_isFollowMeSetup
:
_followEnabled
.
rawValue
==
1
&&
_followParamsAvailable
&&
_followOffsetType
.
rawValue
==
_followOffsetTypeHeadingRelative
&&
_followSysId
.
rawValue
==
0
property
bool
_roverFirmware
:
controller
.
roverFirmware
readonly
property
int
_followYawBehaviorNone
:
0
readonly
property
int
_followYawBehaviorFace
:
1
readonly
property
int
_followYawBehaviorSame
:
2
readonly
property
int
_followYawBehaviorFlight
:
3
readonly
property
int
_followYawBehaviorNone
:
0
readonly
property
int
_followYawBehaviorFace
:
1
readonly
property
int
_followYawBehaviorSame
:
2
readonly
property
int
_followYawBehaviorFlight
:
3
readonly
property
int
_followOffsetTypeHeadingRelative
:
1
readonly
property
int
_followAltitudeTypeRelative
:
1
Component.onCompleted
:
_setUIFromParams
()
...
...
@@ -89,7 +91,7 @@ SetupPage {
_followOffsetType
.
rawValue
=
1
// Relative to vehicle
_followSysId
.
rawValue
=
0
// Follow first message sent
if
(
!
_roverFirmware
)
{
_followAltitudeType
.
rawValue
=
1
// Altitude is r
elative
_followAltitudeType
.
rawValue
=
_followAltitudeTypeR
elative
}
controller
.
distance
.
value
=
controller
.
distance
.
defaultValue
...
...
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