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

APM Planner 1.1.14 

remove bad params from loading from file
add message on firmware screen.
fix moving geofence
fix terminal crash bug
modify udp param list
This commit is contained in:
Michael Oborne 2011-12-28 07:05:12 +08:00
parent ac3f7512cc
commit 1527234c81
10 changed files with 994 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/ArdupilotMegaPlanner/Common.cs
View File

@ -54,7 +54,6 @@ namespace ArdupilotMega
public int wprad = 0;
public GMapControl MainMap;
PointLatLng wpradposition;
public GMapMarkerRect(PointLatLng p)
: base(p)

14
Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs
View File

@ -611,6 +611,20 @@ namespace ArdupilotMega.GCSViews
continue;
if (name == "CMD_TOTAL")
continue;
if (name == "FENCE_TOTAL")
continue;
if (name == "SYS_NUM_RESETS")
continue;
if (name == "ARSPD_OFFSET")
continue;
if (name == "GND_ABS_PRESS")
continue;
if (name == "GND_TEMP")
continue;
if (name == "CMD_INDEX")
continue;
if (name == "LOG_LASTFILE")
continue;
if (row.Cells[0].Value.ToString() == name)
{
if (row.Cells[1].Value.ToString() != value.ToString())

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

@ -32,6 +32,7 @@ namespace ArdupilotMega.GCSViews
private PictureBox pictureBoxACHil;
private PictureBox pictureBoxACHHil;
private ImageLabel pictureBoxOcta;
private Label label1;
private ImageLabel pictureBoxOctav;
private void InitializeComponent()
@ -53,6 +54,7 @@ namespace ArdupilotMega.GCSViews
this.pictureBoxACHHil = new System.Windows.Forms.PictureBox();
this.pictureBoxOcta = new ArdupilotMega.ImageLabel();
this.pictureBoxOctav = new ArdupilotMega.ImageLabel();
this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxHilimage)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxAPHil)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxACHil)).BeginInit();
@ -186,10 +188,16 @@ namespace ArdupilotMega.GCSViews
this.pictureBoxOctav.TabStop = false;
this.pictureBoxOctav.Click += new System.EventHandler(this.pictureBoxOctav_Click);
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// Firmware
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBoxOctav);
this.Controls.Add(this.pictureBoxOcta);
this.Controls.Add(this.pictureBoxACHHil);

57
Tools/ArdupilotMegaPlanner/GCSViews/Firmware.resx
View File

@ -142,7 +142,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxAPM.ZOrder" xml:space="preserve">
<value>15</value>
<value>16</value>
</data>
<data name="pictureBoxQuad.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -794,7 +794,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxQuad.ZOrder" xml:space="preserve">
<value>14</value>
<value>15</value>
</data>
<data name="pictureBoxHexa.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -818,7 +818,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxHexa.ZOrder" xml:space="preserve">
<value>13</value>
<value>14</value>
</data>
<data name="pictureBoxTri.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -842,7 +842,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxTri.ZOrder" xml:space="preserve">
<value>12</value>
<value>13</value>
</data>
<data name="pictureBoxY6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -866,7 +866,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxY6.ZOrder" xml:space="preserve">
<value>11</value>
<value>12</value>
</data>
<data name="lbl_status.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -896,7 +896,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lbl_status.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="progress.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -920,7 +920,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;progress.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -950,7 +950,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="pictureBoxHeli.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -974,7 +974,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxHeli.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="BUT_setup.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -1001,7 +1001,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;BUT_setup.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="pictureBoxHilimage.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 362</value>
@ -1025,7 +1025,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxHilimage.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="pictureBoxAPHil.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -1052,7 +1052,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxAPHil.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="pictureBoxACHil.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -1079,7 +1079,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxACHil.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="pictureBoxACHHil.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -1106,7 +1106,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxACHHil.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="pictureBoxOcta.Location" type="System.Drawing.Point, System.Drawing">
<value>696, 176</value>
@ -1127,7 +1127,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxOcta.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="pictureBoxOctav.Location" type="System.Drawing.Point, System.Drawing">
<value>696, 0</value>
@ -1148,6 +1148,33 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxOctav.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>361, 349</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>246, 13</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Please click the images above for "Flight versions"</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

@ -1236,8 +1236,6 @@ namespace ArdupilotMega.GCSViews
});
}
catch (Exception exx) { Console.WriteLine(exx.ToString()); }
BUT_read.Enabled = true;
});
t12.IsBackground = true;
t12.Name = "Read wps";
@ -3084,8 +3082,8 @@ namespace ArdupilotMega.GCSViews
// update flightdata
FlightData.geofence.Markers.Clear();
FlightData.geofence.Polygons.Clear();
FlightData.geofence.Polygons.Add(gf);
FlightData.geofence.Markers.Add(geofence.Markers[0]);
FlightData.geofence.Polygons.Add(new GMapPolygon(gf.Points, "gf fd") { Stroke = gf.Stroke });
FlightData.geofence.Markers.Add(new GMapMarkerGoogleRed(geofence.Markers[0].Position) { ToolTipText = geofence.Markers[0].ToolTipText, ToolTipMode = geofence.Markers[0].ToolTipMode });
MainMap.UpdatePolygonLocalPosition(gf);
MainMap.UpdateMarkerLocalPosition(geofence.Markers[0]);
@ -3131,8 +3129,8 @@ namespace ArdupilotMega.GCSViews
// update flight data
FlightData.geofence.Markers.Clear();
FlightData.geofence.Polygons.Clear();
FlightData.geofence.Polygons.Add(gf);
FlightData.geofence.Markers.Add(geofence.Markers[0]);
FlightData.geofence.Polygons.Add(new GMapPolygon(gf.Points, "gf fd") { Stroke = gf.Stroke });
FlightData.geofence.Markers.Add(new GMapMarkerGoogleRed(geofence.Markers[0].Position) { ToolTipText = geofence.Markers[0].ToolTipText, ToolTipMode = geofence.Markers[0].ToolTipMode });
MainMap.UpdatePolygonLocalPosition(gf);
MainMap.UpdateMarkerLocalPosition(geofence.Markers[0]);
@ -3273,5 +3271,19 @@ namespace ArdupilotMega.GCSViews
catch { MessageBox.Show("Failed to write fence file"); }
}
}
public T DeepClone<T>(T obj)
{
using (var ms = new System.IO.MemoryStream())
{
var formatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
formatter.Serialize(ms, obj);
ms.Position = 0;
return (T)formatter.Deserialize(ms);
}
}
}
}

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

@ -187,12 +187,16 @@ namespace ArdupilotMega.GCSViews
DateTime start = DateTime.Now;
while ((DateTime.Now - start).TotalMilliseconds < 2000)
{
try
{
if (comPort.BytesToRead > 0)
{
comPort_DataReceived((object)null, (SerialDataReceivedEventArgs)null);
}
}
catch { return; }
}
comPort.Write("\n\n\n");

68
Tools/ArdupilotMegaPlanner/MAVLink.cs
View File

@ -206,10 +206,13 @@ namespace ArdupilotMega
if (getparams == true)
getParamList();
}
catch (Exception e) {
try {
catch (Exception e)
{
try
{
BaseStream.Close();
} catch { }
}
catch { }
MainV2.givecomport = false;
frm.Close();
throw e;
@ -590,6 +593,12 @@ namespace ArdupilotMega
public Hashtable getParamList()
{
MainV2.givecomport = true;
List<int> missed = new List<int>();
// ryan - re start
__mavlink_param_request_read_t rereq = new __mavlink_param_request_read_t();
rereq.target_system = sysid;
rereq.target_component = compid;
__mavlink_param_request_list_t req = new __mavlink_param_request_list_t();
req.target_system = sysid;
@ -601,9 +610,10 @@ namespace ArdupilotMega
DateTime restart = DateTime.Now;
int retrys = 3;
int param_counter = 0;
int total_params = 9999;
while (param_counter < total_params-1)
int nextid = 0;
int param_count = 0;
int param_total = 5;
while (param_count < param_total)
{
if (!(start.AddMilliseconds(5000) > DateTime.Now))
{
@ -615,17 +625,23 @@ namespace ArdupilotMega
retrys--;
continue;
}
else
{
MainV2.givecomport = false;
throw new Exception("Timeout on read - getParamList");
}
if (!(restart.AddMilliseconds(1000) > DateTime.Now))
{
rereq.param_id = new byte[] { 0x0, 0x0 };
rereq.param_index = (short)nextid;
sendPacket(rereq);
restart = DateTime.Now;
}
System.Windows.Forms.Application.DoEvents();
byte[] buffer = readPacket();
if (buffer.Length > 5)
{
//stopwatch.Reset();
//stopwatch.Start();
if (buffer[5] == MAVLINK_MSG_ID_PARAM_VALUE)
{
restart = DateTime.Now;
@ -639,7 +655,31 @@ namespace ArdupilotMega
par = (__mavlink_param_value_t)temp;
total_params = (par.param_count);
param_total = (par.param_count);
// for out of order udp packets
if (BaseStream.GetType() != typeof(UdpSerial))
{
if (nextid == (par.param_index))
{
nextid++;
}
else
{
if (retrys > 0)
{
generatePacket(MAVLINK_MSG_ID_PARAM_REQUEST_LIST, req);
param_count = 0;
nextid = 0;
retrys--;
continue;
}
missed.Add(nextid); // for later devel
MainV2.givecomport = false;
throw new Exception("Missed ID expecting " + nextid + " got " + (par.param_index) + "\nPlease try loading again");
}
}
string st = System.Text.ASCIIEncoding.ASCII.GetString(par.param_id);
@ -650,14 +690,20 @@ namespace ArdupilotMega
st = st.Substring(0, pos);
}
Console.WriteLine(DateTime.Now.Millisecond + " got param " + (par.param_index) + " of " + (total_params - 1) + " name: " + st);
Console.WriteLine(DateTime.Now.Millisecond + " got param " + (par.param_index) + " of " + (param_total - 1) + " name: " + st);
modifyParamForDisplay(true, st, ref par.param_value);
param[st] = (par.param_value);
param_counter = param.Count;
param_count++;
}
else
{
//Console.WriteLine(DateTime.Now + " PC paramlist " + buffer[5] + " " + this.BytesToRead);
}
//stopwatch.Stop();
//Console.WriteLine("Time elapsed: {0}", stopwatch.Elapsed);
}
}
MainV2.givecomport = false;

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

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

47
Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs generated
View File

@ -31,8 +31,6 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setup));
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabReset = new System.Windows.Forms.TabPage();
this.BUT_reset = new ArdupilotMega.MyButton();
this.tabRadioIn = new System.Windows.Forms.TabPage();
this.groupBoxElevons = new System.Windows.Forms.GroupBox();
this.CHK_mixmode = new System.Windows.Forms.CheckBox();
@ -171,9 +169,11 @@
this.HS4 = new ArdupilotMega.HorizontalProgressBar2();
this.HS3 = new ArdupilotMega.VerticalProgressBar2();
this.Gservoloc = new AGaugeApp.AGauge();
this.tabReset = new System.Windows.Forms.TabPage();
this.BUT_reset = new ArdupilotMega.MyButton();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.label27 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabReset.SuspendLayout();
this.tabRadioIn.SuspendLayout();
this.groupBoxElevons.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit();
@ -196,11 +196,11 @@
((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS1_TRIM)).BeginInit();
this.tabReset.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
//
//this.tabControl1.Controls.Add(this.tabReset);
this.tabControl1.Controls.Add(this.tabRadioIn);
this.tabControl1.Controls.Add(this.tabModes);
this.tabControl1.Controls.Add(this.tabHardware);
@ -212,21 +212,6 @@
this.tabControl1.SelectedIndex = 0;
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// tabReset
//
this.tabReset.Controls.Add(this.BUT_reset);
resources.ApplyResources(this.tabReset, "tabReset");
this.tabReset.Name = "tabReset";
this.tabReset.UseVisualStyleBackColor = true;
//
// BUT_reset
//
resources.ApplyResources(this.BUT_reset, "BUT_reset");
this.BUT_reset.Name = "BUT_reset";
this.BUT_reset.Tag = "";
this.BUT_reset.UseVisualStyleBackColor = true;
this.BUT_reset.Click += new System.EventHandler(this.BUT_reset_Click);
//
// tabRadioIn
//
this.tabRadioIn.Controls.Add(this.groupBoxElevons);
@ -664,6 +649,7 @@
// tabHardware
//
this.tabHardware.BackColor = System.Drawing.Color.DarkRed;
this.tabHardware.Controls.Add(this.label27);
this.tabHardware.Controls.Add(this.CMB_sonartype);
this.tabHardware.Controls.Add(this.CHK_enableoptflow);
this.tabHardware.Controls.Add(this.pictureBox2);
@ -1520,6 +1506,26 @@
this.Gservoloc.Value2 = 180F;
this.Gservoloc.Value3 = 0F;
//
// tabReset
//
this.tabReset.Controls.Add(this.BUT_reset);
resources.ApplyResources(this.tabReset, "tabReset");
this.tabReset.Name = "tabReset";
this.tabReset.UseVisualStyleBackColor = true;
//
// BUT_reset
//
resources.ApplyResources(this.BUT_reset, "BUT_reset");
this.BUT_reset.Name = "BUT_reset";
this.BUT_reset.Tag = "";
this.BUT_reset.UseVisualStyleBackColor = true;
this.BUT_reset.Click += new System.EventHandler(this.BUT_reset_Click);
//
// label27
//
resources.ApplyResources(this.label27, "label27");
this.label27.Name = "label27";
//
// Setup
//
resources.ApplyResources(this, "$this");
@ -1530,7 +1536,6 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Setup_FormClosing);
this.Load += new System.EventHandler(this.Setup_Load);
this.tabControl1.ResumeLayout(false);
this.tabReset.ResumeLayout(false);
this.tabRadioIn.ResumeLayout(false);
this.tabRadioIn.PerformLayout();
this.groupBoxElevons.ResumeLayout(false);
@ -1563,6 +1568,7 @@
((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS1_TRIM)).EndInit();
this.tabReset.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -1711,6 +1717,7 @@
private System.Windows.Forms.CheckBox CHK_elevonch1rev;
private System.Windows.Forms.CheckBox CHK_elevonrev;
private System.Windows.Forms.GroupBox groupBoxElevons;
private System.Windows.Forms.Label label27;
}
}

1524
Tools/ArdupilotMegaPlanner/Setup/Setup.resx
View File

File diff suppressed because it is too large Load Diff