Mission Planner 1.2.65

custom firmware load fix refresh on disconnect px4fmu updates px4uploader update add H, Y6, tri, Heli to frame setup
ArduPilot · Aug 3, 2013 · 6bdf16e · 6bdf16e
1 parent 2bb87cb
commit 6bdf16e
Show file tree

Hide file tree

Showing 97 changed files with 1,231 additions and 12,120 deletions.
diff --git a/Arduino/ArduinoDetect.cs b/Arduino/ArduinoDetect.cs
@@ -115,6 +115,8 @@ public static string DetectBoard(string port)
                 ManagementObjectSearcher searcher = new ManagementObjectSearcher(query);
                 foreach (ManagementObject obj2 in searcher.Get())
                 {
+                    Console.WriteLine("PNPID: "+obj2.Properties["PNPDeviceID"].Value.ToString());
+
                     // check vid and pid
                     if (obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_2341&PID_0010"))
                     {
@@ -126,10 +128,10 @@ public static string DetectBoard(string port)
                         }
                     }
 
-                    if (obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0010") || obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0011"))
+                    if (obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0010") || obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0011") || obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0012") || obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0013") || obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0014") || obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0015") || obj2.Properties["PNPDeviceID"].Value.ToString().Contains(@"USB\VID_26AC&PID_0016"))
                     {
                         // check port name as well
-                        if (obj2.Properties["Name"].Value.ToString().ToUpper().Contains(serialPort.PortName.ToUpper()))
+                        //if (obj2.Properties["Name"].Value.ToString().ToUpper().Contains(serialPort.PortName.ToUpper()))
                         {
                             log.Info("is a px4");
                             return "px4";

diff --git a/ArdupilotMega.csproj b/ArdupilotMega.csproj
@@ -188,9 +188,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Lib\ProjNet.dll</HintPath>
     </Reference>
-    <Reference Include="px4uploader, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="px4uploader, Version=1.0.4855.33293, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <ExecutableExtension>.exe</ExecutableExtension>
       <HintPath>..\..\px4uploader\bin\Release\px4uploader.exe</HintPath>
     </Reference>
     <Reference Include="System">
@@ -354,11 +353,11 @@
     <Compile Include="GCSViews\ConfigurationView\ConfigHWOSD.Designer.cs">
       <DependentUpon>ConfigHWOSD.cs</DependentUpon>
     </Compile>
-    <Compile Include="GCSViews\HardwareConfig.cs">
+    <Compile Include="GCSViews\InitialSetup.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="GCSViews\HardwareConfig.Designer.cs">
-      <DependentUpon>HardwareConfig.cs</DependentUpon>
+    <Compile Include="GCSViews\InitialSetup.Designer.cs">
+      <DependentUpon>InitialSetup.cs</DependentUpon>
     </Compile>
     <Compile Include="GCSViews\SoftwareConfig.cs">
       <SubType>UserControl</SubType>
@@ -585,8 +584,8 @@
     <EmbeddedResource Include="GCSViews\ConfigurationView\ConfigHWOSD.zh-TW.resx">
       <DependentUpon>ConfigHWOSD.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GCSViews\HardwareConfig.resx">
-      <DependentUpon>HardwareConfig.cs</DependentUpon>
+    <EmbeddedResource Include="GCSViews\InitialSetup.resx">
+      <DependentUpon>InitialSetup.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="GCSViews\SoftwareConfig.resx">
       <DependentUpon>SoftwareConfig.cs</DependentUpon>
@@ -606,7 +605,7 @@
     <None Include="Driver\arduino mega 2560.cat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Driver\px4fmu.cat">
+    <None Include="Driver\px4fmu_2.0.0.3.cat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Driver\signed.cer">
@@ -1757,7 +1756,7 @@
     <Content Include="Driver\i386\ftserui2.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Driver\px4fmu.inf">
+    <Content Include="Driver\px4fmu_2.0.0.3.inf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="FirmwareHistory.txt">
@@ -1859,6 +1858,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Resources\APM_rover-firmware.png" />
+    <None Include="Resources\frames-h.png" />
     <Content Include="Resources\guagebg.jpg" />
     <Content Include="Resources\MAVCmd.zh-TW.txt" />
     <Content Include="Resources\MAVParam.zh-TW.txt" />

diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,4 +1,16 @@
-* Mission Planner 1.2.63
+* Mission Planner 1.2.65
+custom firmware load fix
+refresh on disconnect
+px4fmu updates
+px4uploader update
+add H, Y6, tri, Heli to frame setup
+
+* Mission Planner 1.2.64
+rename hardware and software config
+change fw screen loading
+wizard wip
+
+* Mission Planner 1.2.63
 relocate controls to external dll
 change mp icon
 add backup metadatafile