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
a269adf6
Commit
a269adf6
authored
Apr 25, 2016
by
dogmaphobic
Committed by
Lorenz Meier
Apr 25, 2016
Browse files
Don't use hardcoded values for the combo box actions combo boxes.
Got the new BAT_LOW_THR parameter.
parent
f68b5622
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
a269adf6
...
...
@@ -109,7 +109,7 @@ QGCView {
FactComboBox
{
id
:
lowBattCombo
width
:
_editFieldWidth
model
:
[
qsTr
(
"
No Action
"
),
qsTr
(
"
Return To Land
"
)
]
//
model: [ qsTr("No Action"), qsTr("Return To Land") ]
fact
:
_lowBattAction
}
}
...
...
@@ -121,7 +121,7 @@ QGCView {
}
FactTextField
{
id
:
batLowLevelField
fact
:
controller
.
getParameterFact
(
-
1
,
"
COM_DISARM_LAND
"
)
fact
:
controller
.
getParameterFact
(
-
1
,
"
BAT_LOW_THR
"
)
showUnits
:
true
width
:
_editFieldWidth
}
...
...
@@ -166,7 +166,7 @@ QGCView {
FactComboBox
{
id
:
rcLossCombo
width
:
_editFieldWidth
model
:
[
qsTr
(
"
Loiter
"
),
qsTr
(
"
Return To Land
"
),
qsTr
(
"
Land at current position
"
)
]
//
model: [ qsTr("Loiter"), qsTr("Return To Land"), qsTr("Land at current position") ]
fact
:
_rcLossAction
}
}
...
...
@@ -242,7 +242,7 @@ QGCView {
FactComboBox
{
id
:
fenceActionCombo
width
:
_editFieldWidth
model
:
[
qsTr
(
"
None
"
),
qsTr
(
"
Warning
"
),
qsTr
(
"
Loiter
"
),
qsTr
(
"
Return Home
"
),
qsTr
(
"
Flight termination
"
)
]
//
model: [ qsTr("None"), qsTr("Warning"), qsTr("Loiter"), qsTr("Return Home"), qsTr("Flight termination") ]
fact
:
_fenceAction
}
}
...
...
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