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
3b8053ab
Commit
3b8053ab
authored
Apr 29, 2016
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PX4 Safety config: Make auto disarm more obvious
parent
11895fd5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
10 deletions
+15
-10
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+15
-10
No files found.
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
3b8053ab
...
...
@@ -54,6 +54,7 @@ QGCView {
property
Fact
_lowBattAction
:
controller
.
getParameterFact
(
-
1
,
"
COM_LOW_BAT_ACT
"
)
property
Fact
_rcLossAction
:
controller
.
getParameterFact
(
-
1
,
"
NAV_RCL_ACT
"
)
property
Fact
_dlLossAction
:
controller
.
getParameterFact
(
-
1
,
"
NAV_DLL_ACT
"
)
property
Fact
_disarmLandDelay
:
controller
.
getParameterFact
(
-
1
,
"
COM_DISARM_LAND
"
)
QGCViewPanel
{
id
:
panel
...
...
@@ -72,7 +73,7 @@ QGCView {
*/
Item
{
width
:
1
;
height
:
_margins
*
0.5
;
}
QGCLabel
{
text
:
qsTr
(
"
Low Battery Trigger
"
)
text
:
qsTr
(
"
Low Battery
Failsafe
Trigger
"
)
font.weight
:
Font
.
DemiBold
}
Rectangle
{
...
...
@@ -101,7 +102,7 @@ QGCView {
QGCLabel
{
anchors.baseline
:
lowBattCombo
.
baseline
width
:
_middleRowWidth
text
:
qsTr
(
"
Action:
"
)
text
:
qsTr
(
"
Failsafe
Action:
"
)
}
FactComboBox
{
id
:
lowBattCombo
...
...
@@ -143,7 +144,7 @@ QGCView {
**** RC Loss ****
*/
QGCLabel
{
text
:
qsTr
(
"
RC Loss Trigger
"
)
text
:
qsTr
(
"
RC Loss
Failsafe
Trigger
"
)
font.weight
:
Font
.
DemiBold
}
Rectangle
{
...
...
@@ -171,7 +172,7 @@ QGCView {
QGCLabel
{
anchors.baseline
:
rcLossCombo
.
baseline
width
:
_middleRowWidth
text
:
qsTr
(
"
Action:
"
)
text
:
qsTr
(
"
Failsafe
Action:
"
)
}
FactComboBox
{
id
:
rcLossCombo
...
...
@@ -200,7 +201,7 @@ QGCView {
**** Data Link Loss ****
*/
QGCLabel
{
text
:
qsTr
(
"
Data Link Loss Trigger
"
)
text
:
qsTr
(
"
Data Link Loss
Failsafe
Trigger
"
)
font.weight
:
Font
.
DemiBold
}
Rectangle
{
...
...
@@ -228,7 +229,7 @@ QGCView {
QGCLabel
{
anchors.baseline
:
dlLossCombo
.
baseline
width
:
_middleRowWidth
text
:
qsTr
(
"
Action:
"
)
text
:
qsTr
(
"
Failsafe
Action:
"
)
}
FactComboBox
{
id
:
dlLossCombo
...
...
@@ -257,7 +258,7 @@ QGCView {
**** Geofence ****
*/
QGCLabel
{
text
:
qsTr
(
"
Geofence Trigger
"
)
text
:
qsTr
(
"
Geofence
Failsafe
Trigger
"
)
font.weight
:
Font
.
DemiBold
}
Rectangle
{
...
...
@@ -496,15 +497,19 @@ QGCView {
}
}
Row
{
QGCLabel
{
QGCCheckBox
{
id
:
disarmDelayCheckBox
anchors.baseline
:
disarmField
.
baseline
width
:
_middleRowWidth
text
:
qsTr
(
"
Disarm After:
"
)
checked
:
_disarmLandDelay
.
value
>
0
onClicked
:
_disarmLandDelay
.
value
=
checked
?
2
:
0
width
:
_middleRowWidth
}
FactTextField
{
id
:
disarmField
fact
:
controller
.
getParameterFact
(
-
1
,
"
COM_DISARM_LAND
"
)
showUnits
:
true
fact
:
_disarmLandDelay
enabled
:
disarmDelayCheckBox
.
checked
width
:
_editFieldWidth
}
}
...
...
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