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
97bbb8d2
Commit
97bbb8d2
authored
Jun 22, 2017
by
Don Gagne
Committed by
GitHub
Jun 22, 2017
Browse files
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
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
97bbb8d2
...
...
@@ -94,7 +94,7 @@ Item {
//-- Map warnings
Column
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.
verticalCenter
:
parent
.
verticalCenter
anchors.
top
:
parent
.
verticalCenter
spacing
:
ScreenTools
.
defaultFontPixelHeight
QGCLabel
{
...
...
@@ -114,6 +114,18 @@ Item {
font.pointSize
:
ScreenTools
.
largeFontPointSize
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
...
...
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