From b9bf84c7af65eae34cea66f0510346b312def19e Mon Sep 17 00:00:00 2001
From: Michael Oborne <mich146@hotmail.com>
Date: Tue, 19 Jun 2012 07:15:40 -0700
Subject: [PATCH] APM Planner 1.1.93 fix armed/disarmed message

---
 Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj       | 6 +++---
 Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user  | 2 +-
 Tools/ArdupilotMegaPlanner/CurrentState.cs            | 2 ++
 Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
index 7c76e88dea..4f05e626a4 100644
--- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
+++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ArdupilotMega</RootNamespace>
-    <AssemblyName>ArdupilotMegaPlanner</AssemblyName>
+    <AssemblyName>ArdupilotMegaPlanner10</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -42,7 +42,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MAVLINK10cra</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MAVLINK10</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -58,7 +58,7 @@
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MAVLINK10cra</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MAVLINK10</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user
index 496c214467..c06c0e6d56 100644
--- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user
+++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user
@@ -11,6 +11,6 @@
     <UpdateUrlHistory />
   </PropertyGroup>
   <PropertyGroup>
-    <ReferencePath>C:\Users\hog\Desktop\DIYDrones\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\;C:\Users\hog\Desktop\DIYDrones\myquad\sharpkml\SharpKml\bin\Release\;C:\Users\hog\Desktop\DIYDrones\myquad\MetaDataExtractorCSharp240d\bin\Release\;C:\Users\hog\Documents\Visual Studio 2010\Projects\ArdupilotMega\ArdupilotMega\Lib\</ReferencePath>
+    <ReferencePath>C:\Users\hog\Desktop\DIYDrones\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\;C:\Users\hog\Desktop\DIYDrones\myquad\sharpkml\SharpKml\bin\Release\;C:\Users\hog\Desktop\DIYDrones\myquad\MetaDataExtractorCSharp240d\bin\Release\;C:\Users\hog\Documents\Visual Studio 2010\Projects\ArdupilotMega\ArdupilotMega\Lib\;C:\Users\meee\Desktop\ArduPilotMegaPlanner\</ReferencePath>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs
index 5effdfcd8a..317d2a7fd9 100644
--- a/Tools/ArdupilotMegaPlanner/CurrentState.cs
+++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs
@@ -449,6 +449,8 @@ namespace ArdupilotMega
                 {
                     var hb = bytearray.ByteArrayToStructure<MAVLink.mavlink_heartbeat_t>(6);
 
+                    armed = (hb.base_mode & (byte)MAVLink.MAV_MODE_FLAG.SAFETY_ARMED) == (byte)MAVLink.MAV_MODE_FLAG.SAFETY_ARMED ? 4 : 3;
+
                     string oldmode = mode;
 
                     mode = "Unknown";
diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
index f5b9c7920f..932178790d 100644
--- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
+++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@ using System.Resources;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.1.*")]
-[assembly: AssemblyFileVersion("1.1.92")]
+[assembly: AssemblyFileVersion("1.1.93")]
 [assembly: NeutralResourcesLanguageAttribute("")]