aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

APM Planner 1.1.1

Browse Source 
fix apm 1.4 vs apm 2
Firmware screen control-C = custom hex upload
This commit is contained in:
Michael Oborne 2011-12-06 20:59:52 +08:00
parent 65b26d1453
commit ac02ce545c
6 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/ArdupilotMegaPlanner/ArduinoDetect.cs
View File

@ -85,9 +85,16 @@ namespace ArdupilotMega
Console.WriteLine("Dependant : " + obj2["Dependent"]);
if (obj2["Dependent"].ToString().Contains(@"USB\\VID_2341&PID_0010"))
{
if (DialogResult.Yes == MessageBox.Show("Is this a APM 2?", "APM 2", MessageBoxButtons.YesNo))
{
return "2560-2";
}
else
{
return "2560";
}
}
}
return "2560";
@ -103,6 +110,7 @@ namespace ArdupilotMega
return "2560";
}
}
}
}
catch { }

4
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -580,13 +580,11 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\MAVCmd.zh-Hans.txt" />
<None Include="Resources\MAVParam.txt" />
<Content Include="Resources\MAVParam.zh-Hans.txt" />
<None Include="Resources\MAVCmd.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\MAVParam.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\new frames-09.png" />
<Content Include="dataflashlog.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

29
Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
View File

@ -121,28 +121,28 @@
<data name="Params.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<metadata name="Command.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Command.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value>
</metadata>
</data>
<data name="Command.HeaderText" xml:space="preserve">
<value>Command</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Command.Width" type="System.Int32, mscorlib">
<value>150</value>
</data>
<metadata name="Value.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<data name="Value.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value>
</metadata>
</data>
<data name="Value.HeaderText" xml:space="preserve">
<value>Value</value>
</data>
<data name="Value.Width" type="System.Int32, mscorlib">
<value>80</value>
</data>
<metadata name="Default.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<data name="Default.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value>
</metadata>
</data>
<data name="Default.HeaderText" xml:space="preserve">
<value>Default</value>
</data>
@ -155,9 +155,9 @@
<data name="mavScale.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<metadata name="RawValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<data name="RawValue.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value>
</metadata>
</data>
<data name="RawValue.HeaderText" xml:space="preserve">
<value>RawValue</value>
</data>
@ -4968,9 +4968,9 @@
<data name="CHK_GDIPlus.Text" xml:space="preserve">
<value>GDI+ (old type)</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<data name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>17, 17</value>
</metadata>
</data>
<data name="CHK_GDIPlus.ToolTip" xml:space="preserve">
<value>OpenGL = Disabled
GDI+ = Enabled</value>
@ -6299,9 +6299,9 @@ GDI+ = Enabled</value>
<data name="&gt;&gt;BUT_compare.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">
<data name="$this.Localizable" type="System.Boolean, mscorlib">
<value>True</value>
</metadata>
</data>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
@ -6350,4 +6350,7 @@ GDI+ = Enabled</value>
<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>
</data>
<data name="MAVParam" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MAVParam.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
</root>

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

@ -258,6 +258,18 @@ namespace ArdupilotMega.GCSViews
findfirmware("AC2-QUADHIL");
return true;
}
if (keyData == (Keys.Control | Keys.C))
{
OpenFileDialog fd = new OpenFileDialog();
fd.Filter = "Firmware (*.hex)|*.hex";
fd.ShowDialog();
if (File.Exists(fd.FileName))
{
UploadFlash(fd.FileName, ArduinoDetect.DetectVersion(MainV2.comportname));
}
return true;
}
return base.ProcessCmdKey(ref msg, keyData);
}
@ -534,6 +546,8 @@ namespace ArdupilotMega.GCSViews
return;
}
Console.WriteLine("Using "+baseurl);
// Create a request using a URL that can receive a post.
WebRequest request = WebRequest.Create(baseurl);
request.Timeout = 10000;

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

2
Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.application
View File

@ -11,7 +11,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>gEz+riTnX11Gvx+CG6QPheFVPYU=</dsig:DigestValue>
<dsig:DigestValue>mN7pjMOs48ZdF2S8vaEAJbtq8b4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>