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
97bbb8d2
Commit
97bbb8d2
authored
Jun 22, 2017
by
Don Gagne
Committed by
GitHub
Jun 22, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5317 from jaxxzer/pr-prearm-fail-info
Add some extra information to prearm failure display
parents
116afe32
015d58c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+13
-1
No files found.
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
97bbb8d2
...
@@ -94,7 +94,7 @@ Item {
...
@@ -94,7 +94,7 @@ Item {
//-- Map warnings
//-- Map warnings
Column
{
Column
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.
verticalCenter
:
parent
.
verticalCenter
anchors.
top
:
parent
.
verticalCenter
spacing
:
ScreenTools
.
defaultFontPixelHeight
spacing
:
ScreenTools
.
defaultFontPixelHeight
QGCLabel
{
QGCLabel
{
...
@@ -114,6 +114,18 @@ Item {
...
@@ -114,6 +114,18 @@ Item {
font.pointSize
:
ScreenTools
.
largeFontPointSize
font.pointSize
:
ScreenTools
.
largeFontPointSize
text
:
_activeVehicle
?
_activeVehicle
.
prearmError
:
""
text
:
_activeVehicle
?
_activeVehicle
.
prearmError
:
""
}
}
QGCLabel
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
visible
:
_activeVehicle
&&
_activeVehicle
.
prearmError
width
:
ScreenTools
.
defaultFontPixelWidth
*
50
horizontalAlignment
:
Text
.
AlignHCenter
wrapMode
:
Text
.
WordWrap
z
:
QGroundControl
.
zOrderTopMost
color
:
mapPal
.
text
font.pointSize
:
ScreenTools
.
largeFontPointSize
text
:
"
The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure or disable the arming check via the Safety tab on the Vehicle Setup page.
"
}
}
}
//-- Instrument Panel
//-- Instrument Panel
...
...
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