Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 01:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mission Planner 1.2.18

Browse Source 
fix mono crash
add rxrssi
fix altitude mis label on mouse over in flight planner
add trigger camera now action.
new win8 msi
This commit is contained in:
Michael Oborne 2012-11-08 21:01:43 +08:00
parent 2b714ff7b0
commit a2423dbe83
18 changed files with 1943 additions and 1176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -391,6 +391,12 @@
<Compile Include="GCSViews\ConfigurationView\ConfigFailSafe.Designer.cs">
<DependentUpon>ConfigFailSafe.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigCameraParams.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigCameraParams.Designer.cs">
<DependentUpon>ConfigCameraParams.cs</DependentUpon>
</Compile>
<Compile Include="HIL\Hil.cs" />
<None Include="HIL\JSBSim.cs" />
<Compile Include="HIL\XPlane.cs" />
@ -780,6 +786,9 @@
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigRawParams.fr.resx">
<DependentUpon>ConfigRawParams.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigCameraParams.resx">
<DependentUpon>ConfigCameraParams.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MavlinkLog.zh-Hans.resx">
<DependentUpon>MavlinkLog.cs</DependentUpon>
</EmbeddedResource>
@ -1304,9 +1313,10 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="ChangeLog.txt" />
<Content Include="Driver\Arduino MEGA 2560.inf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Driver\Arduino MEGA 2560.inf" />
<Content Include="Driver\dpinst.xml" />
<Content Include="Driver\DPInstx64.exe" />
<Content Include="Driver\DPInstx86.exe" />
<Content Include="hud.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>

5
Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageViewButton.cs
View File

@ -62,7 +62,10 @@ namespace ArdupilotMega.Controls.BackstageView
protected override void OnPaint(PaintEventArgs pevent)
{
((BackStageViewMenuPanel)this.Parent).PaintBackground(pevent);
if (this.Parent != null)
{
((BackStageViewMenuPanel)this.Parent).PaintBackground(pevent);
}
Graphics g = pevent.Graphics;

4
Tools/ArdupilotMegaPlanner/CurrentState.cs
View File

@ -87,6 +87,7 @@ namespace ArdupilotMega
// turn radius
public float radius { get { if (groundspeed <= 1) return 0; return ((groundspeed * groundspeed)/(float)(9.8f*Math.Tan(roll * deg2rad))); } }
public float rxrssi { get; set; }
//radio
public float ch1in { get; set; }
public float ch2in { get; set; }
@ -880,6 +881,9 @@ namespace ArdupilotMega
ch7in = rcin.chan7_raw;
ch8in = rcin.chan8_raw;
//percent
rxrssi = (float)((rcin.rssi / 255.0) * 100.0);
//MAVLink.packets[MAVLink.MAVLINK_MSG_ID_RC_CHANNELS_RAW] = null;
}

92
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.Designer.cs generated Normal file
View File

@ -0,0 +1,92 @@
namespace ArdupilotMega.GCSViews.ConfigurationView
{
partial class ConfigParamParams
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.BUT_rerequestparams = new ArdupilotMega.Controls.MyButton();
this.BUT_writePIDS = new ArdupilotMega.Controls.MyButton();
this.SuspendLayout();
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 36);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(514, 110);
this.tableLayoutPanel1.TabIndex = 0;
//
// BUT_rerequestparams
//
this.BUT_rerequestparams.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.BUT_rerequestparams.Location = new System.Drawing.Point(121, 11);
this.BUT_rerequestparams.Name = "BUT_rerequestparams";
this.BUT_rerequestparams.Padding = new System.Windows.Forms.Padding(0, 15, 0, 0);
this.BUT_rerequestparams.Size = new System.Drawing.Size(103, 19);
this.BUT_rerequestparams.TabIndex = 73;
this.BUT_rerequestparams.Text = "Refresh Params";
this.BUT_rerequestparams.UseVisualStyleBackColor = true;
//
// BUT_writePIDS
//
this.BUT_writePIDS.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.BUT_writePIDS.Location = new System.Drawing.Point(12, 11);
this.BUT_writePIDS.Name = "BUT_writePIDS";
this.BUT_writePIDS.Padding = new System.Windows.Forms.Padding(0, 15, 0, 0);
this.BUT_writePIDS.Size = new System.Drawing.Size(103, 19);
this.BUT_writePIDS.TabIndex = 74;
this.BUT_writePIDS.Text = "Write Params";
this.BUT_writePIDS.UseVisualStyleBackColor = true;
//
// ConfigFriendlyParams
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.Controls.Add(this.BUT_rerequestparams);
this.Controls.Add(this.BUT_writePIDS);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "ConfigFriendlyParams";
this.Size = new System.Drawing.Size(673, 177);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private Controls.MyButton BUT_rerequestparams;
private Controls.MyButton BUT_writePIDS;
}
}

395
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.cs Normal file
View File

@ -0,0 +1,395 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using ArdupilotMega.Controls;
using ArdupilotMega.Controls.BackstageView;
using ArdupilotMega.Utilities;
using log4net;
namespace ArdupilotMega.GCSViews.ConfigurationView
{
public partial class ConfigParamParams : UserControl, IActivate
{
#region Class Fields
private static readonly ILog log =
LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private readonly ParameterMetaDataRepository _parameterMetaDataRepository;
private Dictionary<string, string> _params = new Dictionary<string, string>();
#endregion
#region Properties
/// <summary>
/// Gets or sets the parameter mode.
/// </summary>
/// <value>
/// The parameter mode.
/// </value>
public string ParameterMode { get; set; }
#endregion
#region Constructor
public ConfigParamParams()
{
InitializeComponent();
tableLayoutPanel1.Height = this.Height;
_parameterMetaDataRepository = new ParameterMetaDataRepository();
MainV2.comPort.ParamListChanged += comPort_ParamListChanged;
Resize += this_Resize;
BUT_rerequestparams.Click += BUT_rerequestparams_Click;
BUT_writePIDS.Click += BUT_writePIDS_Click;
}
#endregion
#region Events
/// <summary>
/// Handles the Click event of the BUT_writePIDS control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
protected void BUT_writePIDS_Click(object sender, EventArgs e)
{
bool errorThrown = false;
_params.ForEach(x =>
{
var matchingControls = tableLayoutPanel1.Controls.Find(x.Key, true);
if (matchingControls.Length > 0)
{
var ctl = (IDynamicParameterControl)matchingControls[0];
try
{
MainV2.comPort.setParam(x.Key, float.Parse(ctl.Value));
}
catch
{
errorThrown = true;
CustomMessageBox.Show("Set " + x.Key + " Failed");
}
}
});
if (!errorThrown)
{
CustomMessageBox.Show("Parameters successfully saved.");
}
}
/// <summary>
/// Handles the Click event of the BUT_rerequestparams control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
protected void BUT_rerequestparams_Click(object sender, EventArgs e)
{
if (!MainV2.comPort.BaseStream.IsOpen)
return;
((Control)sender).Enabled = false;
try
{
MainV2.comPort.getParamList();
}
catch (Exception ex)
{
log.Error("Exception getting param list", ex);
CustomMessageBox.Show("Error: getting param list");
}
((Control)sender).Enabled = true;
BindParamList();
}
/// <summary>
/// Handles the Resize event of the this control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
protected void this_Resize(object sender, EventArgs e)
{
tableLayoutPanel1.Height = this.Height - 50;
}
/// <summary>
/// Handles the Load event of the ConfigRawParamsV2 control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
public void Activate()
{
BindParamList();
}
/// <summary>
/// Handles the ParamListChanged event of the comPort control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
protected void comPort_ParamListChanged(object sender, EventArgs e)
{
SortParamList();
}
#endregion
#region Methods
/// <summary>
/// Sorts the param list.
/// </summary>
private void SortParamList()
{
// Clear list
_params.Clear();
// When the parameter list is changed, re sort the list for our View's purposes
MainV2.comPort.param.Keys.ForEach(x =>
{
string displayName = _parameterMetaDataRepository.GetParameterMetaData(x.ToString(), ParameterMetaDataConstants.DisplayName);
string parameterMode = _parameterMetaDataRepository.GetParameterMetaData(x.ToString(), ParameterMetaDataConstants.User);
// If we have a friendly display name AND
if (!String.IsNullOrEmpty(displayName) &&
// The user type is equal to the ParameterMode specified at class instantiation OR
((!String.IsNullOrEmpty(parameterMode) && parameterMode == ParameterMode) ||
// The user type is empty and this is in Advanced mode
String.IsNullOrEmpty(parameterMode) && ParameterMode == ParameterMetaDataConstants.Advanced))
{
_params.Add(x.ToString(), displayName);
}
});
_params = _params.OrderBy(x => x.Value).ToDictionary(x => x.Key, x => x.Value);
}
/// <summary>
/// Binds the param list.
/// </summary>
private void BindParamList()
{
tableLayoutPanel1.Controls.Clear();
if (_params == null || _params.Count == 0) SortParamList();
// get the params if nothing exists already
if (_params != null && _params.Count == 0)
{
try
{
Utilities.ParameterMetaDataParser.GetParameterInformation();
_parameterMetaDataRepository.Reload();
SortParamList();
}
catch (Exception exp) { log.Error(exp); } // just to cleanup any errors
}
this.SuspendLayout();
_params.OrderBy(x => x.Key).ForEach(x =>
{
if(!String.IsNullOrEmpty(x.Key))
{
try
{
bool controlAdded = false;
if (!x.Key.StartsWith("MNT_"))
return;
string value = ((float)MainV2.comPort.param[x.Key]).ToString("0.###", CultureInfo.InvariantCulture);
string description = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Description);
string displayName = x.Value + " (" + x.Key + ")";
string units = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Units);
// If this is a range
string rangeRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Range);
string incrementRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Increment);
// modify for scaling
float test = 1;
MAVLink.modifyParamForDisplay(true, x.Key, ref test);
if (test != 1)
{
if (units.ToLower() == "centi-degrees")
{
units = "Degrees";
incrementRaw = "0.1";
string[] rangeParts = rangeRaw.Split(new[] { ' ' });
if (rangeParts.Count() == 2)
{
float lowerRange;
float.TryParse(rangeParts[0], out lowerRange);
float upperRange;
float.TryParse(rangeParts[1], out upperRange);
rangeRaw = (lowerRange / 100) + " " + (upperRange / 100);
}
}
else if (units.ToLower() == "centimeters")
{
units = "Meters";
incrementRaw = "0.1";
string[] rangeParts = rangeRaw.Split(new[] { ' ' });
if (rangeParts.Count() == 2)
{
float lowerRange;
float.TryParse(rangeParts[0], out lowerRange);
float upperRange;
float.TryParse(rangeParts[1], out upperRange);
rangeRaw = (lowerRange / 100) + " " + (upperRange / 100);
}
}
else
{
units += " / " + (int)(1 / test);
}
}
if (!String.IsNullOrEmpty(rangeRaw) && !String.IsNullOrEmpty(incrementRaw))
{
float increment, intValue;
float.TryParse(incrementRaw, out increment);
float.TryParse(value, out intValue);
string[] rangeParts = rangeRaw.Split(new[] { ' ' });
if (rangeParts.Count() == 2 && increment > 0)
{
float lowerRange;
float.TryParse(rangeParts[0], out lowerRange);
float upperRange;
float.TryParse(rangeParts[1], out upperRange);
int scaler = (int)float.Parse((1 / increment).ToString(CultureInfo.InvariantCulture));
int scaledLowerRange = 0, scaledUpperRange = 0;
int scaledIncrement = (int)increment;
if (scaler > 0)
{
scaledLowerRange = (int)(lowerRange * scaler);
scaledUpperRange = (int)(upperRange * scaler);
scaledIncrement = (int)float.Parse((increment * scaler).ToString(CultureInfo.InvariantCulture));
intValue *= scaler;
}
var rangeControl = new RangeControl();
rangeControl.Name = x.Key;
rangeControl.Scaler = scaler;
rangeControl.DescriptionText = FitDescriptionText(units, description);
rangeControl.LabelText = displayName;
rangeControl.TrackBarControl.Minimum = Math.Min(scaledLowerRange,(int)intValue);
rangeControl.TrackBarControl.Maximum = Math.Max(scaledUpperRange, (int)intValue);
rangeControl.TrackBarControl.TickFrequency = scaledIncrement;
rangeControl.TrackBarControl.Value = (int)intValue;
rangeControl.NumericUpDownControl.Increment = (decimal)increment;
rangeControl.NumericUpDownControl.DecimalPlaces = scaler.ToString(CultureInfo.InvariantCulture).Length - 1;
rangeControl.NumericUpDownControl.Minimum = (decimal)Math.Min(lowerRange, ((float)MainV2.comPort.param[x.Key]));
rangeControl.NumericUpDownControl.Maximum = (decimal)Math.Max(upperRange, ((float)MainV2.comPort.param[x.Key]));
rangeControl.NumericUpDownControl.Value = (decimal)((float)MainV2.comPort.param[x.Key]);
rangeControl.AttachEvents();
tableLayoutPanel1.Controls.Add(rangeControl);
controlAdded = true;
}
}
if (!controlAdded)
{
// If this is a subset of values
string availableValuesRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Values);
if (!String.IsNullOrEmpty(availableValuesRaw))
{
string[] availableValues = availableValuesRaw.Split(new[] { ',' });
if (availableValues.Any())
{
var valueControl = new ValuesControl();
valueControl.Name = x.Key;
valueControl.DescriptionText = FitDescriptionText(units, description);
valueControl.LabelText = displayName;
var splitValues = new List<KeyValuePair<string, string>>();
// Add the values to the ddl
availableValues.ForEach(val =>
{
string[] valParts = val.Split(new[] { ':' });
splitValues.Add(new KeyValuePair<string, string>(valParts[0], (valParts.Length > 1) ? valParts[1] : valParts[0]));
});
valueControl.ComboBoxControl.DisplayMember = "Value";
valueControl.ComboBoxControl.ValueMember = "Key";
valueControl.ComboBoxControl.DataSource = splitValues;
valueControl.ComboBoxControl.SelectedValue = value;
tableLayoutPanel1.Controls.Add(valueControl);
}
}
}
} // if there is an error simply dont show it, ie bad pde file, bad scale etc
catch (Exception ex) { log.Error(ex); }
}
});
ThemeManager.ApplyThemeTo(this);
this.ResumeLayout();
}
/// <summary>
/// Fits the description text.
/// </summary>
/// <param name="description">The description.</param>
/// <returns></returns>
private string FitDescriptionText(string description)
{
return FitDescriptionText(string.Empty, description);
}
/// <summary>
/// Fits the description text.
/// </summary>
/// <param name="units">The units.</param>
/// <param name="description">The description.</param>
/// <returns></returns>
private string FitDescriptionText(string units, string description)
{
var returnDescription = new StringBuilder();
if (!String.IsNullOrEmpty(units))
{
returnDescription.Append(String.Format("Units: {0}{1}", units, Environment.NewLine));
}
if (!String.IsNullOrEmpty(description))
{
returnDescription.Append("Description: ");
var descriptionParts = description.Split(new char[] { ' ' });
for (int i = 0; i < descriptionParts.Length; i++)
{
returnDescription.Append(String.Format("{0} ", descriptionParts[i]));
if (i != 0 && i % 12 == 0) returnDescription.Append(Environment.NewLine);
}
}
return returnDescription.ToString();
}
#endregion
}
}

120
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

711
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.designer.cs generated
View File

@ -38,8 +38,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.PBOX_WarningIcon = new ArdupilotMega.Controls.PictureBoxWithPseudoOpacity();
this.LBL_Error = new ArdupilotMega.Controls.LabelWithPseudoOpacity();
this.LNK_wiki = new System.Windows.Forms.LinkLabel();
this.label15 = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox();
@ -48,60 +46,62 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.mavlinkNumericUpDownRAM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownRAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.mavlinkNumericUpDownRSM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownRSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkCheckBoxRR = new ArdupilotMega.Controls.MavlinkCheckBox();
this.label16 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
this.mavlinkNumericUpDownPAM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownPAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.label20 = new System.Windows.Forms.Label();
this.label21 = new System.Windows.Forms.Label();
this.mavlinkNumericUpDownPSM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownPSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkCheckBoxPR = new ArdupilotMega.Controls.MavlinkCheckBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.mavlinkNumericUpDownTAM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownTAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.mavlinkNumericUpDownTSM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownTSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkCheckBoxTR = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkComboBoxTilt = new System.Windows.Forms.ComboBox();
this.mavlinkComboBoxRoll = new System.Windows.Forms.ComboBox();
this.mavlinkComboBoxPan = new System.Windows.Forms.ComboBox();
this.CMB_inputch_tilt = new ArdupilotMega.Controls.MavlinkComboBox();
this.label22 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.CMB_inputch_roll = new ArdupilotMega.Controls.MavlinkComboBox();
this.label24 = new System.Windows.Forms.Label();
this.CMB_inputch_pan = new ArdupilotMega.Controls.MavlinkComboBox();
this.CMB_inputch_roll = new ArdupilotMega.Controls.MavlinkComboBox();
this.CMB_inputch_tilt = new ArdupilotMega.Controls.MavlinkComboBox();
this.mavlinkNumericUpDownTAM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownTAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownTSM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownTSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkCheckBoxTR = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkNumericUpDownPAM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownPAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownPSM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownPSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkCheckBoxPR = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkNumericUpDownRAM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownRAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownRSM = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkNumericUpDownRSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkCheckBoxRR = new ArdupilotMega.Controls.MavlinkCheckBox();
this.LBL_Error = new ArdupilotMega.Controls.LabelWithPseudoOpacity();
this.PBOX_WarningIcon = new ArdupilotMega.Controls.PictureBoxWithPseudoOpacity();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).BeginInit();
this.SuspendLayout();
//
// pictureBox1
@ -143,20 +143,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.label6.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label6.Name = "label6";
//
// PBOX_WarningIcon
//
resources.ApplyResources(this.PBOX_WarningIcon, "PBOX_WarningIcon");
this.PBOX_WarningIcon.Image = global::ArdupilotMega.Properties.Resources.iconWarning32;
this.PBOX_WarningIcon.Name = "PBOX_WarningIcon";
this.PBOX_WarningIcon.Opacity = 0.5F;
this.PBOX_WarningIcon.TabStop = false;
//
// LBL_Error
//
resources.ApplyResources(this.LBL_Error, "LBL_Error");
this.LBL_Error.ForeColor = System.Drawing.Color.WhiteSmoke;
this.LBL_Error.Name = "LBL_Error";
//
// LNK_wiki
//
resources.ApplyResources(this.LNK_wiki, "LNK_wiki");
@ -207,59 +193,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.label12.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label12.Name = "label12";
//
// mavlinkNumericUpDownRAM
//
resources.ApplyResources(this.mavlinkNumericUpDownRAM, "mavlinkNumericUpDownRAM");
this.mavlinkNumericUpDownRAM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRAM.Max = 1F;
this.mavlinkNumericUpDownRAM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRAM.Min = 0F;
this.mavlinkNumericUpDownRAM.Name = "mavlinkNumericUpDownRAM";
this.mavlinkNumericUpDownRAM.param = null;
this.mavlinkNumericUpDownRAM.ParamName = null;
this.mavlinkNumericUpDownRAM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// mavlinkNumericUpDownRAMX
//
resources.ApplyResources(this.mavlinkNumericUpDownRAMX, "mavlinkNumericUpDownRAMX");
this.mavlinkNumericUpDownRAMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRAMX.Max = 1F;
this.mavlinkNumericUpDownRAMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRAMX.Min = 0F;
this.mavlinkNumericUpDownRAMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownRAMX.Name = "mavlinkNumericUpDownRAMX";
this.mavlinkNumericUpDownRAMX.param = null;
this.mavlinkNumericUpDownRAMX.ParamName = null;
this.mavlinkNumericUpDownRAMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// label13
//
resources.ApplyResources(this.label13, "label13");
@ -272,75 +205,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.label14.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label14.Name = "label14";
//
// mavlinkNumericUpDownRSM
//
resources.ApplyResources(this.mavlinkNumericUpDownRSM, "mavlinkNumericUpDownRSM");
this.mavlinkNumericUpDownRSM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRSM.Max = 1F;
this.mavlinkNumericUpDownRSM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRSM.Min = 0F;
this.mavlinkNumericUpDownRSM.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownRSM.Name = "mavlinkNumericUpDownRSM";
this.mavlinkNumericUpDownRSM.param = null;
this.mavlinkNumericUpDownRSM.ParamName = null;
this.mavlinkNumericUpDownRSM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// mavlinkNumericUpDownRSMX
//
resources.ApplyResources(this.mavlinkNumericUpDownRSMX, "mavlinkNumericUpDownRSMX");
this.mavlinkNumericUpDownRSMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRSMX.Max = 1F;
this.mavlinkNumericUpDownRSMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRSMX.Min = 0F;
this.mavlinkNumericUpDownRSMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownRSMX.Name = "mavlinkNumericUpDownRSMX";
this.mavlinkNumericUpDownRSMX.param = null;
this.mavlinkNumericUpDownRSMX.ParamName = null;
this.mavlinkNumericUpDownRSMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// mavlinkCheckBoxRR
//
resources.ApplyResources(this.mavlinkCheckBoxRR, "mavlinkCheckBoxRR");
this.mavlinkCheckBoxRR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.mavlinkCheckBoxRR.Name = "mavlinkCheckBoxRR";
this.mavlinkCheckBoxRR.OffValue = 0F;
this.mavlinkCheckBoxRR.OnValue = 1F;
this.mavlinkCheckBoxRR.param = null;
this.mavlinkCheckBoxRR.ParamName = null;
this.mavlinkCheckBoxRR.UseVisualStyleBackColor = true;
//
// label16
//
resources.ApplyResources(this.label16, "label16");
@ -363,59 +227,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.label19.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label19.Name = "label19";
//
// mavlinkNumericUpDownPAM
//
resources.ApplyResources(this.mavlinkNumericUpDownPAM, "mavlinkNumericUpDownPAM");
this.mavlinkNumericUpDownPAM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPAM.Max = 1F;
this.mavlinkNumericUpDownPAM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPAM.Min = 0F;
this.mavlinkNumericUpDownPAM.Name = "mavlinkNumericUpDownPAM";
this.mavlinkNumericUpDownPAM.param = null;
this.mavlinkNumericUpDownPAM.ParamName = null;
this.mavlinkNumericUpDownPAM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// mavlinkNumericUpDownPAMX
//
resources.ApplyResources(this.mavlinkNumericUpDownPAMX, "mavlinkNumericUpDownPAMX");
this.mavlinkNumericUpDownPAMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPAMX.Max = 1F;
this.mavlinkNumericUpDownPAMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPAMX.Min = 0F;
this.mavlinkNumericUpDownPAMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownPAMX.Name = "mavlinkNumericUpDownPAMX";
this.mavlinkNumericUpDownPAMX.param = null;
this.mavlinkNumericUpDownPAMX.ParamName = null;
this.mavlinkNumericUpDownPAMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// label20
//
resources.ApplyResources(this.label20, "label20");
@ -428,75 +239,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.label21.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label21.Name = "label21";
//
// mavlinkNumericUpDownPSM
//
resources.ApplyResources(this.mavlinkNumericUpDownPSM, "mavlinkNumericUpDownPSM");
this.mavlinkNumericUpDownPSM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPSM.Max = 1F;
this.mavlinkNumericUpDownPSM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPSM.Min = 0F;
this.mavlinkNumericUpDownPSM.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownPSM.Name = "mavlinkNumericUpDownPSM";
this.mavlinkNumericUpDownPSM.param = null;
this.mavlinkNumericUpDownPSM.ParamName = null;
this.mavlinkNumericUpDownPSM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// mavlinkNumericUpDownPSMX
//
resources.ApplyResources(this.mavlinkNumericUpDownPSMX, "mavlinkNumericUpDownPSMX");
this.mavlinkNumericUpDownPSMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPSMX.Max = 1F;
this.mavlinkNumericUpDownPSMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPSMX.Min = 0F;
this.mavlinkNumericUpDownPSMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownPSMX.Name = "mavlinkNumericUpDownPSMX";
this.mavlinkNumericUpDownPSMX.param = null;
this.mavlinkNumericUpDownPSMX.ParamName = null;
this.mavlinkNumericUpDownPSMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// mavlinkCheckBoxPR
//
resources.ApplyResources(this.mavlinkCheckBoxPR, "mavlinkCheckBoxPR");
this.mavlinkCheckBoxPR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.mavlinkCheckBoxPR.Name = "mavlinkCheckBoxPR";
this.mavlinkCheckBoxPR.OffValue = 0F;
this.mavlinkCheckBoxPR.OnValue = 1F;
this.mavlinkCheckBoxPR.param = null;
this.mavlinkCheckBoxPR.ParamName = null;
this.mavlinkCheckBoxPR.UseVisualStyleBackColor = true;
//
// label1
//
resources.ApplyResources(this.label1, "label1");
@ -519,6 +261,84 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.label4.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label4.Name = "label4";
//
// label7
//
resources.ApplyResources(this.label7, "label7");
this.label7.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label7.Name = "label7";
//
// label8
//
resources.ApplyResources(this.label8, "label8");
this.label8.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label8.Name = "label8";
//
// mavlinkComboBoxTilt
//
this.mavlinkComboBoxTilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.mavlinkComboBoxTilt.FormattingEnabled = true;
resources.ApplyResources(this.mavlinkComboBoxTilt, "mavlinkComboBoxTilt");
this.mavlinkComboBoxTilt.Name = "mavlinkComboBoxTilt";
this.mavlinkComboBoxTilt.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged);
//
// mavlinkComboBoxRoll
//
this.mavlinkComboBoxRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.mavlinkComboBoxRoll.FormattingEnabled = true;
resources.ApplyResources(this.mavlinkComboBoxRoll, "mavlinkComboBoxRoll");
this.mavlinkComboBoxRoll.Name = "mavlinkComboBoxRoll";
this.mavlinkComboBoxRoll.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged);
//
// mavlinkComboBoxPan
//
this.mavlinkComboBoxPan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.mavlinkComboBoxPan.FormattingEnabled = true;
resources.ApplyResources(this.mavlinkComboBoxPan, "mavlinkComboBoxPan");
this.mavlinkComboBoxPan.Name = "mavlinkComboBoxPan";
this.mavlinkComboBoxPan.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged);
//
// label22
//
resources.ApplyResources(this.label22, "label22");
this.label22.Name = "label22";
//
// label23
//
resources.ApplyResources(this.label23, "label23");
this.label23.Name = "label23";
//
// label24
//
resources.ApplyResources(this.label24, "label24");
this.label24.Name = "label24";
//
// CMB_inputch_pan
//
this.CMB_inputch_pan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
resources.ApplyResources(this.CMB_inputch_pan, "CMB_inputch_pan");
this.CMB_inputch_pan.FormattingEnabled = true;
this.CMB_inputch_pan.Name = "CMB_inputch_pan";
this.CMB_inputch_pan.param = null;
this.CMB_inputch_pan.ParamName = null;
//
// CMB_inputch_roll
//
this.CMB_inputch_roll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
resources.ApplyResources(this.CMB_inputch_roll, "CMB_inputch_roll");
this.CMB_inputch_roll.FormattingEnabled = true;
this.CMB_inputch_roll.Name = "CMB_inputch_roll";
this.CMB_inputch_roll.param = null;
this.CMB_inputch_roll.ParamName = null;
//
// CMB_inputch_tilt
//
this.CMB_inputch_tilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
resources.ApplyResources(this.CMB_inputch_tilt, "CMB_inputch_tilt");
this.CMB_inputch_tilt.FormattingEnabled = true;
this.CMB_inputch_tilt.Name = "CMB_inputch_tilt";
this.CMB_inputch_tilt.param = null;
this.CMB_inputch_tilt.ParamName = null;
//
// mavlinkNumericUpDownTAM
//
resources.ApplyResources(this.mavlinkNumericUpDownTAM, "mavlinkNumericUpDownTAM");
@ -572,18 +392,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
0,
0});
//
// label7
//
resources.ApplyResources(this.label7, "label7");
this.label7.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label7.Name = "label7";
//
// label8
//
resources.ApplyResources(this.label8, "label8");
this.label8.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label8.Name = "label8";
//
// mavlinkNumericUpDownTSM
//
resources.ApplyResources(this.mavlinkNumericUpDownTSM, "mavlinkNumericUpDownTSM");
@ -653,71 +461,264 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
this.mavlinkCheckBoxTR.ParamName = null;
this.mavlinkCheckBoxTR.UseVisualStyleBackColor = true;
//
// mavlinkComboBoxTilt
// mavlinkNumericUpDownPAM
//
this.mavlinkComboBoxTilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.mavlinkComboBoxTilt.FormattingEnabled = true;
resources.ApplyResources(this.mavlinkComboBoxTilt, "mavlinkComboBoxTilt");
this.mavlinkComboBoxTilt.Name = "mavlinkComboBoxTilt";
this.mavlinkComboBoxTilt.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged);
resources.ApplyResources(this.mavlinkNumericUpDownPAM, "mavlinkNumericUpDownPAM");
this.mavlinkNumericUpDownPAM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPAM.Max = 1F;
this.mavlinkNumericUpDownPAM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPAM.Min = 0F;
this.mavlinkNumericUpDownPAM.Name = "mavlinkNumericUpDownPAM";
this.mavlinkNumericUpDownPAM.param = null;
this.mavlinkNumericUpDownPAM.ParamName = null;
this.mavlinkNumericUpDownPAM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// mavlinkComboBoxRoll
// mavlinkNumericUpDownPAMX
//
this.mavlinkComboBoxRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.mavlinkComboBoxRoll.FormattingEnabled = true;
resources.ApplyResources(this.mavlinkComboBoxRoll, "mavlinkComboBoxRoll");
this.mavlinkComboBoxRoll.Name = "mavlinkComboBoxRoll";
this.mavlinkComboBoxRoll.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged);
resources.ApplyResources(this.mavlinkNumericUpDownPAMX, "mavlinkNumericUpDownPAMX");
this.mavlinkNumericUpDownPAMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPAMX.Max = 1F;
this.mavlinkNumericUpDownPAMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPAMX.Min = 0F;
this.mavlinkNumericUpDownPAMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownPAMX.Name = "mavlinkNumericUpDownPAMX";
this.mavlinkNumericUpDownPAMX.param = null;
this.mavlinkNumericUpDownPAMX.ParamName = null;
this.mavlinkNumericUpDownPAMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// mavlinkComboBoxPan
// mavlinkNumericUpDownPSM
//
this.mavlinkComboBoxPan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.mavlinkComboBoxPan.FormattingEnabled = true;
resources.ApplyResources(this.mavlinkComboBoxPan, "mavlinkComboBoxPan");
this.mavlinkComboBoxPan.Name = "mavlinkComboBoxPan";
this.mavlinkComboBoxPan.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged);
resources.ApplyResources(this.mavlinkNumericUpDownPSM, "mavlinkNumericUpDownPSM");
this.mavlinkNumericUpDownPSM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPSM.Max = 1F;
this.mavlinkNumericUpDownPSM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPSM.Min = 0F;
this.mavlinkNumericUpDownPSM.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownPSM.Name = "mavlinkNumericUpDownPSM";
this.mavlinkNumericUpDownPSM.param = null;
this.mavlinkNumericUpDownPSM.ParamName = null;
this.mavlinkNumericUpDownPSM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// CMB_inputch_tilt
// mavlinkNumericUpDownPSMX
//
this.CMB_inputch_tilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
resources.ApplyResources(this.CMB_inputch_tilt, "CMB_inputch_tilt");
this.CMB_inputch_tilt.FormattingEnabled = true;
this.CMB_inputch_tilt.Name = "CMB_inputch_tilt";
this.CMB_inputch_tilt.param = null;
this.CMB_inputch_tilt.ParamName = null;
resources.ApplyResources(this.mavlinkNumericUpDownPSMX, "mavlinkNumericUpDownPSMX");
this.mavlinkNumericUpDownPSMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownPSMX.Max = 1F;
this.mavlinkNumericUpDownPSMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownPSMX.Min = 0F;
this.mavlinkNumericUpDownPSMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownPSMX.Name = "mavlinkNumericUpDownPSMX";
this.mavlinkNumericUpDownPSMX.param = null;
this.mavlinkNumericUpDownPSMX.ParamName = null;
this.mavlinkNumericUpDownPSMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// label22
// mavlinkCheckBoxPR
//
resources.ApplyResources(this.label22, "label22");
this.label22.Name = "label22";
resources.ApplyResources(this.mavlinkCheckBoxPR, "mavlinkCheckBoxPR");
this.mavlinkCheckBoxPR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.mavlinkCheckBoxPR.Name = "mavlinkCheckBoxPR";
this.mavlinkCheckBoxPR.OffValue = 0F;
this.mavlinkCheckBoxPR.OnValue = 1F;
this.mavlinkCheckBoxPR.param = null;
this.mavlinkCheckBoxPR.ParamName = null;
this.mavlinkCheckBoxPR.UseVisualStyleBackColor = true;
//
// label23
// mavlinkNumericUpDownRAM
//
resources.ApplyResources(this.label23, "label23");
this.label23.Name = "label23";
resources.ApplyResources(this.mavlinkNumericUpDownRAM, "mavlinkNumericUpDownRAM");
this.mavlinkNumericUpDownRAM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRAM.Max = 1F;
this.mavlinkNumericUpDownRAM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRAM.Min = 0F;
this.mavlinkNumericUpDownRAM.Name = "mavlinkNumericUpDownRAM";
this.mavlinkNumericUpDownRAM.param = null;
this.mavlinkNumericUpDownRAM.ParamName = null;
this.mavlinkNumericUpDownRAM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// CMB_inputch_roll
// mavlinkNumericUpDownRAMX
//
this.CMB_inputch_roll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
resources.ApplyResources(this.CMB_inputch_roll, "CMB_inputch_roll");
this.CMB_inputch_roll.FormattingEnabled = true;
this.CMB_inputch_roll.Name = "CMB_inputch_roll";
this.CMB_inputch_roll.param = null;
this.CMB_inputch_roll.ParamName = null;
resources.ApplyResources(this.mavlinkNumericUpDownRAMX, "mavlinkNumericUpDownRAMX");
this.mavlinkNumericUpDownRAMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRAMX.Max = 1F;
this.mavlinkNumericUpDownRAMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRAMX.Min = 0F;
this.mavlinkNumericUpDownRAMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownRAMX.Name = "mavlinkNumericUpDownRAMX";
this.mavlinkNumericUpDownRAMX.param = null;
this.mavlinkNumericUpDownRAMX.ParamName = null;
this.mavlinkNumericUpDownRAMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// label24
// mavlinkNumericUpDownRSM
//
resources.ApplyResources(this.label24, "label24");
this.label24.Name = "label24";
resources.ApplyResources(this.mavlinkNumericUpDownRSM, "mavlinkNumericUpDownRSM");
this.mavlinkNumericUpDownRSM.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRSM.Max = 1F;
this.mavlinkNumericUpDownRSM.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRSM.Min = 0F;
this.mavlinkNumericUpDownRSM.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownRSM.Name = "mavlinkNumericUpDownRSM";
this.mavlinkNumericUpDownRSM.param = null;
this.mavlinkNumericUpDownRSM.ParamName = null;
this.mavlinkNumericUpDownRSM.Value = new decimal(new int[] {
1000,
0,
0,
0});
//
// CMB_inputch_pan
// mavlinkNumericUpDownRSMX
//
this.CMB_inputch_pan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
resources.ApplyResources(this.CMB_inputch_pan, "CMB_inputch_pan");
this.CMB_inputch_pan.FormattingEnabled = true;
this.CMB_inputch_pan.Name = "CMB_inputch_pan";
this.CMB_inputch_pan.param = null;
this.CMB_inputch_pan.ParamName = null;
resources.ApplyResources(this.mavlinkNumericUpDownRSMX, "mavlinkNumericUpDownRSMX");
this.mavlinkNumericUpDownRSMX.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.mavlinkNumericUpDownRSMX.Max = 1F;
this.mavlinkNumericUpDownRSMX.Maximum = new decimal(new int[] {
2200,
0,
0,
0});
this.mavlinkNumericUpDownRSMX.Min = 0F;
this.mavlinkNumericUpDownRSMX.Minimum = new decimal(new int[] {
800,
0,
0,
0});
this.mavlinkNumericUpDownRSMX.Name = "mavlinkNumericUpDownRSMX";
this.mavlinkNumericUpDownRSMX.param = null;
this.mavlinkNumericUpDownRSMX.ParamName = null;
this.mavlinkNumericUpDownRSMX.Value = new decimal(new int[] {
2000,
0,
0,
0});
//
// mavlinkCheckBoxRR
//
resources.ApplyResources(this.mavlinkCheckBoxRR, "mavlinkCheckBoxRR");
this.mavlinkCheckBoxRR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.mavlinkCheckBoxRR.Name = "mavlinkCheckBoxRR";
this.mavlinkCheckBoxRR.OffValue = 0F;
this.mavlinkCheckBoxRR.OnValue = 1F;
this.mavlinkCheckBoxRR.param = null;
this.mavlinkCheckBoxRR.ParamName = null;
this.mavlinkCheckBoxRR.UseVisualStyleBackColor = true;
//
// LBL_Error
//
resources.ApplyResources(this.LBL_Error, "LBL_Error");
this.LBL_Error.DoubleBuffered = true;
this.LBL_Error.ForeColor = System.Drawing.Color.WhiteSmoke;
this.LBL_Error.Name = "LBL_Error";
//
// PBOX_WarningIcon
//
resources.ApplyResources(this.PBOX_WarningIcon, "PBOX_WarningIcon");
this.PBOX_WarningIcon.Image = global::ArdupilotMega.Properties.Resources.iconWarning32;
this.PBOX_WarningIcon.Name = "PBOX_WarningIcon";
this.PBOX_WarningIcon.Opacity = 0.5F;
this.PBOX_WarningIcon.TabStop = false;
//
// ConfigMount
//
@ -780,20 +781,20 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
resources.ApplyResources(this, "$this");
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

1067
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.resx
View File

File diff suppressed because it is too large Load Diff

2
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs
View File

@ -78,6 +78,8 @@ If you are just setting up 3DR radios, you may continue without connecting.");
AddBackstageViewPage(new ConfigFriendlyParams { ParameterMode = ParameterMetaDataConstants.Advanced }, "Advanced Params", tunningpage);
AddBackstageViewPage(new ConfigRawParams(), "Adv Parameter List", tunningpage);
// AddBackstageViewPage(new ConfigParamParams() { ParameterMode = ParameterMetaDataConstants.Standard }, "Camera Gimbal Adv");
/******************************HELI **************************/
if (MainV2.comPort.param["H_GYR_ENABLE"] != null) // heli
{

9
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs generated
View File

@ -14,6 +14,7 @@
this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.flyToHereAltToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pointCameraHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.triggerCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.flightPlannerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainH = new System.Windows.Forms.SplitContainer();
this.SubMainLeft = new System.Windows.Forms.SplitContainer();
@ -120,6 +121,7 @@
this.goHereToolStripMenuItem,
this.flyToHereAltToolStripMenuItem,
this.pointCameraHereToolStripMenuItem,
this.triggerCameraToolStripMenuItem,
this.flightPlannerToolStripMenuItem});
this.contextMenuStripMap.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuStripMap, "contextMenuStripMap");
@ -142,6 +144,12 @@
resources.ApplyResources(this.pointCameraHereToolStripMenuItem, "pointCameraHereToolStripMenuItem");
this.pointCameraHereToolStripMenuItem.Click += new System.EventHandler(this.pointCameraHereToolStripMenuItem_Click);
//
// triggerCameraToolStripMenuItem
//
this.triggerCameraToolStripMenuItem.Name = "triggerCameraToolStripMenuItem";
resources.ApplyResources(this.triggerCameraToolStripMenuItem, "triggerCameraToolStripMenuItem");
this.triggerCameraToolStripMenuItem.Click += new System.EventHandler(this.triggerCameraToolStripMenuItem_Click);
//
// flightPlannerToolStripMenuItem
//
this.flightPlannerToolStripMenuItem.Name = "flightPlannerToolStripMenuItem";
@ -1442,6 +1450,7 @@
private Controls.MyButton BUT_ARM;
private Controls.ModifyandSet modifyandSetAlt;
private Controls.ModifyandSet modifyandSetSpeed;
private System.Windows.Forms.ToolStripMenuItem triggerCameraToolStripMenuItem;
}
}

25
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
View File

@ -476,7 +476,7 @@ namespace ArdupilotMega.GCSViews
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.RAW_SENSORS, MainV2.cs.ratesensors); // request raw sensor
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.RC_CHANNELS, MainV2.cs.raterc); // request rc info
}
catch { }
catch { log.Error("Failed to request rates"); }
lastdata = DateTime.Now.AddSeconds(120); // prevent flooding
}
@ -498,7 +498,7 @@ namespace ArdupilotMega.GCSViews
aviwriter.avi_end(hud1.Width, hud1.Height, 10);
}
}
catch { }
catch { log.Error("Failed to write avi"); }
if (MainV2.comPort.logreadmode && MainV2.comPort.logplaybackfile != null)
{
@ -511,7 +511,7 @@ namespace ArdupilotMega.GCSViews
{
MainV2.comPort.logplaybackfile.Close();
}
catch { }
catch { log.Error("Failed to close logfile"); }
MainV2.comPort.logplaybackfile = null;
}
@ -520,8 +520,12 @@ namespace ArdupilotMega.GCSViews
if (updatescreen.AddMilliseconds(300) < DateTime.Now)
{
updatePlayPauseButton(true);
updateLogPlayPosition();
try
{
updatePlayPauseButton(true);
updateLogPlayPosition();
}
catch { log.Error("Failed to update log playback pos"); }
updatescreen = DateTime.Now;
}
@ -532,7 +536,7 @@ namespace ArdupilotMega.GCSViews
{
MainV2.comPort.readPacket();
}
catch { }
catch { log.Error("Failed to read log packet"); }
double act = (MainV2.comPort.lastlogread - logplayback).TotalMilliseconds;
@ -2535,5 +2539,14 @@ print 'Roll complete'
{
}
private void triggerCameraToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
MainV2.comPort.setDigicamControl(true);
}
catch { CustomMessageBox.Show("Error sending command"); }
}
}
}

112
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
View File

@ -122,31 +122,37 @@
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="goHereToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
<value>188, 22</value>
</data>
<data name="goHereToolStripMenuItem.Text" xml:space="preserve">
<value>Fly To Here</value>
</data>
<data name="flyToHereAltToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
<value>188, 22</value>
</data>
<data name="flyToHereAltToolStripMenuItem.Text" xml:space="preserve">
<value>Fly To Here Alt</value>
</data>
<data name="pointCameraHereToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
<value>188, 22</value>
</data>
<data name="pointCameraHereToolStripMenuItem.Text" xml:space="preserve">
<value>Point Camera Here</value>
</data>
<data name="triggerCameraToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>188, 22</value>
</data>
<data name="triggerCameraToolStripMenuItem.Text" xml:space="preserve">
<value>Trigger Camera NOW</value>
</data>
<data name="flightPlannerToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
<value>188, 22</value>
</data>
<data name="flightPlannerToolStripMenuItem.Text" xml:space="preserve">
<value>Flight Planner</value>
</data>
<data name="contextMenuStripMap.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 92</value>
<value>189, 136</value>
</data>
<data name="&gt;&gt;contextMenuStripMap.Name" xml:space="preserve">
<value>contextMenuStripMap</value>
@ -216,7 +222,7 @@
<value>User Items</value>
</data>
<data name="contextMenuStripHud.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 158</value>
<value>177, 136</value>
</data>
<data name="&gt;&gt;contextMenuStripHud.Name" xml:space="preserve">
<value>contextMenuStripHud</value>
@ -244,7 +250,7 @@
<value>hud1</value>
</data>
<data name="&gt;&gt;hud1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;hud1.Parent" xml:space="preserve">
<value>SubMainLeft.Panel1</value>
@ -283,7 +289,7 @@
<value>quickView6</value>
</data>
<data name="&gt;&gt;quickView6.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView6.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -307,7 +313,7 @@
<value>quickView5</value>
</data>
<data name="&gt;&gt;quickView5.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView5.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -331,7 +337,7 @@
<value>quickView4</value>
</data>
<data name="&gt;&gt;quickView4.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView4.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -355,7 +361,7 @@
<value>quickView3</value>
</data>
<data name="&gt;&gt;quickView3.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView3.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -379,7 +385,7 @@
<value>quickView2</value>
</data>
<data name="&gt;&gt;quickView2.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView2.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -409,7 +415,7 @@
<value>quickView1</value>
</data>
<data name="&gt;&gt;quickView1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView1.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -457,7 +463,7 @@
<value>modifyandSetSpeed</value>
</data>
<data name="&gt;&gt;modifyandSetSpeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;modifyandSetSpeed.Parent" xml:space="preserve">
<value>tabActions</value>
@ -478,7 +484,7 @@
<value>modifyandSetAlt</value>
</data>
<data name="&gt;&gt;modifyandSetAlt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;modifyandSetAlt.Parent" xml:space="preserve">
<value>tabActions</value>
@ -511,7 +517,7 @@
<value>BUT_ARM</value>
</data>
<data name="&gt;&gt;BUT_ARM.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_ARM.Parent" xml:space="preserve">
<value>tabActions</value>
@ -538,7 +544,7 @@
<value>BUT_script</value>
</data>
<data name="&gt;&gt;BUT_script.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_script.Parent" xml:space="preserve">
<value>tabActions</value>
@ -568,7 +574,7 @@
<value>BUT_joystick</value>
</data>
<data name="&gt;&gt;BUT_joystick.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_joystick.Parent" xml:space="preserve">
<value>tabActions</value>
@ -598,7 +604,7 @@
<value>BUT_quickmanual</value>
</data>
<data name="&gt;&gt;BUT_quickmanual.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickmanual.Parent" xml:space="preserve">
<value>tabActions</value>
@ -628,7 +634,7 @@
<value>BUT_quickrtl</value>
</data>
<data name="&gt;&gt;BUT_quickrtl.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickrtl.Parent" xml:space="preserve">
<value>tabActions</value>
@ -658,7 +664,7 @@
<value>BUT_quickauto</value>
</data>
<data name="&gt;&gt;BUT_quickauto.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickauto.Parent" xml:space="preserve">
<value>tabActions</value>
@ -712,7 +718,7 @@
<value>BUT_setwp</value>
</data>
<data name="&gt;&gt;BUT_setwp.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_setwp.Parent" xml:space="preserve">
<value>tabActions</value>
@ -763,7 +769,7 @@
<value>BUT_setmode</value>
</data>
<data name="&gt;&gt;BUT_setmode.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_setmode.Parent" xml:space="preserve">
<value>tabActions</value>
@ -793,7 +799,7 @@
<value>BUT_clear_track</value>
</data>
<data name="&gt;&gt;BUT_clear_track.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_clear_track.Parent" xml:space="preserve">
<value>tabActions</value>
@ -844,7 +850,7 @@
<value>BUT_Homealt</value>
</data>
<data name="&gt;&gt;BUT_Homealt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_Homealt.Parent" xml:space="preserve">
<value>tabActions</value>
@ -874,7 +880,7 @@
<value>BUT_RAWSensor</value>
</data>
<data name="&gt;&gt;BUT_RAWSensor.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_RAWSensor.Parent" xml:space="preserve">
<value>tabActions</value>
@ -904,7 +910,7 @@
<value>BUTrestartmission</value>
</data>
<data name="&gt;&gt;BUTrestartmission.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTrestartmission.Parent" xml:space="preserve">
<value>tabActions</value>
@ -934,7 +940,7 @@
<value>BUTactiondo</value>
</data>
<data name="&gt;&gt;BUTactiondo.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTactiondo.Parent" xml:space="preserve">
<value>tabActions</value>
@ -988,7 +994,7 @@
<value>Gvspeed</value>
</data>
<data name="&gt;&gt;Gvspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gvspeed.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1018,7 +1024,7 @@
<value>Gheading</value>
</data>
<data name="&gt;&gt;Gheading.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gheading.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1048,7 +1054,7 @@
<value>Galt</value>
</data>
<data name="&gt;&gt;Galt.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Galt.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1081,7 +1087,7 @@
<value>Gspeed</value>
</data>
<data name="&gt;&gt;Gspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gspeed.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1165,7 +1171,7 @@
<value>lbl_playbackspeed</value>
</data>
<data name="&gt;&gt;lbl_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1192,7 +1198,7 @@
<value>lbl_logpercent</value>
</data>
<data name="&gt;&gt;lbl_logpercent.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_logpercent.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1219,7 +1225,7 @@
<value>NUM_playbackspeed</value>
</data>
<data name="&gt;&gt;NUM_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;NUM_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1246,7 +1252,7 @@
<value>BUT_log2kml</value>
</data>
<data name="&gt;&gt;BUT_log2kml.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_log2kml.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1300,7 +1306,7 @@
<value>BUT_playlog</value>
</data>
<data name="&gt;&gt;BUT_playlog.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_playlog.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1327,7 +1333,7 @@
<value>BUT_loadtelem</value>
</data>
<data name="&gt;&gt;BUT_loadtelem.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_loadtelem.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1513,7 +1519,7 @@
<value>lbl_winddir</value>
</data>
<data name="&gt;&gt;lbl_winddir.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_winddir.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1543,7 +1549,7 @@
<value>lbl_windvel</value>
</data>
<data name="&gt;&gt;lbl_windvel.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_windvel.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1576,7 +1582,7 @@
<value>lbl_hdop</value>
</data>
<data name="&gt;&gt;lbl_hdop.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_hdop.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1609,7 +1615,7 @@
<value>lbl_sats</value>
</data>
<data name="&gt;&gt;lbl_sats.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_sats.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1781,7 +1787,7 @@
<value>gMapControl1</value>
</data>
<data name="&gt;&gt;gMapControl1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;gMapControl1.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1844,7 +1850,7 @@
<value>TXT_lat</value>
</data>
<data name="&gt;&gt;TXT_lat.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_lat.Parent" xml:space="preserve">
<value>panel1</value>
@ -1901,7 +1907,7 @@
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>panel1</value>
@ -1931,7 +1937,7 @@
<value>TXT_long</value>
</data>
<data name="&gt;&gt;TXT_long.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_long.Parent" xml:space="preserve">
<value>panel1</value>
@ -1961,7 +1967,7 @@
<value>TXT_alt</value>
</data>
<data name="&gt;&gt;TXT_alt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_alt.Parent" xml:space="preserve">
<value>panel1</value>
@ -2150,13 +2156,13 @@
<value>714, 17</value>
</metadata>
<data name="resetToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>102, 22</value>
</data>
<data name="resetToolStripMenuItem.Text" xml:space="preserve">
<value>Reset</value>
</data>
<data name="contextMenuStripDockContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>153, 48</value>
<value>103, 26</value>
</data>
<data name="&gt;&gt;contextMenuStripDockContainer.Name" xml:space="preserve">
<value>contextMenuStripDockContainer</value>
@ -2194,6 +2200,12 @@
<data name="&gt;&gt;pointCameraHereToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;triggerCameraToolStripMenuItem.Name" xml:space="preserve">
<value>triggerCameraToolStripMenuItem</value>
</data>
<data name="&gt;&gt;triggerCameraToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;flightPlannerToolStripMenuItem.Name" xml:space="preserve">
<value>flightPlannerToolStripMenuItem</value>
</data>
@ -2276,6 +2288,6 @@
<value>FlightData</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null</value>
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

2
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs
View File

@ -1921,7 +1921,7 @@ namespace ArdupilotMega.GCSViews
MainMap.Invalidate(false);
int answer;
if (item.Tag != null && int.TryParse(item.Tag.ToString(), out answer))
if (item.Tag != null && rc.InnerMarker != null && int.TryParse(rc.InnerMarker.Tag.ToString(), out answer))
{
try
{

41
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -260,14 +260,15 @@ namespace ArdupilotMega
// preload
Python.CreateEngine();
}
catch (ArgumentException e) {
//http://www.microsoft.com/en-us/download/details.aspx?id=16083
//System.ArgumentException: Font 'Arial' does not support style 'Regular'.
catch (ArgumentException e)
{
//http://www.microsoft.com/en-us/download/details.aspx?id=16083
//System.ArgumentException: Font 'Arial' does not support style 'Regular'.
log.Fatal(e);
CustomMessageBox.Show(e.ToString() + "\n\n Please install this http://www.microsoft.com/en-us/download/details.aspx?id=16083");
this.Close();
}
log.Fatal(e);
CustomMessageBox.Show(e.ToString() + "\n\n Please install this http://www.microsoft.com/en-us/download/details.aspx?id=16083");
this.Close();
}
catch (Exception e) { log.Fatal(e); CustomMessageBox.Show("A Major error has occured : " + e.ToString()); this.Close(); }
if (MainV2.config["CHK_GDIPlus"] != null)
@ -388,14 +389,14 @@ namespace ArdupilotMega
{
// If the form has been closed, or never shown before, we need all new stuff
this.connectionStatsForm = new Form
{
Width = 430,
Height = 180,
MaximizeBox = false,
MinimizeBox = false,
FormBorderStyle = FormBorderStyle.FixedDialog,
Text = "Link Stats"
};
{
Width = 430,
Height = 180,
MaximizeBox = false,
MinimizeBox = false,
FormBorderStyle = FormBorderStyle.FixedDialog,
Text = "Link Stats"
};
// Change the connection stats control, so that when/if the connection stats form is showing,
// there will be something to see
this.connectionStatsForm.Controls.Clear();
@ -685,7 +686,7 @@ namespace ArdupilotMega
}
}
catch (Exception exp3) { log.Error(exp3); }
MessageBox.Show("Can not establish a connection\n\n" + ex.Message);
CustomMessageBox.Show("Can not establish a connection\n\n" + ex.Message);
return;
}
}
@ -1475,7 +1476,7 @@ namespace ArdupilotMega
foreach (var point in MainV2.comPort.wps.Values)
{
coords.Add(new SharpKml.Base.Vector(point.x, point.y, point.z));
coords.Add(new SharpKml.Base.Vector(point.x, point.y, point.z));
}
SharpKml.Dom.LineString ls = new SharpKml.Dom.LineString();
@ -2005,7 +2006,7 @@ namespace ArdupilotMega
}
}
catch { }
// log.Debug(file + " " + bytes);
// log.Debug(file + " " + bytes);
int len = dataStream.Read(buf1, 0, 1024);
if (len == 0)
break;
@ -2292,8 +2293,8 @@ namespace ArdupilotMega
private void MainV2_MouseMove(object sender, MouseEventArgs e)
{
// if (e.Y < 50)
// MainMenu.Visible = true;
// if (e.Y < 50)
// MainMenu.Visible = true;
}
}
}

18
Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs
View File

@ -2068,6 +2068,24 @@ namespace ArdupilotMega
MainV2.giveComport = false;
}
public void setDigicamConfigure()
{
// not implmented
}
public void setDigicamControl(bool shot)
{
mavlink_digicam_control_t req = new mavlink_digicam_control_t();
req.target_system = sysid;
req.target_component = compid;
req.shot = (shot == true) ? (byte)1 : (byte)0;
generatePacket(MAVLINK_MSG_ID_DIGICAM_CONTROL, req);
System.Threading.Thread.Sleep(20);
generatePacket(MAVLINK_MSG_ID_DIGICAM_CONTROL, req);
}
public void setMountConfigure(MAV_MOUNT_MODE mountmode, bool stabroll, bool stabpitch, bool stabyaw)
{
mavlink_mount_configure_t req = new mavlink_mount_configure_t();

456
Tools/ArdupilotMegaPlanner/Msi/installer.wxs
View File

@ -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.2.15" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<Product Id="*" Name="Mission Planner" Language="1033" Version="1.2.18" 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" />
<Package Description="Mission Planner Installer" Comments="Mission Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.15" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.2.15" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.18" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.2.18" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
</Upgrade>
<InstallExecuteSequence>
@ -31,252 +31,235 @@
<Permission User="Everyone" GenericAll="yes" />
</CreateFolder>
</Component>
<Component Id="_comp1" Guid="d2637ade-1969-4a66-8494-199dc6c850d6">
<Component Id="_comp1" Guid="66eb4b03-f236-4571-8ddb-51ef65bf5fe0">
<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\AeroSimRCAPMHil.zip" />
<File Id="_6" Source="..\bin\release\alglibnet2.dll" />
<File Id="_7" Source="..\bin\release\ArduCopter-hil.exe" />
<File Id="_8" Source="..\bin\release\arducopter-xplane.zip" />
<File Id="_9" Source="..\bin\release\ArduCopterConfig.xml" />
<File Id="_10" Source="..\bin\release\ArduinoCPP.exe" />
<File Id="_11" Source="..\bin\release\ArduinoCPP.exe.config" />
<File Id="_12" Source="..\bin\release\ArduinoCPP.pdb" />
<File Id="_13" Source="..\bin\release\ArdupilotMegaPlanner.application" />
<File Id="_14" Source="..\bin\release\ArdupilotMegaPlanner.exe" ><netfx:NativeImage Id="ngen_ArdupilotMegaPlannerexe"/> </File>
<File Id="_15" Source="..\bin\release\ArdupilotMegaPlanner.exe.config" />
<File Id="_16" Source="..\bin\release\ArdupilotMegaPlanner.exe.manifest" />
<File Id="_17" Source="..\bin\release\ArdupilotMegaPlanner.pdb" />
<File Id="_18" Source="..\bin\release\ArdupilotMegaPlanner10.application" />
<File Id="_19" Source="..\bin\release\ArdupilotMegaPlanner10.exe" />
<File Id="_20" Source="..\bin\release\ArdupilotMegaPlanner10.exe.config" />
<File Id="_21" Source="..\bin\release\ArdupilotMegaPlanner10.exe.manifest" />
<File Id="_22" Source="..\bin\release\ArdupilotMegaPlanner10.pdb" />
<File Id="_23" Source="..\bin\release\ArduPlane-hil.exe" />
<File Id="_24" Source="..\bin\release\AStar.dll" />
<File Id="_25" Source="..\bin\release\AStar.pdb" />
<File Id="_26" Source="..\bin\release\block_plane_0.dae" />
<File Id="_27" Source="..\bin\release\BSE.Windows.Forms.dll" />
<File Id="_28" Source="..\bin\release\BSE.Windows.Forms.pdb" />
<File Id="_29" Source="..\bin\release\BSE.Windows.Forms.xml" />
<File Id="_30" Source="..\bin\release\Core.dll" />
<File Id="_31" Source="..\bin\release\Crom.Controls.dll" />
<File Id="_32" Source="..\bin\release\Crom.Controls.pdb" />
<File Id="_33" Source="..\bin\release\cygstdc++-6.dll" />
<File Id="_34" Source="..\bin\release\cygwin1.dll" />
<File Id="_35" Source="..\bin\release\dataflashlog.xml" />
<File Id="_36" Source="..\bin\release\DirectShowLib-2005.dll" />
<File Id="_37" Source="..\bin\release\eeprom.bin" />
<File Id="_38" Source="..\bin\release\FDLayout.xml" />
<File Id="_39" Source="..\bin\release\FDscreen.xml" />
<File Id="_40" Source="..\bin\release\GMap.NET.Core.dll" />
<File Id="_41" Source="..\bin\release\GMap.NET.Core.pdb" />
<File Id="_42" Source="..\bin\release\GMap.NET.WindowsForms.dll" />
<File Id="_43" Source="..\bin\release\GMap.NET.WindowsForms.pdb" />
<File Id="_44" Source="..\bin\release\hud.html" />
<File Id="_45" Source="..\bin\release\ICSharpCode.SharpZipLib.dll" />
<File Id="_46" Source="..\bin\release\Ionic.Zip.Reduced.dll" />
<File Id="_47" Source="..\bin\release\IronPython.dll" />
<File Id="_48" Source="..\bin\release\IronPython.Modules.dll" />
<File Id="_49" Source="..\bin\release\JSBSim.exe" />
<File Id="_50" Source="..\bin\release\KMLib.dll" />
<File Id="_51" Source="..\bin\release\log4net.dll" />
<File Id="_52" Source="..\bin\release\mavcmd.xml" />
<File Id="_53" Source="..\bin\release\MAVLink.xml" />
<File Id="_54" Source="..\bin\release\MetaDataExtractor.dll" />
<File Id="_55" Source="..\bin\release\Microsoft.DirectX.DirectInput.dll" />
<File Id="_56" Source="..\bin\release\Microsoft.DirectX.dll" />
<File Id="_57" Source="..\bin\release\Microsoft.Dynamic.dll" />
<File Id="_58" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
<File Id="_59" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
<File Id="_60" Source="..\bin\release\Microsoft.Scripting.dll" />
<File Id="_61" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
<File Id="_62" Source="..\bin\release\netDxf.dll" />
<File Id="_63" Source="..\bin\release\OpenTK.Compatibility.dll" />
<File Id="_64" Source="..\bin\release\OpenTK.dll" />
<File Id="_65" Source="..\bin\release\OpenTK.dll.config" />
<File Id="_66" Source="..\bin\release\OpenTK.GLControl.dll" />
<File Id="_67" Source="..\bin\release\ParameterMetaData.xml" />
<File Id="_68" Source="..\bin\release\px4uploader.exe" />
<File Id="_69" Source="..\bin\release\px4uploader.exe.config" />
<File Id="_70" Source="..\bin\release\px4uploader.pdb" />
<File Id="_71" Source="..\bin\release\quadhil.xml" />
<File Id="_72" Source="..\bin\release\Release.zip" />
<File Id="_73" Source="..\bin\release\runme" />
<File Id="_74" Source="..\bin\release\serialsent.raw" />
<File Id="_75" Source="..\bin\release\Sharp3D.Math.dll" />
<File Id="_76" Source="..\bin\release\SharpKml.dll" />
<File Id="_77" Source="..\bin\release\SharpKml.pdb" />
<File Id="_78" Source="..\bin\release\SharpKml.xml" />
<File Id="_79" Source="..\bin\release\System.Data.SQLite.dll" />
<File Id="_80" Source="..\bin\release\System.Reactive.dll" />
<File Id="_81" Source="..\bin\release\System.Reactive.xml" />
<File Id="_82" Source="..\bin\release\System.Speech.dll" />
<File Id="_83" Source="..\bin\release\Transitions.dll" />
<File Id="_84" Source="..\bin\release\Updater.exe" />
<File Id="_85" Source="..\bin\release\Updater.exe.config" />
<File Id="_86" Source="..\bin\release\Updater.pdb" />
<File Id="_87" Source="..\bin\release\version.exe" />
<File Id="_88" Source="..\bin\release\version.txt" />
<File Id="_89" Source="..\bin\release\ZedGraph.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.config" />
<File Id="_14" Source="..\bin\release\ArdupilotMegaPlanner.exe.manifest" />
<File Id="_15" Source="..\bin\release\ArdupilotMegaPlanner10.application" />
<File Id="_16" Source="..\bin\release\ArdupilotMegaPlanner10.exe" ><netfx:NativeImage Id="ngen_ArdupilotMegaPlannerexe"/> </File>
<File Id="_17" Source="..\bin\release\ArdupilotMegaPlanner10.exe.config" />
<File Id="_18" Source="..\bin\release\ArdupilotMegaPlanner10.exe.manifest" />
<File Id="_19" Source="..\bin\release\ArdupilotMegaPlanner10.pdb" />
<File Id="_20" Source="..\bin\release\block_plane_0.dae" />
<File Id="_21" Source="..\bin\release\BSE.Windows.Forms.dll" />
<File Id="_22" Source="..\bin\release\BSE.Windows.Forms.pdb" />
<File Id="_23" Source="..\bin\release\BSE.Windows.Forms.xml" />
<File Id="_24" Source="..\bin\release\Core.dll" />
<File Id="_25" Source="..\bin\release\dataflashlog.xml" />
<File Id="_26" Source="..\bin\release\DirectShowLib-2005.dll" />
<File Id="_27" Source="..\bin\release\eeprom.bin" />
<File Id="_28" Source="..\bin\release\FDLayout.xml" />
<File Id="_29" Source="..\bin\release\FDscreen.xml" />
<File Id="_30" Source="..\bin\release\GMap.NET.Core.dll" />
<File Id="_31" Source="..\bin\release\GMap.NET.Core.pdb" />
<File Id="_32" Source="..\bin\release\GMap.NET.WindowsForms.dll" />
<File Id="_33" Source="..\bin\release\GMap.NET.WindowsForms.pdb" />
<File Id="_34" Source="..\bin\release\hud.html" />
<File Id="_35" Source="..\bin\release\ICSharpCode.SharpZipLib.dll" />
<File Id="_36" Source="..\bin\release\Ionic.Zip.Reduced.dll" />
<File Id="_37" Source="..\bin\release\IronPython.dll" />
<File Id="_38" Source="..\bin\release\IronPython.Modules.dll" />
<File Id="_39" Source="..\bin\release\KMLib.dll" />
<File Id="_40" Source="..\bin\release\log4net.dll" />
<File Id="_41" Source="..\bin\release\mavcmd.xml" />
<File Id="_42" Source="..\bin\release\MAVLink.xml" />
<File Id="_43" Source="..\bin\release\MetaDataExtractor.dll" />
<File Id="_44" Source="..\bin\release\Microsoft.DirectX.DirectInput.dll" />
<File Id="_45" Source="..\bin\release\Microsoft.DirectX.dll" />
<File Id="_46" Source="..\bin\release\Microsoft.Dynamic.dll" />
<File Id="_47" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
<File Id="_48" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
<File Id="_49" Source="..\bin\release\Microsoft.Scripting.dll" />
<File Id="_50" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
<File Id="_51" Source="..\bin\release\netDxf.dll" />
<File Id="_52" Source="..\bin\release\OpenTK.dll" />
<File Id="_53" Source="..\bin\release\OpenTK.dll.config" />
<File Id="_54" Source="..\bin\release\OpenTK.GLControl.dll" />
<File Id="_55" Source="..\bin\release\ParameterMetaData.xml" />
<File Id="_56" Source="..\bin\release\px4uploader.exe" />
<File Id="_57" Source="..\bin\release\px4uploader.exe.config" />
<File Id="_58" Source="..\bin\release\px4uploader.pdb" />
<File Id="_59" Source="..\bin\release\quadhil.xml" />
<File Id="_60" Source="..\bin\release\runme" />
<File Id="_61" Source="..\bin\release\serialsent.raw" />
<File Id="_62" Source="..\bin\release\SharpKml.dll" />
<File Id="_63" Source="..\bin\release\SharpKml.pdb" />
<File Id="_64" Source="..\bin\release\SharpKml.xml" />
<File Id="_65" Source="..\bin\release\System.Data.SQLite.dll" />
<File Id="_66" Source="..\bin\release\System.Reactive.dll" />
<File Id="_67" Source="..\bin\release\System.Reactive.xml" />
<File Id="_68" Source="..\bin\release\System.Speech.dll" />
<File Id="_69" Source="..\bin\release\Transitions.dll" />
<File Id="_70" Source="..\bin\release\Updater.exe" />
<File Id="_71" Source="..\bin\release\Updater.exe.config" />
<File Id="_72" Source="..\bin\release\Updater.pdb" />
<File Id="_73" Source="..\bin\release\version.exe" />
<File Id="_74" Source="..\bin\release\version.txt" />
<File Id="_75" Source="..\bin\release\ZedGraph.dll" />
</Component>
<Directory Id="aircraft89" Name="aircraft">
<Component Id="_comp90" Guid="61b5ecd4-597d-4e78-825b-8819f90e7ee3">
<File Id="_91" Source="..\bin\release\aircraft\placeholder.txt" />
<Directory Id="aircraft75" Name="aircraft">
<Component Id="_comp76" Guid="12281adf-8eef-4cc6-ad8f-f2c350ed3829">
<File Id="_77" Source="..\bin\release\aircraft\placeholder.txt" />
</Component>
<Directory Id="arducopter91" Name="arducopter">
<Component Id="_comp92" Guid="c99bc9cc-cde7-4f5d-a957-087f36a5b12b">
<File Id="_93" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_94" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_95" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
<File Id="_96" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
<File Id="_97" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
<File Id="_98" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
<File Id="_99" Source="..\bin\release\aircraft\arducopter\quad.nas" />
<File Id="_100" Source="..\bin\release\aircraft\arducopter\README" />
<Directory Id="arducopter77" Name="arducopter">
<Component Id="_comp78" Guid="6a0fd93e-2c4f-4ca1-b404-955ef311ad44">
<File Id="_79" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_80" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_81" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
<File Id="_82" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
<File Id="_83" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
<File Id="_84" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
<File Id="_85" Source="..\bin\release\aircraft\arducopter\quad.nas" />
<File Id="_86" Source="..\bin\release\aircraft\arducopter\README" />
</Component>
<Directory Id="data100" Name="data">
<Component Id="_comp101" Guid="5bc94fd8-2d8d-4822-84fe-5740a1cbdfa6">
<File Id="_102" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_103" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_104" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
<Directory Id="data86" Name="data">
<Component Id="_comp87" Guid="c53ccc37-5f6b-4617-8cf7-cf59452dc70d">
<File Id="_88" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_89" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_90" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
</Component>
</Directory>
<Directory Id="Engines104" Name="Engines">
<Component Id="_comp105" Guid="3bcda6f9-7f96-46b7-9fe3-ddf523f31ae3">
<File Id="_106" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_107" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
<Directory Id="Engines90" Name="Engines">
<Component Id="_comp91" Guid="f198cd73-430a-4ac1-a21b-adfa463b4364">
<File Id="_92" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_93" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
</Component>
</Directory>
<Directory Id="Models107" Name="Models">
<Component Id="_comp108" Guid="0d3b2842-6057-408a-86c8-e75a9c104478">
<File Id="_109" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_110" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_111" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
<File Id="_112" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
<File Id="_113" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
<File Id="_114" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
<File Id="_115" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
<File Id="_116" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
<File Id="_117" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
<Directory Id="Models93" Name="Models">
<Component Id="_comp94" Guid="f9771636-7b40-4dfe-9a7e-0532a356d23b">
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
<File Id="_98" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
<File Id="_99" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
<File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
<File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
<File Id="_102" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
<File Id="_103" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
</Component>
</Directory>
</Directory>
<Directory Id="Rascal117" Name="Rascal">
<Component Id="_comp118" Guid="3088bd89-6657-4830-a176-64df493b1a1e">
<File Id="_119" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
<File Id="_125" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
<File Id="_126" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
<File Id="_127" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
<Directory Id="Rascal103" Name="Rascal">
<Component Id="_comp104" Guid="76144af3-2bcc-4b80-8b59-a525be7db9cc">
<File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_106" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_107" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
<File Id="_108" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
<File Id="_109" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
<File Id="_110" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
<File Id="_111" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
<File Id="_112" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
<File Id="_113" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
</Component>
<Directory Id="Engines127" Name="Engines">
<Component Id="_comp128" Guid="8b1b8303-7c90-4497-beea-0f686b68a013">
<File Id="_129" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_130" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
<Directory Id="Engines113" Name="Engines">
<Component Id="_comp114" Guid="7e72c683-4d08-48a4-8f27-29eb593a101e">
<File Id="_115" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_116" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
</Component>
</Directory>
<Directory Id="Models130" Name="Models">
<Component Id="_comp131" Guid="a60a5cb2-ccc5-4d78-bfa5-3c65c0b0f8d3">
<File Id="_132" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_133" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_134" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
<File Id="_135" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
<File Id="_136" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
<File Id="_137" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
<File Id="_138" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
<Directory Id="Models116" Name="Models">
<Component Id="_comp117" Guid="3aae75c2-ce19-403f-9d8b-fd21b7f6de91">
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_119" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
</Component>
</Directory>
<Directory Id="Systems138" Name="Systems">
<Component Id="_comp139" Guid="67ff0dd7-68fe-48f7-b813-5ca2ac82a39e">
<File Id="_140" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_141" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_142" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
<File Id="_143" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
<File Id="_144" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
<Directory Id="Systems124" Name="Systems">
<Component Id="_comp125" Guid="df13815a-c1e9-426e-8e98-845689516611">
<File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_127" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_128" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
<File Id="_129" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
<File Id="_130" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
</Component>
</Directory>
</Directory>
</Directory>
<Directory Id="Driver144" Name="Driver">
<Component Id="_comp145" Guid="e859515f-903e-4dce-9020-d4b85dd60299">
<File Id="_146" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
<Directory Id="es_ES130" Name="es-ES">
<Component Id="_comp131" Guid="298b6cf4-017f-4e26-ac06-9f6867447af7">
<File Id="_132" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
<File Id="_133" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="es_ES146" Name="es-ES">
<Component Id="_comp147" Guid="fab393cc-342c-458b-b9bf-1bf563b756f3">
<File Id="_148" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
<File Id="_149" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="fr133" Name="fr">
<Component Id="_comp134" Guid="7e88ee86-ecb6-45d8-85ca-335277827a6b">
<File Id="_135" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
<File Id="_136" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="fr149" Name="fr">
<Component Id="_comp150" Guid="fa073daf-6c19-450a-b8e5-bfe09bed0afc">
<File Id="_151" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
<File Id="_152" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="it_IT136" Name="it-IT">
<Component Id="_comp137" Guid="4368d19d-4e2c-4099-93f6-0af906a22c3d">
<File Id="_138" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
<File Id="_139" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="it_IT152" Name="it-IT">
<Component Id="_comp153" Guid="0d0a7abc-3e5d-4e0b-af67-353d456e09b2">
<File Id="_154" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
<File Id="_155" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="jsbsim139" Name="jsbsim">
<Component Id="_comp140" Guid="9c052920-2e1b-4bfd-aacd-93984cab66a5">
<File Id="_141" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_142" Source="..\bin\release\jsbsim\rascal_test.xml" />
</Component>
</Directory>
<Directory Id="jsbsim155" Name="jsbsim">
<Component Id="_comp156" Guid="e8dd82ec-58ed-4d6a-b41f-694779d8be89">
<File Id="_157" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_158" Source="..\bin\release\jsbsim\rascal_test.xml" />
<Directory Id="m3u142" Name="m3u">
<Component Id="_comp143" Guid="4afea87b-d882-496c-9b28-ab96be5cb1e7">
<File Id="_144" Source="..\bin\release\m3u\both.m3u" />
<File Id="_145" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_146" Source="..\bin\release\m3u\hud.m3u" />
<File Id="_147" Source="..\bin\release\m3u\map.m3u" />
<File Id="_148" Source="..\bin\release\m3u\networklink.kml" />
</Component>
</Directory>
<Directory Id="m3u158" Name="m3u">
<Component Id="_comp159" Guid="763fb0ab-b7df-438f-acb7-187f5cf42c1c">
<File Id="_160" Source="..\bin\release\m3u\both.m3u" />
<File Id="_161" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_162" Source="..\bin\release\m3u\hud.m3u" />
<File Id="_163" Source="..\bin\release\m3u\map.m3u" />
<File Id="_164" Source="..\bin\release\m3u\networklink.kml" />
<Directory Id="pl148" Name="pl">
<Component Id="_comp149" Guid="24ff96f3-d9ef-4ee5-9cd0-8f2103c67e2c">
<File Id="_150" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
<File Id="_151" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="pl164" Name="pl">
<Component Id="_comp165" Guid="450e8122-66bd-4e6e-abec-99c2ab8d7ba7">
<File Id="_166" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
<File Id="_167" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="Resources151" Name="Resources">
<Component Id="_comp152" Guid="07499fed-ac1e-4daa-9e0b-69affc987e60">
<File Id="_153" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_154" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
</Component>
</Directory>
<Directory Id="Resources167" Name="Resources">
<Component Id="_comp168" Guid="1b00b56e-299c-4caf-95c4-766050d11bc6">
<File Id="_169" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_170" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
<Directory Id="ru_RU154" Name="ru-RU">
<Component Id="_comp155" Guid="093cb2dc-02b2-4161-9a59-489a7ded75ca">
<File Id="_156" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
<File Id="_157" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="ru_RU170" Name="ru-RU">
<Component Id="_comp171" Guid="6208a03a-2e48-4d2b-a0e5-deb515f94225">
<File Id="_172" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
<File Id="_173" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="zh_Hans157" Name="zh-Hans">
<Component Id="_comp158" Guid="24c574aa-6cc4-4b31-ac2c-50ebcbe978af">
<File Id="_159" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
<File Id="_160" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_Hans173" Name="zh-Hans">
<Component Id="_comp174" Guid="fdfbe0eb-ae40-4b77-8e74-90257c0ad659">
<File Id="_175" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
<File Id="_176" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_TW176" Name="zh-TW">
<Component Id="_comp177" Guid="ff89bfa4-f6c0-45d6-a8dc-a1511f88b7e2">
<File Id="_178" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
<File Id="_179" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="zh_TW160" Name="zh-TW">
<Component Id="_comp161" Guid="ced1caa4-ba82-4690-82cc-adbc469d1af6">
<File Id="_162" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
<File Id="_163" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="drivers" Name="Drivers">
<Directory Id="driver" Name="Drivers">
<Component Id="MyDriver" Guid="{6AC8226E-A005-437e-A3CD-0FC32D9A346F}">
<File Id="apm2inf" Source="..\Driver\Arduino MEGA 2560.inf" />
<difx:Driver AddRemovePrograms='no' Legacy="yes" PlugAndPlayPrompt="no" />
<File Id="dpixml" Source="..\Driver\dpinst.xml" />
<File Id="dpix64" Source="..\Driver\DPInstx64.exe" />
<File Id="dpix86" Source="..\Driver\DPInstx86.exe" />
</Component>
</Directory>
</Directory>
@ -287,23 +270,26 @@
</Directory>
</Directory>
<CustomAction Id='Install_Unsigned_Driver86' Execute='deferred'
Directory='driver' ExeCommand='"[driver]DPInstx86.exe"' Return='ignore' />
<CustomAction Id='Install_Unsigned_Driver64' Execute='deferred'
Directory='driver' ExeCommand='"[driver]DPInstx64.exe"' Return='ignore' />
<InstallExecuteSequence>
<Custom Action="Install_Unsigned_Driver86" After="InstallFiles">NOT
Installed AND NOT VersionNT64</Custom>
<Custom Action="Install_Unsigned_Driver64" After="InstallFiles">NOT
Installed AND VersionNT64</Custom>
</InstallExecuteSequence>
<DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="{8BC628BA-08A0-43d6-88C8-D4C007AC4607}">
<Shortcut Id="ApplicationStartMenuShortcut" Name="APM Planner Mav 0.9" Description="Ardupilot Mega Planner" Target="[APMPlanner]ArdupilotMegaPlanner.exe" WorkingDirectory="APMPlanner" />
<Shortcut Id="ApplicationStartMenuShortcut10" Name="APM Planner Mav 1.0" Description="Ardupilot Mega Planner" Target="[APMPlanner]ArdupilotMegaPlanner10.exe" WorkingDirectory="APMPlanner" />
<Shortcut Id="ApplicationStartMenuShortcut10" Name="Mission Planner Mav 1.0" Description="Ardupilot Mega Planner" Target="[APMPlanner]ArdupilotMegaPlanner10.exe" WorkingDirectory="APMPlanner" />
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
<Shortcut Id="UninstallProduct" Name="Uninstall APM Planner" Description="Uninstalls My Application" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
<Shortcut Id="UninstallProduct" Name="Uninstall Mission Planner" Description="Uninstalls My Application" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
<RegistryValue Root="HKCU" Key="Software\MichaelOborne\APMPlanner" Name="installed" Type="integer" Value="1" KeyPath="yes" />
</Component>
</DirectoryRef>
@ -312,32 +298,30 @@
<ComponentRef Id="InstallDirPermissions" />
<ComponentRef Id="_comp1" />
<ComponentRef Id="_comp90" />
<ComponentRef Id="_comp92" />
<ComponentRef Id="_comp101" />
<ComponentRef Id="_comp105" />
<ComponentRef Id="_comp108" />
<ComponentRef Id="_comp118" />
<ComponentRef Id="_comp128" />
<ComponentRef Id="_comp76" />
<ComponentRef Id="_comp78" />
<ComponentRef Id="_comp87" />
<ComponentRef Id="_comp91" />
<ComponentRef Id="_comp94" />
<ComponentRef Id="_comp104" />
<ComponentRef Id="_comp114" />
<ComponentRef Id="_comp117" />
<ComponentRef Id="_comp125" />
<ComponentRef Id="_comp131" />
<ComponentRef Id="_comp139" />
<ComponentRef Id="_comp145" />
<ComponentRef Id="_comp147" />
<ComponentRef Id="_comp150" />
<ComponentRef Id="_comp153" />
<ComponentRef Id="_comp156" />
<ComponentRef Id="_comp159" />
<ComponentRef Id="_comp165" />
<ComponentRef Id="_comp168" />
<ComponentRef Id="_comp171" />
<ComponentRef Id="_comp174" />
<ComponentRef Id="_comp177" />
<ComponentRef Id="_comp134" />
<ComponentRef Id="_comp137" />
<ComponentRef Id="_comp140" />
<ComponentRef Id="_comp143" />
<ComponentRef Id="_comp149" />
<ComponentRef Id="_comp152" />
<ComponentRef Id="_comp155" />
<ComponentRef Id="_comp158" />
<ComponentRef Id="_comp161" />
<ComponentRef Id="ApplicationShortcut" />
<ComponentRef Id="MyDriver" />
</Feature>
<!-- Step 2: Add UI to your installer / Step 4: Trigger the custom action -->
<Property Id="WIXUI_INSTALLDIR" Value="APMPlanner" />
@ -349,10 +333,10 @@
Event="DoAction"
Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI>
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch APM Planner" />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Mission Planner" />
<!-- Step 3: Include the custom action -->
<Property Id="WixShellExecTarget" Value="[#_14]" />
<Property Id="WixShellExecTarget" Value="[#_16]" />
<CustomAction Id="LaunchApplication"
BinaryKey="WixCA"
DllEntry="WixShellExec"

2
Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
View File

@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.*")]
[assembly: AssemblyFileVersion("1.2.17")]
[assembly: AssemblyFileVersion("1.2.18")]
[assembly: NeutralResourcesLanguageAttribute("")]

42
Tools/ArdupilotMegaPlanner/wix/Program.cs
View File

@ -179,9 +179,9 @@ namespace wix
<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=""" + newid + @""" Name=""APM Planner"" Language=""1033"" Version="""+version+@""" Manufacturer=""Michael Oborne"" UpgradeCode=""{625389D7-EB3C-4d77-A5F6-A285CF99437D}"">
<Product Id=""" + newid + @""" Name=""Mission Planner"" Language=""1033"" Version=""" + version + @""" 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"" />
<Package Description=""Mission Planner Installer"" Comments=""Mission Planner Installer"" Manufacturer=""Michael Oborne"" InstallerVersion=""200"" Compressed=""yes"" />
<Upgrade Id=""{625389D7-EB3C-4d77-A5F6-A285CF99437D}"">
@ -210,10 +210,12 @@ namespace wix
{
string data = @"
<Directory Id=""drivers"" Name=""Drivers"">
<Directory Id=""driver"" Name=""Drivers"">
<Component Id=""MyDriver"" Guid=""{6AC8226E-A005-437e-A3CD-0FC32D9A346F}"">
<File Id=""apm2inf"" Source=""..\Driver\Arduino MEGA 2560.inf"" />
<difx:Driver AddRemovePrograms='no' Legacy=""yes"" PlugAndPlayPrompt=""no"" />
<File Id=""dpixml"" Source=""..\Driver\dpinst.xml"" />
<File Id=""dpix64"" Source=""..\Driver\DPInstx64.exe"" />
<File Id=""dpix86"" Source=""..\Driver\DPInstx86.exe"" />
</Component>
</Directory>
</Directory>
@ -224,23 +226,26 @@ namespace wix
</Directory>
</Directory>
<CustomAction Id='Install_Unsigned_Driver86' Execute='deferred'
Directory='driver' ExeCommand='""[driver]DPInstx86.exe""' Return='ignore' />
<CustomAction Id='Install_Unsigned_Driver64' Execute='deferred'
Directory='driver' ExeCommand='""[driver]DPInstx64.exe""' Return='ignore' />
<InstallExecuteSequence>
<Custom Action=""Install_Unsigned_Driver86"" After=""InstallFiles"">NOT
Installed AND NOT VersionNT64</Custom>
<Custom Action=""Install_Unsigned_Driver64"" After=""InstallFiles"">NOT
Installed AND VersionNT64</Custom>
</InstallExecuteSequence>
<DirectoryRef Id=""ApplicationProgramsFolder"">
<Component Id=""ApplicationShortcut"" Guid=""{8BC628BA-08A0-43d6-88C8-D4C007AC4607}"">
<Shortcut Id=""ApplicationStartMenuShortcut"" Name=""APM Planner Mav 0.9"" Description=""Ardupilot Mega Planner"" Target=""[APMPlanner]ArdupilotMegaPlanner.exe"" WorkingDirectory=""APMPlanner"" />
<Shortcut Id=""ApplicationStartMenuShortcut10"" Name=""APM Planner Mav 1.0"" Description=""Ardupilot Mega Planner"" Target=""[APMPlanner]ArdupilotMegaPlanner10.exe"" WorkingDirectory=""APMPlanner"" />
<Shortcut Id=""ApplicationStartMenuShortcut10"" Name=""Mission Planner Mav 1.0"" Description=""Ardupilot Mega Planner"" Target=""[APMPlanner]ArdupilotMegaPlanner10.exe"" WorkingDirectory=""APMPlanner"" />
<RemoveFolder Id=""ApplicationProgramsFolder"" On=""uninstall"" />
<Shortcut Id=""UninstallProduct"" Name=""Uninstall APM Planner"" Description=""Uninstalls My Application"" Target=""[System64Folder]msiexec.exe"" Arguments=""/x [ProductCode]"" />
<Shortcut Id=""UninstallProduct"" Name=""Uninstall Mission Planner"" Description=""Uninstalls My Application"" Target=""[System64Folder]msiexec.exe"" Arguments=""/x [ProductCode]"" />
<RegistryValue Root=""HKCU"" Key=""Software\MichaelOborne\APMPlanner"" Name=""installed"" Type=""integer"" Value=""1"" KeyPath=""yes"" />
</Component>
</DirectoryRef>
@ -260,7 +265,6 @@ data = @"
<ComponentRef Id=""ApplicationShortcut"" />
<ComponentRef Id=""MyDriver"" />
</Feature>
<!-- Step 2: Add UI to your installer / Step 4: Trigger the custom action -->
<Property Id=""WIXUI_INSTALLDIR"" Value=""APMPlanner"" />
@ -272,7 +276,7 @@ data = @"
Event=""DoAction""
Value=""LaunchApplication"">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI>
<Property Id=""WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"" Value=""Launch APM Planner"" />
<Property Id=""WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"" Value=""Launch Mission Planner"" />
<!-- Step 3: Include the custom action -->
<Property Id=""WixShellExecTarget"" Value=""[#" + mainexeid + @"]"" />
@ -310,7 +314,7 @@ data = @"
no++;
if (filepath.EndsWith("ArdupilotMegaPlanner.exe")) {
if (filepath.EndsWith("ArdupilotMegaPlanner10.exe")) {
mainexeid = "_" + no;
sw.WriteLine("<File Id=\"_" + no + "\" Source=\"" + filepath + "\" ><netfx:NativeImage Id=\"ngen_ArdupilotMegaPlannerexe\"/> </File>");