From e4ea66b5dc3ec2cc5f5fa3b44ae3c83f8537fdcd Mon Sep 17 00:00:00 2001
From: Michael Oborne <mich146@hotmail.com>
Date: Sun, 3 Jun 2012 08:08:47 +0800
Subject: [PATCH] APM Planner 1.1.91 fix datasource binding exception.

---
 .../Controls/BackstageView/BackstageView.cs   |  14 +-
 .../ConfigFlightModes.Designer.cs             |   4 +
 .../ConfigurationView/ConfigFlightModes.resx  |   4 +-
 Tools/ArdupilotMegaPlanner/Msi/installer.wxs  | 368 +++++++++---------
 .../Properties/AssemblyInfo.cs                |   2 +-
 5 files changed, 202 insertions(+), 190 deletions(-)

diff --git a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs
index 0f9e0591b1..45c5e2d68a 100644
--- a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs
+++ b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs
@@ -249,22 +249,24 @@ namespace ArdupilotMega.Controls.BackstageView
         {
             // deactivate the old page
             _activePage.Page.Close();
-            Pages.ForEach(x =>
-            {
-                x.Page.Visible = false;
-            });
+           // Pages.ForEach(x =>
+           // {
+              //  x.Page.Visible = false;
+           // });
 
+            // deactivate button
             _activePage.Page.Visible = false;
             var oldButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == _activePage);
             oldButton.IsSelected = false;
 
+            // ensure fields have been init
+            associatedPage.Page.DoLoad(new EventArgs());
+            // show it
             associatedPage.Page.Visible = true;
             var newButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == associatedPage);
             newButton.IsSelected = true;
 
             _activePage = associatedPage;
-
-            _activePage.Page.DoLoad(new EventArgs());
         }
 
         public void Close()
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs
index a9c3c3d324..23b51bcdcb 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs
@@ -120,6 +120,10 @@
             this.lbl_currentmode.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.currentStateBindingSource, "mode", true));
             this.lbl_currentmode.Name = "lbl_currentmode";
             // 
+            // currentStateBindingSource
+            // 
+            this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState);
+            // 
             // label12
             // 
             resources.ApplyResources(this.label12, "label12");
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx
index 5fe9928d4b..a87aca3c3e 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx
@@ -946,7 +946,7 @@
     <value>BUT_SaveModes</value>
   </data>
   <data name="&gt;&gt;BUT_SaveModes.Type" xml:space="preserve">
-    <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4536.38105, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;BUT_SaveModes.Parent" xml:space="preserve">
     <value>$this</value>
@@ -973,6 +973,6 @@
     <value>ConfigFlightModes</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4536.38105, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs
index c8fa517040..342ffa31d7 100644
--- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs
+++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs
@@ -2,14 +2,14 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension">
 
 
-    <Product Id="*" Name="APM Planner" Language="1033" Version="1.1.89" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
+    <Product Id="*" Name="APM Planner" Language="1033" Version="1.1.90" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
 
         <Package Description="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
 
 
 <Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
-    <UpgradeVersion OnlyDetect="yes" Minimum="1.1.89" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
-    <UpgradeVersion OnlyDetect="no" Maximum="1.1.89" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
+    <UpgradeVersion OnlyDetect="yes" Minimum="1.1.90" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
+    <UpgradeVersion OnlyDetect="no" Maximum="1.1.90" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
 </Upgrade>
 
 <InstallExecuteSequence>
@@ -31,209 +31,215 @@
                             <Permission User="Everyone" GenericAll="yes" /> 
                         </CreateFolder>
                     </Component>
-<Component Id="_comp1" Guid="3cd5b44e-a6fd-4003-bd94-a090b1836683">
+<Component Id="_comp1" Guid="304401d2-6ff0-4e0c-882e-e84e1f984a1c">
 <File Id="_2" Source="..\bin\release\.gdbinit" />
 <File Id="_3" Source="..\bin\release\.gitignore" />
 <File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
-<File Id="_5" Source="..\bin\release\alglibnet2.dll" />
-<File Id="_6" Source="..\bin\release\ArduCopterConfig.xml" />
-<File Id="_7" Source="..\bin\release\ArduinoCPP.exe" />
-<File Id="_8" Source="..\bin\release\ArduinoCPP.exe.config" />
-<File Id="_9" Source="..\bin\release\ArduinoCPP.pdb" />
-<File Id="_10" Source="..\bin\release\ArdupilotMegaPlanner.application" />
-<File Id="_11" Source="..\bin\release\ArdupilotMegaPlanner.exe" ><netfx:NativeImage Id="ngen_ArdupilotMegaPlannerexe"/> </File>
-<File Id="_12" Source="..\bin\release\ArdupilotMegaPlanner.exe.config" />
-<File Id="_13" Source="..\bin\release\ArdupilotMegaPlanner.exe.manifest" />
-<File Id="_14" Source="..\bin\release\ArdupilotMegaPlanner.pdb" />
-<File Id="_15" Source="..\bin\release\block_plane_0.dae" />
-<File Id="_16" Source="..\bin\release\BSE.Windows.Forms.dll" />
-<File Id="_17" Source="..\bin\release\BSE.Windows.Forms.pdb" />
-<File Id="_18" Source="..\bin\release\BSE.Windows.Forms.xml" />
-<File Id="_19" Source="..\bin\release\Core.dll" />
-<File Id="_20" Source="..\bin\release\dataflashlog.xml" />
-<File Id="_21" Source="..\bin\release\DirectShowLib-2005.dll" />
-<File Id="_22" Source="..\bin\release\eeprom.bin" />
-<File Id="_23" Source="..\bin\release\GMap.NET.Core.dll" />
-<File Id="_24" Source="..\bin\release\GMap.NET.Core.pdb" />
-<File Id="_25" Source="..\bin\release\GMap.NET.WindowsForms.dll" />
-<File Id="_26" Source="..\bin\release\GMap.NET.WindowsForms.pdb" />
-<File Id="_27" Source="..\bin\release\hud.html" />
-<File Id="_28" Source="..\bin\release\ICSharpCode.SharpZipLib.dll" />
-<File Id="_29" Source="..\bin\release\Ionic.Zip.Reduced.dll" />
-<File Id="_30" Source="..\bin\release\IronPython.dll" />
-<File Id="_31" Source="..\bin\release\IronPython.Modules.dll" />
-<File Id="_32" Source="..\bin\release\KMLib.dll" />
-<File Id="_33" Source="..\bin\release\log4net.dll" />
-<File Id="_34" Source="..\bin\release\mavcmd.xml" />
-<File Id="_35" Source="..\bin\release\MAVLink.xml" />
-<File Id="_36" Source="..\bin\release\MetaDataExtractor.dll" />
-<File Id="_37" Source="..\bin\release\Microsoft.DirectX.DirectInput.dll" />
-<File Id="_38" Source="..\bin\release\Microsoft.DirectX.dll" />
-<File Id="_39" Source="..\bin\release\Microsoft.Dynamic.dll" />
-<File Id="_40" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
-<File Id="_41" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
-<File Id="_42" Source="..\bin\release\Microsoft.Scripting.dll" />
-<File Id="_43" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
-<File Id="_44" Source="..\bin\release\netDxf.dll" />
-<File Id="_45" Source="..\bin\release\OpenTK.dll" />
-<File Id="_46" Source="..\bin\release\OpenTK.GLControl.dll" />
-<File Id="_47" Source="..\bin\release\ParameterMetaData.xml" />
-<File Id="_48" Source="..\bin\release\quadhil.xml" />
-<File Id="_49" Source="..\bin\release\SharpKml.dll" />
-<File Id="_50" Source="..\bin\release\SharpKml.pdb" />
-<File Id="_51" Source="..\bin\release\SharpKml.xml" />
-<File Id="_52" Source="..\bin\release\System.Data.SQLite.dll" />
-<File Id="_53" Source="..\bin\release\System.Reactive.dll" />
-<File Id="_54" Source="..\bin\release\System.Reactive.xml" />
-<File Id="_55" Source="..\bin\release\System.Speech.dll" />
-<File Id="_56" Source="..\bin\release\Updater.exe" />
-<File Id="_57" Source="..\bin\release\Updater.exe.config" />
-<File Id="_58" Source="..\bin\release\Updater.pdb" />
-<File Id="_59" Source="..\bin\release\version.exe" />
-<File Id="_60" Source="..\bin\release\version.txt" />
-<File Id="_61" Source="..\bin\release\ZedGraph.dll" />
+<File Id="_5" Source="..\bin\release\AeroSimRCAPMHil.zip" />
+<File Id="_6" Source="..\bin\release\alglibnet2.dll" />
+<File Id="_7" Source="..\bin\release\arducopter-xplane.zip" />
+<File Id="_8" Source="..\bin\release\ArduCopterConfig.xml" />
+<File Id="_9" Source="..\bin\release\ArduinoCPP.exe" />
+<File Id="_10" Source="..\bin\release\ArduinoCPP.exe.config" />
+<File Id="_11" Source="..\bin\release\ArduinoCPP.pdb" />
+<File Id="_12" Source="..\bin\release\ArdupilotMegaPlanner.application" />
+<File Id="_13" Source="..\bin\release\ArdupilotMegaPlanner.exe" ><netfx:NativeImage Id="ngen_ArdupilotMegaPlannerexe"/> </File>
+<File Id="_14" Source="..\bin\release\ArdupilotMegaPlanner.exe.config" />
+<File Id="_15" Source="..\bin\release\ArdupilotMegaPlanner.exe.manifest" />
+<File Id="_16" Source="..\bin\release\ArdupilotMegaPlanner.pdb" />
+<File Id="_17" Source="..\bin\release\block_plane_0.dae" />
+<File Id="_18" Source="..\bin\release\BSE.Windows.Forms.dll" />
+<File Id="_19" Source="..\bin\release\BSE.Windows.Forms.pdb" />
+<File Id="_20" Source="..\bin\release\BSE.Windows.Forms.xml" />
+<File Id="_21" Source="..\bin\release\Core.dll" />
+<File Id="_22" Source="..\bin\release\dataflashlog.xml" />
+<File Id="_23" Source="..\bin\release\DirectShowLib-2005.dll" />
+<File Id="_24" Source="..\bin\release\eeprom.bin" />
+<File Id="_25" Source="..\bin\release\GMap.NET.Core.dll" />
+<File Id="_26" Source="..\bin\release\GMap.NET.Core.pdb" />
+<File Id="_27" Source="..\bin\release\GMap.NET.WindowsForms.dll" />
+<File Id="_28" Source="..\bin\release\GMap.NET.WindowsForms.pdb" />
+<File Id="_29" Source="..\bin\release\hud.html" />
+<File Id="_30" Source="..\bin\release\ICSharpCode.SharpZipLib.dll" />
+<File Id="_31" Source="..\bin\release\Ionic.Zip.Reduced.dll" />
+<File Id="_32" Source="..\bin\release\IronPython.dll" />
+<File Id="_33" Source="..\bin\release\IronPython.Modules.dll" />
+<File Id="_34" Source="..\bin\release\JSBSim.exe" />
+<File Id="_35" Source="..\bin\release\KMLib.dll" />
+<File Id="_36" Source="..\bin\release\log4net.dll" />
+<File Id="_37" Source="..\bin\release\mavcmd.xml" />
+<File Id="_38" Source="..\bin\release\MAVLink.xml" />
+<File Id="_39" Source="..\bin\release\MetaDataExtractor.dll" />
+<File Id="_40" Source="..\bin\release\Microsoft.DirectX.DirectInput.dll" />
+<File Id="_41" Source="..\bin\release\Microsoft.DirectX.dll" />
+<File Id="_42" Source="..\bin\release\Microsoft.Dynamic.dll" />
+<File Id="_43" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
+<File Id="_44" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
+<File Id="_45" Source="..\bin\release\Microsoft.Scripting.dll" />
+<File Id="_46" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
+<File Id="_47" Source="..\bin\release\netDxf.dll" />
+<File Id="_48" Source="..\bin\release\OpenTK.Compatibility.dll" />
+<File Id="_49" Source="..\bin\release\OpenTK.dll" />
+<File Id="_50" Source="..\bin\release\OpenTK.dll.config" />
+<File Id="_51" Source="..\bin\release\OpenTK.GLControl.dll" />
+<File Id="_52" Source="..\bin\release\ParameterMetaData.xml" />
+<File Id="_53" Source="..\bin\release\quadhil.xml" />
+<File Id="_54" Source="..\bin\release\runme" />
+<File Id="_55" Source="..\bin\release\SharpKml.dll" />
+<File Id="_56" Source="..\bin\release\SharpKml.pdb" />
+<File Id="_57" Source="..\bin\release\SharpKml.xml" />
+<File Id="_58" Source="..\bin\release\System.Data.SQLite.dll" />
+<File Id="_59" Source="..\bin\release\System.Reactive.dll" />
+<File Id="_60" Source="..\bin\release\System.Reactive.xml" />
+<File Id="_61" Source="..\bin\release\System.Speech.dll" />
+<File Id="_62" Source="..\bin\release\Updater.exe" />
+<File Id="_63" Source="..\bin\release\Updater.exe.config" />
+<File Id="_64" Source="..\bin\release\Updater.pdb" />
+<File Id="_65" Source="..\bin\release\version.exe" />
+<File Id="_66" Source="..\bin\release\version.txt" />
+<File Id="_67" Source="..\bin\release\ZedGraph.dll" />
 </Component>
-<Directory Id="aircraft61" Name="aircraft">
-<Component Id="_comp62" Guid="6c67b6d9-880e-46c4-9bfc-b0a354998fd8">
-<File Id="_63" Source="..\bin\release\aircraft\placeholder.txt" />
+<Directory Id="aircraft67" Name="aircraft">
+<Component Id="_comp68" Guid="a8b31701-6229-41c5-bebb-800326324456">
+<File Id="_69" Source="..\bin\release\aircraft\placeholder.txt" />
 </Component>
-<Directory Id="arducopter63" Name="arducopter">
-<Component Id="_comp64" Guid="10303db5-3b6c-4965-b62b-783efb2a1d45">
-<File Id="_65" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
-<File Id="_66" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
-<File Id="_67" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
-<File Id="_68" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
-<File Id="_69" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
-<File Id="_70" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
-<File Id="_71" Source="..\bin\release\aircraft\arducopter\quad.nas" />
-<File Id="_72" Source="..\bin\release\aircraft\arducopter\README" />
+<Directory Id="arducopter69" Name="arducopter">
+<Component Id="_comp70" Guid="74c0eb64-d270-48b0-b324-dff6a511ac81">
+<File Id="_71" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
+<File Id="_72" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
+<File Id="_73" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
+<File Id="_74" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
+<File Id="_75" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
+<File Id="_76" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
+<File Id="_77" Source="..\bin\release\aircraft\arducopter\quad.nas" />
+<File Id="_78" Source="..\bin\release\aircraft\arducopter\README" />
 </Component>
-<Directory Id="data72" Name="data">
-<Component Id="_comp73" Guid="bf66bb0b-2b6f-44f7-8008-928d0964458f">
-<File Id="_74" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
-<File Id="_75" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
-<File Id="_76" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
+<Directory Id="data78" Name="data">
+<Component Id="_comp79" Guid="7b15a3ff-ab07-44a4-9473-a8df5fbc334b">
+<File Id="_80" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
+<File Id="_81" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
+<File Id="_82" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
 </Component>
 </Directory>
-<Directory Id="Engines76" Name="Engines">
-<Component Id="_comp77" Guid="12124f43-e105-4f1b-ab86-38da6acfd4ae">
-<File Id="_78" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
-<File Id="_79" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
+<Directory Id="Engines82" Name="Engines">
+<Component Id="_comp83" Guid="8e233296-39f1-4228-8d8b-949b11e298c4">
+<File Id="_84" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
+<File Id="_85" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
 </Component>
 </Directory>
-<Directory Id="Models79" Name="Models">
-<Component Id="_comp80" Guid="3374ea5b-d56c-4765-99ac-5ea1042be4f1">
-<File Id="_81" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
-<File Id="_82" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
-<File Id="_83" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
-<File Id="_84" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
-<File Id="_85" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
-<File Id="_86" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
-<File Id="_87" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
-<File Id="_88" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
-<File Id="_89" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
+<Directory Id="Models85" Name="Models">
+<Component Id="_comp86" Guid="821faf86-233b-4de1-80d4-8f914393ac95">
+<File Id="_87" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
+<File Id="_88" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
+<File Id="_89" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
+<File Id="_90" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
+<File Id="_91" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
+<File Id="_92" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
+<File Id="_93" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
+<File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
+<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
 </Component>
 </Directory>
 </Directory>
-<Directory Id="Rascal89" Name="Rascal">
-<Component Id="_comp90" Guid="3cc57396-3827-453e-b69b-8a63eaba0847">
-<File Id="_91" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
-<File Id="_92" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
-<File Id="_93" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
-<File Id="_94" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
-<File Id="_95" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
-<File Id="_96" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
-<File Id="_97" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
-<File Id="_98" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
-<File Id="_99" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
+<Directory Id="Rascal95" Name="Rascal">
+<Component Id="_comp96" Guid="486d52eb-1ea2-47ae-9867-415dccf9ba67">
+<File Id="_97" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
+<File Id="_98" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
+<File Id="_99" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
+<File Id="_100" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
+<File Id="_101" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
+<File Id="_102" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
+<File Id="_103" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
+<File Id="_104" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
+<File Id="_105" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
 </Component>
-<Directory Id="Engines99" Name="Engines">
-<Component Id="_comp100" Guid="45ceafec-aa86-4622-a1fd-1ec6a72bc9fc">
-<File Id="_101" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
-<File Id="_102" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
+<Directory Id="Engines105" Name="Engines">
+<Component Id="_comp106" Guid="f60b22ea-6558-4c3c-b422-181254c121ec">
+<File Id="_107" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
+<File Id="_108" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
 </Component>
 </Directory>
-<Directory Id="Models102" Name="Models">
-<Component Id="_comp103" Guid="49d7a440-4ea5-4b7f-813b-557ce3c68a39">
-<File Id="_104" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
-<File Id="_105" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
-<File Id="_106" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
-<File Id="_107" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
-<File Id="_108" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
-<File Id="_109" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
-<File Id="_110" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
+<Directory Id="Models108" Name="Models">
+<Component Id="_comp109" Guid="234c046f-bc24-4958-86e3-7a75da198d79">
+<File Id="_110" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
+<File Id="_111" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
+<File Id="_112" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
+<File Id="_113" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
+<File Id="_114" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
+<File Id="_115" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
+<File Id="_116" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
 </Component>
 </Directory>
-<Directory Id="Systems110" Name="Systems">
-<Component Id="_comp111" Guid="97a83a4b-3b89-4a85-a9a3-f395604d0e98">
-<File Id="_112" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
-<File Id="_113" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
-<File Id="_114" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
-<File Id="_115" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
-<File Id="_116" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
+<Directory Id="Systems116" Name="Systems">
+<Component Id="_comp117" Guid="4b254cc2-40eb-4168-945b-570434f3ce80">
+<File Id="_118" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
+<File Id="_119" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
+<File Id="_120" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
+<File Id="_121" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
+<File Id="_122" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
 </Component>
 </Directory>
 </Directory>
 </Directory>
-<Directory Id="Driver116" Name="Driver">
-<Component Id="_comp117" Guid="9987d045-e5db-47d6-b788-143824acf461">
-<File Id="_118" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
+<Directory Id="Driver122" Name="Driver">
+<Component Id="_comp123" Guid="8e462eb2-d786-4186-bd0a-71a80efe01fa">
+<File Id="_124" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
 </Component>
 </Directory>
-<Directory Id="es_ES118" Name="es-ES">
-<Component Id="_comp119" Guid="705efc21-be62-4058-89c7-dac6b818d4d7">
-<File Id="_120" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
+<Directory Id="es_ES124" Name="es-ES">
+<Component Id="_comp125" Guid="06e792f7-0160-48c8-9b55-dfe4df9ac7c8">
+<File Id="_126" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
 </Component>
 </Directory>
-<Directory Id="fr120" Name="fr">
-<Component Id="_comp121" Guid="77b4e169-7b32-4b46-b119-f3395c43e64c">
-<File Id="_122" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
+<Directory Id="fr126" Name="fr">
+<Component Id="_comp127" Guid="3d4a977b-c97f-49a3-982a-e6e4c9d6f115">
+<File Id="_128" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
 </Component>
 </Directory>
-<Directory Id="it_IT122" Name="it-IT">
-<Component Id="_comp123" Guid="4d7b06d8-37a9-403b-9511-c29f1802137c">
-<File Id="_124" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
+<Directory Id="it_IT128" Name="it-IT">
+<Component Id="_comp129" Guid="47a09a31-9372-49c4-8493-f9db67666c37">
+<File Id="_130" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
 </Component>
 </Directory>
-<Directory Id="jsbsim124" Name="jsbsim">
-<Component Id="_comp125" Guid="7280be57-2c86-49ea-be0e-b5a2ba667da8">
-<File Id="_126" Source="..\bin\release\jsbsim\fgout.xml" />
-<File Id="_127" Source="..\bin\release\jsbsim\rascal_test.xml" />
+<Directory Id="jsbsim130" Name="jsbsim">
+<Component Id="_comp131" Guid="784ab043-cefd-4c96-a0be-2b21e779ce55">
+<File Id="_132" Source="..\bin\release\jsbsim\fgout.xml" />
+<File Id="_133" Source="..\bin\release\jsbsim\rascal_test.xml" />
 </Component>
 </Directory>
-<Directory Id="m3u127" Name="m3u">
-<Component Id="_comp128" Guid="dc638622-945c-44b0-9775-4b0ec00eaad3">
-<File Id="_129" Source="..\bin\release\m3u\both.m3u" />
-<File Id="_130" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
-<File Id="_131" Source="..\bin\release\m3u\hud.m3u" />
-<File Id="_132" Source="..\bin\release\m3u\map.m3u" />
-<File Id="_133" Source="..\bin\release\m3u\networklink.kml" />
+<Directory Id="m3u133" Name="m3u">
+<Component Id="_comp134" Guid="d76e9ada-a0c2-40a4-879b-aff12588e50b">
+<File Id="_135" Source="..\bin\release\m3u\both.m3u" />
+<File Id="_136" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
+<File Id="_137" Source="..\bin\release\m3u\hud.m3u" />
+<File Id="_138" Source="..\bin\release\m3u\map.m3u" />
+<File Id="_139" Source="..\bin\release\m3u\networklink.kml" />
 </Component>
 </Directory>
-<Directory Id="pl133" Name="pl">
-<Component Id="_comp134" Guid="205b236f-1c19-4cd1-b238-e9636d49d292">
-<File Id="_135" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
+<Directory Id="pl139" Name="pl">
+<Component Id="_comp140" Guid="d1e6c69a-acc2-431a-8b15-93d69b998a74">
+<File Id="_141" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
 </Component>
 </Directory>
-<Directory Id="Resources135" Name="Resources">
-<Component Id="_comp136" Guid="23394318-8b80-4ad4-80c7-76c290349614">
-<File Id="_137" Source="..\bin\release\Resources\MAVCmd.txt" />
-<File Id="_138" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
+<Directory Id="Resources141" Name="Resources">
+<Component Id="_comp142" Guid="e25a586c-827b-424a-9bdf-7e0d14066caa">
+<File Id="_143" Source="..\bin\release\Resources\MAVCmd.txt" />
+<File Id="_144" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
 </Component>
 </Directory>
-<Directory Id="ru_RU138" Name="ru-RU">
-<Component Id="_comp139" Guid="9673ea0c-6aaf-44db-80ac-e84fbc858071">
-<File Id="_140" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
+<Directory Id="ru_RU144" Name="ru-RU">
+<Component Id="_comp145" Guid="075ffb44-84aa-41f4-846e-d5b485d9c208">
+<File Id="_146" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
 </Component>
 </Directory>
-<Directory Id="zh_Hans140" Name="zh-Hans">
-<Component Id="_comp141" Guid="d7a7a784-6ddd-4dd3-96cf-36fb1b8e4c7d">
-<File Id="_142" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
+<Directory Id="zh_Hans146" Name="zh-Hans">
+<Component Id="_comp147" Guid="07fef6eb-cdbb-4fb8-81a4-6a4cf64a5da0">
+<File Id="_148" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
 </Component>
 </Directory>
-<Directory Id="zh_TW142" Name="zh-TW">
-<Component Id="_comp143" Guid="c7a53d2e-f88d-48ae-8686-5f9ed74c925d">
-<File Id="_144" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
+<Directory Id="zh_TW148" Name="zh-TW">
+<Component Id="_comp149" Guid="b37d19f2-038f-4f40-bc6d-428bcd58447b">
+<File Id="_150" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
 </Component>
 </Directory>
 
@@ -275,26 +281,26 @@
             <ComponentRef Id="InstallDirPermissions" />
 
 <ComponentRef Id="_comp1" />
-<ComponentRef Id="_comp62" />
-<ComponentRef Id="_comp64" />
-<ComponentRef Id="_comp73" />
-<ComponentRef Id="_comp77" />
-<ComponentRef Id="_comp80" />
-<ComponentRef Id="_comp90" />
-<ComponentRef Id="_comp100" />
-<ComponentRef Id="_comp103" />
-<ComponentRef Id="_comp111" />
+<ComponentRef Id="_comp68" />
+<ComponentRef Id="_comp70" />
+<ComponentRef Id="_comp79" />
+<ComponentRef Id="_comp83" />
+<ComponentRef Id="_comp86" />
+<ComponentRef Id="_comp96" />
+<ComponentRef Id="_comp106" />
+<ComponentRef Id="_comp109" />
 <ComponentRef Id="_comp117" />
-<ComponentRef Id="_comp119" />
-<ComponentRef Id="_comp121" />
 <ComponentRef Id="_comp123" />
 <ComponentRef Id="_comp125" />
-<ComponentRef Id="_comp128" />
+<ComponentRef Id="_comp127" />
+<ComponentRef Id="_comp129" />
+<ComponentRef Id="_comp131" />
 <ComponentRef Id="_comp134" />
-<ComponentRef Id="_comp136" />
-<ComponentRef Id="_comp139" />
-<ComponentRef Id="_comp141" />
-<ComponentRef Id="_comp143" />
+<ComponentRef Id="_comp140" />
+<ComponentRef Id="_comp142" />
+<ComponentRef Id="_comp145" />
+<ComponentRef Id="_comp147" />
+<ComponentRef Id="_comp149" />
 
             
             <ComponentRef Id="ApplicationShortcut" />
@@ -315,7 +321,7 @@
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch APM Planner" />
 
     <!-- Step 3: Include the custom action -->
-    <Property Id="WixShellExecTarget" Value="[#_11]" />
+    <Property Id="WixShellExecTarget" Value="[#_13]" />
     <CustomAction Id="LaunchApplication" 
         BinaryKey="WixCA" 
         DllEntry="WixShellExec"
diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
index bf68a51ff9..742da1752e 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.90")]
+[assembly: AssemblyFileVersion("1.1.91")]
 [assembly: NeutralResourcesLanguageAttribute("")]