Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mission Planner 1.2.19 

check for serial port name hang. and disable
add more failsafe screen status items
fix mavlink log graph bug
This commit is contained in:
Michael Oborne 2012-11-10 11:16:51 +08:00
parent ecfd568e80
commit be4c48d912
9 changed files with 855 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tools/ArdupilotMegaPlanner/Comms/CommsSerialPort.cs
View File

@ -11,6 +11,8 @@ namespace ArdupilotMega.Comms
{
public class SerialPort : System.IO.Ports.SerialPort,ICommsSerial
{
static bool serialportproblem = false;
public new void Open()
{
// 500ms write timeout - win32 api default
@ -68,18 +70,30 @@ namespace ArdupilotMega.Comms
internal static string GetNiceName(string port)
{
if (serialportproblem)
return "";
DateTime start = DateTime.Now;
try
{
ObjectQuery query = new ObjectQuery("SELECT * FROM Win32_SerialPort"); // Win32_USBControllerDevice
ManagementObjectSearcher searcher = new ManagementObjectSearcher(query);
foreach (ManagementObject obj2 in searcher.Get())
{
//DeviceID
//DeviceID
if (obj2.Properties["DeviceID"].Value.ToString().ToUpper() == port.ToUpper())
{
DateTime end = DateTime.Now;
if ((end - start).TotalSeconds > 5)
serialportproblem = true;
return obj2.Properties["Name"].Value.ToString();
}
}
}
catch { }
return "";
}

12
Tools/ArdupilotMegaPlanner/Driver/dpinst.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0"?>
<dpInst>
<enableNotListedLanguages/>
<suppressAddRemovePrograms/>
<suppressWizard/>
<quietInstallStrict/>
<forceIfDriverIsNotBetter/>
<search>
<subDirectory>*</subDirectory>
</search>
</dpInst>

260
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.Designer.cs generated
View File

@ -30,9 +30,22 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigFailSafe));
this.currentStateBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.lbl_currentmode = new System.Windows.Forms.Label();
this.currentStateBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.LNK_wiki = new System.Windows.Forms.LinkLabel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.mavlinkCheckBoxthr_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkCheckBoxthr_fs_action = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkNumericUpDownthr_fs_value = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.mavlinkCheckBoxlong_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkCheckBoxgcs_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkCheckBoxshort_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label3 = new System.Windows.Forms.Label();
this.lbl_armed = new System.Windows.Forms.Label();
this.lbl_gpslock = new System.Windows.Forms.Label();
this.horizontalProgressBar9 = new ArdupilotMega.HorizontalProgressBar();
this.horizontalProgressBar10 = new ArdupilotMega.HorizontalProgressBar();
this.horizontalProgressBar11 = new ArdupilotMega.HorizontalProgressBar();
@ -49,26 +62,11 @@
this.horizontalProgressBar3 = new ArdupilotMega.HorizontalProgressBar();
this.horizontalProgressBar2 = new ArdupilotMega.HorizontalProgressBar();
this.horizontalProgressBar1 = new ArdupilotMega.HorizontalProgressBar();
this.lbl_currentmode = new System.Windows.Forms.Label();
this.mavlinkCheckBoxthr_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkNumericUpDownthr_fs_value = new ArdupilotMega.Controls.MavlinkNumericUpDown();
this.LNK_wiki = new System.Windows.Forms.LinkLabel();
this.mavlinkCheckBoxgcs_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.mavlinkCheckBoxshort_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkCheckBoxlong_fs = new ArdupilotMega.Controls.MavlinkCheckBox();
this.mavlinkCheckBoxthr_fs_action = new ArdupilotMega.Controls.MavlinkCheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownthr_fs_value)).BeginInit();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// currentStateBindingSource
//
this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState);
//
// label2
//
resources.ApplyResources(this.label2, "label2");
@ -79,6 +77,128 @@
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// lbl_currentmode
//
this.lbl_currentmode.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.currentStateBindingSource, "mode", true));
resources.ApplyResources(this.lbl_currentmode, "lbl_currentmode");
this.lbl_currentmode.Name = "lbl_currentmode";
//
// currentStateBindingSource
//
this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState);
//
// LNK_wiki
//
resources.ApplyResources(this.LNK_wiki, "LNK_wiki");
this.LNK_wiki.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;
this.LNK_wiki.LinkColor = System.Drawing.Color.CornflowerBlue;
this.LNK_wiki.Name = "LNK_wiki";
this.LNK_wiki.TabStop = true;
this.LNK_wiki.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LNK_wiki_LinkClicked);
//
// toolTip1
//
this.toolTip1.AutoPopDelay = 20000;
this.toolTip1.InitialDelay = 500;
this.toolTip1.ReshowDelay = 100;
//
// mavlinkCheckBoxthr_fs
//
resources.ApplyResources(this.mavlinkCheckBoxthr_fs, "mavlinkCheckBoxthr_fs");
this.mavlinkCheckBoxthr_fs.Name = "mavlinkCheckBoxthr_fs";
this.mavlinkCheckBoxthr_fs.OffValue = 0F;
this.mavlinkCheckBoxthr_fs.OnValue = 1F;
this.mavlinkCheckBoxthr_fs.param = null;
this.mavlinkCheckBoxthr_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs, resources.GetString("mavlinkCheckBoxthr_fs.ToolTip"));
this.mavlinkCheckBoxthr_fs.UseVisualStyleBackColor = true;
//
// mavlinkCheckBoxthr_fs_action
//
resources.ApplyResources(this.mavlinkCheckBoxthr_fs_action, "mavlinkCheckBoxthr_fs_action");
this.mavlinkCheckBoxthr_fs_action.Name = "mavlinkCheckBoxthr_fs_action";
this.mavlinkCheckBoxthr_fs_action.OffValue = 0F;
this.mavlinkCheckBoxthr_fs_action.OnValue = 1F;
this.mavlinkCheckBoxthr_fs_action.param = null;
this.mavlinkCheckBoxthr_fs_action.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs_action, resources.GetString("mavlinkCheckBoxthr_fs_action.ToolTip"));
this.mavlinkCheckBoxthr_fs_action.UseVisualStyleBackColor = true;
//
// mavlinkNumericUpDownthr_fs_value
//
resources.ApplyResources(this.mavlinkNumericUpDownthr_fs_value, "mavlinkNumericUpDownthr_fs_value");
this.mavlinkNumericUpDownthr_fs_value.Max = 1F;
this.mavlinkNumericUpDownthr_fs_value.Min = 0F;
this.mavlinkNumericUpDownthr_fs_value.Name = "mavlinkNumericUpDownthr_fs_value";
this.mavlinkNumericUpDownthr_fs_value.param = null;
this.mavlinkNumericUpDownthr_fs_value.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkNumericUpDownthr_fs_value, resources.GetString("mavlinkNumericUpDownthr_fs_value.ToolTip"));
//
// mavlinkCheckBoxlong_fs
//
resources.ApplyResources(this.mavlinkCheckBoxlong_fs, "mavlinkCheckBoxlong_fs");
this.mavlinkCheckBoxlong_fs.Name = "mavlinkCheckBoxlong_fs";
this.mavlinkCheckBoxlong_fs.OffValue = 0F;
this.mavlinkCheckBoxlong_fs.OnValue = 1F;
this.mavlinkCheckBoxlong_fs.param = null;
this.mavlinkCheckBoxlong_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxlong_fs, resources.GetString("mavlinkCheckBoxlong_fs.ToolTip"));
this.mavlinkCheckBoxlong_fs.UseVisualStyleBackColor = true;
//
// mavlinkCheckBoxgcs_fs
//
resources.ApplyResources(this.mavlinkCheckBoxgcs_fs, "mavlinkCheckBoxgcs_fs");
this.mavlinkCheckBoxgcs_fs.Name = "mavlinkCheckBoxgcs_fs";
this.mavlinkCheckBoxgcs_fs.OffValue = 0F;
this.mavlinkCheckBoxgcs_fs.OnValue = 1F;
this.mavlinkCheckBoxgcs_fs.param = null;
this.mavlinkCheckBoxgcs_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxgcs_fs, resources.GetString("mavlinkCheckBoxgcs_fs.ToolTip"));
this.mavlinkCheckBoxgcs_fs.UseVisualStyleBackColor = true;
//
// mavlinkCheckBoxshort_fs
//
resources.ApplyResources(this.mavlinkCheckBoxshort_fs, "mavlinkCheckBoxshort_fs");
this.mavlinkCheckBoxshort_fs.Name = "mavlinkCheckBoxshort_fs";
this.mavlinkCheckBoxshort_fs.OffValue = 0F;
this.mavlinkCheckBoxshort_fs.OnValue = 1F;
this.mavlinkCheckBoxshort_fs.param = null;
this.mavlinkCheckBoxshort_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxshort_fs, resources.GetString("mavlinkCheckBoxshort_fs.ToolTip"));
this.mavlinkCheckBoxshort_fs.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs_action);
this.groupBox1.Controls.Add(this.mavlinkNumericUpDownthr_fs_value);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxlong_fs);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxgcs_fs);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxshort_fs);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// lbl_armed
//
this.lbl_armed.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.currentStateBindingSource, "armed", true));
resources.ApplyResources(this.lbl_armed, "lbl_armed");
this.lbl_armed.Name = "lbl_armed";
this.lbl_armed.Paint += new System.Windows.Forms.PaintEventHandler(this.lbl_armed_Paint);
//
// lbl_gpslock
//
this.lbl_gpslock.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.currentStateBindingSource, "gpsstatus", true));
resources.ApplyResources(this.lbl_gpslock, "lbl_gpslock");
this.lbl_gpslock.Name = "lbl_gpslock";
this.lbl_gpslock.Paint += new System.Windows.Forms.PaintEventHandler(this.lbl_gpslock_Paint);
//
// horizontalProgressBar9
//
this.horizontalProgressBar9.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch8out", true));
@ -303,114 +423,12 @@
this.horizontalProgressBar1.Step = 1;
this.horizontalProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
//
// lbl_currentmode
//
this.lbl_currentmode.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.currentStateBindingSource, "mode", true));
resources.ApplyResources(this.lbl_currentmode, "lbl_currentmode");
this.lbl_currentmode.Name = "lbl_currentmode";
//
// mavlinkCheckBoxthr_fs
//
resources.ApplyResources(this.mavlinkCheckBoxthr_fs, "mavlinkCheckBoxthr_fs");
this.mavlinkCheckBoxthr_fs.Name = "mavlinkCheckBoxthr_fs";
this.mavlinkCheckBoxthr_fs.OffValue = 0F;
this.mavlinkCheckBoxthr_fs.OnValue = 1F;
this.mavlinkCheckBoxthr_fs.param = null;
this.mavlinkCheckBoxthr_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs, resources.GetString("mavlinkCheckBoxthr_fs.ToolTip"));
this.mavlinkCheckBoxthr_fs.UseVisualStyleBackColor = true;
//
// mavlinkNumericUpDownthr_fs_value
//
resources.ApplyResources(this.mavlinkNumericUpDownthr_fs_value, "mavlinkNumericUpDownthr_fs_value");
this.mavlinkNumericUpDownthr_fs_value.Max = 1F;
this.mavlinkNumericUpDownthr_fs_value.Min = 0F;
this.mavlinkNumericUpDownthr_fs_value.Name = "mavlinkNumericUpDownthr_fs_value";
this.mavlinkNumericUpDownthr_fs_value.param = null;
this.mavlinkNumericUpDownthr_fs_value.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkNumericUpDownthr_fs_value, resources.GetString("mavlinkNumericUpDownthr_fs_value.ToolTip"));
//
// LNK_wiki
//
resources.ApplyResources(this.LNK_wiki, "LNK_wiki");
this.LNK_wiki.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;
this.LNK_wiki.LinkColor = System.Drawing.Color.CornflowerBlue;
this.LNK_wiki.Name = "LNK_wiki";
this.LNK_wiki.TabStop = true;
this.LNK_wiki.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LNK_wiki_LinkClicked);
//
// mavlinkCheckBoxgcs_fs
//
resources.ApplyResources(this.mavlinkCheckBoxgcs_fs, "mavlinkCheckBoxgcs_fs");
this.mavlinkCheckBoxgcs_fs.Name = "mavlinkCheckBoxgcs_fs";
this.mavlinkCheckBoxgcs_fs.OffValue = 0F;
this.mavlinkCheckBoxgcs_fs.OnValue = 1F;
this.mavlinkCheckBoxgcs_fs.param = null;
this.mavlinkCheckBoxgcs_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxgcs_fs, resources.GetString("mavlinkCheckBoxgcs_fs.ToolTip"));
this.mavlinkCheckBoxgcs_fs.UseVisualStyleBackColor = true;
//
// toolTip1
//
this.toolTip1.AutoPopDelay = 20000;
this.toolTip1.InitialDelay = 500;
this.toolTip1.ReshowDelay = 100;
//
// mavlinkCheckBoxshort_fs
//
resources.ApplyResources(this.mavlinkCheckBoxshort_fs, "mavlinkCheckBoxshort_fs");
this.mavlinkCheckBoxshort_fs.Name = "mavlinkCheckBoxshort_fs";
this.mavlinkCheckBoxshort_fs.OffValue = 0F;
this.mavlinkCheckBoxshort_fs.OnValue = 1F;
this.mavlinkCheckBoxshort_fs.param = null;
this.mavlinkCheckBoxshort_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxshort_fs, resources.GetString("mavlinkCheckBoxshort_fs.ToolTip"));
this.mavlinkCheckBoxshort_fs.UseVisualStyleBackColor = true;
//
// mavlinkCheckBoxlong_fs
//
resources.ApplyResources(this.mavlinkCheckBoxlong_fs, "mavlinkCheckBoxlong_fs");
this.mavlinkCheckBoxlong_fs.Name = "mavlinkCheckBoxlong_fs";
this.mavlinkCheckBoxlong_fs.OffValue = 0F;
this.mavlinkCheckBoxlong_fs.OnValue = 1F;
this.mavlinkCheckBoxlong_fs.param = null;
this.mavlinkCheckBoxlong_fs.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxlong_fs, resources.GetString("mavlinkCheckBoxlong_fs.ToolTip"));
this.mavlinkCheckBoxlong_fs.UseVisualStyleBackColor = true;
//
// mavlinkCheckBoxthr_fs_action
//
resources.ApplyResources(this.mavlinkCheckBoxthr_fs_action, "mavlinkCheckBoxthr_fs_action");
this.mavlinkCheckBoxthr_fs_action.Name = "mavlinkCheckBoxthr_fs_action";
this.mavlinkCheckBoxthr_fs_action.OffValue = 0F;
this.mavlinkCheckBoxthr_fs_action.OnValue = 1F;
this.mavlinkCheckBoxthr_fs_action.param = null;
this.mavlinkCheckBoxthr_fs_action.ParamName = null;
this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs_action, resources.GetString("mavlinkCheckBoxthr_fs_action.ToolTip"));
this.mavlinkCheckBoxthr_fs_action.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs_action);
this.groupBox1.Controls.Add(this.mavlinkNumericUpDownthr_fs_value);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxlong_fs);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxgcs_fs);
this.groupBox1.Controls.Add(this.mavlinkCheckBoxshort_fs);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// ConfigFailSafe
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lbl_gpslock);
this.Controls.Add(this.lbl_armed);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.LNK_wiki);
this.Controls.Add(this.lbl_currentmode);
@ -474,5 +492,7 @@
private Controls.MavlinkCheckBox mavlinkCheckBoxthr_fs_action;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label lbl_armed;
private System.Windows.Forms.Label lbl_gpslock;
}
}

42
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.cs
View File

@ -60,5 +60,47 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
{
Process.Start(new ProcessStartInfo("http://code.google.com/p/ardupilot-mega/wiki/APM2xFailsafe"));
}
private void lbl_armed_Paint(object sender, PaintEventArgs e)
{
if (lbl_armed.Text == "True")
{
lbl_armed.Text = "Armed";
}
else if (lbl_armed.Text == "False")
{
lbl_armed.Text = "Disarmed";
}
}
private void lbl_gpslock_Paint(object sender, PaintEventArgs e)
{
int _gpsfix = 0;
try
{
_gpsfix = int.Parse(lbl_gpslock.Text);
}
catch { return; }
string gps = "";
if (_gpsfix == 0)
{
gps = ("GPS: No GPS");
}
else if (_gpsfix == 1)
{
gps = ("GPS: No Fix");
}
else if (_gpsfix == 2)
{
gps = ("GPS: 3D Fix");
}
else if (_gpsfix == 3)
{
gps = ("GPS: 3D Fix");
}
lbl_gpslock.Text = gps;
}
}
}

1131
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.resx
View File

File diff suppressed because it is too large Load Diff

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

@ -613,7 +613,7 @@ namespace ArdupilotMega.GCSViews
try
{
// Console.WriteLine(DateTime.Now.Millisecond);
//Console.WriteLine(DateTime.Now.Millisecond);
updateBindingSource();
// Console.WriteLine(DateTime.Now.Millisecond + " done ");

22
Tools/ArdupilotMegaPlanner/MavlinkLog.cs
View File

@ -692,6 +692,9 @@ namespace ArdupilotMega
byte[] packet = MavlinkInterface.readPacket();
if (packet.Length > 5 && packet[3] == 0xff)
continue;
cs.datetime = MavlinkInterface.lastlogread;
cs.UpdateCurrentSettings(null, true, MavlinkInterface);
@ -766,17 +769,34 @@ namespace ArdupilotMega
{
list.Add(time, (byte)field.GetValue(data));
}
else if (value.GetType() == typeof(sbyte))
{
list.Add(time, (sbyte)field.GetValue(data));
}
else if (value.GetType() == typeof(Int32))
{
list.Add(time, (Int32)field.GetValue(data));
}
else if (value.GetType() == typeof(UInt32))
{
list.Add(time, (UInt32)field.GetValue(data));
}
else if (value.GetType() == typeof(ulong))
{
list.Add(time, (ulong)field.GetValue(data));
}
else if (value.GetType() == typeof(long))
{
list.Add(time, (long)field.GetValue(data));
}
else if (value.GetType() == typeof(double))
{
list.Add(time, (double)field.GetValue(data));
}
else
{
Console.WriteLine("Unknown data type");
}
}
}

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

@ -31,7 +31,7 @@
<Permission User="Everyone" GenericAll="yes" />
</CreateFolder>
</Component>
<Component Id="_comp1" Guid="66eb4b03-f236-4571-8ddb-51ef65bf5fe0">
<Component Id="_comp1" Guid="30477c8d-136b-4abe-a0ff-94cad3f530fd">
<File Id="_2" Source="..\bin\release\.gdbinit" />
<File Id="_3" Source="..\bin\release\.gitignore" />
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
@ -108,11 +108,11 @@
<File Id="_75" Source="..\bin\release\ZedGraph.dll" />
</Component>
<Directory Id="aircraft75" Name="aircraft">
<Component Id="_comp76" Guid="12281adf-8eef-4cc6-ad8f-f2c350ed3829">
<Component Id="_comp76" Guid="64cd7ff1-45ca-4059-8f88-0ef5440568ff">
<File Id="_77" Source="..\bin\release\aircraft\placeholder.txt" />
</Component>
<Directory Id="arducopter77" Name="arducopter">
<Component Id="_comp78" Guid="6a0fd93e-2c4f-4ca1-b404-955ef311ad44">
<Component Id="_comp78" Guid="c0fdc060-4a78-4eeb-abbc-1e6be6fab746">
<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" />
@ -123,20 +123,20 @@
<File Id="_86" Source="..\bin\release\aircraft\arducopter\README" />
</Component>
<Directory Id="data86" Name="data">
<Component Id="_comp87" Guid="c53ccc37-5f6b-4617-8cf7-cf59452dc70d">
<Component Id="_comp87" Guid="ee55c7c0-e3d8-4f78-bcce-bcff6916baa2">
<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="Engines90" Name="Engines">
<Component Id="_comp91" Guid="f198cd73-430a-4ac1-a21b-adfa463b4364">
<Component Id="_comp91" Guid="2ad45652-e002-47b4-bb20-551f3451964c">
<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="Models93" Name="Models">
<Component Id="_comp94" Guid="f9771636-7b40-4dfe-9a7e-0532a356d23b">
<Component Id="_comp94" Guid="a30e0a61-5c65-4bda-a725-0f488fc3e136">
<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" />
@ -150,7 +150,7 @@
</Directory>
</Directory>
<Directory Id="Rascal103" Name="Rascal">
<Component Id="_comp104" Guid="76144af3-2bcc-4b80-8b59-a525be7db9cc">
<Component Id="_comp104" Guid="4dd20071-b293-4254-a947-f304f4de376c">
<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" />
@ -162,13 +162,13 @@
<File Id="_113" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
</Component>
<Directory Id="Engines113" Name="Engines">
<Component Id="_comp114" Guid="7e72c683-4d08-48a4-8f27-29eb593a101e">
<Component Id="_comp114" Guid="977eb9a5-5198-4d3a-827d-cb72e93ad4c1">
<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="Models116" Name="Models">
<Component Id="_comp117" Guid="3aae75c2-ce19-403f-9d8b-fd21b7f6de91">
<Component Id="_comp117" Guid="c7b802e7-ffa2-4e94-ba8c-3d8667bdc0a5">
<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" />
@ -179,7 +179,7 @@
</Component>
</Directory>
<Directory Id="Systems124" Name="Systems">
<Component Id="_comp125" Guid="df13815a-c1e9-426e-8e98-845689516611">
<Component Id="_comp125" Guid="9b2afda1-6e48-428b-9869-8b17a95ae86e">
<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" />
@ -190,31 +190,31 @@
</Directory>
</Directory>
<Directory Id="es_ES130" Name="es-ES">
<Component Id="_comp131" Guid="298b6cf4-017f-4e26-ac06-9f6867447af7">
<Component Id="_comp131" Guid="8b897a61-8267-4042-a66a-1252fe4a9bf0">
<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="fr133" Name="fr">
<Component Id="_comp134" Guid="7e88ee86-ecb6-45d8-85ca-335277827a6b">
<Component Id="_comp134" Guid="20245952-4261-47c6-a747-5ed48a6794e6">
<File Id="_135" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
<File Id="_136" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="it_IT136" Name="it-IT">
<Component Id="_comp137" Guid="4368d19d-4e2c-4099-93f6-0af906a22c3d">
<Component Id="_comp137" Guid="518985a2-0a76-4633-baf0-b3c71dbbf89c">
<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="jsbsim139" Name="jsbsim">
<Component Id="_comp140" Guid="9c052920-2e1b-4bfd-aacd-93984cab66a5">
<Component Id="_comp140" Guid="699b6219-45bb-452b-aa68-3cdb9bf5fb8e">
<File Id="_141" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_142" Source="..\bin\release\jsbsim\rascal_test.xml" />
</Component>
</Directory>
<Directory Id="m3u142" Name="m3u">
<Component Id="_comp143" Guid="4afea87b-d882-496c-9b28-ab96be5cb1e7">
<Component Id="_comp143" Guid="91ada541-c506-430e-886a-e2163315cb6e">
<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" />
@ -223,31 +223,31 @@
</Component>
</Directory>
<Directory Id="pl148" Name="pl">
<Component Id="_comp149" Guid="24ff96f3-d9ef-4ee5-9cd0-8f2103c67e2c">
<Component Id="_comp149" Guid="b99936a1-1876-41c0-b348-b7205a4a12b0">
<File Id="_150" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
<File Id="_151" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="Resources151" Name="Resources">
<Component Id="_comp152" Guid="07499fed-ac1e-4daa-9e0b-69affc987e60">
<Component Id="_comp152" Guid="84cad085-0412-4916-99f9-302e4f294722">
<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="ru_RU154" Name="ru-RU">
<Component Id="_comp155" Guid="093cb2dc-02b2-4161-9a59-489a7ded75ca">
<Component Id="_comp155" Guid="57233474-1f71-4fbf-9311-494e097ee17c">
<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="zh_Hans157" Name="zh-Hans">
<Component Id="_comp158" Guid="24c574aa-6cc4-4b31-ac2c-50ebcbe978af">
<Component Id="_comp158" Guid="e51b9be7-0897-475a-96bc-bf2178428340">
<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_TW160" Name="zh-TW">
<Component Id="_comp161" Guid="ced1caa4-ba82-4690-82cc-adbc469d1af6">
<Component Id="_comp161" Guid="e12395f7-33a0-4c75-9d37-41186c591153">
<File Id="_162" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
<File Id="_163" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
</Component>

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.18")]
[assembly: AssemblyFileVersion("1.2.19")]
[assembly: NeutralResourcesLanguageAttribute("")]