From f2f189ef184177fd2dfe71bc9a6e064ee36e3f06 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Wed, 23 Mar 2016 00:06:22 +0100
Subject: [PATCH] LP-206 Keep UAVO order for Armed and FlightMode (OSD
 compatibility)

---
 shared/uavobjectdefinition/flightstatus.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared/uavobjectdefinition/flightstatus.xml b/shared/uavobjectdefinition/flightstatus.xml
index 5f3661cc8..6e3797e35 100644
--- a/shared/uavobjectdefinition/flightstatus.xml
+++ b/shared/uavobjectdefinition/flightstatus.xml
@@ -2,10 +2,12 @@
     <object name="FlightStatus" singleinstance="true" settings="false" category="Control">
         <description>Contains major flight status information for other modules.</description>
         <field name="Armed" units="" type="enum" elements="1" options="Disarmed,Arming,Armed" defaultvalue="Disarmed"/>
-        <field name="AlwaysStabilizeWhenArmed" units="" type="enum" elements="1" options="False,True" defaultvalue="False"/>
 
 	<!-- Note these enumerated values should be the same as ManualControlSettings -->
         <field name="FlightMode" units="" type="enum" elements="1" options="Manual,Stabilized1,Stabilized2,Stabilized3,Stabilized4,Stabilized5,Stabilized6,PositionHold,CourseLock,VelocityRoam,HomeLeash,AbsolutePosition,ReturnToBase,Land,PathPlanner,POI,AutoCruise,AutoTakeoff"/>
+        <!-- Keep Armed (first pos) and FlightMode (second pos) before this line for OSD compatibility -->
+        <field name="AlwaysStabilizeWhenArmed" units="" type="enum" elements="1" options="False,True" defaultvalue="False"/>
+
         <!-- the options for FlightModeAssist needs to match the StablizationSettings' assist options -->
         <field name="FlightModeAssist" units="" type="enum" elements="1" options="None,GPSAssist_PrimaryThrust,GPSAssist"/>
         <field name="AssistedControlState" units="" type="enum" elements="1" options="Primary,Brake,Hold" defaultvalue="Primary"/>