mirror of https://github.com/ArduPilot/ardupilot
Mission Planner 1.2.4
remove geofence tab add guided alt remeber change wp upload retry to 200 ms
This commit is contained in:
Michael Oborne
parent
b312938b5a
commit
4b27564833
|
|
@ -840,7 +840,7 @@ namespace ArdupilotMega
|
|||
form.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
|
||||
form.TopMost = true;
|
||||
//form.TopLevel = true;
|
||||
form.TopLevel = true;
|
||||
|
||||
form.Text = title;
|
||||
label.Text = promptText;
|
||||
|
|
@ -864,8 +864,8 @@ namespace ArdupilotMega
|
|||
form.ClientSize = new Size(396, 107);
|
||||
form.Controls.AddRange(new Control[] { label, textBox, buttonOk, buttonCancel });
|
||||
form.ClientSize = new Size(Math.Max(300, label.Right + 10), form.ClientSize.Height);
|
||||
form.FormBorderStyle = FormBorderStyle.FixedDialog;
|
||||
form.StartPosition = FormStartPosition.CenterParent;
|
||||
form.FormBorderStyle = FormBorderStyle.FixedSingle;
|
||||
form.StartPosition = FormStartPosition.CenterScreen;
|
||||
form.MinimizeBox = false;
|
||||
form.MaximizeBox = false;
|
||||
form.AcceptButton = buttonOk;
|
||||
|
|
@ -875,7 +875,11 @@ namespace ArdupilotMega
|
|||
|
||||
DialogResult dialogResult = DialogResult.Cancel;
|
||||
|
||||
form.ShowDialog();
|
||||
Console.WriteLine("Input Box");
|
||||
|
||||
form.ShowDialog();
|
||||
|
||||
Console.WriteLine("Input Box 2");
|
||||
|
||||
dialogResult = form.DialogResult;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ using System.Threading;
|
|||
using System.Net; // dns, ip address
|
||||
using System.Net.Sockets; // tcplistner
|
||||
using log4net;
|
||||
using System.IO;
|
||||
|
||||
namespace ArdupilotMega.Comms
|
||||
{
|
||||
|
|
@ -75,7 +76,7 @@ namespace ArdupilotMega.Comms
|
|||
set;
|
||||
}
|
||||
|
||||
public void Open()
|
||||
public void Open()
|
||||
{
|
||||
if (client.Client.Connected)
|
||||
{
|
||||
|
|
@ -83,6 +84,8 @@ namespace ArdupilotMega.Comms
|
|||
return;
|
||||
}
|
||||
|
||||
log.Info("TCP Open");
|
||||
|
||||
string dest = Port;
|
||||
string host = "127.0.0.1";
|
||||
|
||||
|
|
@ -100,6 +103,7 @@ namespace ArdupilotMega.Comms
|
|||
{
|
||||
throw new Exception("Canceled by request");
|
||||
}
|
||||
|
||||
Port = dest;
|
||||
|
||||
ArdupilotMega.MainV2.config["TCP_port"] = Port;
|
||||
|
|
|
|||
|
|
@ -101,26 +101,7 @@ namespace System.Windows.Forms
|
|||
ThemeManager.ApplyThemeTo(msgBoxFrm);
|
||||
}
|
||||
catch { }
|
||||
|
||||
Console.WriteLine("CustomMessageBox 1");
|
||||
|
||||
/* if (System.Windows.Forms.Application.OpenForms.Count > 0)
|
||||
{
|
||||
msgBoxFrm.StartPosition = FormStartPosition.Manual;
|
||||
Form parentForm = System.Windows.Forms.Application.OpenForms[0];
|
||||
// center of first form
|
||||
msgBoxFrm.Location = new Point(parentForm.Location.X + parentForm.Width / 2 - msgBoxFrm.Width / 2,
|
||||
parentForm.Location.Y + parentForm.Height / 2 - msgBoxFrm.Height / 2);
|
||||
Console.WriteLine("CustomMessageBox 2a " + parentForm.Name);
|
||||
DialogResult test = msgBoxFrm.ShowDialog();
|
||||
}
|
||||
else*/
|
||||
{
|
||||
Console.WriteLine("CustomMessageBox 2b");
|
||||
DialogResult test = msgBoxFrm.ShowDialog();
|
||||
}
|
||||
|
||||
Console.WriteLine("CustomMessageBox 3");
|
||||
DialogResult test = msgBoxFrm.ShowDialog();
|
||||
|
||||
DialogResult answer = _state;
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ namespace ArdupilotMega.Controls
|
|||
this.Controls.Add(this.btnCancel);
|
||||
this.Controls.Add(this.lblProgressMessage);
|
||||
this.Controls.Add(this.progressBar1);
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "ProgressReporterDialogue";
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ If you are just setting up 3DR radios, you may continue without connecting.");
|
|||
AddBackstageViewPage(configpanel, "ArduCopter Pids");
|
||||
|
||||
AddBackstageViewPage(new ConfigArducopter(), "ArduCopter Config");
|
||||
AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence");
|
||||
// AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence");
|
||||
}
|
||||
/****************************** ArduCopter **************************/
|
||||
else if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2)
|
||||
|
|
@ -99,7 +99,7 @@ If you are just setting up 3DR radios, you may continue without connecting.");
|
|||
AddBackstageViewPage(configpanel, "ArduCopter Pids");
|
||||
|
||||
AddBackstageViewPage(new ConfigArducopter(), "ArduCopter Config");
|
||||
AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence");
|
||||
// AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence");
|
||||
}
|
||||
/****************************** ArduPlane **************************/
|
||||
else if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane)
|
||||
|
|
|
|||
|
|
@ -404,9 +404,28 @@ namespace ArdupilotMega.GCSViews
|
|||
}
|
||||
catch (Exception ex) { lbl_status.Text = "Failed download"; CustomMessageBox.Show("Failed to download new firmware : " + ex.ToString()); return; }
|
||||
|
||||
System.Threading.ThreadPool.QueueUserWorkItem(fwtype, temp);
|
||||
|
||||
UploadFlash(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"firmware.hex", board);
|
||||
}
|
||||
|
||||
void fwtype(object temp)
|
||||
{
|
||||
software sw = (software)temp;
|
||||
try
|
||||
{
|
||||
// Create a request using a URL that can receive a post.
|
||||
WebRequest request = WebRequest.Create("http://vps.oborne.me/" + sw.name);
|
||||
request.Timeout = 10000;
|
||||
// Set the Method property of the request to POST.
|
||||
request.Method = "GET";
|
||||
// Get the request stream.
|
||||
// Get the response.
|
||||
WebResponse response = request.GetResponse();
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
||||
public void UploadFlash(string filename, string board)
|
||||
{
|
||||
byte[] FLASH = new byte[1];
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightData));
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.pointCameraHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
|
@ -64,10 +64,10 @@
|
|||
this.tableMap = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.zg1 = new ZedGraph.ZedGraphControl();
|
||||
this.lbl_hdop = new ArdupilotMega.Controls.MyLabel();
|
||||
this.lbl_sats = new ArdupilotMega.Controls.MyLabel();
|
||||
this.lbl_winddir = new ArdupilotMega.Controls.MyLabel();
|
||||
this.lbl_windvel = new ArdupilotMega.Controls.MyLabel();
|
||||
this.lbl_hdop = new ArdupilotMega.Controls.MyLabel();
|
||||
this.lbl_sats = new ArdupilotMega.Controls.MyLabel();
|
||||
this.gMapControl1 = new ArdupilotMega.Controls.myGMAP();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.TXT_lat = new ArdupilotMega.Controls.MyLabel();
|
||||
|
|
@ -1059,22 +1059,6 @@
|
|||
this.zg1.ScrollMinY2 = 0D;
|
||||
this.zg1.DoubleClick += new System.EventHandler(this.zg1_DoubleClick);
|
||||
//
|
||||
// lbl_hdop
|
||||
//
|
||||
resources.ApplyResources(this.lbl_hdop, "lbl_hdop");
|
||||
this.lbl_hdop.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "gpshdop", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "hdop: 0"));
|
||||
this.lbl_hdop.Name = "lbl_hdop";
|
||||
this.lbl_hdop.resize = true;
|
||||
this.toolTip1.SetToolTip(this.lbl_hdop, resources.GetString("lbl_hdop.ToolTip"));
|
||||
//
|
||||
// lbl_sats
|
||||
//
|
||||
resources.ApplyResources(this.lbl_sats, "lbl_sats");
|
||||
this.lbl_sats.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "satcount", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Sats: 0"));
|
||||
this.lbl_sats.Name = "lbl_sats";
|
||||
this.lbl_sats.resize = true;
|
||||
this.toolTip1.SetToolTip(this.lbl_sats, resources.GetString("lbl_sats.ToolTip"));
|
||||
//
|
||||
// lbl_winddir
|
||||
//
|
||||
this.lbl_winddir.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "wind_dir", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Dir: 0"));
|
||||
|
|
@ -1091,6 +1075,22 @@
|
|||
this.lbl_windvel.resize = true;
|
||||
this.toolTip1.SetToolTip(this.lbl_windvel, resources.GetString("lbl_windvel.ToolTip"));
|
||||
//
|
||||
// lbl_hdop
|
||||
//
|
||||
resources.ApplyResources(this.lbl_hdop, "lbl_hdop");
|
||||
this.lbl_hdop.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "gpshdop", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "hdop: 0"));
|
||||
this.lbl_hdop.Name = "lbl_hdop";
|
||||
this.lbl_hdop.resize = true;
|
||||
this.toolTip1.SetToolTip(this.lbl_hdop, resources.GetString("lbl_hdop.ToolTip"));
|
||||
//
|
||||
// lbl_sats
|
||||
//
|
||||
resources.ApplyResources(this.lbl_sats, "lbl_sats");
|
||||
this.lbl_sats.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "satcount", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Sats: 0"));
|
||||
this.lbl_sats.Name = "lbl_sats";
|
||||
this.lbl_sats.resize = true;
|
||||
this.toolTip1.SetToolTip(this.lbl_sats, resources.GetString("lbl_sats.ToolTip"));
|
||||
//
|
||||
// gMapControl1
|
||||
//
|
||||
this.gMapControl1.BackColor = System.Drawing.Color.Transparent;
|
||||
|
|
@ -1203,8 +1203,8 @@
|
|||
//
|
||||
// dataGridViewImageColumn1
|
||||
//
|
||||
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle3;
|
||||
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1;
|
||||
resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1");
|
||||
this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up;
|
||||
this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
||||
|
|
@ -1212,8 +1212,8 @@
|
|||
//
|
||||
// dataGridViewImageColumn2
|
||||
//
|
||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle4;
|
||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2;
|
||||
resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2");
|
||||
this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down;
|
||||
this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
||||
|
|
|
|||
|
|
@ -1050,9 +1050,15 @@ namespace ArdupilotMega.GCSViews
|
|||
{
|
||||
alt = (100 * MainV2.cs.multiplierdist).ToString("0");
|
||||
}
|
||||
|
||||
if (MainV2.config.ContainsKey("guided_alt"))
|
||||
alt = MainV2.config["guided_alt"].ToString();
|
||||
|
||||
if (DialogResult.Cancel == Common.InputBox("Enter Alt", "Enter Guided Mode Alt", ref alt))
|
||||
return;
|
||||
|
||||
MainV2.config["guided_alt"] = alt;
|
||||
|
||||
int intalt = (int)(100 * MainV2.cs.multiplierdist);
|
||||
if (!int.TryParse(alt, out intalt))
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1871,7 +1871,7 @@ namespace ArdupilotMega
|
|||
|
||||
while (true)
|
||||
{
|
||||
if (!(start.AddMilliseconds(500) > DateTime.Now))
|
||||
if (!(start.AddMilliseconds(200) > DateTime.Now))
|
||||
{
|
||||
if (retrys > 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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.2" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
<Product Id="*" Name="APM Planner" Language="1033" Version="1.2.3" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
|
||||
<Package Description="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
|
||||
|
||||
|
||||
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.2" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
|
||||
<UpgradeVersion OnlyDetect="no" Maximum="1.2.2" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
|
||||
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.3" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
|
||||
<UpgradeVersion OnlyDetect="no" Maximum="1.2.3" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
|
||||
</Upgrade>
|
||||
|
||||
<InstallExecuteSequence>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<Permission User="Everyone" GenericAll="yes" />
|
||||
</CreateFolder>
|
||||
</Component>
|
||||
<Component Id="_comp1" Guid="0880ee7d-3ad6-4f7d-b275-5a4d0c8909e8">
|
||||
<Component Id="_comp1" Guid="17e9d4b1-21f8-4eef-8a4f-8ddaf8d9772a">
|
||||
<File Id="_2" Source="..\bin\release\.gdbinit" />
|
||||
<File Id="_3" Source="..\bin\release\.gitignore" />
|
||||
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
|
||||
|
|
@ -113,11 +113,11 @@
|
|||
<File Id="_80" Source="..\bin\release\ZedGraph.dll" />
|
||||
</Component>
|
||||
<Directory Id="aircraft80" Name="aircraft">
|
||||
<Component Id="_comp81" Guid="7ee81b5c-bd45-467b-a3c3-3abc2648f668">
|
||||
<Component Id="_comp81" Guid="af7977eb-babd-4b26-855f-a90b87d70e06">
|
||||
<File Id="_82" Source="..\bin\release\aircraft\placeholder.txt" />
|
||||
</Component>
|
||||
<Directory Id="arducopter82" Name="arducopter">
|
||||
<Component Id="_comp83" Guid="fbe66a2f-28f8-4455-a6eb-45ba8c24e137">
|
||||
<Component Id="_comp83" Guid="218c501a-08c0-4cc6-9c68-99bab4346c93">
|
||||
<File Id="_84" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
|
||||
<File Id="_85" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
|
||||
<File Id="_86" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
|
||||
|
|
@ -128,20 +128,20 @@
|
|||
<File Id="_91" Source="..\bin\release\aircraft\arducopter\README" />
|
||||
</Component>
|
||||
<Directory Id="data91" Name="data">
|
||||
<Component Id="_comp92" Guid="b4f5258c-df81-4ccd-9d86-3c88874c67e2">
|
||||
<Component Id="_comp92" Guid="02f2cc74-b186-4a68-913f-429d45e053f8">
|
||||
<File Id="_93" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
|
||||
<File Id="_94" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
|
||||
<File Id="_95" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Engines95" Name="Engines">
|
||||
<Component Id="_comp96" Guid="fd61ff98-62b8-4458-877d-69c43f1d7036">
|
||||
<Component Id="_comp96" Guid="733f8ba4-9c24-4d38-9f92-8f34ea7a6234">
|
||||
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
|
||||
<File Id="_98" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Models98" Name="Models">
|
||||
<Component Id="_comp99" Guid="d5edb89b-7c72-4be8-82e8-3262e59efeb6">
|
||||
<Component Id="_comp99" Guid="728d1d01-ec9a-43c8-a81e-7d91496eafe9">
|
||||
<File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
|
||||
<File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
|
||||
<File Id="_102" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="Rascal108" Name="Rascal">
|
||||
<Component Id="_comp109" Guid="597e6f43-ea7f-4e9f-a413-51a07c7b7d3c">
|
||||
<Component Id="_comp109" Guid="8f10b3cd-67a8-4bac-8210-c62c5cc05aa6">
|
||||
<File Id="_110" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
|
||||
<File Id="_111" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
|
||||
<File Id="_112" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
|
||||
|
|
@ -167,13 +167,13 @@
|
|||
<File Id="_118" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
|
||||
</Component>
|
||||
<Directory Id="Engines118" Name="Engines">
|
||||
<Component Id="_comp119" Guid="681a2280-ab43-4fe0-bbde-58fef72d2357">
|
||||
<Component Id="_comp119" Guid="dcc616da-7d61-440b-aae3-2a943a8dbe8e">
|
||||
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
|
||||
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Models121" Name="Models">
|
||||
<Component Id="_comp122" Guid="41981c44-2638-479b-903c-868962950f40">
|
||||
<Component Id="_comp122" Guid="b1c1b806-04a7-44d5-a0c3-9f1c736bc3bb">
|
||||
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
|
||||
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
|
||||
<File Id="_125" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
|
||||
|
|
@ -184,7 +184,7 @@
|
|||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Systems129" Name="Systems">
|
||||
<Component Id="_comp130" Guid="1083301c-ad48-4eb7-8ad2-0eda01548cb0">
|
||||
<Component Id="_comp130" Guid="3def3d74-d98a-4363-b6d2-9002f39756d5">
|
||||
<File Id="_131" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
|
||||
<File Id="_132" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
|
||||
<File Id="_133" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
|
||||
|
|
@ -195,33 +195,33 @@
|
|||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="Driver135" Name="Driver">
|
||||
<Component Id="_comp136" Guid="216457cc-9c44-40e8-b79c-805f1ae45b8e">
|
||||
<Component Id="_comp136" Guid="fcb597df-f34d-48f3-9783-41e99fadd442">
|
||||
<File Id="_137" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="es_ES137" Name="es-ES">
|
||||
<Component Id="_comp138" Guid="3a65762d-eaf0-4778-9004-3ea5c2ea3b55">
|
||||
<Component Id="_comp138" Guid="42011f68-26f3-4939-bf5c-ec581da25c41">
|
||||
<File Id="_139" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="fr139" Name="fr">
|
||||
<Component Id="_comp140" Guid="770c2787-ec20-4035-b996-57df64ee37a1">
|
||||
<Component Id="_comp140" Guid="017123be-1a33-4e1e-9fe8-72b85aef2aec">
|
||||
<File Id="_141" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="it_IT141" Name="it-IT">
|
||||
<Component Id="_comp142" Guid="0e9b87fc-f97f-41bc-8c4d-d4b8dac20d87">
|
||||
<Component Id="_comp142" Guid="a49c5d65-3620-41ff-8332-02af58ad4143">
|
||||
<File Id="_143" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="jsbsim143" Name="jsbsim">
|
||||
<Component Id="_comp144" Guid="aa2d0a9d-0965-4e7f-864f-e61b0e3fbee7">
|
||||
<Component Id="_comp144" Guid="4d00116b-0046-4c97-9ec8-294636ad7cef">
|
||||
<File Id="_145" Source="..\bin\release\jsbsim\fgout.xml" />
|
||||
<File Id="_146" Source="..\bin\release\jsbsim\rascal_test.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="m3u146" Name="m3u">
|
||||
<Component Id="_comp147" Guid="62eea887-2327-4181-a450-c7b6493d72b5">
|
||||
<Component Id="_comp147" Guid="3b1562fc-0b69-4309-845d-fa389ecd4da1">
|
||||
<File Id="_148" Source="..\bin\release\m3u\both.m3u" />
|
||||
<File Id="_149" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
|
||||
<File Id="_150" Source="..\bin\release\m3u\hud.m3u" />
|
||||
|
|
@ -230,28 +230,28 @@
|
|||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="pl152" Name="pl">
|
||||
<Component Id="_comp153" Guid="33d43c02-2e8f-40ca-a67b-e83fa9c9c1c3">
|
||||
<Component Id="_comp153" Guid="a3c41c20-e053-4bff-bb69-b6b7fd760bdf">
|
||||
<File Id="_154" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Resources154" Name="Resources">
|
||||
<Component Id="_comp155" Guid="27487232-7266-4ce8-b0ea-7291b11c533e">
|
||||
<Component Id="_comp155" Guid="77cbe6de-ca2b-4c12-9d3c-912cb5d744bf">
|
||||
<File Id="_156" Source="..\bin\release\Resources\MAVCmd.txt" />
|
||||
<File Id="_157" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="ru_RU157" Name="ru-RU">
|
||||
<Component Id="_comp158" Guid="8a264de2-36a3-4d74-88f4-968708c4efd3">
|
||||
<Component Id="_comp158" Guid="acfbdeec-4c63-4c88-a858-2d8742dbc3dd">
|
||||
<File Id="_159" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="zh_Hans159" Name="zh-Hans">
|
||||
<Component Id="_comp160" Guid="070654c2-8f7d-4707-a961-2d831bf91e9d">
|
||||
<Component Id="_comp160" Guid="219cfe94-5153-4912-9c77-dad919b61497">
|
||||
<File Id="_161" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="zh_TW161" Name="zh-TW">
|
||||
<Component Id="_comp162" Guid="37916047-4a50-43ba-a2a6-14a89eaf6142">
|
||||
<Component Id="_comp162" Guid="c86c1d25-4df6-4732-b45b-f881fb45e81b">
|
||||
<File Id="_163" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
|
|
|
|||
|
|
@ -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.3")]
|
||||
[assembly: AssemblyFileVersion("1.2.4")]
|
||||
[assembly: NeutralResourcesLanguageAttribute("")]
|
||||
|
|
|
|||
Loading…
Reference in New Issue