Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
d304cb11
Commit
d304cb11
authored
Jun 23, 2016
by
Don Gagne
Browse files
Support both THR_MID and MOT_THST_HOVER
parent
d90e7aa0
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
View file @
d304cb11
...
...
@@ -26,14 +26,20 @@ QGCView {
QGCPalette
{
id
:
palette
;
colorGroupEnabled
:
enabled
}
property
Fact
_throttleMid
:
controller
.
getParameterFact
(
-
1
,
"
THR_MID
"
)
property
Fact
_rcFeel
:
controller
.
getParameterFact
(
-
1
,
"
RC_FEEL_RP
"
)
property
Fact
_rateRollP
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_RLL_P
"
)
property
Fact
_rateRollI
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_RLL_I
"
)
property
Fact
_ratePitchP
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_PIT_P
"
)
property
Fact
_ratePitchI
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_PIT_I
"
)
property
Fact
_rateClimbP
:
controller
.
getParameterFact
(
-
1
,
"
ACCEL_Z_P
"
)
property
Fact
_rateClimbI
:
controller
.
getParameterFact
(
-
1
,
"
ACCEL_Z_I
"
)
// Older firmwares use THR_MODE, newer use MOT_THST_HOVER
property
bool
_throttleMidExists
:
controller
.
parameterExists
(
-
1
,
"
THR_MID
"
)
property
Fact
_hoverTuneParam
:
controller
.
getParameterFact
(
-
1
,
_throttleMidExists
?
"
THR_MID
"
:
"
MOT_THST_HOVER
"
)
property
real
_hoverTuneMin
:
_throttleMidExists
?
200
:
0
property
real
_hoverTuneMax
:
_throttleMidExists
?
800
:
1
property
real
_hoverTuneStep
:
_throttleMidExists
?
10
:
0.01
property
Fact
_rcFeel
:
controller
.
getParameterFact
(
-
1
,
"
RC_FEEL_RP
"
)
property
Fact
_rateRollP
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_RLL_P
"
)
property
Fact
_rateRollI
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_RLL_I
"
)
property
Fact
_ratePitchP
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_PIT_P
"
)
property
Fact
_ratePitchI
:
controller
.
getParameterFact
(
-
1
,
"
r.ATC_RAT_PIT_I
"
)
property
Fact
_rateClimbP
:
controller
.
getParameterFact
(
-
1
,
"
ACCEL_Z_P
"
)
property
Fact
_rateClimbI
:
controller
.
getParameterFact
(
-
1
,
"
ACCEL_Z_I
"
)
property
Fact
_ch7Opt
:
controller
.
getParameterFact
(
-
1
,
"
CH7_OPT
"
)
property
Fact
_ch8Opt
:
controller
.
getParameterFact
(
-
1
,
"
CH8_OPT
"
)
...
...
@@ -63,7 +69,7 @@ QGCView {
// handler which updates your property with the new value, this first value change will trash
// your bound values. In order to work around this we don't set the values into the Sliders until
// after Qml load is done. We also don't track value changes until Qml load completes.
throttleHover
.
value
=
_
throttleMid
.
value
throttleHover
.
value
=
_
hoverTuneParam
.
value
rollPitch
.
value
=
_rateRollP
.
value
climb
.
value
=
_rateClimbP
.
value
rcFeel
.
value
=
_rcFeel
.
value
...
...
@@ -159,14 +165,14 @@ QGCView {
id
:
throttleHover
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
minimumValue
:
200
maximumValue
:
800
stepSize
:
10.0
minimumValue
:
_hoverTuneMin
maximumValue
:
_hoverTuneMax
stepSize
:
_hoverTuneStep
tickmarksEnabled
:
true
onValueChanged
:
{
if
(
_loadComplete
)
{
_
throttleMid
.
value
=
value
_
hoverTuneParam
.
value
=
value
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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