Commit 97bbb8d2 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5317 from jaxxzer/pr-prearm-fail-info

Add some extra information to prearm failure display
parents 116afe32 015d58c1
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment