Generic: warning fixs

ArduPilot · Aug 4, 2016 · dc3df0e · dc3df0e
1 parent a4c1c2a
commit dc3df0e
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 494 deletions.
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
 </configuration>
diff --git a/ConnectionOptions.cs b/ConnectionOptions.cs
@@ -44,7 +44,7 @@ private void BUT_connect_Click(object sender, EventArgs e)
 
                 MainV2._connectionControl.UpdateSysIDS();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
             }
         }

diff --git a/Controls/DistanceBar.cs b/Controls/DistanceBar.cs
@@ -139,7 +139,7 @@ protected override void OnPaint(PaintEventArgs e)
                     e.Graphics.DrawImageUnscaled(buffer, 0, 0);
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
             }
         }

diff --git a/Controls/Loading.cs b/Controls/Loading.cs
@@ -39,7 +39,7 @@ public string Text
             }
         }
 
-        public static void Close()
+        public new static void Close()
         {
             if (Instance != null)
             {

diff --git a/GCSViews/ConfigurationView/ConfigHWCompass.cs b/GCSViews/ConfigurationView/ConfigHWCompass.cs
@@ -473,7 +473,6 @@ private void timer1_Tick(object sender, EventArgs e)
                 }
 
                 // message for user
-                string message = "";
                 foreach (var item in status.Values)
                 {
                     lbl_obmagresult.AppendText("id:" + item.compass_id + " x:" + item.ofs_x.ToString("0.0") + " y:" + item.ofs_y.ToString("0.0") + " z:" +

diff --git a/GCSViews/FlightPlanner.cs b/GCSViews/FlightPlanner.cs
@@ -1795,7 +1795,7 @@ void getWPs(object sender, ProgressWorkerEventArgs e, object passdata = null)
                     {
                         cmds.Add(port.getHomePosition());
                     }
-                    catch (TimeoutException ex)
+                    catch (TimeoutException)
                     {
                         // blank home
                         cmds.Add(new Locationwp() { id = (ushort)MAVLink.MAV_CMD.WAYPOINT });
@@ -2108,7 +2108,7 @@ void saveWPs(object sender, ProgressWorkerEventArgs e, object passdata = null)
                         }
                         a++;
                     }
-                    catch (TimeoutException ex)
+                    catch (TimeoutException)
                     {
                         use_int = false;
                         // added here to prevent timeout errors

diff --git a/GCSViews/InitialSetup.cs b/GCSViews/InitialSetup.cs
@@ -43,6 +43,16 @@ public bool isCopter
         public bool isHeli
         {
             get { return isConnected && MainV2.comPort.MAV.aptype == MAVLink.MAV_TYPE.HELICOPTER; }
+        }
+
+        public bool isQuadPlane
+        {
+            get
+            {
+                return isConnected && isPlane &&
+                       MainV2.comPort.MAV.param.ContainsKey("Q_ENABLE") &&
+                       (MainV2.comPort.MAV.param["Q_ENABLE"].Value == 1.0);
+            }
         }
 
         public bool isPlane

diff --git a/GCSViews/InitialSetup.resx b/GCSViews/InitialSetup.resx
diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj
@@ -15,7 +15,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>8c4aca6f</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>48ccbae5</NuGetPackageImportStamp>
     <PublishUrl>f:\publish\MissionPlanner\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -38,7 +38,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -145,43 +145,27 @@
     <Reference Include="DotSpatial.Topology">
       <HintPath>packages\DotSpatial.Topology.1.6.0.0\lib\net40-Client\DotSpatial.Topology.dll</HintPath>
     </Reference>
-    <Reference Include="fftpack_lite, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>DLLs\fftpack_lite.dll</HintPath>
-    </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Ionic.Zip">
       <HintPath>packages\DotNetZip.1.9.2\lib\net20\Ionic.Zip.dll</HintPath>
     </Reference>
-    <Reference Include="lapack_lite, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>DLLs\lapack_lite.dll</HintPath>
-    </Reference>
     <Reference Include="log4net">
       <HintPath>packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>True</Private>
-      <HintPath>ExtLibs\Microsoft.DirectX.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.DirectX.DirectInput, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>True</Private>
-      <HintPath>ExtLibs\Microsoft.DirectX.DirectInput.dll</HintPath>
-    </Reference>
-    <Reference Include="mtrand, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>DLLs\mtrand.dll</HintPath>
-    </Reference>
     <Reference Include="ObjectListView">
       <HintPath>packages\Unofficial.ObjectListView.2.6.0\lib\net20\ObjectListView.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net">
       <HintPath>packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
+    <Reference Include="SharpDX">
+      <HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.DirectInput">
+      <HintPath>$(SharpDXPackageBinDir)\SharpDX.DirectInput.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -3920,7 +3904,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
   </Target>
+  <Import Project="packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('packages\SharpDX.2.6.3\build\SharpDX.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Program.cs b/Program.cs
@@ -160,6 +160,9 @@ public static void Main(string[] args)
 
             Utilities.NGEN.doNGEN();
 
+            log.InfoFormat("64bit os {0}, 64bit process {1}", System.Environment.Is64BitOperatingSystem,
+                System.Environment.Is64BitProcess);
+
             try
             {
                 //System.Diagnostics.Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.RealTime;

diff --git a/Utilities/OpticalFlow.cs b/Utilities/OpticalFlow.cs
@@ -14,11 +14,6 @@ public class OpticalFlow: IDisposable
         // since its not listed in the docs
         // https://github.com/PX4/Flow/blob/4a314cfdb099aed9795b825e7518203771207fbb/src/modules/flow/dcmi.c#L292
 
-        // of status
-        MAVLink.mavlink_optical_flow_t msg;
-        // of status
-        MAVLink.mavlink_optical_flow_rad_t msg2;
-
         // size of incomming data
         MAVLink.mavlink_data_transmission_handshake_t msgDataTransmissionHandshake;
 

diff --git a/packages.config b/packages.config
@@ -24,6 +24,8 @@
   <package id="Rx-Linq" version="2.2.4" targetFramework="net40" requireReinstallation="True" />
   <package id="Rx-Main" version="2.2.4" targetFramework="net40" />
   <package id="Rx-PlatformServices" version="2.2.4" targetFramework="net40" requireReinstallation="True" />
+  <package id="SharpDX" version="2.6.3" targetFramework="net40" />
+  <package id="SharpDX.DirectInput" version="2.6.3" targetFramework="net40" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
   <package id="Unofficial.ObjectListView" version="2.6.0" targetFramework="net40" />
 </packages>