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

APM Planner 1.1.98

Browse Source 
Modify BackStage View - will change again soon
modify target alt calc
change order on param lists
remove old firmware selection dialog
add hil mod flag to hil connect
implement main switcher - will change again soon
change some invokes to async, to prevent other threads slowing.
fix mavlink log graphing error
modify help text
general mono for mac fixs - still combating https://bugzilla.xamarin.com/show_bug.cgi?id=3124
This commit is contained in:
Michael Oborne 2012-07-16 21:37:35 +08:00
parent ead41670c4
commit f48e86747f
31 changed files with 416 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -245,7 +245,19 @@
</Compile> </Compile>
<Compile Include="Comms\CommsTCPSerial.cs" /> <Compile Include="Comms\CommsTCPSerial.cs" />
<Compile Include="Comms\CommsUdpSerial.cs" /> <Compile Include="Comms\CommsUdpSerial.cs" />
<Compile Include="Controls\MainSwitcher.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\MainSwitcher.Designer.cs">
<DependentUpon>MainSwitcher.cs</DependentUpon>
</Compile>
<Compile Include="Delta.cs" /> <Compile Include="Delta.cs" />
<Compile Include="GCSViews\ConfigurationView\ConfigAP_Limits.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigAP_Limits.Designer.cs">
<DependentUpon>ConfigAP_Limits.cs</DependentUpon>
</Compile>
<Compile Include="Presenter\ConfigCameraStabPresenter.cs" /> <Compile Include="Presenter\ConfigCameraStabPresenter.cs" />
<Compile Include="Controls\HSI.cs"> <Compile Include="Controls\HSI.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
@ -641,6 +653,9 @@
<EmbeddedResource Include="Controls\HSI.resx"> <EmbeddedResource Include="Controls\HSI.resx">
<DependentUpon>HSI.cs</DependentUpon> <DependentUpon>HSI.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Controls\MainSwitcher.resx">
<DependentUpon>MainSwitcher.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\ProgressReporterDialogue.resx"> <EmbeddedResource Include="Controls\ProgressReporterDialogue.resx">
<DependentUpon>ProgressReporterDialogue.cs</DependentUpon> <DependentUpon>ProgressReporterDialogue.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
@ -824,6 +839,9 @@
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigArdurover.resx"> <EmbeddedResource Include="GCSViews\ConfigurationView\ConfigArdurover.resx">
<DependentUpon>ConfigArdurover.cs</DependentUpon> <DependentUpon>ConfigArdurover.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigAP_Limits.resx">
<DependentUpon>ConfigAP_Limits.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCSViews\ConfigurationView\Setup.resx"> <EmbeddedResource Include="GCSViews\ConfigurationView\Setup.resx">
<DependentUpon>Setup.cs</DependentUpon> <DependentUpon>Setup.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

3
Tools/ArdupilotMegaPlanner/Controls/AGauge.cs
View File

@ -1486,6 +1486,7 @@ System.ComponentModel.Description("Enables or disables the range selected by Nee
#region base member overrides #region base member overrides
protected override void OnPaintBackground(PaintEventArgs pevent) protected override void OnPaintBackground(PaintEventArgs pevent)
{ {
base.OnPaintBackground(pevent);
} }
protected override void OnPaint(PaintEventArgs pe) protected override void OnPaint(PaintEventArgs pe)
@ -1498,6 +1499,8 @@ System.ComponentModel.Description("Enables or disables the range selected by Nee
if (!ThisReallyVisible()) if (!ThisReallyVisible())
return; return;
base.OnPaint(pe);
float scale = 1; float scale = 1;
// scale it // scale it

10
Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs
View File

@ -5,6 +5,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using ArdupilotMega.Controls.BackstageView; using ArdupilotMega.Controls.BackstageView;
using ArdupilotMega.Utilities;
namespace ArdupilotMega.Controls.BackstageView namespace ArdupilotMega.Controls.BackstageView
{ {
@ -162,7 +163,7 @@ namespace ArdupilotMega.Controls.BackstageView
_pages.Add(page); _pages.Add(page);
CreateLinkButton(page); CreateLinkButton(page);
this.pnlPages.Controls.Add(page.Page); //this.pnlPages.Controls.Add(page.Page);
if (_activePage == null) if (_activePage == null)
{ {
@ -253,16 +254,23 @@ namespace ArdupilotMega.Controls.BackstageView
{ {
x.Page.Visible = false; x.Page.Visible = false;
}); });
this.pnlPages.Controls.Remove(_activePage.Page);
// deactivate button // deactivate button
_activePage.Page.Visible = false; _activePage.Page.Visible = false;
var oldButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == _activePage); var oldButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == _activePage);
oldButton.IsSelected = false; oldButton.IsSelected = false;
ThemeManager.ApplyThemeTo(associatedPage.Page);
// ensure fields have been init // ensure fields have been init
associatedPage.Page.DoLoad(new EventArgs()); associatedPage.Page.DoLoad(new EventArgs());
// show it // show it
associatedPage.Page.Visible = true; associatedPage.Page.Visible = true;
// add control
this.pnlPages.Controls.Add(associatedPage.Page);
var newButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == associatedPage); var newButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == associatedPage);
newButton.IsSelected = true; newButton.IsSelected = true;

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

@ -94,10 +94,10 @@ namespace ArdupilotMega.Controls.BackstageView
g.DrawString(Text, new Font(FontFamily.GenericSansSerif, 10, FontStyle.Bold), new SolidBrush(SelectedTextColor), 10, 6); g.DrawString(Text, new Font(FontFamily.GenericSansSerif, 10, FontStyle.Bold), new SolidBrush(SelectedTextColor), 10, 6);
g.FillPolygon(arrowBrush, arrowPoints);
var pencilBrush = new Pen(this.PencilBorderColor); var pencilBrush = new Pen(this.PencilBorderColor);
g.DrawLine(pencilBrush, Width - 1, 0, Width - 1, Height - 1);
g.FillPolygon(arrowBrush, arrowPoints);
g.DrawPolygon(pencilBrush, arrowPoints); g.DrawPolygon(pencilBrush, arrowPoints);

2
Tools/ArdupilotMegaPlanner/Controls/HUD.cs
View File

@ -252,7 +252,7 @@ namespace ArdupilotMega.Controls
{ {
//GL.Enable(EnableCap.AlphaTest) //GL.Enable(EnableCap.AlphaTest)
// Console.WriteLine("hud paint");
if (!started) if (!started)
return; return;

6
Tools/ArdupilotMegaPlanner/Controls/MyLabel.cs
View File

@ -74,12 +74,18 @@ namespace ArdupilotMega.Controls
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)
{ {
TextRenderer.DrawText(e.Graphics, label, this.Font, new Point(0, 0), ForeColor);
/*
//return;
stringFormat.Alignment = StringAlignment.Near; stringFormat.Alignment = StringAlignment.Near;
stringFormat.LineAlignment = StringAlignment.Center; stringFormat.LineAlignment = StringAlignment.Center;
s = new SolidBrush(ForeColor); s = new SolidBrush(ForeColor);
e.Graphics.DrawString(label, this.Font, s, new PointF(0, this.Height / 2.0f), stringFormat); e.Graphics.DrawString(label, this.Font, s, new PointF(0, this.Height / 2.0f), stringFormat);
*/
} }
protected override void OnPaintBackground(PaintEventArgs pevent) protected override void OnPaintBackground(PaintEventArgs pevent)

4
Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs
View File

@ -185,8 +185,8 @@ namespace ArdupilotMega.Controls
if (this.InvokeRequired) if (this.InvokeRequired)
{ {
// invoke async
this.Invoke((MethodInvoker) delegate this.BeginInvoke((MethodInvoker) delegate
{ {
lblProgressMessage.Text = status; lblProgressMessage.Text = status;

2
Tools/ArdupilotMegaPlanner/Controls/RangeControl.Designer.cs generated
View File

@ -99,7 +99,7 @@
this.myLabel1.Location = new System.Drawing.Point(4, 4); this.myLabel1.Location = new System.Drawing.Point(4, 4);
this.myLabel1.Name = "myLabel1"; this.myLabel1.Name = "myLabel1";
this.myLabel1.resize = false; this.myLabel1.resize = false;
this.myLabel1.Size = new System.Drawing.Size(301, 23); this.myLabel1.Size = new System.Drawing.Size(471, 23);
this.myLabel1.TabIndex = 0; this.myLabel1.TabIndex = 0;
this.myLabel1.Text = "myLabel1"; this.myLabel1.Text = "myLabel1";
// //

7
Tools/ArdupilotMegaPlanner/CurrentState.cs
View File

@ -131,7 +131,7 @@ namespace ArdupilotMega
public float nav_bearing { get; set; } public float nav_bearing { get; set; }
public float target_bearing { get; set; } public float target_bearing { get; set; }
public float wp_dist { get { return (_wpdist * multiplierdist); } set { _wpdist = value; } } public float wp_dist { get { return (_wpdist * multiplierdist); } set { _wpdist = value; } }
public float alt_error { get { return _alt_error * multiplierdist; } set { _alt_error = value; } } public float alt_error { get { return _alt_error * multiplierdist; } set { _alt_error = value; _targetalt = (float)Math.Round(alt + alt_error, 0); } }
public float ber_error { get { return (target_bearing - yaw); } set { } } public float ber_error { get { return (target_bearing - yaw); } set { } }
public float aspd_error { get { return _aspd_error * multiplierspeed; } set { _aspd_error = value; } } public float aspd_error { get { return _aspd_error * multiplierspeed; } set { _aspd_error = value; } }
public float xtrack_error { get; set; } public float xtrack_error { get; set; }
@ -141,9 +141,10 @@ namespace ArdupilotMega
float _wpdist; float _wpdist;
float _aspd_error; float _aspd_error;
float _alt_error; float _alt_error;
float _targetalt;
public float targetaltd100 { get { return ((alt + alt_error) / 100) % 10; } } public float targetaltd100 { get { return (_targetalt / 100) % 10; } }
public float targetalt { get { return (float)Math.Round(alt + alt_error, 0); } } public float targetalt { get { return _targetalt; } }
//airspeed_error = (airspeed_error - airspeed); //airspeed_error = (airspeed_error - airspeed);
public float targetairspeed { get { return (float)Math.Round(airspeed + aspd_error / 100, 0); } } public float targetairspeed { get { return (float)Math.Round(airspeed + aspd_error / 100, 0); } }

1
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationPlane.cs
View File

@ -67,7 +67,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
try try
{ {
#if MAVLINK10 #if MAVLINK10
int fixme; // needs to be accel only
MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_CALIBRATION,1,1,1,0,0,0,0); MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_CALIBRATION,1,1,1,0,0,0,0);
#else #else
MainV2.comPort.doAction(MAVLink.MAV_ACTION.MAV_ACTION_CALIBRATE_ACC); MainV2.comPort.doAction(MAVLink.MAV_ACTION.MAV_ACTION_CALIBRATE_ACC);

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

@ -198,7 +198,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
catch (Exception exp) { log.Error(exp); } // just to cleanup any errors catch (Exception exp) { log.Error(exp); } // just to cleanup any errors
} }
_params.ForEach(x => _params.OrderBy(x => x.Key).ForEach(x =>
{ {
if(!String.IsNullOrEmpty(x.Key)) if(!String.IsNullOrEmpty(x.Key))
{ {

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

@ -16,6 +16,11 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
public Setup() public Setup()
{ {
InitializeComponent(); InitializeComponent();
}
private void Setup_Load(object sender, EventArgs e)
{
if (MainV2.comPort.BaseStream.IsOpen) if (MainV2.comPort.BaseStream.IsOpen)
{ {
@ -36,7 +41,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
} }
// Add the pages that can only be shown when we are connected to an APM // Add the pages that can only be shown when we are connected to an APM
private void AddPagesForConnectedState() private void AddPagesForConnectedState()
{ {
@ -75,6 +79,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
AddBackstageViewPage(configpanel, "ArduCopter Pids"); AddBackstageViewPage(configpanel, "ArduCopter Pids");
AddBackstageViewPage(new ConfigArducopter(), "ArduCopter Config"); AddBackstageViewPage(new ConfigArducopter(), "ArduCopter Config");
AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence");
} }
/****************************** ArduPlane **************************/ /****************************** ArduPlane **************************/
else if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane) else if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane)
@ -100,11 +105,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
} }
private void Setup_Load(object sender, EventArgs e)
{
}
private void Setup_FormClosing(object sender, FormClosingEventArgs e) private void Setup_FormClosing(object sender, FormClosingEventArgs e)
{ {
backstageView.Close(); backstageView.Close();

4
Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs
View File

@ -298,6 +298,7 @@ namespace ArdupilotMega.GCSViews
lbl_status.Text = "Detecting APM Version"; lbl_status.Text = "Detecting APM Version";
this.Refresh(); this.Refresh();
Application.DoEvents();
board = ArduinoDetect.DetectBoard(MainV2.comPortName); board = ArduinoDetect.DetectBoard(MainV2.comPortName);
@ -373,6 +374,7 @@ namespace ArdupilotMega.GCSViews
lbl_status.Text = "Downloading from Internet"; lbl_status.Text = "Downloading from Internet";
this.Refresh(); this.Refresh();
Application.DoEvents();
dataStream.ReadTimeout = 30000; dataStream.ReadTimeout = 30000;
@ -397,6 +399,7 @@ namespace ArdupilotMega.GCSViews
progress.Value = 100; progress.Value = 100;
this.Refresh(); this.Refresh();
Application.DoEvents();
log.Info("Downloaded"); log.Info("Downloaded");
} }
catch (Exception ex) { lbl_status.Text = "Failed download"; CustomMessageBox.Show("Failed to download new firmware : " + ex.ToString()); return; } catch (Exception ex) { lbl_status.Text = "Failed download"; CustomMessageBox.Show("Failed to download new firmware : " + ex.ToString()); return; }
@ -412,6 +415,7 @@ namespace ArdupilotMega.GCSViews
{ {
lbl_status.Text = "Reading Hex File"; lbl_status.Text = "Reading Hex File";
this.Refresh(); this.Refresh();
Application.DoEvents();
sr = new StreamReader(filename); sr = new StreamReader(filename);
FLASH = readIntelHEXv2(sr); FLASH = readIntelHEXv2(sr);
sr.Close(); sr.Close();

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

@ -1271,11 +1271,6 @@ namespace ArdupilotMega.GCSViews
private void BUT_log2kml_Click(object sender, EventArgs e) private void BUT_log2kml_Click(object sender, EventArgs e)
{ {
if (DialogResult.Cancel == Common.MessageShowAgain("Tlog to KML Firmware Version", "When converting logs, ensure your Firmware version is set correctly.\n(Near your com port selection.)"))
{
return;
}
Form frm = new MavlinkLog(); Form frm = new MavlinkLog();
ThemeManager.ApplyThemeTo(frm); ThemeManager.ApplyThemeTo(frm);
frm.ShowDialog(); frm.ShowDialog();

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

@ -226,7 +226,7 @@
<value>hud1</value> <value>hud1</value>
</data> </data>
<data name="&gt;&gt;hud1.Type" xml:space="preserve"> <data name="&gt;&gt;hud1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;hud1.Parent" xml:space="preserve"> <data name="&gt;&gt;hud1.Parent" xml:space="preserve">
<value>SubMainLeft.Panel1</value> <value>SubMainLeft.Panel1</value>
@ -265,7 +265,7 @@
<value>BUT_script</value> <value>BUT_script</value>
</data> </data>
<data name="&gt;&gt;BUT_script.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_script.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_script.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_script.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -298,7 +298,7 @@
<value>BUT_joystick</value> <value>BUT_joystick</value>
</data> </data>
<data name="&gt;&gt;BUT_joystick.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_joystick.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_joystick.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_joystick.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -328,7 +328,7 @@
<value>BUT_quickmanual</value> <value>BUT_quickmanual</value>
</data> </data>
<data name="&gt;&gt;BUT_quickmanual.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_quickmanual.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_quickmanual.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_quickmanual.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -358,7 +358,7 @@
<value>BUT_quickrtl</value> <value>BUT_quickrtl</value>
</data> </data>
<data name="&gt;&gt;BUT_quickrtl.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_quickrtl.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_quickrtl.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_quickrtl.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -388,7 +388,7 @@
<value>BUT_quickauto</value> <value>BUT_quickauto</value>
</data> </data>
<data name="&gt;&gt;BUT_quickauto.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_quickauto.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_quickauto.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_quickauto.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -442,7 +442,7 @@
<value>BUT_setwp</value> <value>BUT_setwp</value>
</data> </data>
<data name="&gt;&gt;BUT_setwp.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_setwp.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_setwp.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_setwp.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -493,7 +493,7 @@
<value>BUT_setmode</value> <value>BUT_setmode</value>
</data> </data>
<data name="&gt;&gt;BUT_setmode.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_setmode.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_setmode.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_setmode.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -523,7 +523,7 @@
<value>BUT_clear_track</value> <value>BUT_clear_track</value>
</data> </data>
<data name="&gt;&gt;BUT_clear_track.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_clear_track.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_clear_track.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_clear_track.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -574,7 +574,7 @@
<value>BUT_Homealt</value> <value>BUT_Homealt</value>
</data> </data>
<data name="&gt;&gt;BUT_Homealt.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_Homealt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_Homealt.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_Homealt.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -604,7 +604,7 @@
<value>BUT_RAWSensor</value> <value>BUT_RAWSensor</value>
</data> </data>
<data name="&gt;&gt;BUT_RAWSensor.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_RAWSensor.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_RAWSensor.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_RAWSensor.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -634,7 +634,7 @@
<value>BUTrestartmission</value> <value>BUTrestartmission</value>
</data> </data>
<data name="&gt;&gt;BUTrestartmission.Type" xml:space="preserve"> <data name="&gt;&gt;BUTrestartmission.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUTrestartmission.Parent" xml:space="preserve"> <data name="&gt;&gt;BUTrestartmission.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -664,7 +664,7 @@
<value>BUTactiondo</value> <value>BUTactiondo</value>
</data> </data>
<data name="&gt;&gt;BUTactiondo.Type" xml:space="preserve"> <data name="&gt;&gt;BUTactiondo.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUTactiondo.Parent" xml:space="preserve"> <data name="&gt;&gt;BUTactiondo.Parent" xml:space="preserve">
<value>tabActions</value> <value>tabActions</value>
@ -718,7 +718,7 @@
<value>Gvspeed</value> <value>Gvspeed</value>
</data> </data>
<data name="&gt;&gt;Gvspeed.Type" xml:space="preserve"> <data name="&gt;&gt;Gvspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;Gvspeed.Parent" xml:space="preserve"> <data name="&gt;&gt;Gvspeed.Parent" xml:space="preserve">
<value>tabGauges</value> <value>tabGauges</value>
@ -748,7 +748,7 @@
<value>Gheading</value> <value>Gheading</value>
</data> </data>
<data name="&gt;&gt;Gheading.Type" xml:space="preserve"> <data name="&gt;&gt;Gheading.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;Gheading.Parent" xml:space="preserve"> <data name="&gt;&gt;Gheading.Parent" xml:space="preserve">
<value>tabGauges</value> <value>tabGauges</value>
@ -778,7 +778,7 @@
<value>Galt</value> <value>Galt</value>
</data> </data>
<data name="&gt;&gt;Galt.Type" xml:space="preserve"> <data name="&gt;&gt;Galt.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;Galt.Parent" xml:space="preserve"> <data name="&gt;&gt;Galt.Parent" xml:space="preserve">
<value>tabGauges</value> <value>tabGauges</value>
@ -811,7 +811,7 @@
<value>Gspeed</value> <value>Gspeed</value>
</data> </data>
<data name="&gt;&gt;Gspeed.Type" xml:space="preserve"> <data name="&gt;&gt;Gspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;Gspeed.Parent" xml:space="preserve"> <data name="&gt;&gt;Gspeed.Parent" xml:space="preserve">
<value>tabGauges</value> <value>tabGauges</value>
@ -895,7 +895,7 @@
<value>lbl_playbackspeed</value> <value>lbl_playbackspeed</value>
</data> </data>
<data name="&gt;&gt;lbl_playbackspeed.Type" xml:space="preserve"> <data name="&gt;&gt;lbl_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lbl_playbackspeed.Parent" xml:space="preserve"> <data name="&gt;&gt;lbl_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value> <value>tabTLogs</value>
@ -922,7 +922,7 @@
<value>lbl_logpercent</value> <value>lbl_logpercent</value>
</data> </data>
<data name="&gt;&gt;lbl_logpercent.Type" xml:space="preserve"> <data name="&gt;&gt;lbl_logpercent.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lbl_logpercent.Parent" xml:space="preserve"> <data name="&gt;&gt;lbl_logpercent.Parent" xml:space="preserve">
<value>tabTLogs</value> <value>tabTLogs</value>
@ -949,7 +949,7 @@
<value>NUM_playbackspeed</value> <value>NUM_playbackspeed</value>
</data> </data>
<data name="&gt;&gt;NUM_playbackspeed.Type" xml:space="preserve"> <data name="&gt;&gt;NUM_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;NUM_playbackspeed.Parent" xml:space="preserve"> <data name="&gt;&gt;NUM_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value> <value>tabTLogs</value>
@ -976,7 +976,7 @@
<value>BUT_log2kml</value> <value>BUT_log2kml</value>
</data> </data>
<data name="&gt;&gt;BUT_log2kml.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_log2kml.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_log2kml.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_log2kml.Parent" xml:space="preserve">
<value>tabTLogs</value> <value>tabTLogs</value>
@ -1030,7 +1030,7 @@
<value>BUT_playlog</value> <value>BUT_playlog</value>
</data> </data>
<data name="&gt;&gt;BUT_playlog.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_playlog.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_playlog.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_playlog.Parent" xml:space="preserve">
<value>tabTLogs</value> <value>tabTLogs</value>
@ -1057,7 +1057,7 @@
<value>BUT_loadtelem</value> <value>BUT_loadtelem</value>
</data> </data>
<data name="&gt;&gt;BUT_loadtelem.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_loadtelem.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_loadtelem.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_loadtelem.Parent" xml:space="preserve">
<value>tabTLogs</value> <value>tabTLogs</value>
@ -1246,7 +1246,7 @@
<value>lbl_hdop</value> <value>lbl_hdop</value>
</data> </data>
<data name="&gt;&gt;lbl_hdop.Type" xml:space="preserve"> <data name="&gt;&gt;lbl_hdop.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lbl_hdop.Parent" xml:space="preserve"> <data name="&gt;&gt;lbl_hdop.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value> <value>splitContainer1.Panel2</value>
@ -1279,7 +1279,7 @@
<value>lbl_sats</value> <value>lbl_sats</value>
</data> </data>
<data name="&gt;&gt;lbl_sats.Type" xml:space="preserve"> <data name="&gt;&gt;lbl_sats.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lbl_sats.Parent" xml:space="preserve"> <data name="&gt;&gt;lbl_sats.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value> <value>splitContainer1.Panel2</value>
@ -1309,7 +1309,7 @@
<value>lbl_winddir</value> <value>lbl_winddir</value>
</data> </data>
<data name="&gt;&gt;lbl_winddir.Type" xml:space="preserve"> <data name="&gt;&gt;lbl_winddir.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lbl_winddir.Parent" xml:space="preserve"> <data name="&gt;&gt;lbl_winddir.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value> <value>splitContainer1.Panel2</value>
@ -1339,7 +1339,7 @@
<value>lbl_windvel</value> <value>lbl_windvel</value>
</data> </data>
<data name="&gt;&gt;lbl_windvel.Type" xml:space="preserve"> <data name="&gt;&gt;lbl_windvel.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;lbl_windvel.Parent" xml:space="preserve"> <data name="&gt;&gt;lbl_windvel.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value> <value>splitContainer1.Panel2</value>
@ -1511,7 +1511,7 @@
<value>gMapControl1</value> <value>gMapControl1</value>
</data> </data>
<data name="&gt;&gt;gMapControl1.Type" xml:space="preserve"> <data name="&gt;&gt;gMapControl1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;gMapControl1.Parent" xml:space="preserve"> <data name="&gt;&gt;gMapControl1.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value> <value>splitContainer1.Panel2</value>
@ -1574,7 +1574,7 @@
<value>TXT_lat</value> <value>TXT_lat</value>
</data> </data>
<data name="&gt;&gt;TXT_lat.Type" xml:space="preserve"> <data name="&gt;&gt;TXT_lat.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;TXT_lat.Parent" xml:space="preserve"> <data name="&gt;&gt;TXT_lat.Parent" xml:space="preserve">
<value>panel1</value> <value>panel1</value>
@ -1631,7 +1631,7 @@
<value>label1</value> <value>label1</value>
</data> </data>
<data name="&gt;&gt;label1.Type" xml:space="preserve"> <data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve"> <data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>panel1</value> <value>panel1</value>
@ -1661,7 +1661,7 @@
<value>TXT_long</value> <value>TXT_long</value>
</data> </data>
<data name="&gt;&gt;TXT_long.Type" xml:space="preserve"> <data name="&gt;&gt;TXT_long.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;TXT_long.Parent" xml:space="preserve"> <data name="&gt;&gt;TXT_long.Parent" xml:space="preserve">
<value>panel1</value> <value>panel1</value>
@ -1691,7 +1691,7 @@
<value>TXT_alt</value> <value>TXT_alt</value>
</data> </data>
<data name="&gt;&gt;TXT_alt.Type" xml:space="preserve"> <data name="&gt;&gt;TXT_alt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;TXT_alt.Parent" xml:space="preserve"> <data name="&gt;&gt;TXT_alt.Parent" xml:space="preserve">
<value>panel1</value> <value>panel1</value>
@ -1892,7 +1892,7 @@
<value>label6</value> <value>label6</value>
</data> </data>
<data name="&gt;&gt;label6.Type" xml:space="preserve"> <data name="&gt;&gt;label6.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;label6.Parent" xml:space="preserve"> <data name="&gt;&gt;label6.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@ -1988,6 +1988,6 @@
<value>FlightData</value> <value>FlightData</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value> <value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4580.38577, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
</root> </root>

32
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.Designer.cs generated
View File

@ -119,16 +119,18 @@
this.clearPolygonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearPolygonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.clearMissionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearMissionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.geoFenceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.geoFenceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.GeoFenceuploadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GeoFenceuploadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GeoFencedownloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GeoFencedownloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.setReturnLocationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.setReturnLocationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.loadFromFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadFromFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.trackBar1 = new ArdupilotMega.Controls.MyTrackBar(); this.trackBar1 = new ArdupilotMega.Controls.MyTrackBar();
this.label11 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label();
this.panelBASE = new System.Windows.Forms.Panel(); this.panelBASE = new System.Windows.Forms.Panel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.saveToFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.Commands)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Commands)).BeginInit();
this.panel5.SuspendLayout(); this.panel5.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
@ -827,6 +829,8 @@
// geoFenceToolStripMenuItem // geoFenceToolStripMenuItem
// //
this.geoFenceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.geoFenceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem1,
this.toolStripSeparator4,
this.GeoFenceuploadToolStripMenuItem, this.GeoFenceuploadToolStripMenuItem,
this.GeoFencedownloadToolStripMenuItem, this.GeoFencedownloadToolStripMenuItem,
this.setReturnLocationToolStripMenuItem, this.setReturnLocationToolStripMenuItem,
@ -835,6 +839,16 @@
this.geoFenceToolStripMenuItem.Name = "geoFenceToolStripMenuItem"; this.geoFenceToolStripMenuItem.Name = "geoFenceToolStripMenuItem";
resources.ApplyResources(this.geoFenceToolStripMenuItem, "geoFenceToolStripMenuItem"); resources.ApplyResources(this.geoFenceToolStripMenuItem, "geoFenceToolStripMenuItem");
// //
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
//
// GeoFenceuploadToolStripMenuItem // GeoFenceuploadToolStripMenuItem
// //
this.GeoFenceuploadToolStripMenuItem.Name = "GeoFenceuploadToolStripMenuItem"; this.GeoFenceuploadToolStripMenuItem.Name = "GeoFenceuploadToolStripMenuItem";
@ -859,6 +873,12 @@
resources.ApplyResources(this.loadFromFileToolStripMenuItem, "loadFromFileToolStripMenuItem"); resources.ApplyResources(this.loadFromFileToolStripMenuItem, "loadFromFileToolStripMenuItem");
this.loadFromFileToolStripMenuItem.Click += new System.EventHandler(this.loadFromFileToolStripMenuItem_Click); this.loadFromFileToolStripMenuItem.Click += new System.EventHandler(this.loadFromFileToolStripMenuItem_Click);
// //
// saveToFileToolStripMenuItem
//
this.saveToFileToolStripMenuItem.Name = "saveToFileToolStripMenuItem";
resources.ApplyResources(this.saveToFileToolStripMenuItem, "saveToFileToolStripMenuItem");
this.saveToFileToolStripMenuItem.Click += new System.EventHandler(this.saveToFileToolStripMenuItem_Click);
//
// trackBar1 // trackBar1
// //
resources.ApplyResources(this.trackBar1, "trackBar1"); resources.ApplyResources(this.trackBar1, "trackBar1");
@ -895,12 +915,6 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// saveToFileToolStripMenuItem
//
this.saveToFileToolStripMenuItem.Name = "saveToFileToolStripMenuItem";
resources.ApplyResources(this.saveToFileToolStripMenuItem, "saveToFileToolStripMenuItem");
this.saveToFileToolStripMenuItem.Click += new System.EventHandler(this.saveToFileToolStripMenuItem_Click);
//
// FlightPlanner // FlightPlanner
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
@ -1016,10 +1030,12 @@
private ArdupilotMega.Controls.MyButton BUT_loadkml; private ArdupilotMega.Controls.MyButton BUT_loadkml;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripMenuItem geoFenceToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem geoFenceToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem GeoFenceuploadToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem GeoFencedownloadToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem GeoFencedownloadToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem setReturnLocationToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem setReturnLocationToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem loadFromFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadFromFileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveToFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveToFileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem GeoFenceuploadToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
} }
} }

61
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.resx
View File

@ -556,7 +556,7 @@
<value>BUT_write</value> <value>BUT_write</value>
</data> </data>
<data name="&gt;&gt;BUT_write.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_write.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_write.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_write.Parent" xml:space="preserve">
<value>panel5</value> <value>panel5</value>
@ -583,7 +583,7 @@
<value>BUT_read</value> <value>BUT_read</value>
</data> </data>
<data name="&gt;&gt;BUT_read.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_read.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_read.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_read.Parent" xml:space="preserve">
<value>panel5</value> <value>panel5</value>
@ -610,7 +610,7 @@
<value>SaveFile</value> <value>SaveFile</value>
</data> </data>
<data name="&gt;&gt;SaveFile.Type" xml:space="preserve"> <data name="&gt;&gt;SaveFile.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;SaveFile.Parent" xml:space="preserve"> <data name="&gt;&gt;SaveFile.Parent" xml:space="preserve">
<value>panel5</value> <value>panel5</value>
@ -637,7 +637,7 @@
<value>BUT_loadwpfile</value> <value>BUT_loadwpfile</value>
</data> </data>
<data name="&gt;&gt;BUT_loadwpfile.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_loadwpfile.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_loadwpfile.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_loadwpfile.Parent" xml:space="preserve">
<value>panel5</value> <value>panel5</value>
@ -1261,7 +1261,7 @@
<value>BUT_loadkml</value> <value>BUT_loadkml</value>
</data> </data>
<data name="&gt;&gt;BUT_loadkml.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_loadkml.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_loadkml.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_loadkml.Parent" xml:space="preserve">
<value>panelWaypoints</value> <value>panelWaypoints</value>
@ -1291,7 +1291,7 @@
<value>BUT_zoomto</value> <value>BUT_zoomto</value>
</data> </data>
<data name="&gt;&gt;BUT_zoomto.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_zoomto.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_zoomto.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_zoomto.Parent" xml:space="preserve">
<value>panelWaypoints</value> <value>panelWaypoints</value>
@ -1321,7 +1321,7 @@
<value>BUT_Camera</value> <value>BUT_Camera</value>
</data> </data>
<data name="&gt;&gt;BUT_Camera.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_Camera.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_Camera.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_Camera.Parent" xml:space="preserve">
<value>panelWaypoints</value> <value>panelWaypoints</value>
@ -1351,7 +1351,7 @@
<value>BUT_grid</value> <value>BUT_grid</value>
</data> </data>
<data name="&gt;&gt;BUT_grid.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_grid.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_grid.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_grid.Parent" xml:space="preserve">
<value>panelWaypoints</value> <value>panelWaypoints</value>
@ -1381,7 +1381,7 @@
<value>BUT_Prefetch</value> <value>BUT_Prefetch</value>
</data> </data>
<data name="&gt;&gt;BUT_Prefetch.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_Prefetch.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_Prefetch.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_Prefetch.Parent" xml:space="preserve">
<value>panelWaypoints</value> <value>panelWaypoints</value>
@ -1411,7 +1411,7 @@
<value>button1</value> <value>button1</value>
</data> </data>
<data name="&gt;&gt;button1.Type" xml:space="preserve"> <data name="&gt;&gt;button1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;button1.Parent" xml:space="preserve"> <data name="&gt;&gt;button1.Parent" xml:space="preserve">
<value>panelWaypoints</value> <value>panelWaypoints</value>
@ -1441,7 +1441,7 @@
<value>BUT_Add</value> <value>BUT_Add</value>
</data> </data>
<data name="&gt;&gt;BUT_Add.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_Add.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_Add.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_Add.Parent" xml:space="preserve">
<value>panelWaypoints</value> <value>panelWaypoints</value>
@ -1686,6 +1686,15 @@
<data name="clearMissionToolStripMenuItem.Text" xml:space="preserve"> <data name="clearMissionToolStripMenuItem.Text" xml:space="preserve">
<value>Clear Mission</value> <value>Clear Mission</value>
</data> </data>
<data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 22</value>
</data>
<data name="toolStripMenuItem1.Text" xml:space="preserve">
<value>Complex</value>
</data>
<data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 6</value>
</data>
<data name="GeoFenceuploadToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="GeoFenceuploadToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 22</value> <value>177, 22</value>
</data> </data>
@ -1889,7 +1898,7 @@
<value>MainMap</value> <value>MainMap</value>
</data> </data>
<data name="&gt;&gt;MainMap.Type" xml:space="preserve"> <data name="&gt;&gt;MainMap.Type" xml:space="preserve">
<value>GMap.NET.WindowsForms.GMapControl, GMap.NET.WindowsForms, Version=1.5.5.5, Culture=neutral, PublicKeyToken=b85b9027b614afef</value> <value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;MainMap.Parent" xml:space="preserve"> <data name="&gt;&gt;MainMap.Parent" xml:space="preserve">
<value>panelMap</value> <value>panelMap</value>
@ -1919,7 +1928,7 @@
<value>trackBar1</value> <value>trackBar1</value>
</data> </data>
<data name="&gt;&gt;trackBar1.Type" xml:space="preserve"> <data name="&gt;&gt;trackBar1.Type" xml:space="preserve">
<value>ArdupilotMega.MyTrackBar, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;trackBar1.Parent" xml:space="preserve"> <data name="&gt;&gt;trackBar1.Parent" xml:space="preserve">
<value>panelMap</value> <value>panelMap</value>
@ -2200,6 +2209,18 @@
<data name="&gt;&gt;geoFenceToolStripMenuItem.Type" xml:space="preserve"> <data name="&gt;&gt;geoFenceToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;toolStripMenuItem1.Name" xml:space="preserve">
<value>toolStripMenuItem1</value>
</data>
<data name="&gt;&gt;toolStripMenuItem1.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;toolStripSeparator4.Name" xml:space="preserve">
<value>toolStripSeparator4</value>
</data>
<data name="&gt;&gt;toolStripSeparator4.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;GeoFenceuploadToolStripMenuItem.Name" xml:space="preserve"> <data name="&gt;&gt;GeoFenceuploadToolStripMenuItem.Name" xml:space="preserve">
<value>GeoFenceuploadToolStripMenuItem</value> <value>GeoFenceuploadToolStripMenuItem</value>
</data> </data>
@ -2224,6 +2245,12 @@
<data name="&gt;&gt;loadFromFileToolStripMenuItem.Type" xml:space="preserve"> <data name="&gt;&gt;loadFromFileToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;saveToFileToolStripMenuItem.Name" xml:space="preserve">
<value>saveToFileToolStripMenuItem</value>
</data>
<data name="&gt;&gt;saveToFileToolStripMenuItem.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;toolTip1.Name" xml:space="preserve"> <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
<value>toolTip1</value> <value>toolTip1</value>
</data> </data>
@ -2236,16 +2263,10 @@
<data name="&gt;&gt;timer1.Type" xml:space="preserve"> <data name="&gt;&gt;timer1.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;saveToFileToolStripMenuItem.Name" xml:space="preserve">
<value>saveToFileToolStripMenuItem</value>
</data>
<data name="&gt;&gt;saveToFileToolStripMenuItem.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;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>FlightPlanner</value> <value>FlightPlanner</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4579.33184, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
</root> </root>

4
Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs
View File

@ -572,6 +572,9 @@ namespace ArdupilotMega.GCSViews
DateTime lastdata = DateTime.MinValue; DateTime lastdata = DateTime.MinValue;
// set enable hil status flag - sends base_mode = 0
MainV2.comPort.setMode(new MAVLink.mavlink_set_mode_t() { target_system = MainV2.comPort.sysid }, MAVLink.MAV_MODE_FLAG.HIL_ENABLED);
while (threadrun == 1) while (threadrun == 1)
{ {
if (comPort.BaseStream.IsOpen == false) { break; } if (comPort.BaseStream.IsOpen == false) { break; }
@ -580,6 +583,7 @@ namespace ArdupilotMega.GCSViews
{ {
try try
{ {
if (CHK_quad.Checked && !RAD_aerosimrc.Checked)// || chkSensor.Checked && RAD_JSBSim.Checked) if (CHK_quad.Checked && !RAD_aerosimrc.Checked)// || chkSensor.Checked && RAD_JSBSim.Checked)
{ {
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.RAW_CONTROLLER, 0); // request servoout comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.RAW_CONTROLLER, 0); // request servoout

1
Tools/ArdupilotMegaPlanner/GCSViews/Terminal.Designer.cs generated
View File

@ -93,6 +93,7 @@
this.Controls.Add(this.BUTsetupshow); this.Controls.Add(this.BUTsetupshow);
this.Controls.Add(this.TXT_terminal); this.Controls.Add(this.TXT_terminal);
this.Name = "Terminal"; this.Name = "Terminal";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Terminal_FormClosing);
this.Load += new System.EventHandler(this.Terminal_Load); this.Load += new System.EventHandler(this.Terminal_Load);
this.ResumeLayout(false); this.ResumeLayout(false);

3
Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs
View File

@ -26,7 +26,6 @@ namespace ArdupilotMega.GCSViews
public Terminal() public Terminal()
{ {
while (threadrun == true)
threadrun = false; threadrun = false;
InitializeComponent(); InitializeComponent();
@ -153,6 +152,8 @@ namespace ArdupilotMega.GCSViews
comPort.Close(); comPort.Close();
} }
System.Threading.Thread.Sleep(400); System.Threading.Thread.Sleep(400);
MainV2.giveComport = false;
} }
private void TXT_terminal_KeyPress(object sender, KeyPressEventArgs e) private void TXT_terminal_KeyPress(object sender, KeyPressEventArgs e)

12
Tools/ArdupilotMegaPlanner/GCSViews/Terminal.resx
View File

@ -166,7 +166,7 @@
<value>BUTsetupshow</value> <value>BUTsetupshow</value>
</data> </data>
<data name="&gt;&gt;BUTsetupshow.Type" xml:space="preserve"> <data name="&gt;&gt;BUTsetupshow.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUTsetupshow.Parent" xml:space="preserve"> <data name="&gt;&gt;BUTsetupshow.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@ -190,7 +190,7 @@
<value>BUTradiosetup</value> <value>BUTradiosetup</value>
</data> </data>
<data name="&gt;&gt;BUTradiosetup.Type" xml:space="preserve"> <data name="&gt;&gt;BUTradiosetup.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUTradiosetup.Parent" xml:space="preserve"> <data name="&gt;&gt;BUTradiosetup.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@ -214,7 +214,7 @@
<value>BUTtests</value> <value>BUTtests</value>
</data> </data>
<data name="&gt;&gt;BUTtests.Type" xml:space="preserve"> <data name="&gt;&gt;BUTtests.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUTtests.Parent" xml:space="preserve"> <data name="&gt;&gt;BUTtests.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@ -238,7 +238,7 @@
<value>Logs</value> <value>Logs</value>
</data> </data>
<data name="&gt;&gt;Logs.Type" xml:space="preserve"> <data name="&gt;&gt;Logs.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;Logs.Parent" xml:space="preserve"> <data name="&gt;&gt;Logs.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@ -262,7 +262,7 @@
<value>BUT_logbrowse</value> <value>BUT_logbrowse</value>
</data> </data>
<data name="&gt;&gt;BUT_logbrowse.Type" xml:space="preserve"> <data name="&gt;&gt;BUT_logbrowse.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;BUT_logbrowse.Parent" xml:space="preserve"> <data name="&gt;&gt;BUT_logbrowse.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
@ -283,6 +283,6 @@
<value>Terminal</value> <value>Terminal</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value> <value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
</root> </root>

4
Tools/ArdupilotMegaPlanner/MainV2.Designer.cs generated
View File

@ -29,7 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainV2)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainV2));
this.MyView = new System.Windows.Forms.Panel(); this.MyView = new ArdupilotMega.Controls.MainSwitcher();
this.MainMenu = new System.Windows.Forms.MenuStrip(); this.MainMenu = new System.Windows.Forms.MenuStrip();
this.MenuFlightData = new System.Windows.Forms.ToolStripButton(); this.MenuFlightData = new System.Windows.Forms.ToolStripButton();
this.MenuFlightPlanner = new System.Windows.Forms.ToolStripButton(); this.MenuFlightPlanner = new System.Windows.Forms.ToolStripButton();
@ -227,7 +227,7 @@
#endregion #endregion
private System.Windows.Forms.Panel MyView; private ArdupilotMega.Controls.MainSwitcher MyView;
private System.Windows.Forms.MenuStrip MainMenu; private System.Windows.Forms.MenuStrip MainMenu;
private System.Windows.Forms.ToolStripButton MenuFlightData; private System.Windows.Forms.ToolStripButton MenuFlightData;
private System.Windows.Forms.ToolStripButton MenuFlightPlanner; private System.Windows.Forms.ToolStripButton MenuFlightPlanner;

213
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -132,11 +132,10 @@ namespace ArdupilotMega
/// </summary> /// </summary>
GCSViews.FlightData FlightData; GCSViews.FlightData FlightData;
GCSViews.FlightPlanner FlightPlanner; GCSViews.FlightPlanner FlightPlanner;
//GCSViews.Configuration Configuration; //GCSViews.ConfigurationView.Setup Configuration;
GCSViews.ConfigurationView.Setup Configuration;
GCSViews.Simulation Simulation; GCSViews.Simulation Simulation;
GCSViews.Firmware Firmware; //GCSViews.Firmware Firmware;
GCSViews.Terminal Terminal; //GCSViews.Terminal Terminal;
private Form connectionStatsForm; private Form connectionStatsForm;
private ConnectionStats _connectionStats; private ConnectionStats _connectionStats;
@ -157,7 +156,7 @@ namespace ArdupilotMega
strVersion = "mav " + MAVLink.MAVLINK_WIRE_PROTOCOL_VERSION; strVersion = "mav " + MAVLink.MAVLINK_WIRE_PROTOCOL_VERSION;
splash.Text = "APM Planner " + Application.ProductVersion + " " + strVersion + " By Michael Oborne"; splash.Text = "Mission Planner " + Application.ProductVersion + " " + strVersion;
splash.Refresh(); splash.Refresh();
@ -246,9 +245,9 @@ namespace ArdupilotMega
{ {
FlightData = new GCSViews.FlightData(); FlightData = new GCSViews.FlightData();
FlightPlanner = new GCSViews.FlightPlanner(); FlightPlanner = new GCSViews.FlightPlanner();
//Configuration = new GCSViews.Configuration(); //Configuration = new GCSViews.ConfigurationView.Setup();
Simulation = new GCSViews.Simulation(); Simulation = new GCSViews.Simulation();
Firmware = new GCSViews.Firmware(); //Firmware = new GCSViews.Firmware();
//Terminal = new GCSViews.Terminal(); //Terminal = new GCSViews.Terminal();
// preload // preload
@ -426,114 +425,36 @@ namespace ArdupilotMega
private void MenuFlightData_Click(object sender, EventArgs e) private void MenuFlightData_Click(object sender, EventArgs e)
{ {
MyView.Controls.Clear(); MyView.ShowScreen("FlightData");
GCSViews.Terminal.threadrun = false;
UserControl temp = FlightData;
ThemeManager.ApplyThemeTo(temp);
temp.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
temp.Location = new Point(0, MainMenu.Height);
temp.Dock = DockStyle.Fill;
MyView.Controls.Add(temp);
if (MainV2.config["FlightSplitter"] != null) if (MainV2.config["FlightSplitter"] != null)
((GCSViews.FlightData)temp).MainHcopy.SplitterDistance = int.Parse(MainV2.config["FlightSplitter"].ToString()); {
FlightData.MainHcopy.SplitterDistance = int.Parse(MainV2.config["FlightSplitter"].ToString()) - 1;
FlightData.MainHcopy.SplitterDistance = int.Parse(MainV2.config["FlightSplitter"].ToString());
}
} }
private void MenuFlightPlanner_Click(object sender, EventArgs e) private void MenuFlightPlanner_Click(object sender, EventArgs e)
{ {
MyView.Controls.Clear();
GCSViews.Terminal.threadrun = false;
UserControl temp = FlightPlanner;
ThemeManager.ApplyThemeTo(temp);
temp.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
temp.Location = new Point(0, MainMenu.Height);
temp.Dock = DockStyle.Fill;
// refresh ap/ac specific items // refresh ap/ac specific items
FlightPlanner.updateCMDParams(); FlightPlanner.updateCMDParams();
MyView.Controls.Add(temp); MyView.ShowScreen("FlightPlanner");
} }
private void MenuConfiguration_Click(object sender, EventArgs e) private void MenuConfiguration_Click(object sender, EventArgs e)
{ {
MyView.Controls.Clear(); MyView.ShowScreen("Config");
GCSViews.Terminal.threadrun = false;
// dispose of old else memory leak
if (Configuration != null)
{
try
{
Configuration.Dispose();
}
catch { }
}
//Configuration = new GCSViews.Configuration();
Configuration = new GCSViews.ConfigurationView.Setup();
UserControl temp = Configuration;
ThemeManager.ApplyThemeTo(temp);
temp.Location = new Point(0, 0);
temp.Dock = DockStyle.Fill;
temp.Size = MyView.Size;
MyView.Controls.Add(temp);
} }
private void MenuSimulation_Click(object sender, EventArgs e) private void MenuSimulation_Click(object sender, EventArgs e)
{ {
MyView.Controls.Clear(); MyView.ShowScreen("Simulation");
GCSViews.Terminal.threadrun = false;
UserControl temp = Simulation;
ThemeManager.ApplyThemeTo(temp);
temp.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
temp.Location = new Point(0, MainMenu.Height);
temp.Dock = DockStyle.Fill;
MyView.Controls.Add(temp);
} }
private void MenuFirmware_Click(object sender, EventArgs e) private void MenuFirmware_Click(object sender, EventArgs e)
{ {
MyView.Controls.Clear(); MyView.ShowScreen("Firmware");
GCSViews.Terminal.threadrun = false;
UserControl temp = Firmware;
ThemeManager.ApplyThemeTo(temp);
temp.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
temp.Dock = DockStyle.Fill;
MyView.Controls.Add(temp);
} }
private void MenuTerminal_Click(object sender, EventArgs e) private void MenuTerminal_Click(object sender, EventArgs e)
@ -543,34 +464,7 @@ namespace ArdupilotMega
MenuConnect_Click(sender, e); MenuConnect_Click(sender, e);
} }
giveComport = true; MyView.ShowScreen("Terminal");
MyView.Controls.Clear();
this.MenuConnect.BackgroundImage = global::ArdupilotMega.Properties.Resources.disconnect;
// dispose of old else memory leak
if (Terminal != null)
{
try
{
Terminal.Dispose();
}
catch { }
}
Terminal = new GCSViews.Terminal();
UserControl temp = Terminal;
ThemeManager.ApplyThemeTo(temp);
temp.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
temp.Dock = DockStyle.Fill;
MyView.Controls.Add(temp);
} }
private void MenuConnect_Click(object sender, EventArgs e) private void MenuConnect_Click(object sender, EventArgs e)
@ -1066,7 +960,7 @@ namespace ArdupilotMega
{ {
if ((string)this.MenuConnect.BackgroundImage.Tag != "Disconnect") if ((string)this.MenuConnect.BackgroundImage.Tag != "Disconnect")
{ {
this.Invoke((MethodInvoker)delegate this.BeginInvoke((MethodInvoker)delegate
{ {
this.MenuConnect.BackgroundImage = global::ArdupilotMega.Properties.Resources.disconnect; this.MenuConnect.BackgroundImage = global::ArdupilotMega.Properties.Resources.disconnect;
this.MenuConnect.BackgroundImage.Tag = "Disconnect"; this.MenuConnect.BackgroundImage.Tag = "Disconnect";
@ -1078,13 +972,23 @@ namespace ArdupilotMega
{ {
if ((string)this.MenuConnect.BackgroundImage.Tag != "Connect") if ((string)this.MenuConnect.BackgroundImage.Tag != "Connect")
{ {
this.Invoke((MethodInvoker)delegate this.BeginInvoke((MethodInvoker)delegate
{ {
this.MenuConnect.BackgroundImage = global::ArdupilotMega.Properties.Resources.connect; this.MenuConnect.BackgroundImage = global::ArdupilotMega.Properties.Resources.connect;
this.MenuConnect.BackgroundImage.Tag = "Connect"; this.MenuConnect.BackgroundImage.Tag = "Connect";
_connectionControl.IsConnected(false); _connectionControl.IsConnected(false);
if (_connectionStats != null) if (_connectionStats != null)
{
_connectionStats.StopUpdates(); _connectionStats.StopUpdates();
}
});
}
if (comPort.logreadmode)
{
this.BeginInvoke((MethodInvoker)delegate
{
_connectionControl.IsConnected(true);
}); });
} }
} }
@ -1144,22 +1048,6 @@ namespace ArdupilotMega
speechcustomtime = DateTime.Now; speechcustomtime = DateTime.Now;
} }
if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds > 10)
{
MainV2.cs.linkqualitygcs = 0;
}
if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds >= 1)
{
if (linkqualitytime.Second != DateTime.Now.Second)
{
MainV2.cs.linkqualitygcs = (ushort)(MainV2.cs.linkqualitygcs * 0.8f);
linkqualitytime = DateTime.Now;
GCSViews.FlightData.myhud.Invalidate();
}
}
if (speechEnable && speechEngine != null && (MainV2.comPort.logreadmode || comPort.BaseStream.IsOpen)) if (speechEnable && speechEngine != null && (MainV2.comPort.logreadmode || comPort.BaseStream.IsOpen))
{ {
float warnalt = float.MaxValue; float warnalt = float.MaxValue;
@ -1181,6 +1069,23 @@ namespace ArdupilotMega
continue; continue;
} }
if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds > 10)
{
MainV2.cs.linkqualitygcs = 0;
}
if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds >= 1)
{
if (linkqualitytime.Second != DateTime.Now.Second)
{
MainV2.cs.linkqualitygcs = (ushort)(MainV2.cs.linkqualitygcs * 0.8f);
linkqualitytime = DateTime.Now;
int fixme;
//GCSViews.FlightData.myhud.Invalidate();
}
}
if (heatbeatSend.Second != DateTime.Now.Second) if (heatbeatSend.Second != DateTime.Now.Second)
{ {
// Console.WriteLine("remote lost {0}", cs.packetdropremote); // Console.WriteLine("remote lost {0}", cs.packetdropremote);
@ -1281,7 +1186,15 @@ namespace ArdupilotMega
private void MainV2_Load(object sender, EventArgs e) private void MainV2_Load(object sender, EventArgs e)
{ {
// init button depressed MyView.AddScreen(new MainSwitcher.Screen("FlightData",FlightData,true));
MyView.AddScreen(new MainSwitcher.Screen("FlightPlanner", FlightPlanner, true));
MyView.AddScreen(new MainSwitcher.Screen("Config", new GCSViews.ConfigurationView.Setup(), false));
MyView.AddScreen(new MainSwitcher.Screen("Simulation", Simulation, true));
MyView.AddScreen(new MainSwitcher.Screen("Firmware", new GCSViews.Firmware(), false));
MyView.AddScreen(new MainSwitcher.Screen("Terminal", new GCSViews.Terminal(), false));
MyView.AddScreen(new MainSwitcher.Screen("Help", new GCSViews.Help(), false));
// init button depressed - ensures correct action
MenuFlightData_Click(sender, e); MenuFlightData_Click(sender, e);
// for long running tasks using own threads. // for long running tasks using own threads.
@ -1671,21 +1584,7 @@ namespace ArdupilotMega
private void MenuHelp_Click(object sender, EventArgs e) private void MenuHelp_Click(object sender, EventArgs e)
{ {
MyView.Controls.Clear(); MyView.ShowScreen("Help");
UserControl temp = new GCSViews.Help();
ThemeManager.ApplyThemeTo(temp);
temp.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
temp.Dock = DockStyle.Fill;
MyView.Controls.Add(temp);
temp.ForeColor = Color.White;
temp.BackColor = Color.FromArgb(0x26, 0x27, 0x28);
} }
@ -2230,7 +2129,7 @@ namespace ArdupilotMega
config["language"] = ci.Name; config["language"] = ci.Name;
//System.Threading.Thread.CurrentThread.CurrentCulture = ci; //System.Threading.Thread.CurrentThread.CurrentCulture = ci;
HashSet<Control> views = new HashSet<Control> { FlightData, FlightPlanner, Simulation, Firmware }; HashSet<Control> views = new HashSet<Control> { FlightData, FlightPlanner, Simulation };
foreach (Control view in MyView.Controls) foreach (Control view in MyView.Controls)
views.Add(view); views.Add(view);

1
Tools/ArdupilotMegaPlanner/Mavlink/IMAVLink.cs
View File

@ -100,6 +100,7 @@ namespace ArdupilotMega
void sendPacket(object indata); void sendPacket(object indata);
bool setFencePoint(byte index, PointLatLngAlt plla, byte fencepointcount); bool setFencePoint(byte index, PointLatLngAlt plla, byte fencepointcount);
void setMode(string modein); void setMode(string modein);
void setMode(ArdupilotMega.MAVLink.mavlink_set_mode_t mode, ArdupilotMega.MAVLink.MAV_MODE_FLAG base_mode = 0);
void setMountConfigure(ArdupilotMega.MAVLink.MAV_MOUNT_MODE mountmode, bool stabroll, bool stabpitch, bool stabyaw); void setMountConfigure(ArdupilotMega.MAVLink.MAV_MOUNT_MODE mountmode, bool stabroll, bool stabpitch, bool stabyaw);
void setMountControl(double pa, double pb, double pc, bool islatlng); void setMountControl(double pa, double pb, double pc, bool islatlng);
bool setParam(string paramname, float value); bool setParam(string paramname, float value);

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

@ -2002,9 +2002,7 @@ namespace ArdupilotMega
if (translateMode(modein, ref mode)) if (translateMode(modein, ref mode))
{ {
generatePacket((byte)MAVLink.MAVLINK_MSG_ID_SET_MODE, mode); setMode(mode);
System.Threading.Thread.Sleep(10);
generatePacket((byte)MAVLink.MAVLINK_MSG_ID_SET_MODE, mode);
} }
} }
catch { System.Windows.Forms.MessageBox.Show("Failed to change Modes"); } catch { System.Windows.Forms.MessageBox.Show("Failed to change Modes"); }
@ -2031,6 +2029,15 @@ namespace ArdupilotMega
#endif #endif
} }
public void setMode(mavlink_set_mode_t mode, MAV_MODE_FLAG base_mode = 0)
{
mode.base_mode |= (byte)base_mode;
generatePacket((byte)MAVLink.MAVLINK_MSG_ID_SET_MODE, mode);
System.Threading.Thread.Sleep(10);
generatePacket((byte)MAVLink.MAVLINK_MSG_ID_SET_MODE, mode);
}
/// <summary> /// <summary>
/// used for last bad serial characters /// used for last bad serial characters
/// </summary> /// </summary>
@ -2605,6 +2612,7 @@ namespace ArdupilotMega
mavlinkversion = hb.mavlink_version; mavlinkversion = hb.mavlink_version;
aptype = (MAV_TYPE)hb.type; aptype = (MAV_TYPE)hb.type;
setAPType();
} }
return temp; return temp;

23
Tools/ArdupilotMegaPlanner/MavlinkLog.cs
View File

@ -835,10 +835,10 @@ namespace ArdupilotMega
string code = @" string code = @"
public double stage(object inp) { public double stage(object inp) {
return getAltAboveHome((MAVLink09.mavlink_gps_raw_t) inp); return getAltAboveHome((MAVLink.mavlink_gps_raw_int_t) inp);
} }
public double getAltAboveHome(MAVLink09.mavlink_gps_raw_t gps) public double getAltAboveHome(MAVLink.mavlink_gps_raw_int_t gps)
{ {
if (customforusenumber == -1 && gps.fix_type != 2) if (customforusenumber == -1 && gps.fix_type != 2)
customforusenumber = gps.alt; customforusenumber = gps.alt;
@ -870,6 +870,9 @@ namespace ArdupilotMega
// from here // from here
PointPairList result = (PointPairList)this.datappl[field]; PointPairList result = (PointPairList)this.datappl[field];
try
{
object assemblyInstance = results.CompiledAssembly.CreateInstance("ExpressionEvaluator.Calculator"); object assemblyInstance = results.CompiledAssembly.CreateInstance("ExpressionEvaluator.Calculator");
foreach (double time in temp.Keys) foreach (double time in temp.Keys)
@ -877,6 +880,8 @@ namespace ArdupilotMega
result.Add(time, (double)mi.Invoke(assemblyInstance, new object[] { temp[time] })); result.Add(time, (double)mi.Invoke(assemblyInstance, new object[] { temp[time] }));
} }
} }
catch { }
}
else else
{ {
CustomMessageBox.Show("Compile Failed"); CustomMessageBox.Show("Compile Failed");
@ -976,16 +981,16 @@ namespace ArdupilotMega
PointPairList list = ((PointPairList)this.datappl[field]); PointPairList list = ((PointPairList)this.datappl[field]);
PointPairList listfix = ((PointPairList)this.datappl["fix_type mavlink_gps_raw_t"]); PointPairList listfix = ((PointPairList)this.datappl["fix_type mavlink_gps_raw_int_t"]);
PointPairList listx = ((PointPairList)this.datappl["lat mavlink_gps_raw_t"]); PointPairList listx = ((PointPairList)this.datappl["lat mavlink_gps_raw_int_t"]);
PointPairList listy = ((PointPairList)this.datappl["lon mavlink_gps_raw_t"]); PointPairList listy = ((PointPairList)this.datappl["lon mavlink_gps_raw_int_t"]);
PointPairList listz = ((PointPairList)this.datappl["alt mavlink_gps_raw_t"]); PointPairList listz = ((PointPairList)this.datappl["alt mavlink_gps_raw_int_t"]);
for (int a = 0; a < listfix.Count; a++) for (int a = 0; a < listfix.Count; a++)
{ {
if (listfix[a].Y == 2) if (listfix[a].Y == 3)
{ {
home = new PointLatLngAlt(listx[a].Y, listy[a].Y, listz[a].Y,"Home"); home = new PointLatLngAlt(listx[a].Y / 10000000.0, listy[a].Y / 10000000.0, listz[a].Y / 1000.0, "Home");
break; break;
} }
} }
@ -995,7 +1000,7 @@ namespace ArdupilotMega
for (int a = 0; a < listx.Count; a++) for (int a = 0; a < listx.Count; a++)
{ {
double ans = home.GetDistance(new PointLatLngAlt(listx[a].Y, listy[a].Y, listz[a].Y, "Point")); double ans = home.GetDistance(new PointLatLngAlt(listx[a].Y / 10000000.0, listy[a].Y / 10000000.0, listz[a].Y / 1000.0, "Point"));
//Console.WriteLine("{0} {1} {2} {3}", ans, listx[a].Y, listy[a].Y, listz[a].Y); //Console.WriteLine("{0} {1} {2} {3}", ans, listx[a].Y, listy[a].Y, listz[a].Y);

283
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"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension">
<Product Id="*" Name="APM Planner" Language="1033" Version="1.1.96" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}"> <Product Id="*" Name="APM Planner" Language="1033" Version="1.1.97" 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="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}"> <Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<UpgradeVersion OnlyDetect="yes" Minimum="1.1.96" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" /> <UpgradeVersion OnlyDetect="yes" Minimum="1.1.97" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.1.96" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" /> <UpgradeVersion OnlyDetect="no" Maximum="1.1.97" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
</Upgrade> </Upgrade>
<InstallExecuteSequence> <InstallExecuteSequence>
@ -31,7 +31,7 @@
<Permission User="Everyone" GenericAll="yes" /> <Permission User="Everyone" GenericAll="yes" />
</CreateFolder> </CreateFolder>
</Component> </Component>
<Component Id="_comp1" Guid="51ed87ff-f399-4df1-8100-a78e628d8282"> <Component Id="_comp1" Guid="ca2a9504-1ff4-4dcc-ae3f-29a0034e7341">
<File Id="_2" Source="..\bin\release\.gdbinit" /> <File Id="_2" Source="..\bin\release\.gdbinit" />
<File Id="_3" Source="..\bin\release\.gitignore" /> <File Id="_3" Source="..\bin\release\.gitignore" />
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" /> <File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
@ -90,162 +90,163 @@
<File Id="_57" Source="..\bin\release\ParameterMetaData.xml" /> <File Id="_57" Source="..\bin\release\ParameterMetaData.xml" />
<File Id="_58" Source="..\bin\release\quadhil.xml" /> <File Id="_58" Source="..\bin\release\quadhil.xml" />
<File Id="_59" Source="..\bin\release\runme" /> <File Id="_59" Source="..\bin\release\runme" />
<File Id="_60" Source="..\bin\release\SharpKml.dll" /> <File Id="_60" Source="..\bin\release\serialsent.raw" />
<File Id="_61" Source="..\bin\release\SharpKml.pdb" /> <File Id="_61" Source="..\bin\release\SharpKml.dll" />
<File Id="_62" Source="..\bin\release\SharpKml.xml" /> <File Id="_62" Source="..\bin\release\SharpKml.pdb" />
<File Id="_63" Source="..\bin\release\System.Data.SQLite.dll" /> <File Id="_63" Source="..\bin\release\SharpKml.xml" />
<File Id="_64" Source="..\bin\release\System.Reactive.dll" /> <File Id="_64" Source="..\bin\release\System.Data.SQLite.dll" />
<File Id="_65" Source="..\bin\release\System.Reactive.xml" /> <File Id="_65" Source="..\bin\release\System.Reactive.dll" />
<File Id="_66" Source="..\bin\release\System.Speech.dll" /> <File Id="_66" Source="..\bin\release\System.Reactive.xml" />
<File Id="_67" Source="..\bin\release\Transitions.dll" /> <File Id="_67" Source="..\bin\release\System.Speech.dll" />
<File Id="_68" Source="..\bin\release\Updater.exe" /> <File Id="_68" Source="..\bin\release\Transitions.dll" />
<File Id="_69" Source="..\bin\release\Updater.exe.config" /> <File Id="_69" Source="..\bin\release\Updater.exe" />
<File Id="_70" Source="..\bin\release\Updater.pdb" /> <File Id="_70" Source="..\bin\release\Updater.exe.config" />
<File Id="_71" Source="..\bin\release\version.exe" /> <File Id="_71" Source="..\bin\release\Updater.pdb" />
<File Id="_72" Source="..\bin\release\version.txt" /> <File Id="_72" Source="..\bin\release\version.exe" />
<File Id="_73" Source="..\bin\release\ZedGraph.dll" /> <File Id="_73" Source="..\bin\release\version.txt" />
<File Id="_74" Source="..\bin\release\ZedGraph.dll" />
</Component> </Component>
<Directory Id="aircraft73" Name="aircraft"> <Directory Id="aircraft74" Name="aircraft">
<Component Id="_comp74" Guid="f5d0de83-48c7-4a71-92f0-9a9d57d3e82d"> <Component Id="_comp75" Guid="908d5437-38f1-49a8-8642-93dc0f7d8db2">
<File Id="_75" Source="..\bin\release\aircraft\placeholder.txt" /> <File Id="_76" Source="..\bin\release\aircraft\placeholder.txt" />
</Component> </Component>
<Directory Id="arducopter75" Name="arducopter"> <Directory Id="arducopter76" Name="arducopter">
<Component Id="_comp76" Guid="88fb41e6-9ad8-4926-931b-6afff7359ea2"> <Component Id="_comp77" Guid="c73a000c-e8c8-4cf9-80aa-100b3d4ffc8f">
<File Id="_77" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" /> <File Id="_78" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_78" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" /> <File Id="_79" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_79" Source="..\bin\release\aircraft\arducopter\arducopter.xml" /> <File Id="_80" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
<File Id="_80" Source="..\bin\release\aircraft\arducopter\initfile.xml" /> <File Id="_81" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
<File Id="_81" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" /> <File Id="_82" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
<File Id="_82" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" /> <File Id="_83" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
<File Id="_83" Source="..\bin\release\aircraft\arducopter\quad.nas" /> <File Id="_84" Source="..\bin\release\aircraft\arducopter\quad.nas" />
<File Id="_84" Source="..\bin\release\aircraft\arducopter\README" /> <File Id="_85" Source="..\bin\release\aircraft\arducopter\README" />
</Component> </Component>
<Directory Id="data84" Name="data"> <Directory Id="data85" Name="data">
<Component Id="_comp85" Guid="1c9503b2-9317-427a-846a-29aca07ade36"> <Component Id="_comp86" Guid="f1216dc7-61ab-48c4-9e21-c3cc0c5708e2">
<File Id="_86" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" /> <File Id="_87" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_87" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" /> <File Id="_88" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_88" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" /> <File Id="_89" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Engines88" Name="Engines"> <Directory Id="Engines89" Name="Engines">
<Component Id="_comp89" Guid="f680284d-ee46-485f-94c7-72ef64948c39"> <Component Id="_comp90" Guid="05137442-a8a4-48fe-b97c-28cf16c942ed">
<File Id="_90" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" /> <File Id="_91" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_91" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" /> <File Id="_92" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Models91" Name="Models"> <Directory Id="Models92" Name="Models">
<Component Id="_comp92" Guid="b0ca7457-c3d2-43e0-84e9-9d2ad89d5cc4"> <Component Id="_comp93" Guid="9eed71d0-d0e6-4ae1-a553-1238d819cf1a">
<File Id="_93" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" /> <File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" /> <File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" /> <File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
<File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" /> <File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" /> <File Id="_98" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
<File Id="_98" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" /> <File Id="_99" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
<File Id="_99" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" /> <File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
<File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" /> <File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
<File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" /> <File Id="_102" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
</Component> </Component>
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="Rascal101" Name="Rascal"> <Directory Id="Rascal102" Name="Rascal">
<Component Id="_comp102" Guid="02d6a7bb-90ba-46f0-9bb1-1ec9707e093a"> <Component Id="_comp103" Guid="6b8ea520-d2c2-4e03-9fbd-6ddf6cf5e6d9">
<File Id="_103" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" /> <File Id="_104" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_104" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" /> <File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal.xml" /> <File Id="_106" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
<File Id="_106" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" /> <File Id="_107" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
<File Id="_107" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" /> <File Id="_108" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
<File Id="_108" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" /> <File Id="_109" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
<File Id="_109" Source="..\bin\release\aircraft\Rascal\README.Rascal" /> <File Id="_110" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
<File Id="_110" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" /> <File Id="_111" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
<File Id="_111" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" /> <File Id="_112" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
</Component> </Component>
<Directory Id="Engines111" Name="Engines"> <Directory Id="Engines112" Name="Engines">
<Component Id="_comp112" Guid="01e9c632-0210-4930-aae2-ad0c9ee0ffc8"> <Component Id="_comp113" Guid="a8edb6d3-b79f-4169-968b-06234f4f4ba0">
<File Id="_113" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" /> <File Id="_114" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_114" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" /> <File Id="_115" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Models114" Name="Models"> <Directory Id="Models115" Name="Models">
<Component Id="_comp115" Guid="e9a6a7a2-2ac4-4b3a-b340-38cc65c37690"> <Component Id="_comp116" Guid="491e588f-3a89-4a5e-bba2-d1a08e96ed22">
<File Id="_116" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" /> <File Id="_117" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_117" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" /> <File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" /> <File Id="_119" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
<File Id="_119" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" /> <File Id="_120" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" /> <File Id="_121" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" /> <File Id="_122" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" /> <File Id="_123" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Systems122" Name="Systems"> <Directory Id="Systems123" Name="Systems">
<Component Id="_comp123" Guid="2a07d8e4-c5e5-4705-8d25-392f0733abf2"> <Component Id="_comp124" Guid="3f88c88f-5b9b-4858-a075-2318cc7b2072">
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" /> <File Id="_125" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_125" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" /> <File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" /> <File Id="_127" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
<File Id="_127" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" /> <File Id="_128" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
<File Id="_128" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" /> <File Id="_129" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
</Component> </Component>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="Driver128" Name="Driver"> <Directory Id="Driver129" Name="Driver">
<Component Id="_comp129" Guid="f7f15503-7115-4ac1-8aa3-3625f9917a93"> <Component Id="_comp130" Guid="81d76c90-c0a9-478a-9178-be2c93c5a90f">
<File Id="_130" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" /> <File Id="_131" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="es_ES130" Name="es-ES"> <Directory Id="es_ES131" Name="es-ES">
<Component Id="_comp131" Guid="2e240851-0995-4ee4-bfb9-573824fe5515"> <Component Id="_comp132" Guid="6543b793-04ce-4d7a-90f3-73bbcddbc433">
<File Id="_132" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_133" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="fr132" Name="fr"> <Directory Id="fr133" Name="fr">
<Component Id="_comp133" Guid="67ef3f83-9966-432f-acf8-b16cd9293755"> <Component Id="_comp134" Guid="2cab0718-ac75-412d-ac49-98eb08b5fada">
<File Id="_134" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_135" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="it_IT134" Name="it-IT"> <Directory Id="it_IT135" Name="it-IT">
<Component Id="_comp135" Guid="7ca12d12-75c4-4414-9368-cd293216deb0"> <Component Id="_comp136" Guid="d8efe3d0-22c7-4a38-bcaa-c4bb22296d1f">
<File Id="_136" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_137" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="jsbsim136" Name="jsbsim"> <Directory Id="jsbsim137" Name="jsbsim">
<Component Id="_comp137" Guid="218978da-c605-4f1f-9de9-c3137361d0df"> <Component Id="_comp138" Guid="854d9c31-d3d6-4858-98f7-d385ce97c694">
<File Id="_138" Source="..\bin\release\jsbsim\fgout.xml" /> <File Id="_139" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_139" Source="..\bin\release\jsbsim\rascal_test.xml" /> <File Id="_140" Source="..\bin\release\jsbsim\rascal_test.xml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="m3u139" Name="m3u"> <Directory Id="m3u140" Name="m3u">
<Component Id="_comp140" Guid="010c372d-c85f-4bfe-9d05-fca36998955b"> <Component Id="_comp141" Guid="8455d8b6-4036-4a32-9c1b-653860b37351">
<File Id="_141" Source="..\bin\release\m3u\both.m3u" /> <File Id="_142" Source="..\bin\release\m3u\both.m3u" />
<File Id="_142" Source="..\bin\release\m3u\GeoRefnetworklink.kml" /> <File Id="_143" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_143" Source="..\bin\release\m3u\hud.m3u" /> <File Id="_144" Source="..\bin\release\m3u\hud.m3u" />
<File Id="_144" Source="..\bin\release\m3u\map.m3u" /> <File Id="_145" Source="..\bin\release\m3u\map.m3u" />
<File Id="_145" Source="..\bin\release\m3u\networklink.kml" /> <File Id="_146" Source="..\bin\release\m3u\networklink.kml" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="pl145" Name="pl"> <Directory Id="pl146" Name="pl">
<Component Id="_comp146" Guid="1169ee9c-7e77-4f36-aeef-478b12bee34e"> <Component Id="_comp147" Guid="36187644-8b2f-467d-aba6-7e9782add084">
<File Id="_147" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_148" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="Resources147" Name="Resources"> <Directory Id="Resources148" Name="Resources">
<Component Id="_comp148" Guid="11fda02b-b51a-4b9a-93ed-7ef78d1c5201"> <Component Id="_comp149" Guid="9d90680e-4778-49c3-bfb4-b5095ede9213">
<File Id="_149" Source="..\bin\release\Resources\MAVCmd.txt" /> <File Id="_150" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_150" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" /> <File Id="_151" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="ru_RU150" Name="ru-RU"> <Directory Id="ru_RU151" Name="ru-RU">
<Component Id="_comp151" Guid="222ed999-6709-4131-bc3b-3c064a9c3560"> <Component Id="_comp152" Guid="05306f8f-5da9-49db-ad35-19ba65448091">
<File Id="_152" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_153" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="zh_Hans152" Name="zh-Hans"> <Directory Id="zh_Hans153" Name="zh-Hans">
<Component Id="_comp153" Guid="9a4c0831-bc61-4569-9d74-1be94832b702"> <Component Id="_comp154" Guid="ea885378-7bc9-4319-bdbc-1274ff2af44e">
<File Id="_154" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_155" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="zh_TW154" Name="zh-TW"> <Directory Id="zh_TW155" Name="zh-TW">
<Component Id="_comp155" Guid="812f4883-fed1-4733-9993-ef4877e992d6"> <Component Id="_comp156" Guid="cf222069-8a9a-4411-85f3-0b29f66499b7">
<File Id="_156" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" /> <File Id="_157" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
</Component> </Component>
</Directory> </Directory>
@ -289,26 +290,26 @@
<ComponentRef Id="InstallDirPermissions" /> <ComponentRef Id="InstallDirPermissions" />
<ComponentRef Id="_comp1" /> <ComponentRef Id="_comp1" />
<ComponentRef Id="_comp74" /> <ComponentRef Id="_comp75" />
<ComponentRef Id="_comp76" /> <ComponentRef Id="_comp77" />
<ComponentRef Id="_comp85" /> <ComponentRef Id="_comp86" />
<ComponentRef Id="_comp89" /> <ComponentRef Id="_comp90" />
<ComponentRef Id="_comp92" /> <ComponentRef Id="_comp93" />
<ComponentRef Id="_comp102" /> <ComponentRef Id="_comp103" />
<ComponentRef Id="_comp112" /> <ComponentRef Id="_comp113" />
<ComponentRef Id="_comp115" /> <ComponentRef Id="_comp116" />
<ComponentRef Id="_comp123" /> <ComponentRef Id="_comp124" />
<ComponentRef Id="_comp129" /> <ComponentRef Id="_comp130" />
<ComponentRef Id="_comp131" /> <ComponentRef Id="_comp132" />
<ComponentRef Id="_comp133" /> <ComponentRef Id="_comp134" />
<ComponentRef Id="_comp135" /> <ComponentRef Id="_comp136" />
<ComponentRef Id="_comp137" /> <ComponentRef Id="_comp138" />
<ComponentRef Id="_comp140" /> <ComponentRef Id="_comp141" />
<ComponentRef Id="_comp146" /> <ComponentRef Id="_comp147" />
<ComponentRef Id="_comp148" /> <ComponentRef Id="_comp149" />
<ComponentRef Id="_comp151" /> <ComponentRef Id="_comp152" />
<ComponentRef Id="_comp153" /> <ComponentRef Id="_comp154" />
<ComponentRef Id="_comp155" /> <ComponentRef Id="_comp156" />
<ComponentRef Id="ApplicationShortcut" /> <ComponentRef Id="ApplicationShortcut" />

9
Tools/ArdupilotMegaPlanner/Program.cs
View File

@ -29,7 +29,7 @@ namespace ArdupilotMega
Application.ThreadException += Application_ThreadException; Application.ThreadException += Application_ThreadException;
// Application.Idle += Application_Idle; Application.Idle += Application_Idle;
int wt = 0, ct = 0; int wt = 0, ct = 0;
ThreadPool.GetMaxThreads(out wt, out ct); ThreadPool.GetMaxThreads(out wt, out ct);
@ -96,8 +96,11 @@ namespace ArdupilotMega
static void Application_Idle(object sender, EventArgs e) static void Application_Idle(object sender, EventArgs e)
{ {
System.Threading.Thread.Sleep(10); //System.Threading.Thread.Sleep(10);
Console.Write("Idle\r"); //Console.Write("Idle\n");
System.Threading.Thread.Sleep(20);
Application.DoEvents();
} }
static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e) static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)

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

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

BIN
Tools/ArdupilotMegaPlanner/Resources/Welcome_to_Michael_Oborne.rtf
View File

Binary file not shown.

6
Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
View File

@ -238,8 +238,14 @@ namespace ArdupilotMega.Utilities
} }
} }
if (!returnDict.ContainsKey(key)) if (!returnDict.ContainsKey(key))
{
returnDict.Add(key, metaDict); returnDict.Add(key, metaDict);
} }
else
{
log.Error("Duplicate Key " + key);
}
}
} }
} }
} }