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
dc3e21f8
Commit
dc3e21f8
authored
Dec 30, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Arming Checks to Safety
parent
f488f6b0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
3 deletions
+31
-3
APMSafetyComponentCopter.qml
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
+31
-3
No files found.
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
View file @
dc3e21f8
...
...
@@ -58,6 +58,8 @@ QGCView {
property
Fact
_rtlLoitTimeFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_LOIT_TIME
"
)
property
Fact
_rtlAltFinalFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_ALT_FINAL
"
)
property
Fact
_armingCheck
:
controller
.
getParameterFact
(
-
1
,
"
ARMING_CHECK
"
)
property
real
_margins
:
ScreenTools
.
defaultFontPixelHeight
ExclusiveGroup
{
id
:
fenceActionRadioGroup
}
...
...
@@ -71,9 +73,8 @@ QGCView {
Flickable
{
clip
:
true
anchors.fill
:
parent
boundsBehavior
:
Flickable
.
StopAtBounds
contentHeight
:
rtlSettings
.
y
+
rtlSettings
.
height
flickableDirection
:
Flickable
.
VerticalFlick
contentHeight
:
armingCheckSettings
.
y
+
armingCheckSettings
.
height
contentWidth
:
armingCheckSettings
.
x
+
armingCheckSettings
.
width
QGCLabel
{
id
:
failsafeLabel
...
...
@@ -447,6 +448,33 @@ QGCView {
showUnits
:
true
}
}
// Rectangle - RTL Settings
QGCLabel
{
id
:
armingCheckLabel
anchors.topMargin
:
_margins
anchors.left
:
parent
.
left
anchors.top
:
rtlSettings
.
bottom
text
:
"
Arming Checks
"
font.weight
:
Font
.
DemiBold
}
Rectangle
{
id
:
armingCheckSettings
anchors.topMargin
:
_margins
/
2
anchors.left
:
parent
.
left
anchors.top
:
armingCheckLabel
.
bottom
width
:
armingCheckColumn
.
x
+
armingCheckColumn
.
width
+
_margins
height
:
armingCheckColumn
.
y
+
armingCheckColumn
.
height
+
_margins
color
:
palette
.
windowShade
Column
{
id
:
armingCheckColumn
spacing
:
_margins
QGCLabel
{
text
:
"
Be very careful when turning off arming checks. Could lead to loss of Vehicle control.
"
}
FactBitmask
{
fact
:
_armingCheck
}
}
}
}
// Flickable
}
// QGCViewPanel
}
// QGCView
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