diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config index 67f8ea046e..6a318ad9b7 100644 --- a/.nuget/NuGet.Config +++ b/.nuget/NuGet.Config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/ConnectionOptions.cs b/ConnectionOptions.cs index ff2ace1f32..fba2b261c9 100644 --- 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 index 2deda9604e..40789bca5c 100644 --- 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 index 7e249d604f..2e97567941 100644 --- 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 index 6a93e23f8b..f61f0ddece 100644 --- 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 index 39077dfbdc..2819c47158 100644 --- 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 index 1c514d1d44..24204bc00f 100644 --- 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 index 37f9912521..13bffb1c0c 100644 --- a/GCSViews/InitialSetup.resx +++ b/GCSViews/InitialSetup.resx @@ -128,12 +128,12 @@ 4, 4, 4, 4 - + 826, 134 - - + + 998, 134 - + Fill @@ -150,18 +150,12 @@ False - - configFirmware1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigFirmware, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Install Firmware - + 608, 134 - + Fill @@ -174,18 +168,12 @@ 3 - - configFirmwareDisabled1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigFirmwareDisabled, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Install Firmware - + 576, 17 - + Fill @@ -198,18 +186,12 @@ 4 - - configWizard1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigWizard, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Wizard - + 771, 17 - + Fill @@ -222,18 +204,12 @@ 5 - - configMandatory1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigMandatory, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Mandatory Hardware - + 17, 56 - + True @@ -249,18 +225,12 @@ 7 - - configTradHeli1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigTradHeli, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Heli Setup - + 218, 56 - + Fill @@ -273,18 +243,12 @@ 9 - - configFrameType1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigFrameType, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Frame Type - + 197, 17 - + Fill @@ -297,24 +261,12 @@ 10 - - configAccelerometerCalibration - - - MissionPlanner.GCSViews.ConfigurationView.ConfigAccelerometerCalibration, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - - - $this - - - 1 - Accel Calibration - + 433, 56 - + Fill @@ -327,18 +279,12 @@ 10 - - configHWCompass1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWCompass, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Compass - + 640, 56 - + Fill @@ -351,18 +297,12 @@ 13 - - configRadioInput1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigRadioInput, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Radio Calibration - + 17, 17 - + Fill @@ -375,18 +315,12 @@ 14 - - configESC1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigESCCalibration, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - ESC Calibration - + 827, 56 - + Fill @@ -399,18 +333,12 @@ 14 - - configFlightModes1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigFlightModes, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Flight Modes - + 1025, 56 - + Fill @@ -423,18 +351,12 @@ 15 - - configFailSafe1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigFailSafe, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - FailSafe - + 962, 17 - + Fill @@ -447,18 +369,12 @@ 6 - - configOptional1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigOptional, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Optional Hardware - + 17, 95 - + Fill @@ -474,18 +390,12 @@ 16 - - _3DRradio1 - - - MissionPlanner.Sikradio, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Sik Radio - + 220, 95 - + Fill @@ -498,18 +408,12 @@ 17 - - configBatteryMonitoring1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigBatteryMonitoring, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Battery Monitor - + 676, 173 - + Fill @@ -522,24 +426,12 @@ 11 - - configBatteryMonitoring21 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigBatteryMonitoring2, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - - - $this - - - 3 - Battery Monitor 2 - + 17, 173 - + Fill @@ -552,18 +444,12 @@ 2 - - configCompassMot1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigCompassMot, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Compass/Motor Calib - + 422, 95 - + Fill @@ -576,18 +462,12 @@ 18 - - ConfigHWRangeFinder1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWRangeFinder, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Sonar - + 611, 95 - + Fill @@ -600,18 +480,12 @@ 19 - - configHWAirspeed1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWAirspeed, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Airspeed - + 1043, 173 - + 229, 25 @@ -621,24 +495,12 @@ 13 - - configHWPX4Flow1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWPX4Flow, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - - - $this - - - 5 - PX4Flow - + 817, 95 - + Fill @@ -651,18 +513,12 @@ 20 - - configHWOptFlow1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWOptFlow, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Optical Flow - + 1018, 95 - + Fill @@ -675,18 +531,12 @@ 21 - - configHWOSD1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWOSD, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - OSD - + 17, 134 - + Fill @@ -699,18 +549,12 @@ 22 - - configMount1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigMount, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Camera Gimbal - + 214, 134 - + Fill @@ -723,18 +567,12 @@ 23 - - tracker1 - - - MissionPlanner.Antenna.Tracker, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Antenna tracker - + 246, 173 - + Fill @@ -747,18 +585,12 @@ 0 - - configMotor1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigMotorTest, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Motor Test - + 421, 134 - + Fill @@ -771,24 +603,12 @@ 3 - - configHWBT1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWBT, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - - - $this - - - 2 - Bluetooth Setup - + 462, 173 - + Fill @@ -801,18 +621,12 @@ 24 - - configHWPa1 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWParachute, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - Parachute - + 864, 173 - + Fill @@ -825,18 +639,6 @@ 12 - - configHWESP8266 - - - MissionPlanner.GCSViews.ConfigurationView.ConfigHWESP8266, MissionPlanner, Version=1.1.5980.32223, Culture=neutral, PublicKeyToken=null - - - $this - - - 4 - ESP8266 Setup @@ -846,213 +648,21 @@ 1 - - backstageView - - - MissionPlanner.Controls.BackstageView.BackstageView, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 0 - - + 384, 17 - + Install Firmware - + True - - + + 226 - + 1000, 919 - - backstageViewPagePX4Flow - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagefw - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - initialSetupBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - backstageViewPagefwdisabled - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagewizard - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagemand - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagetradheli - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageframetype - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageaccel - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagecompass - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageradio - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageESC - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageflmode - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagefs - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageopt - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageSikradio - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagebatmon - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageBatt2 - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagecompassmot - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagesonar - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageairspeed - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageoptflow - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageosd - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagegimbal - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageAntTrack - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageMotorTest - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPagehwbt - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageParachute - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageESP - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - backstageViewPageinstfw - - - MissionPlanner.Controls.BackstageView.BackstageViewPage, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - InitialSetup diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj index 7481bf37af..4d29ec92f4 100644 --- a/MissionPlanner.csproj +++ b/MissionPlanner.csproj @@ -15,7 +15,7 @@ false .\ true - 8c4aca6f + 48ccbae5 f:\publish\MissionPlanner\ true Disk @@ -38,7 +38,7 @@ true - x86 + AnyCPU true full false @@ -145,43 +145,27 @@ packages\DotSpatial.Topology.1.6.0.0\lib\net40-Client\DotSpatial.Topology.dll - - False - DLLs\fftpack_lite.dll - packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll packages\DotNetZip.1.9.2\lib\net20\Ionic.Zip.dll - - False - DLLs\lapack_lite.dll - packages\log4net.2.0.0\lib\net40-full\log4net.dll - - False - True - ExtLibs\Microsoft.DirectX.dll - - - False - True - ExtLibs\Microsoft.DirectX.DirectInput.dll - - - False - DLLs\mtrand.dll - packages\Unofficial.ObjectListView.2.6.0\lib\net20\ObjectListView.dll packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll + + $(SharpDXPackageBinDir)\SharpDX.dll + + + $(SharpDXPackageBinDir)\SharpDX.DirectInput.dll + @@ -3920,7 +3904,9 @@ 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}. + +