diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe index 305300ad4f..ec1309c7aa 100644 Binary files a/.nuget/NuGet.exe and b/.nuget/NuGet.exe differ diff --git a/ExtLibs/Arduino/Arduino.csproj b/ExtLibs/Arduino/Arduino.csproj index 3014a6b755..21fe12462a 100644 --- a/ExtLibs/Arduino/Arduino.csproj +++ b/ExtLibs/Arduino/Arduino.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net461;netstandard20 diff --git a/ExtLibs/ExtGuided/ExtGuided.csproj b/ExtLibs/ExtGuided/ExtGuided.csproj index 0eee6e2700..39f450043a 100644 --- a/ExtLibs/ExtGuided/ExtGuided.csproj +++ b/ExtLibs/ExtGuided/ExtGuided.csproj @@ -19,7 +19,7 @@ true full false - ..\..\bin\Debug\plugins\ + ..\..\bin\Debug\net461\plugins\ DEBUG;TRACE prompt 4 diff --git a/ExtLibs/Mavlink/MAVLink.csproj b/ExtLibs/Mavlink/MAVLink.csproj index 3bde3c2530..a8a2ac0af7 100644 --- a/ExtLibs/Mavlink/MAVLink.csproj +++ b/ExtLibs/Mavlink/MAVLink.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net461;netstandard20 library diff --git a/ExtLibs/MissionPlanner.Gridv2/MissionPlanner.Gridv2.csproj b/ExtLibs/MissionPlanner.Gridv2/MissionPlanner.Gridv2.csproj index 094534d6e3..f3c3b7cc0f 100644 --- a/ExtLibs/MissionPlanner.Gridv2/MissionPlanner.Gridv2.csproj +++ b/ExtLibs/MissionPlanner.Gridv2/MissionPlanner.Gridv2.csproj @@ -21,7 +21,7 @@ true full false - ..\..\bin\Debug\plugins\ + ..\..\bin\Debug\net461\plugins\ DEBUG;TRACE prompt 4 @@ -31,7 +31,7 @@ pdbonly true - ..\..\bin\Release\plugins\ + ..\..\bin\Release\net461\plugins\ TRACE prompt 4 diff --git a/ExtLibs/MissionPlanner.Stats/MissionPlanner.Stats.csproj b/ExtLibs/MissionPlanner.Stats/MissionPlanner.Stats.csproj index a45336f2c6..f1b37f6ab8 100644 --- a/ExtLibs/MissionPlanner.Stats/MissionPlanner.Stats.csproj +++ b/ExtLibs/MissionPlanner.Stats/MissionPlanner.Stats.csproj @@ -19,7 +19,7 @@ true full false - ..\..\bin\Debug\plugins\ + ..\..\bin\Debug\net461\plugins\ DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ pdbonly true - ..\..\bin\Release\plugins\ + ..\..\bin\Release\net461\plugins\ TRACE prompt 4 diff --git a/ExtLibs/SimpleGrid/MissionPlanner.SimpleGrid.csproj b/ExtLibs/SimpleGrid/MissionPlanner.SimpleGrid.csproj index 8458f3b2ea..ab2b93fd17 100644 --- a/ExtLibs/SimpleGrid/MissionPlanner.SimpleGrid.csproj +++ b/ExtLibs/SimpleGrid/MissionPlanner.SimpleGrid.csproj @@ -21,7 +21,7 @@ true full false - ..\..\bin\Debug\plugins\ + ..\..\bin\Debug\net461\plugins\ DEBUG;TRACE prompt 4 @@ -31,7 +31,7 @@ pdbonly true - ..\..\bin\Release\plugins\ + ..\..\bin\Release\net461\plugins\ TRACE prompt 4 diff --git a/ExtLibs/TrackerHome/TrackerHomeGPS.csproj b/ExtLibs/TrackerHome/TrackerHomeGPS.csproj index 2c0855fc3e..669c75b728 100644 --- a/ExtLibs/TrackerHome/TrackerHomeGPS.csproj +++ b/ExtLibs/TrackerHome/TrackerHomeGPS.csproj @@ -19,7 +19,7 @@ true full false - ..\..\bin\Debug\plugins\ + ..\..\bin\Debug\net461\plugins\ DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ pdbonly true - ..\..\bin\Release\plugins\ + ..\..\bin\Release\net461\plugins\ TRACE prompt 4 diff --git a/Log/LogStrings.Designer.cs b/Log/LogStrings.Designer.cs index a826c63fde..6364ecf7fc 100644 --- a/Log/LogStrings.Designer.cs +++ b/Log/LogStrings.Designer.cs @@ -19,7 +19,7 @@ namespace MissionPlanner.Log { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class LogStrings { diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj index d3d995b3f0..6f8edffa5b 100644 --- a/MissionPlanner.csproj +++ b/MissionPlanner.csproj @@ -1,18 +1,22 @@ - + + net461 mpdesktop.ico Exe Michael Oborne - 1.3.34.4 + 1.3.49.9 Mission Planner Mission Planner Copyright © Michael Oborne 2010-2017 - 1.3.49.4 - 1.3.49.4 - + $(Version) + 1.0.0.0 + + + True + dev bin\Debug\ @@ -667,7 +671,7 @@ PreserveNewest - + PreserveNewest @@ -705,7 +709,7 @@ - + PreserveNewest @@ -851,6 +855,7 @@ ZedGraph False + @@ -881,6 +886,7 @@ + @@ -899,8 +905,3871 @@ + + - + + + + + Control + + + Tracker.cs + + + Control + + + ControlSensorsStatus.cs + + + Component + + + Form + + + Video.cs + + + Control + + + ConfigFrameClassType.cs + + + Control + + + ConfigGPSInject.cs + + + + + Form + + + GridUI.cs + + + Form + + + LogDownloadscp.cs + + + + Component + + + Strings.cs + + + Form + + + Control.cs + + + + + Form + + + Control.cs + + + + + + + + + Form + + + WPControl.cs + + + + + + Form + + + AASettings.cs + + + + + + + + + + + Form + + + AuthKeys.cs + + + Control + + + ConnectionControl.cs + + + Control + + + ConnectionStats.cs + + + Form + + + ControlTest.cs + + + Control + + + DistanceBar.cs + + + + + Form + + + Loading.cs + + + Form + + + LogAnalyzer.cs + + + Control + + + Component + + + Component + + + Component + + + + Control + + + CheckListControl.cs + + + + Control + + + Form + + + CheckListEditor.cs + + + Control + + + ServoOptions.cs + + + Control + + + SITL.cs + + + Form + + + ThemeColors.cs + + + Component + + + Control + + + ModifyandSet.cs + + + Form + + + EKFStatus.cs + + + Form + + + Vibration.cs + + + + Control + + + DefaultSettings.cs + + + Control + + + ConfigAccelerometerCalibration.cs + + + Control + + + ConfigAC_Fence.cs + + + Control + + + ConfigAntennaTracker.cs + + + Control + + + ConfigArducopter.cs + + + Control + + + ConfigArduplane.cs + + + Control + + + ConfigArdurover.cs + + + Control + + + ConfigAteryx.cs + + + Control + + + ConfigAteryxSensors.cs + + + Control + + + ConfigBatteryMonitoring.cs + + + Control + + + ConfigBatteryMonitoring2.cs + + + Control + + + ConfigCompassMot.cs + + + Control + + + ConfigESCCalibration.cs + + + Control + + + ConfigFailSafe.cs + + + Control + + + ConfigFirmware.cs + + + Control + + + ConfigFirmwareDisabled.cs + + + Control + + + ConfigFlightModes.cs + + + Control + + + ConfigFrameType.cs + + + Control + + + ConfigFriendlyParams.cs + + + Control + + + Control + + + ConfigHWAirspeed.cs + + + Control + + + ConfigHWesp8266.cs + + + Control + + + ConfigHWBT.cs + + + Control + + + ConfigHWCompass.cs + + + Control + + + ConfigHWUAVCAN.cs + + + Control + + + ConfigHWPX4Flow.cs + + + Control + + + ConfigHWOptFlow.cs + + + Control + + + ConfigHWOSD.cs + + + Control + + + ConfigHWParachute.cs + + + Control + + + ConfigHWRangeFinder.cs + + + Control + + + ConfigMandatory.cs + + + Control + + + ConfigMotorTest.cs + + + Control + + + ConfigMount.cs + + + Control + + + ConfigOptional.cs + + + Control + + + ConfigPlanner.cs + + + Control + + + ConfigPlannerAdv.cs + + + Control + + + ConfigRadioInput.cs + + + Control + + + ConfigRawParams.cs + + + Control + + + ConfigRawParamsTree.cs + + + Control + + + ConfigSimplePids.cs + + + Control + + + ConfigTradHeli.cs + + + Control + + + ConfigWizard.cs + + + Control + + + FlightData.cs + + + Control + + + FlightPlanner.cs + + + Control + + + Help.cs + + + Control + + + InitialSetup.cs + + + Control + + + SoftwareConfig.cs + + + Control + + + Terminal.cs + + + georefimage.cs + + + + + + + + Form + + + Joy_Do_Repeat_Servo.cs + + + Form + + + Joy_Button_axis.cs + + + Form + + + Joy_Do_Set_Servo.cs + + + Form + + + Joy_Do_Repeat_Relay.cs + + + Form + + + Joy_ChangeMode.cs + + + Form + + + Joy_Do_Set_Relay.cs + + + Form + + + Joy_Mount_Mode.cs + + + + + + Form + + + LogDownloadMavLink.cs + + + + Form + + + LogIndex.cs + + + + True + True + LogStrings.resx + + + + + + + + + + Form + + + MovingBase.cs + + + + + + + + Form + + + GenOTP.cs + + + + + + Control + + + + + Form + + + PluginUI.cs + + + True + True + Resources.resx + + + + Form + + + ScriptConsole.cs + + + Control + + + SerialInjectGPS.cs + + + Form + + + ConnectionOptions.cs + + + Form + + + FollowPathControl.cs + + + + + + + + + + + + + + + + + + + + Form + + + fftui.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Control + + + 10FlightModes.cs + + + Control + + + 11Verify.cs + + + Control + + + 12FailSafe.cs + + + Control + + + 13GeoFence.cs + + + Control + + + 1Intro.cs + + + Control + + + 2FrameFW.cs + + + Control + + + 3ConnectAP.cs + + + Control + + + 4FrameType.cs + + + Control + + + 5AccelCalib.cs + + + Control + + + 6CompassCalib.cs + + + Control + + + 7BatteryMonitor.cs + + + Control + + + 8OptionalItemsAC.cs + + + Control + + + 8OptionalItemsAP.cs + + + Control + + + 98DontForget.cs + + + Control + + + 9RadioCalibration.cs + + + + Form + + + Wizard.cs + + + Tracker.cs + + + Tracker.cs + + + ConnectionOptions.cs + + + ConnectionOptions.cs + + + AuthKeys.cs + + + ConnectionControl.cs + + + ConnectionControl.cs + + + ConnectionStats.cs + + + ConnectionStats.cs + + + ControlSensorsStatus.cs + + + ControlTest.cs + + + DefaultSettings.cs + + + DefaultSettings.cs + + + Loading.cs + + + ModifyandSet.cs + + + ModifyandSet.cs + + + ServoOptions.cs + + + ServoOptions.cs + + + ThemeColors.cs + + + ThemeColors.cs + + + Video.cs + + + FollowMe.cs + + + FollowMe.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAccelerometerCalibration.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAC_Fence.cs + + + ConfigAntennaTracker.cs + + + ConfigAntennaTracker.cs + + + ConfigAntennaTracker.cs + + + ConfigAntennaTracker.cs + + + ConfigAntennaTracker.cs + + + ConfigAntennaTracker.cs + + + ConfigAntennaTracker.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + Designer + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArducopter.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArduplane.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigArdurover.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryx.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + Designer + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigAteryxSensors.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigBatteryMonitoring2.cs + + + ConfigCompassMot.cs + + + ConfigESCCalibration.cs + + + ConfigESCCalibration.cs + + + ConfigESCCalibration.cs + + + ConfigESCCalibration.cs + + + ConfigESCCalibration.cs + + + ConfigESCCalibration.cs + + + ConfigESCCalibration.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFailSafe.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + Designer + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmware.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFirmwareDisabled.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFlightModes.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameClassType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFrameType.cs + + + ConfigFriendlyParams.cs + + + ConfigFriendlyParams.cs + + + ConfigFriendlyParams.cs + + + ConfigFriendlyParams.cs + + + ConfigFriendlyParams.cs + + + ConfigFriendlyParams.cs + + + ConfigFriendlyParams.cs + + + ConfigFriendlyParams.cs + + + ConfigGPSInject.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWAirspeed.cs + + + ConfigHWBT.cs + + + ConfigHWBT.cs + + + ConfigHWBT.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWesp8266.cs + + + ConfigHWesp8266.cs + + + ConfigHWesp8266.cs + + + ConfigHWesp8266.cs + + + ConfigHWBT.cs + + + ConfigHWBT.cs + + + ConfigHWBT.cs + + + ConfigHWBT.cs + + + ConfigHWBT.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + Designer + + + ConfigHWCompass.cs + + + ConfigHWCompass.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWParachute.cs + + + ConfigHWParachute.cs + + + ConfigHWParachute.cs + + + ConfigHWPX4Flow.cs + + + ConfigHWPX4Flow.cs + + + ConfigHWPX4Flow.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWUAVCAN.cs + + + ConfigHWUAVCAN.cs + + + ConfigHWUAVCAN.cs + + + ConfigHWUAVCAN.cs + + + ConfigHWPX4Flow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOptFlow.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWOSD.cs + + + ConfigHWParachute.cs + + + ConfigHWParachute.cs + + + ConfigHWParachute.cs + + + ConfigHWParachute.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigHWRangeFinder.cs + + + ConfigMandatory.cs + + + ConfigMandatory.cs + + + ConfigMandatory.cs + + + ConfigMandatory.cs + + + ConfigMandatory.cs + + + ConfigMandatory.cs + + + ConfigMandatory.cs + + + ConfigMandatory.cs + + + ConfigMotorTest.cs + + + ConfigMotorTest.cs + + + ConfigMotorTest.cs + + + ConfigMotorTest.cs + + + ConfigMotorTest.cs + + + ConfigMotorTest.cs + + + ConfigMotorTest.cs + + + ConfigMotorTest.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigMount.cs + + + ConfigOptional.cs + + + ConfigOptional.cs + + + ConfigOptional.cs + + + ConfigOptional.cs + + + ConfigOptional.cs + + + ConfigOptional.cs + + + ConfigOptional.cs + + + ConfigOptional.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigPlanner.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRadioInput.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParams.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + Designer + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigRawParamsTree.cs + + + ConfigSimplePids.cs + + + ConfigSimplePids.cs + + + ConfigSimplePids.cs + + + ConfigSimplePids.cs + + + ConfigSimplePids.cs + + + ConfigSimplePids.cs + + + ConfigSimplePids.cs + + + ConfigSimplePids.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + Designer + + + ConfigTradHeli.cs + + + ConfigTradHeli.cs + + + ConfigWizard.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + + + FlightData.cs + Designer + + + FlightData.cs + + + FlightData.cs + Designer + + + FlightData.cs + + + FlightData.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + Designer + + + FlightPlanner.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + + + FlightPlanner.cs + Designer + + + FlightPlanner.cs + + + FlightPlanner.cs + Designer + + + FlightPlanner.cs + + + FlightPlanner.cs + + + Help.cs + + + Help.cs + Designer + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + + + Help.cs + Designer + + + Help.cs + + + Help.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + InitialSetup.cs + + + SoftwareConfig.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + Terminal.cs + + + georefimage.cs + + + georefimage.cs + + + GridUI.cs + + + JoystickSetup.cs + + + JoystickSetup.cs + + + Joy_Mount_Mode.cs + + + Joy_Mount_Mode.cs + + + LogBrowse.cs + + + LogBrowse.cs + + + LogDownload.cs + + + LogDownload.cs + + + LogDownloadMavLink.cs + + + LogDownloadscp.cs + + + LogDownloadscp.cs + + + LogDownloadscp.cs + Designer + + + LogDownloadMavLink.cs + + + LogStrings.Designer.cs + PublicResXFileCodeGenerator + Designer + + + MavlinkLog.cs + + + MavlinkLog.cs + + + MainV2.cs + + + MainV2.cs + + + MovingBase.cs + + + MovingBase.cs + + + Sikradio.cs + + + Sikradio.cs + + + Sikradio.cs + + + RAW_Sensor.cs + + + RAW_Sensor.cs + + + ScriptConsole.cs + + + ScriptConsole.cs + + + SerialInjectGPS.cs + + + SerialInjectGPS.cs + + + SerialInjectGPS.cs + + + SerialOutputMD.cs + + + SerialOutputMD.cs + + + SerialOutputNMEA.cs + + + SerialOutputNMEA.cs + + + SerialOutputPass.cs + + + SerialOutputPass.cs + + + Strings.cs + + + Strings.cs + + + Strings.cs + + + Strings.cs + + + Strings.cs + + + Strings.cs + + + Strings.cs + + + Control.cs + + + Control.cs + + + WPControl.cs + + + WPControl.cs + + + AASettings.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 10FlightModes.cs + + + 11Verify.cs + + + 11Verify.cs + + + 11Verify.cs + + + 11Verify.cs + + + 11Verify.cs + + + 11Verify.cs + + + 11Verify.cs + + + 11Verify.cs + + + 11Verify.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 12FailSafe.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 13GeoFence.cs + + + 1Intro.cs + + + 1Intro.cs + + + 1Intro.cs + + + 1Intro.cs + + + 1Intro.cs + + + 1Intro.cs + + + 1Intro.cs + + + 1Intro.cs + + + 1Intro.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 2FrameFW.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 3ConnectAP.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 4FrameType.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 5AccelCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 6CompassCalib.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 7BatteryMonitor.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAC.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 8OptionalItemsAP.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 98DontForget.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + 9RadioCalibration.cs + + + Wizard.cs + + + Wizard.cs + + + Wizard.cs + + + Wizard.cs + + + Wizard.cs + + + Wizard.cs + + + Wizard.cs + + + Wizard.cs + + + Always + + + + + PreserveNewest + + + Always + + + Always + + + Always + + + Always + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Always + + + PreserveNewest + + + + PreserveNewest + + + + PreserveNewest + + + PreserveNewest + + + + + + PreserveNewest + + + Always + + + + + Tracker.cs + + + Tracker.cs + + + Tracker.cs + + + Tracker.cs + + + ConnectionOptions.cs + + + ConnectionOptions.cs + + + ConnectionControl.cs + + + ConnectionControl.cs + + + ConnectionControl.cs + + + ConnectionControl.cs + + + ConnectionStats.cs + + + ConnectionStats.cs + + + ConnectionStats.cs + + + ConnectionStats.cs + + + DefaultSettings.cs + + + DefaultSettings.cs + + + DefaultSettings.cs + + + DefaultSettings.cs + + + DistanceBar.cs + + + LogAnalyzer.cs + + + MavlinkCheckBoxBitMask.cs + + + ModifyandSet.cs + + + ModifyandSet.cs + + + ModifyandSet.cs + + + CheckListInput.cs + + + CheckListEditor.cs + + + ServoOptions.cs + + + ServoOptions.cs + + + ServoOptions.cs + + + SITL.cs + Designer + + + ServoOptions.cs + + + ThemeColors.cs + + + ThemeColors.cs + + + ThemeColors.cs + + + ThemeColors.cs + + + EKFStatus.cs + + + Vibration.cs + + + FollowMe.cs + + + FollowMe.cs + + + FollowMe.cs + + + FollowMe.cs + + + georefimage.cs + + + georefimage.cs + + + georefimage.cs + + + georefimage.cs + + + georefimage.cs + + + JoystickSetup.cs + + + JoystickSetup.cs + + + JoystickSetup.cs + + + Joy_ChangeMode.cs + + + Joy_Do_Repeat_Relay.cs + + + Joy_Do_Repeat_Servo.cs + + + Joy_Do_Set_Relay.cs + + + Joy_Button_axis.cs + + + Joy_Do_Set_Servo.cs + + + Joy_Mount_Mode.cs + + + Joy_Mount_Mode.cs + + + Joy_Mount_Mode.cs + + + LogBrowse.cs + + + LogBrowse.cs + + + LogBrowse.cs + + + LogDownload.cs + + + LogDownload.cs + + + LogDownload.cs + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + + + LogIndex.cs + + + MavlinkLog.cs + + + MavlinkLog.cs + + + MavlinkLog.cs + + + MainV2.cs + + + MainV2.cs + + + MainV2.cs + + + MainV2.cs + + + MainV2.cs + + + MovingBase.cs + + + MovingBase.cs + + + MovingBase.cs + + + MovingBase.cs + + + MovingBase.cs + + + OpenGLtest2.cs + + + + Sikradio.cs + + + RAW_Sensor.cs + + + RAW_Sensor.cs + + + RAW_Sensor.cs + + + RAW_Sensor.cs + + + RAW_Sensor.cs + + + ResEdit.cs + + + ResEdit.cs + + + ScriptConsole.cs + + + ScriptConsole.cs + + + ScriptConsole.cs + + + ScriptConsole.cs + + + ScriptConsole.cs + + + SerialInjectGPS.cs + + + SerialInjectGPS.cs + + + SerialInjectGPS.cs + + + SerialInjectGPS.cs + + + ConnectionOptions.cs + + + ConnectionOptions.cs + + + SerialOutputMD.cs + + + SerialOutputMD.cs + + + SerialOutputMD.cs + + + SerialOutputNMEA.cs + + + SerialOutputNMEA.cs + + + SerialOutputNMEA.cs + + + SerialOutputPass.cs + + + SerialOutputPass.cs + + + SerialOutputPass.cs + + + SerialOutputPass.cs + + + fftui.cs + + + WarningControl.cs + + + WarningsManager.cs + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Designer + + + + + + + + + + + + + + + + Control + + + + Form + + + WarningsManager.cs + + + + Control + + + Status.cs + + + + Tracker.cs + + + ConnectionControl.cs + + + FollowMe.cs + + + FollowMe.cs + + + DefaultSettings.cs + + + georefimage.cs + + + georefimage.cs + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + Designer + + + LogDownloadMavLink.cs + + + LogDownloadMavLink.cs + + + MainV2.cs + + + MovingBase.cs + + + MovingBase.cs + + + MovingBase.cs + + + MovingBase.cs + + + MovingBase.cs + + + MovingBase.cs + + + GenOTP.cs + + + MovingBase.cs + + + PluginUI.cs + + + RAW_Sensor.cs + + + ResEdit.cs + + + ScriptConsole.cs + + + ScriptConsole.cs + + + FollowPathControl.cs + + + Status.cs + + + Form + + + SerialOutputPass.cs + + + + + + Control + + + Form + + + OSDVideo.cs + + + Form + + + SerialOutputMD.cs + + + + + + + Form + + + FormationControl.cs + + + + + Control + + + Grid.cs + + + + + + Control + + + Sikradio.cs + + + + Form + + + FollowMe.cs + + + + Form + + + ResEdit.cs + + + Form + + + + Form + + + MavlinkLog.cs + + + + Form + + + JoystickSetup.cs + + + + Form + + + paramcompare.cs + + + Form + + + RAW_Sensor.cs + + + Form + + + MainV2.cs + + + + Form + + + ElevationProfile.cs + + + + Form + + + LogDownload.cs + + + Form + + + LogBrowse.cs + + + + + + Form + + + SerialOutputNMEA.cs + + + + Form + + + Splash.cs + + + Form + + + temp.cs + + + + + + + Tracker.cs + + + Tracker.cs + + + Tracker.cs + Designer + + + Tracker.cs + + + ConnectionStats.cs + + + ModifyandSet.cs + + + ServoOptions.cs + + + ThemeColors.cs + + + SerialOutputPass.cs + + + FollowMe.cs + + + FollowMe.cs + + + georefimage.cs + + + JoystickSetup.cs + Designer + + + LogDownload.cs + + + LogBrowse.cs + + + MavlinkLog.cs + Designer + + + MavlinkLog.cs + + + OpenGLtest.cs + + + OSDVideo.cs + + + Sikradio.cs + + + Sikradio.cs + + + RAW_Sensor.cs + + + SerialOutputMD.cs + + + Sikradio.cs + + + JoystickSetup.cs + + + LogDownload.cs + + + LogBrowse.cs + + + MavlinkLog.cs + + + Sikradio.cs + + + RAW_Sensor.cs + + + FollowMe.cs + + + FollowMe.cs + + + FollowMe.cs + + + georefimage.cs + + + JoystickSetup.cs + + + JoystickSetup.cs + + + JoystickSetup.cs + + + JoystickSetup.cs + + + LogDownload.cs + + + LogDownload.cs + + + LogDownload.cs + + + LogDownload.cs + + + LogBrowse.cs + + + LogBrowse.cs + + + LogBrowse.cs + + + LogBrowse.cs + + + MavlinkLog.cs + + + MavlinkLog.cs + + + MavlinkLog.cs + + + RAW_Sensor.cs + + + RAW_Sensor.cs + + + RAW_Sensor.cs + + + ResEdit.cs + + + JoystickSetup.cs + + + LogDownload.cs + + + LogBrowse.cs + + + paramcompare.cs + + + RAW_Sensor.cs + Designer + + + MavlinkLog.cs + Designer + + + JoystickSetup.cs + Designer + + + JoystickSetup.cs + + + MainV2.cs + + + ElevationProfile.cs + + + LogDownload.cs + Designer + + + LogBrowse.cs + Designer + + + PublicResXFileCodeGenerator + Designer + Resources.Designer.cs + + + SerialOutputNMEA.cs + + + Splash.cs + + + FormationControl.cs + + + Grid.cs + + + temp.cs + + + Designer + + + PreserveNewest + + + PreserveNewest + + + + + + PreserveNewest + + + + Always + + + Always + + + + + + Form + + + + + Always @@ -915,5 +4784,10 @@ + + + + + \ No newline at end of file diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 58f706d658..fffd745f6d 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace MissionPlanner.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { diff --git a/build.bat b/build.bat index c4a0984b58..7c4ee2ae6e 100644 --- a/build.bat +++ b/build.bat @@ -6,7 +6,7 @@ del bin\release\MissionPlannerBeta.zip echo create appx? pause -"C:\Program Files (x86)\Windows Kits\10\bin\x86\makeappx" pack /d bin\release /p MissionPlanner.appx +"C:\Program Files (x86)\Windows Kits\10\bin\x86\makeappx" pack /d bin\release\net461 /p MissionPlanner.appx "C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool" sign /a /v /fd SHA256 /t http://timestamp.verisign.com/scripts/timestamp.dll /n "3B1842DF-8664-4A02-B840-61F61DA8A94E" MissionPlanner.appx