From 34dfac8c0a102bbfd971fd4f73f1b0325fdf0546 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh>
Date: Sat, 8 Nov 2014 16:16:17 +0100
Subject: [PATCH] OP-1564 Fix regression introduced with relaytuning removed

---
 .../share/openpilotgcs/pfd/default/Warnings.qml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml
index 8f4cc90d5..aa56d823f 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml
@@ -16,19 +16,19 @@ Item {
     property variant flightmodeColors : ["gray", "green", "green", "green", "green", "green", "green", "red", 
                                          "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan"]
 
-                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,RelayRate,RelayAttitude,
+                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,
                       // AltitudeHold,AltitudeVario,CruiseControl + Auto mode (VTOL/Wing pathfollower)
                       // grey : 'disabled' modes
 
-    property variant thrustmodeColors : ["green", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey",  
+    property variant thrustmodeColors : ["green", "grey", "grey", "grey", "grey", "grey", "grey", "grey",  
                                          "green", "green", "green", "cyan"]
 
                       // SystemSettings.AirframeType 3 - 18 : VtolPathFollower, check ThrustControl
  
     property var thrust_mode: FlightStatus.FlightMode < 7 ? StabilizationDesired.StabilizationMode_Thrust : 
                               FlightStatus.FlightMode > 7 && SystemSettings.AirframeType > 2 && SystemSettings.AirframeType < 19
-                              && VtolPathFollowerSettings.ThrustControl == 1 ? 13 : 
-                              FlightStatus.FlightMode > 7 && SystemSettings.AirframeType < 3 ? 13: 0 
+                              && VtolPathFollowerSettings.ThrustControl == 1 ? 11 : 
+                              FlightStatus.FlightMode > 7 && SystemSettings.AirframeType < 3 ? 11: 0 
 
 
     property real flight_time: Math.round(SystemStats.FlightTime / 1000)
@@ -224,12 +224,12 @@ Item {
             anchors.fill: parent
             color: FlightStatus.FlightMode < 1 ? "grey" : warnings.thrustmodeColors[thrust_mode.toString()]
 
-                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,RelayRate,RelayAttitude,
+                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,
                       // AltitudeHold,AltitudeVario,CruiseControl
                       // grey : 'disabled' modes
             Text {
                 anchors.centerIn: parent
-                text: ["MANUAL"," "," ", " ", " ", " ", " ", " ", " ", " ",
+                text: ["MANUAL"," "," ", " ", " ", " ", " ", " ",
                        "ALT HOLD", "ALT VARIO", "CRUISECTRL", "AUTO"][thrust_mode.toString()]
                 font {
                     family: "Arial"