From 015d58c1453d1cfe7dac2f17f2e79b21d2178f65 Mon Sep 17 00:00:00 2001
From: Jacob Walser <jwalser90@gmail.com>
Date: Wed, 21 Jun 2017 15:54:10 -0400
Subject: [PATCH] Add some extra information to prearm failure display

---
 src/FlightDisplay/FlightDisplayViewWidgets.qml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index a0faa9a9f..c0a8d6005 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -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
-- 
2.22.0