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

Mission Planner 1.2.3 

hud font move
add progress bar lock
add quickview mono fix
fix centi-degree/degree units
fix mnt config camera tab
fix some meters/feet scaling issues
This commit is contained in:
Michael Oborne 2012-08-06 22:22:57 +08:00
parent 2c4a0636f3
commit f843b42e5b
20 changed files with 1892 additions and 1256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -79,7 +79,7 @@
<StartupObject>ArdupilotMega.Program</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>92959F7BF337E6755031B3721140373D9674958B</ManifestCertificateThumbprint>
<ManifestCertificateThumbprint>02470CFADCC96F21D82436EFEE4A079F3AA2292B</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>ArdupilotMega_TemporaryKey.pfx</ManifestKeyFile>
@ -88,7 +88,7 @@
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>false</SignManifests>
<SignManifests>true</SignManifests>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
@ -1193,6 +1193,7 @@
<None Include="AeroSimRCAPMHil.zip" />
<None Include="app.config" />
<None Include="arducopter-xplane.zip" />
<None Include="ArdupilotMega_TemporaryKey.pfx" />
<None Include="m3u\GeoRefnetworklink.kml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

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

@ -1256,7 +1256,7 @@ namespace ArdupilotMega.Controls
{
//Console.WriteLine(a + " " + scrollbg.Left + " " + (scrollbg.Top - space * (a - start)) + " " + (scrollbg.Left + 20) + " " + (scrollbg.Top - space * (a - start)));
graphicsObject.DrawLine(whitePen, scrollbg.Left, scrollbg.Top - space * (a - start), scrollbg.Left + 10, scrollbg.Top - space * (a - start));
drawstring(graphicsObject, a.ToString().PadLeft(5), font, fontsize, whiteBrush, scrollbg.Left + 7 + (int)(0 * fontoffset), scrollbg.Top - space * (a - start) - 6 - fontoffset);
drawstring(graphicsObject, a.ToString().PadLeft(5), font, fontsize, whiteBrush, scrollbg.Left + 0 + (int)(0 * fontoffset), scrollbg.Top - space * (a - start) - 6 - fontoffset);
}
}

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

@ -21,6 +21,7 @@ namespace ArdupilotMega.Controls
private Exception workerException;
public ProgressWorkerEventArgs doWorkArgs;
internal object locker = new object();
internal int _progress = -1;
internal string _status = "";
@ -213,8 +214,11 @@ namespace ArdupilotMega.Controls
if (doWorkArgs.CancelRequested && !doWorkArgs.CancelAcknowledged)
return;
_progress = progress;
_status = status;
lock (locker)
{
_progress = progress;
_status = status;
}
}
@ -234,10 +238,12 @@ namespace ArdupilotMega.Controls
/// <param name="e"></param>
private void timer1_Tick(object sender, EventArgs e)
{
// this value is being currupted - not thread safe
int pgv = _progress;
lblProgressMessage.Text = _status;
int pgv = -1;
lock (locker)
{
pgv = _progress;
lblProgressMessage.Text = _status;
}
if (pgv == -1)
{
this.progressBar1.Style = ProgressBarStyle.Marquee;
@ -248,7 +254,7 @@ namespace ArdupilotMega.Controls
try
{
this.progressBar1.Value = pgv;
}
} // Exception System.ArgumentOutOfRangeException: Value of '-12959800' is not valid for 'Value'. 'Value' should be between 'minimum' and 'maximum'.
catch { } // clean fail. and ignore, chances are we will hit this again in the next 100 ms
}
}

18
Tools/ArdupilotMegaPlanner/Controls/QuickView.cs
View File

@ -36,5 +36,23 @@ namespace ArdupilotMega.Controls
this.OnDoubleClick(e);
}
public override void Refresh()
{
if (this.Visible)
base.Refresh();
}
protected override void OnInvalidated(InvalidateEventArgs e)
{
if (this.Visible)
base.OnInvalidated(e);
}
protected override void OnPaint(PaintEventArgs e)
{
if (this.Visible)
base.OnPaint(e);
}
}
}

6
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs
View File

@ -84,6 +84,12 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
public void Activate()
{
if (!MainV2.comPort.param.ContainsKey("FRAME"))
{
this.Enabled = false;
return;
}
if ((float)MainV2.comPort.param["FRAME"] == 0)
{
this.radioButton_Plus.Checked = true;

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

@ -214,6 +214,34 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
// If this is a range
string rangeRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Range);
string incrementRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Increment);
// modify for scaling
float test = 1;
MAVLink.modifyParamForDisplay(true, x.Key, ref test);
if (test != 1)
{
if (units.ToLower() == "centi-degrees")
{
units = "Degrees";
incrementRaw = "0.1";
string[] rangeParts = rangeRaw.Split(new[] { ' ' });
if (rangeParts.Count() == 2)
{
float lowerRange;
float.TryParse(rangeParts[0], out lowerRange);
float upperRange;
float.TryParse(rangeParts[1], out upperRange);
rangeRaw = (lowerRange / 100) + " " + (upperRange / 100);
}
}
else
{
units += " / " + (int)(1 / test);
}
}
if (!String.IsNullOrEmpty(rangeRaw) && !String.IsNullOrEmpty(incrementRaw))
{
float increment, intValue;

23
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.cs
View File

@ -100,9 +100,13 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
}
}
updatePitch();
updateRoll();
updateYaw();
try
{
updatePitch();
updateRoll();
updateYaw();
}
catch (Exception ex) { CustomMessageBox.Show("Failed to set Param\n" + ex.ToString()); this.Enabled = false; return; }
}
void ensureDisabled(ComboBox cmb, int number)
@ -130,6 +134,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
}
else
{
MainV2.comPort.setParam("MNT_STAB_PITCH", 0);
ensureDisabled(mavlinkComboBoxTilt,7);
}
@ -150,6 +155,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
}
else
{
MainV2.comPort.setParam("MNT_STAB_ROLL", 0);
ensureDisabled(mavlinkComboBoxRoll,8);
}
@ -170,6 +176,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
}
else
{
MainV2.comPort.setParam("MNT_STAB_YAW", 0);
ensureDisabled(mavlinkComboBoxPan,6);
}
@ -242,9 +249,13 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
if (MainV2.comPort.param.ContainsKey("MNT_MODE"))
MainV2.comPort.setParam("MNT_MODE",3);
updatePitch();
updateRoll();
updateYaw();
try
{
updatePitch();
updateRoll();
updateYaw();
}
catch (Exception ex) { CustomMessageBox.Show("Failed to set Param\n"+ex.ToString()); return; }
}
}
}

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

@ -8,8 +8,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightData));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pointCameraHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -1040,10 +1040,10 @@
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.lbl_hdop);
this.splitContainer1.Panel2.Controls.Add(this.lbl_sats);
this.splitContainer1.Panel2.Controls.Add(this.lbl_winddir);
this.splitContainer1.Panel2.Controls.Add(this.lbl_windvel);
this.splitContainer1.Panel2.Controls.Add(this.lbl_hdop);
this.splitContainer1.Panel2.Controls.Add(this.lbl_sats);
this.splitContainer1.Panel2.Controls.Add(this.gMapControl1);
//
// zg1
@ -1203,8 +1203,8 @@
//
// dataGridViewImageColumn1
//
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle3;
resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1");
this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up;
this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
@ -1212,8 +1212,8 @@
//
// dataGridViewImageColumn2
//
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle4;
resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2");
this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down;
this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;

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

@ -469,6 +469,7 @@ namespace ArdupilotMega.GCSViews
{
if (MainV2.config["CHK_maprotation"] != null && MainV2.config["CHK_maprotation"].ToString() == "True")
{
// dont holdinvalidation here
setMapBearing();
}
@ -516,12 +517,14 @@ namespace ArdupilotMega.GCSViews
//route.Stroke.Width = 5;
//route.Tag = "track";
updateClearRoutes();
//updateClearRoutes();
gMapControl1.UpdateRouteLocalPosition(route);
if (waypoints.AddSeconds(10) < DateTime.Now)
{
//Console.WriteLine("Doing FD WP's");
updateMissionRoute();
updateMissionRouteMarkers();
if (MainV2.comPort.logreadmode && MainV2.comPort.logplaybackfile != null)
{
@ -608,7 +611,7 @@ namespace ArdupilotMega.GCSViews
private void setMapBearing()
{
this.BeginInvoke((System.Windows.Forms.MethodInvoker)delegate()
this.Invoke((System.Windows.Forms.MethodInvoker)delegate()
{
gMapControl1.Bearing = (int)MainV2.cs.yaw;
});
@ -627,7 +630,7 @@ namespace ArdupilotMega.GCSViews
}
// to prevent cross thread calls while in a draw and exception
private void updateMissionRoute()
private void updateMissionRouteMarkers()
{
// not async
this.Invoke((System.Windows.Forms.MethodInvoker)delegate()
@ -656,6 +659,9 @@ namespace ArdupilotMega.GCSViews
}
else
{
if (BUT_playlog.Text == "Play")
return;
this.BeginInvoke((System.Windows.Forms.MethodInvoker)delegate()
{
try
@ -735,7 +741,7 @@ namespace ArdupilotMega.GCSViews
mBorders.InnerMarker = m;
try
{
mBorders.wprad = (int)float.Parse(ArdupilotMega.MainV2.config["TXT_WPRad"].ToString());
mBorders.wprad = (int)(float.Parse(ArdupilotMega.MainV2.config["TXT_WPRad"].ToString()) / MainV2.cs.multiplierdist);
}
catch { }
mBorders.MainMap = gMapControl1;
@ -1511,7 +1517,7 @@ namespace ArdupilotMega.GCSViews
lbl2.Location = new Point(lbl1.Right + 5, y);
lbl2.Size = new System.Drawing.Size(50, 13);
//if (lbl2.Name == "")
lbl2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, field.Name, true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, ""));
lbl2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, field.Name, false, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0"));
lbl2.Name = field.Name + "value";
lbl2.Visible = true;
//lbl2.Text = fieldValue.ToString();

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

File diff suppressed because it is too large Load Diff

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

@ -904,7 +904,7 @@ namespace ArdupilotMega.GCSViews
GMapMarkerRect mBorders = new GMapMarkerRect(point);
{
mBorders.InnerMarker = m;
mBorders.wprad = (int)float.Parse(TXT_WPRad.Text);
mBorders.wprad = (int)(float.Parse(TXT_WPRad.Text) / MainV2.cs.multiplierdist);
mBorders.MainMap = MainMap;
if (color.HasValue)
{
@ -1068,12 +1068,12 @@ namespace ArdupilotMega.GCSViews
else if (command == (byte)MAVLink.MAV_CMD.LOITER_TIME || command == (byte)MAVLink.MAV_CMD.LOITER_TURNS || command == (byte)MAVLink.MAV_CMD.LOITER_UNLIM)
{
pointlist.Add(new PointLatLngAlt(double.Parse(cell3), double.Parse(cell4), (int)double.Parse(cell2) + homealt, (a + 1).ToString()){ color = Color.LightBlue });
addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2) , Color.LightBlue);
addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2), Color.LightBlue);
}
else
{
pointlist.Add(new PointLatLngAlt(double.Parse(cell3), double.Parse(cell4), (int)double.Parse(cell2) + homealt, (a + 1).ToString()));
addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2) ,null);
addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2), null);
}
avglong += double.Parse(Commands.Rows[a].Cells[Lon.Index].Value.ToString());

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

@ -136,7 +136,8 @@
<value>0</value>
</data>
<data name="TXT_terminal.Text" xml:space="preserve">
<value />
<value>*NOTE* CLI Works over USB only
</value>
</data>
<data name="&gt;&gt;TXT_terminal.Name" xml:space="preserve">
<value>TXT_terminal</value>
@ -166,7 +167,7 @@
<value>BUTsetupshow</value>
</data>
<data name="&gt;&gt;BUTsetupshow.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTsetupshow.Parent" xml:space="preserve">
<value>$this</value>
@ -190,7 +191,7 @@
<value>BUTradiosetup</value>
</data>
<data name="&gt;&gt;BUTradiosetup.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTradiosetup.Parent" xml:space="preserve">
<value>$this</value>
@ -214,7 +215,7 @@
<value>BUTtests</value>
</data>
<data name="&gt;&gt;BUTtests.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTtests.Parent" xml:space="preserve">
<value>$this</value>
@ -238,7 +239,7 @@
<value>Logs</value>
</data>
<data name="&gt;&gt;Logs.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Logs.Parent" xml:space="preserve">
<value>$this</value>
@ -262,7 +263,7 @@
<value>BUT_logbrowse</value>
</data>
<data name="&gt;&gt;BUT_logbrowse.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_logbrowse.Parent" xml:space="preserve">
<value>$this</value>
@ -283,6 +284,6 @@
<value>Terminal</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null</value>
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

10
Tools/ArdupilotMegaPlanner/MagCalib.cs
View File

@ -42,7 +42,8 @@ namespace ArdupilotMega
{
double[] ans = getOffsets(openFileDialog1.FileName, throttleThreshold);
SaveOffsets(ans);
if (ans.Length != 1)
SaveOffsets(ans);
}
catch (Exception ex) { log.Debug(ex.ToString()); }
}
@ -82,7 +83,12 @@ namespace ArdupilotMega
log.Info("Start log: " + DateTime.Now);
MAVLink mine = new MAVLink();
mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
try
{
mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
}
catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return new double[] {0}; }
mine.logreadmode = true;
mine.packets.Initialize(); // clear

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

@ -512,7 +512,7 @@ namespace ArdupilotMega
Array.Reverse(datearray);
logfile.Write(datearray, 0, datearray.Length);
logfile.Write(packet, 0, i);
logfile.Flush();
// logfile.Flush();
}
}

19
Tools/ArdupilotMegaPlanner/MavlinkLog.cs
View File

@ -553,7 +553,12 @@ namespace ArdupilotMega
{
MAVLink mine = new MAVLink();
mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
try
{
mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
}
catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return; }
mine.logreadmode = true;
mine.packets.Initialize(); // clear
@ -664,7 +669,11 @@ namespace ArdupilotMega
{
MAVLink MavlinkInterface = new MAVLink();
MavlinkInterface.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
try
{
MavlinkInterface.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
}
catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return options; }
MavlinkInterface.logreadmode = true;
MavlinkInterface.packets.Initialize(); // clear
@ -1199,7 +1208,11 @@ namespace ArdupilotMega
{
MAVLink mine = new MAVLink();
mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
try
{
mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read));
}
catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return; }
mine.logreadmode = true;
mine.packets.Initialize(); // clear

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

@ -2,14 +2,14 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension">
<Product Id="*" Name="APM Planner" Language="1033" Version="1.2.1" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<Product Id="*" Name="APM Planner" Language="1033" Version="1.2.2" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<Package Description="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.1" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.2.1" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.2" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.2.2" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
</Upgrade>
<InstallExecuteSequence>
@ -31,7 +31,7 @@
<Permission User="Everyone" GenericAll="yes" />
</CreateFolder>
</Component>
<Component Id="_comp1" Guid="5af1181b-130d-4ec9-8bfd-fb7589ef0d72">
<Component Id="_comp1" Guid="0880ee7d-3ad6-4f7d-b275-5a4d0c8909e8">
<File Id="_2" Source="..\bin\release\.gdbinit" />
<File Id="_3" Source="..\bin\release\.gitignore" />
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
@ -113,11 +113,11 @@
<File Id="_80" Source="..\bin\release\ZedGraph.dll" />
</Component>
<Directory Id="aircraft80" Name="aircraft">
<Component Id="_comp81" Guid="364e6f4e-db72-4948-ae37-4a1df4bc1fd0">
<Component Id="_comp81" Guid="7ee81b5c-bd45-467b-a3c3-3abc2648f668">
<File Id="_82" Source="..\bin\release\aircraft\placeholder.txt" />
</Component>
<Directory Id="arducopter82" Name="arducopter">
<Component Id="_comp83" Guid="5e0a03c0-42bc-4cdd-8d6e-e9a19ab6f346">
<Component Id="_comp83" Guid="fbe66a2f-28f8-4455-a6eb-45ba8c24e137">
<File Id="_84" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_85" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_86" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
@ -128,20 +128,20 @@
<File Id="_91" Source="..\bin\release\aircraft\arducopter\README" />
</Component>
<Directory Id="data91" Name="data">
<Component Id="_comp92" Guid="6a70d89c-8a9f-41c3-b658-6a466989d852">
<Component Id="_comp92" Guid="b4f5258c-df81-4ccd-9d86-3c88874c67e2">
<File Id="_93" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_94" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_95" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
</Component>
</Directory>
<Directory Id="Engines95" Name="Engines">
<Component Id="_comp96" Guid="fc29fc38-81b1-464e-9a9c-2ab56cff8087">
<Component Id="_comp96" Guid="fd61ff98-62b8-4458-877d-69c43f1d7036">
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_98" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
</Component>
</Directory>
<Directory Id="Models98" Name="Models">
<Component Id="_comp99" Guid="0dde58e2-fa3b-4098-943d-1a495cbb3e14">
<Component Id="_comp99" Guid="d5edb89b-7c72-4be8-82e8-3262e59efeb6">
<File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_102" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
@ -155,7 +155,7 @@
</Directory>
</Directory>
<Directory Id="Rascal108" Name="Rascal">
<Component Id="_comp109" Guid="f4028a82-53dc-4303-857d-33a4834e1d1b">
<Component Id="_comp109" Guid="597e6f43-ea7f-4e9f-a413-51a07c7b7d3c">
<File Id="_110" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_111" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_112" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
@ -167,13 +167,13 @@
<File Id="_118" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
</Component>
<Directory Id="Engines118" Name="Engines">
<Component Id="_comp119" Guid="f9019ec0-95b3-445f-9557-e25b51396a36">
<Component Id="_comp119" Guid="681a2280-ab43-4fe0-bbde-58fef72d2357">
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
</Component>
</Directory>
<Directory Id="Models121" Name="Models">
<Component Id="_comp122" Guid="2b25399a-218c-4971-a67e-dd81a6148381">
<Component Id="_comp122" Guid="41981c44-2638-479b-903c-868962950f40">
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_125" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
@ -184,7 +184,7 @@
</Component>
</Directory>
<Directory Id="Systems129" Name="Systems">
<Component Id="_comp130" Guid="82a3dcad-4445-4210-8bb9-6f136cc7bdc3">
<Component Id="_comp130" Guid="1083301c-ad48-4eb7-8ad2-0eda01548cb0">
<File Id="_131" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_132" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_133" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
@ -195,33 +195,33 @@
</Directory>
</Directory>
<Directory Id="Driver135" Name="Driver">
<Component Id="_comp136" Guid="d3587c59-9ae8-456e-ab46-1c6921a14349">
<Component Id="_comp136" Guid="216457cc-9c44-40e8-b79c-805f1ae45b8e">
<File Id="_137" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
</Component>
</Directory>
<Directory Id="es_ES137" Name="es-ES">
<Component Id="_comp138" Guid="554929db-d28f-4eb4-94a0-7c4b7de45d18">
<Component Id="_comp138" Guid="3a65762d-eaf0-4778-9004-3ea5c2ea3b55">
<File Id="_139" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="fr139" Name="fr">
<Component Id="_comp140" Guid="f48c0f4e-437f-4299-9b13-d57dc97c0fa1">
<Component Id="_comp140" Guid="770c2787-ec20-4035-b996-57df64ee37a1">
<File Id="_141" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="it_IT141" Name="it-IT">
<Component Id="_comp142" Guid="202e5109-2f31-41cb-b923-1c4931655bc7">
<Component Id="_comp142" Guid="0e9b87fc-f97f-41bc-8c4d-d4b8dac20d87">
<File Id="_143" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="jsbsim143" Name="jsbsim">
<Component Id="_comp144" Guid="b625fcb7-eef0-4544-a3ef-cab81029c863">
<Component Id="_comp144" Guid="aa2d0a9d-0965-4e7f-864f-e61b0e3fbee7">
<File Id="_145" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_146" Source="..\bin\release\jsbsim\rascal_test.xml" />
</Component>
</Directory>
<Directory Id="m3u146" Name="m3u">
<Component Id="_comp147" Guid="3d3e08cf-6213-4476-926b-d50838216bbf">
<Component Id="_comp147" Guid="62eea887-2327-4181-a450-c7b6493d72b5">
<File Id="_148" Source="..\bin\release\m3u\both.m3u" />
<File Id="_149" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_150" Source="..\bin\release\m3u\hud.m3u" />
@ -230,28 +230,28 @@
</Component>
</Directory>
<Directory Id="pl152" Name="pl">
<Component Id="_comp153" Guid="ec1d8f2d-8993-4a4c-9b02-c4063162b61d">
<Component Id="_comp153" Guid="33d43c02-2e8f-40ca-a67b-e83fa9c9c1c3">
<File Id="_154" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="Resources154" Name="Resources">
<Component Id="_comp155" Guid="f587c269-44c5-4b6b-9d59-762eda060800">
<Component Id="_comp155" Guid="27487232-7266-4ce8-b0ea-7291b11c533e">
<File Id="_156" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_157" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
</Component>
</Directory>
<Directory Id="ru_RU157" Name="ru-RU">
<Component Id="_comp158" Guid="1587bc4c-3dd6-4493-8e58-cc46786aefac">
<Component Id="_comp158" Guid="8a264de2-36a3-4d74-88f4-968708c4efd3">
<File Id="_159" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_Hans159" Name="zh-Hans">
<Component Id="_comp160" Guid="d1952e25-fec4-4c39-a7c5-e678594ee37c">
<Component Id="_comp160" Guid="070654c2-8f7d-4707-a961-2d831bf91e9d">
<File Id="_161" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_TW161" Name="zh-TW">
<Component Id="_comp162" Guid="1b98478d-2141-4027-bb3d-241bbfc20c15">
<Component Id="_comp162" Guid="37916047-4a50-43ba-a2a6-14a89eaf6142">
<File Id="_163" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>

3
Tools/ArdupilotMegaPlanner/Program.cs
View File

@ -99,6 +99,9 @@ namespace ArdupilotMega
log.Debug(ex.ToString());
if (ex.Message == "Requested registry access is not allowed.") {
return;
}
if (ex.Message == "The port is closed.") {
CustomMessageBox.Show("Serial connection has been lost");
return;

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

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

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

@ -132,6 +132,12 @@ namespace ArdupilotMega.Utilities
running = false;
}
static void getUrlRTSP()
{
}
static Dictionary<string, string> getHeader(StreamReader stream)
{
Dictionary<string, string> answer = new Dictionary<string, string>();

2
Tools/ArdupilotMegaPlanner/paramcompare.cs
View File

@ -63,7 +63,7 @@ namespace ArdupilotMega
{
foreach (DataGridViewRow dgvr in dgv.Rows)
{
if (dgvr.Cells[0].Value.ToString() == row.Cells[Command.Index].Value.ToString())
if (dgvr.Cells[0].Value.ToString().Trim() == row.Cells[Command.Index].Value.ToString().Trim())
{
dgvr.Cells[1].Value = row.Cells[newvalue.Index].Value.ToString();
break;