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
0209165f
Commit
0209165f
authored
Apr 10, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix RTL_LAND_DELAY usage
parent
d225aa6a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
14 deletions
+36
-14
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+36
-14
No files found.
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
0209165f
...
@@ -45,9 +45,10 @@ QGCView {
...
@@ -45,9 +45,10 @@ QGCView {
property
real
_margins
:
ScreenTools
.
defaultFontPixelHeight
property
real
_margins
:
ScreenTools
.
defaultFontPixelHeight
property
Fact
_fenceAction
:
controller
.
getParameterFact
(
-
1
,
"
GF_ACTION
"
)
property
Fact
_fenceAction
:
controller
.
getParameterFact
(
-
1
,
"
GF_ACTION
"
)
property
Fact
_fenceRadius
:
controller
.
getParameterFact
(
-
1
,
"
GF_MAX_HOR_DIST
"
)
property
Fact
_fenceRadius
:
controller
.
getParameterFact
(
-
1
,
"
GF_MAX_HOR_DIST
"
)
property
Fact
_fenceAlt
:
controller
.
getParameterFact
(
-
1
,
"
GF_MAX_VER_DIST
"
)
property
Fact
_fenceAlt
:
controller
.
getParameterFact
(
-
1
,
"
GF_MAX_VER_DIST
"
)
property
Fact
_rtlLandDelay
:
controller
.
getParameterFact
(
-
1
,
"
RTL_LAND_DELAY
"
)
QGCViewPanel
{
QGCViewPanel
{
id
:
panel
id
:
panel
...
@@ -245,26 +246,47 @@ QGCView {
...
@@ -245,26 +246,47 @@ QGCView {
showUnits
:
true
showUnits
:
true
}
}
QGCCheckBox
{
QGCLabel
{
id
:
homeLoiterCheckbox
id
:
returnHomeLabel
anchors.topMargin
:
_margins
anchors.top
:
climbField
.
bottom
anchors.left
:
climbLabel
.
left
text
:
"
Return Home, then:
"
}
ExclusiveGroup
{
id
:
homeLoiterGroup
}
QGCRadioButton
{
id
:
homeLoiterNoLandRadio
anchors.topMargin
:
_margins
anchors.top
:
returnHomeLabel
.
bottom
anchors.left
:
climbLabel
.
left
checked
:
_rtlLandDelay
.
value
<
0
exclusiveGroup
:
homeLoiterGroup
text
:
"
Loiter at Home altitude, do not land
"
onClicked
:
_rtlLandDelay
.
value
=
-
1
}
QGCRadioButton
{
id
:
homeLoiterLandRadio
anchors.baseline
:
landDelayField
.
baseline
anchors.baseline
:
landDelayField
.
baseline
anchors.left
:
climbLabel
.
left
anchors.left
:
climbLabel
.
left
checked
:
fact
.
value
>
0
checked
:
_rtlLandDelay
.
value
>=
0
exclusiveGroup
:
homeLoiterGroup
text
:
"
Loiter at Home altitude for
"
text
:
"
Loiter at Home altitude for
"
property
Fact
fact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_LAND_DELAY
"
)
onClicked
:
_rtlLandDelay
.
value
=
60
onClicked
:
fact
.
value
=
checked
?
60
:
-
1
}
}
FactTextField
{
FactTextField
{
id
:
landDelayField
id
:
landDelayField
anchors.margins
:
_margins
anchors.margins
:
_margins
anchors.left
:
homeLoiter
Checkbox
.
right
anchors.left
:
homeLoiter
LandRadio
.
right
anchors.top
:
climbField
.
bottom
anchors.top
:
homeLoiterNoLandRadio
.
bottom
fact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_LAND_DELAY
"
)
fact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_LAND_DELAY
"
)
showUnits
:
true
showUnits
:
true
enabled
:
homeLoiter
Checkbox
.
checked
===
true
enabled
:
homeLoiter
LandRadio
.
checked
===
true
}
}
QGCLabel
{
QGCLabel
{
...
@@ -272,7 +294,7 @@ QGCView {
...
@@ -272,7 +294,7 @@ QGCView {
anchors.baseline
:
descendField
.
baseline
anchors.baseline
:
descendField
.
baseline
anchors.left
:
climbLabel
.
left
anchors.left
:
climbLabel
.
left
color
:
palette
.
text
color
:
palette
.
text
enabled
:
homeLoiter
Checkbox
.
checked
===
true
enabled
:
homeLoiter
LandRadio
.
checked
===
true
}
}
FactTextField
{
FactTextField
{
...
@@ -281,7 +303,7 @@ QGCView {
...
@@ -281,7 +303,7 @@ QGCView {
anchors.left
:
landDelayField
.
left
anchors.left
:
landDelayField
.
left
anchors.top
:
landDelayField
.
bottom
anchors.top
:
landDelayField
.
bottom
fact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_DESCEND_ALT
"
)
fact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_DESCEND_ALT
"
)
enabled
:
homeLoiter
Checkbox
.
checked
===
true
enabled
:
homeLoiter
LandRadio
.
checked
===
true
showUnits
:
true
showUnits
:
true
}
}
}
}
...
...
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