From 9cb60e1cc9f7402418d7f0983d32e9ba38db01e4 Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Wed, 31 Oct 2012 07:02:29 +0800 Subject: [PATCH] Mission Planner 1.2.15 fix hud battery text overlaying tweak hud resize tweak main switcher fix quickview text scaleing fix dist to mav. added french translation thanks oliver change tooltip time add 3dr iv add distance to home dataflashlog update --- .../Antenna/Tracker.fr.resx | 189 +++++ .../ArdupilotMegaPlanner/ArdupilotMega.csproj | 37 + Tools/ArdupilotMegaPlanner/Camera.fr.resx | 186 +++++ Tools/ArdupilotMegaPlanner/Controls/HUD.cs | 16 +- .../Controls/MainSwitcher.cs | 3 + .../Controls/QuickView.cs | 2 +- Tools/ArdupilotMegaPlanner/CurrentState.cs | 12 +- Tools/ArdupilotMegaPlanner/FollowMe.fr.resx | 131 ++++ .../ConfigurationView/ConfigAP_Limits.fr.resx | 175 +++++ ...onfigAccelerometerCalibrationPlane.fr.resx | 187 +---- ...ConfigAccelerometerCalibrationQuad.fr.resx | 188 +---- .../ConfigArducopter.Designer.cs | 6 + .../ConfigArducopter.fr.resx | 300 ++++++++ .../ConfigurationView/ConfigArducopter.resx | 10 +- .../ConfigArduplane.Designer.cs | 6 + .../ConfigurationView/ConfigArduplane.fr.resx | 294 ++++++++ .../ConfigurationView/ConfigArduplane.resx | 6 +- .../ConfigArdurover.Designer.cs | 34 +- .../ConfigurationView/ConfigArdurover.fr.resx | 225 ++++++ .../ConfigurationView/ConfigArdurover.resx | 690 +++--------------- .../ConfigBatteryMonitoring.Designer.cs | 22 + .../ConfigBatteryMonitoring.cs | 69 +- .../ConfigBatteryMonitoring.fr.resx | 202 +---- .../ConfigBatteryMonitoring.resx | 75 +- .../ConfigurationView/ConfigFailSafe.fr.resx | 194 +---- .../ConfigFlightModes.fr.resx | 131 +--- .../ConfigHardwareOptions.fr.resx | 161 +--- .../ConfigurationView/ConfigMount.fr.resx | 207 ++++++ .../ConfigurationView/ConfigPlanner.fr.resx | 226 ++++++ .../ConfigRadioInput.fr.resx | 194 +---- .../ConfigurationView/ConfigRawParams.fr.resx | 150 ++++ .../ConfigurationView/ConfigTradHeli.fr.resx | 191 ++--- .../GCSViews/Firmware.fr.resx | 6 + .../GCSViews/FlightData.Designer.cs | 2 + .../GCSViews/FlightData.cs | 58 +- .../GCSViews/FlightData.fr.resx | 48 ++ .../GCSViews/FlightData.resx | 106 +-- .../GCSViews/FlightPlanner.fr.resx | 110 +-- .../GCSViews/Simulation.fr.resx | 3 + Tools/ArdupilotMegaPlanner/Log.fr.resx | 3 + Tools/ArdupilotMegaPlanner/MavlinkLog.fr.resx | 12 + Tools/ArdupilotMegaPlanner/OpenGLtest.cs | 8 +- .../Properties/AssemblyInfo.cs | 2 +- .../Radio/3DRradio.Designer.cs | 24 +- Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs | 58 +- .../ArdupilotMegaPlanner/Radio/3DRradio.resx | 167 +++-- Tools/ArdupilotMegaPlanner/dataflashlog.xml | 20 + 47 files changed, 3008 insertions(+), 2138 deletions(-) create mode 100644 Tools/ArdupilotMegaPlanner/Antenna/Tracker.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/Camera.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/FollowMe.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.fr.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.fr.resx diff --git a/Tools/ArdupilotMegaPlanner/Antenna/Tracker.fr.resx b/Tools/ArdupilotMegaPlanner/Antenna/Tracker.fr.resx new file mode 100644 index 0000000000..cd7509ff6b --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/Antenna/Tracker.fr.resx @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Miss using this interface can cause servo damage, use with caution!!! + + + Angle + + + Angle + + + Find Trim (3DR Radio) + + + Angle + + + Angle + + + Pan + + + Trim + + + Interface + + + Trim + + + Tilt + + + Range + + + Range + + + Maestro + + + PWM + + + PWM + + + Rev + + + 1000 + + + Rev + + + 360 + + + Connect + + + 1000 + + + 90 + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj index b1e4e3f434..26187173b9 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj @@ -691,12 +691,18 @@ + + Tracker.cs + Tracker.cs Tracker.cs + + Camera.cs + Camera.cs @@ -739,6 +745,24 @@ ValuesControl.cs + + FollowMe.cs + + + ConfigAP_Limits.cs + + + ConfigArducopter.cs + + + ConfigArduplane.cs + + + ConfigArdurover.cs + + + ConfigMount.cs + ConfigMount.cs @@ -763,12 +787,24 @@ ConfigFailSafe.cs + + ConfigPlanner.cs + + + ConfigRawParams.cs + SetupFresh.cs + + MavlinkLog.cs + OpenGLtest.cs + + 3DRradio.cs + SerialOutput2.cs @@ -1294,6 +1330,7 @@ Always + Designer diff --git a/Tools/ArdupilotMegaPlanner/Camera.fr.resx b/Tools/ArdupilotMegaPlanner/Camera.fr.resx new file mode 100644 index 0000000000..82e5fe64bb --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/Camera.fr.resx @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CM/Pixel + + + FOV V (m) + + + Pixel Width + + + Flight line distance + + + Pixel Height + + + Camera + + + Sidelap + + + Height m (agl) + + + Sensor Height + + + Focal Length + + + FOV H (m) + + + Angle H + + + Sensor Width + + + 4608 + + + Overlap + + + Angle V + + + Across Flight line + + + 6.16 + + + 4.62 + + + Save + + + 3456 + + + Camera top facing forward + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Controls/HUD.cs b/Tools/ArdupilotMegaPlanner/Controls/HUD.cs index 31dced5216..5b14cfb331 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/HUD.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/HUD.cs @@ -1388,9 +1388,7 @@ namespace ArdupilotMega.Controls { graphicsObject.ResetTransform(); - drawstring(graphicsObject, "Bat", font, fontsize + 2, whiteBrush, fontsize, this.Height - 30 - fontoffset); - drawstring(graphicsObject, _batterylevel.ToString("0.00v"), font, fontsize + 2, whiteBrush, fontsize * 4, this.Height - 30 - fontoffset); - drawstring(graphicsObject, _current.ToString("0 A"), font, fontsize + 2, whiteBrush, fontsize * 9, this.Height - 30 - fontoffset); + drawstring(graphicsObject, "Bat "+_batterylevel.ToString("0.00v") +" "+ _current.ToString("0 A"), font, fontsize + 2, whiteBrush, fontsize, this.Height - 30 - fontoffset); } // gps @@ -1754,22 +1752,30 @@ namespace ArdupilotMega.Controls if (DesignMode || !started) return; - + base.OnResize(e); + + if (SixteenXNine) { int ht = (int)(this.Width / 1.777f); if (ht != this.Height) + { this.Height = ht; + return; + } } else { // 4x3 int ht = (int)(this.Width / 1.333f); if (ht != this.Height) + { this.Height = ht; + return; + } } - base.OnResize(e); + graphicsObjectGDIP = Graphics.FromImage(objBitmap); diff --git a/Tools/ArdupilotMegaPlanner/Controls/MainSwitcher.cs b/Tools/ArdupilotMegaPlanner/Controls/MainSwitcher.cs index 63d6544fdd..449dc7ac48 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/MainSwitcher.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/MainSwitcher.cs @@ -63,6 +63,7 @@ namespace ArdupilotMega.Controls nextscreen.Control.Location = new Point(0, 0); + nextscreen.Control.SuspendLayout(); nextscreen.Control.Dock = DockStyle.Fill; nextscreen.Control.Size = this.Size; @@ -76,6 +77,8 @@ namespace ArdupilotMega.Controls this.Controls.Add(nextscreen.Control); + nextscreen.Control.ResumeLayout(); + ThemeManager.ApplyThemeTo(nextscreen.Control); current = nextscreen; diff --git a/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs b/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs index 4ab0911001..12c9095a46 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs @@ -69,7 +69,7 @@ namespace ArdupilotMega.Controls Size extent = TextRenderer.MeasureText(labelWithPseudoOpacity2.Text, this.Font); - float hRatio = (this.Height) / (float)extent.Height; + float hRatio = (labelWithPseudoOpacity2.Height) / (float)(extent.Height); float wRatio = this.Width / (float)extent.Width; float ratio = (hRatio < wRatio) ? hRatio : wRatio; diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs index 5cad04db5c..2d0db1ca8c 100644 --- a/Tools/ArdupilotMegaPlanner/CurrentState.cs +++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs @@ -229,7 +229,7 @@ namespace ArdupilotMega //DST to Home double dstlat = Math.Abs(TrackerLocation.Lat - lat) * 111319.5; double dstlon = Math.Abs(TrackerLocation.Lng - lng) * 111319.5 * scaleLongDown; - return (float)Math.Sqrt((dstlat * dstlat) + (dstlon * dstlon)); + return (float)Math.Sqrt((dstlat * dstlat) + (dstlon * dstlon)) * multiplierdist; } } @@ -237,7 +237,7 @@ namespace ArdupilotMega { get { - float dist = DistToMAV; + float dist = DistToMAV / multiplierdist; if (dist < 5) return 0; @@ -267,7 +267,9 @@ namespace ArdupilotMega //bearing = bearing - 180;//absolut return direction //if (bearing < 0) bearing += 360;//normalization - if (DistToMAV < 5) + float dist = DistToMAV / multiplierdist; + + if (dist < 5) return 0; return (float)bearing; @@ -315,7 +317,9 @@ namespace ArdupilotMega } { - work = DistToMAV * (float)Math.Pow(2.0, work / 6.0); + float dist = DistToMAV / multiplierdist; + + work = dist * (float)Math.Pow(2.0, work / 6.0); } return work; diff --git a/Tools/ArdupilotMegaPlanner/FollowMe.fr.resx b/Tools/ArdupilotMegaPlanner/FollowMe.fr.resx new file mode 100644 index 0000000000..bb1f84d234 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/FollowMe.fr.resx @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + What this does. +1. gets the current gps coords from a nmea gps. +2. sends a guided mode WP to the AP every 2 seconds. + +How to use it +1. connect to ap. +2. take off, test guided mode is working. +3. open this and pick your comport, and baud rate for your nmea gps. +4. it should now be following you. + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.fr.resx new file mode 100644 index 0000000000..8d05e6e74e --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.fr.resx @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + On + + + Enable Required Limits + + + Enable a simple Fixed Radius from home GeoFence, with the ability to specify Heights and fence arming options + + + + RC Channel + + + Require Inside Fence + + + Max Alt + + + Radius + + + Min Alt + + + On + + + Simple Fence + + + Required Limits - Before Arming + + + Alt Limits + + + GPS Lock Limits + + + GPS Lock Required + + + Enable GeoFence + + + Require Within Alt + + + Wiki + + + On + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationPlane.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationPlane.fr.resx index 1bd274beea..c47b6312c8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationPlane.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationPlane.fr.resx @@ -117,196 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - - - Manuel - - - PWM 0 - 1230 - - - PWM 1621 - 1749 - - - Mode Courant: - - - Activ. capteur optique - - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - - - Mode Simple - - - PWM 1750 + - - - Elevons CH1 Rev - - - PWM Actuel: - - - APMSetup - - - Swash-Servo position - - - Activ. Boussole - - - Mode Simple - - - ArduCopter2 - - - Mode Simple - - - type de châssis (+ ou x) - - - 60 - - - 1 - - - Mode Simple - - - Mode Simple - - - 2 - - - Modes - - - Mode Simple - - - 3 - - - Réinit. - - - -60 - - - Haut - - - Mouvement Swash - - - Manuel - - - Deplac. du Gouvernail - - - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - - - Calibrer Radio - - - Max - Mode de vol 2 - - Roulis Max - - - Mode de vol 2 - - - Tangage Max - - - en degrés eg 2° 3' W est -2.3 - Mode de vol 1 Niveler l'apareil pour copensation des accels - - Mode de vol 6 + + Level - - Capacité + + Do a accel calibration now. - - Déclination + + Disables autolevel and will keep the last done accel calibration - - Activer Sonar - - - PWM 1231 - 1360 - - - Entrée Radio - - - 1500 - - - Mode de vol 4 - - - Mode de vol 5 - - - Gyro - - - PWM 1361 - 1490 - - - Matériel - - - PWM 1491 - 1620 - - - Site Web Déclination - - - 1500 - - - Batterie - - - Zéro - - - Activ. Airspeed - - - 4500 - - - RàZ tout parametres du APM - - - 1000 - - - Moniteur + + Manual level \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.fr.resx index 1bd274beea..0475777cd6 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.fr.resx @@ -117,196 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - - - Manuel - - - PWM 0 - 1230 - - - PWM 1621 - 1749 - - - Mode Courant: - - - Activ. capteur optique - - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - - - Mode Simple - - - PWM 1750 + - - - Elevons CH1 Rev - - - PWM Actuel: - - - APMSetup - - - Swash-Servo position - - - Activ. Boussole - - - Mode Simple - - - ArduCopter2 - - - Mode Simple - - - type de châssis (+ ou x) - - - 60 - - - 1 - - - Mode Simple - - - Mode Simple - - - 2 - - - Modes - - - Mode Simple - - - 3 - - - Réinit. - - - -60 - - - Haut - - - Mouvement Swash - - - Manuel - - - Deplac. du Gouvernail - - - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - - - Calibrer Radio - - - Max - - Mode de vol 2 - - - Roulis Max + "+" - Mode de vol 2 - - - Tangage Max - - - en degrés eg 2° 3' W est -2.3 + "X" - Mode de vol 1 - - - Niveler l'apareil pour copensation des accels - - - Mode de vol 6 - - - Capacité - - - Déclination - - - Activer Sonar - - - PWM 1231 - 1360 - - - Entrée Radio - - - 1500 + Configuration Chassis - Mode de vol 4 + Mettre l'appareil de niveau avant de calibrer - Mode de vol 5 + Calibration des accéléromètres - - Gyro - - - PWM 1361 - 1490 - - - Matériel - - - PWM 1491 - 1620 - - - Site Web Déclination - - - 1500 - - - Batterie - - - Zéro - - - Activ. Airspeed - - - 4500 - - - RàZ tout parametres du APM - - - 1000 - - - Moniteur + + Calibrer \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs index 858542592f..86d030a5c3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs @@ -806,6 +806,12 @@ resources.ApplyResources(this.label91, "label91"); this.label91.Name = "label91"; // + // toolTip1 + // + this.toolTip1.AutoPopDelay = 20000; + this.toolTip1.InitialDelay = 500; + this.toolTip1.ReshowDelay = 100; + // // BUT_writePIDS // resources.ApplyResources(this.BUT_writePIDS, "BUT_writePIDS"); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.fr.resx new file mode 100644 index 0000000000..b23f967861 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.fr.resx @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + D + + + IMAX + + + P + + + D + + + IMAX + + + D + + + IMAX + + + I + + + Gain + + + IMAX + + + P + + + I + + + I + + + P + + + I + + + P + + + IMAX + + + IMAX + + + P + + + Ch6 Opt + + + I + + + Min + + + D + + + D + + + IMAX + + + Crosstrack Correction + + + Ch7 Opt + + + D + + + Altitude Hold + + + Nav WP + + + P + + + Throttle Rate + + + Rate Loiter + + + m/s + + + Loiter Speed + + + I + + + I + + + IMAX + + + P + + + P + + + I + + + IMAX + + + P + + + Rate Pitch + + + Rate Roll + + + Stabilize Yaw + + + Stabilize Pitch + + + Stabilize Roll + + + Rate Yaw + + + Stabilize D + + + I + + + Lock Pitch and Roll Values + + + Write Params + + + P + + + IMAX + + + I + + + P + + + IMAX + + + I + + + Refresh Params + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx index 4914219e3c..faddbe520e 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx @@ -135,7 +135,7 @@ myLabel3 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4629.11875, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -201,7 +201,7 @@ myLabel2 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4629.11875, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -312,7 +312,7 @@ myLabel1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4629.11875, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -2506,7 +2506,7 @@ BUT_writePIDS - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4629.11875, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -2536,7 +2536,7 @@ BUT_rerequestparams - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4629.11875, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs index dcc8c52269..3b57217366 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs @@ -791,6 +791,12 @@ resources.ApplyResources(this.label52, "label52"); this.label52.Name = "label52"; // + // toolTip1 + // + this.toolTip1.AutoPopDelay = 20000; + this.toolTip1.InitialDelay = 500; + this.toolTip1.ReshowDelay = 100; + // // BUT_writePIDS // resources.ApplyResources(this.BUT_writePIDS, "BUT_writePIDS"); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.fr.resx new file mode 100644 index 0000000000..337ce370bc --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.fr.resx @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + INT_MAX + + + P to T + + + Gain (cm) + + + Pitch Comp + + + P + + + FBW max + + + D + + + FBW min + + + Servo Roll Pid + + + INT_MAX + + + Servo Pitch Pid + + + P + + + Ratio + + + Max + + + I + + + D + + + Min + + + Cruise + + + INT_MAX + + + FS Value + + + Navigation Angles + + + I + + + Throttle 0-100% + + + Cruise + + + Airspeed m/s + + + D + + + P + + + INT_MAX + + + I + + + D + + + I + + + P + + + INT_MAX + + + D + + + I + + + Other Mix's + + + Energy/Alt Pid + + + Nav Pitch AS Pid + + + P + + + Xtrack Pids + + + INT_MAX + + + Servo Yaw Pid + + + Nav Pitch Alt Pid + + + Nav Roll Pid + + + Pitch Max + + + Bank Max + + + Pitch Min + + + D + + + P + + + I + + + D + + + P + + + I + + + INT_MAX + + + Write Params + + + Rudder Mix + + + Entry Angle + + + Refresh Params + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx index 3f8066d9bb..946db03927 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx @@ -2542,7 +2542,7 @@ BUT_writePIDS - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -2572,7 +2572,7 @@ BUT_rerequestparams - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -2599,6 +2599,6 @@ ConfigArduplane - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs index c0b39b4a6b..117c7761c7 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs @@ -82,6 +82,8 @@ this.BUT_writePIDS = new ArdupilotMega.Controls.MyButton(); this.BUT_rerequestparams = new ArdupilotMega.Controls.MyButton(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.ROV_SONAR_TRIG = new System.Windows.Forms.NumericUpDown(); + this.label13 = new System.Windows.Forms.Label(); this.ROV_GAIN = new System.Windows.Forms.NumericUpDown(); this.label9 = new System.Windows.Forms.Label(); this.ROV_CL_NAV = new System.Windows.Forms.NumericUpDown(); @@ -90,8 +92,6 @@ this.label11 = new System.Windows.Forms.Label(); this.ROV_AWPR_NAV = new System.Windows.Forms.NumericUpDown(); this.label12 = new System.Windows.Forms.Label(); - this.ROV_SONAR_TRIG = new System.Windows.Forms.NumericUpDown(); - this.label13 = new System.Windows.Forms.Label(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.THR_FS_VALUE)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_MAX)).BeginInit(); @@ -120,11 +120,11 @@ ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_P)).BeginInit(); this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_SONAR_TRIG)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_GAIN)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_CL_NAV)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_BOOSTER)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_AWPR_NAV)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ROV_SONAR_TRIG)).BeginInit(); this.SuspendLayout(); // // groupBox3 @@ -415,6 +415,12 @@ resources.ApplyResources(this.label64, "label64"); this.label64.Name = "label64"; // + // toolTip1 + // + this.toolTip1.AutoPopDelay = 20000; + this.toolTip1.InitialDelay = 500; + this.toolTip1.ReshowDelay = 100; + // // BUT_writePIDS // resources.ApplyResources(this.BUT_writePIDS, "BUT_writePIDS"); @@ -445,6 +451,16 @@ this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; // + // ROV_SONAR_TRIG + // + resources.ApplyResources(this.ROV_SONAR_TRIG, "ROV_SONAR_TRIG"); + this.ROV_SONAR_TRIG.Name = "ROV_SONAR_TRIG"; + // + // label13 + // + resources.ApplyResources(this.label13, "label13"); + this.label13.Name = "label13"; + // // ROV_GAIN // resources.ApplyResources(this.ROV_GAIN, "ROV_GAIN"); @@ -485,16 +501,6 @@ resources.ApplyResources(this.label12, "label12"); this.label12.Name = "label12"; // - // ROV_SONAR_TRIG - // - resources.ApplyResources(this.ROV_SONAR_TRIG, "ROV_SONAR_TRIG"); - this.ROV_SONAR_TRIG.Name = "ROV_SONAR_TRIG"; - // - // label13 - // - resources.ApplyResources(this.label13, "label13"); - this.label13.Name = "label13"; - // // ConfigArdurover // resources.ApplyResources(this, "$this"); @@ -537,11 +543,11 @@ ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_P)).EndInit(); this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.ROV_SONAR_TRIG)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_GAIN)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_CL_NAV)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_BOOSTER)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ROV_AWPR_NAV)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ROV_SONAR_TRIG)).EndInit(); this.ResumeLayout(false); } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.fr.resx new file mode 100644 index 0000000000..ac364be5b3 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.fr.resx @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Auto WP Rad + + + Closed Loop Nav + + + Sonar Trigger Dist + + + Booster + + + Gain (cm) + + + FBW max + + + FBW min + + + Ratio + + + Max + + + Min + + + Rover + + + Cruise + + + FS Value + + + Navigation Angles + + + Throttle 0-100% + + + Cruise + + + speed m/s + + + Turn Gain + + + P + + + INT_MAX + + + D + + + I + + + Energy/Alt Pid + + + Xtrack Pids + + + Nav Roll Pid + + + Pitch Max + + + Bank Max + + + Pitch Min + + + D + + + P + + + I + + + INT_MAX + + + Write Params + + + Entry Angle + + + Refresh Params + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx index 813d1b26c2..05ff51af56 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx @@ -117,134 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - THR_FS_VALUE - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 0 - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - - THR_MAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 2 - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 3 - - - THR_MIN - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 4 - - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 5 - - - TRIM_THROTTLE - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 6 - - - label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 7 - - - 413, 231 - - - 195, 108 - - - - 12 - - - Throttle 0-100% - - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 111, 82 78, 20 + 11 @@ -432,125 +312,29 @@ 7 - - ARSPD_RATIO + + 413, 231 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - ARSPD_FBW_MAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 3 - - - ARSPD_FBW_MIN - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 4 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 5 - - - TRIM_ARSPD_CM - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 6 - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 7 - - - 414, 339 - - + 195, 108 - - 13 + + 12 - - speed m/s + + Throttle 0-100% - - groupBox1 + + groupBox3 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 4 + + 3 111, 82 @@ -744,101 +528,29 @@ 7 - - LIM_PITCH_MIN + + 414, 339 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - label39 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - LIM_PITCH_MAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 2 - - - label38 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 3 - - - LIM_ROLL_CD - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 4 - - - label37 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 5 - - - 213, 339 - - + 195, 108 - - 14 + + 13 - - Navigation Angles + + speed m/s - - groupBox2 + + groupBox1 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 5 + + 4 111, 59 @@ -984,77 +696,29 @@ 5 - - XTRK_ANGLE_CD + + 213, 339 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox15 - - - 0 - - - label79 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox15 - - - 1 - - - XTRK_GAIN_SC - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox15 - - - 2 - - - label80 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox15 - - - 3 - - - 12, 339 - - + 195, 108 - - 15 + + 14 - - Xtrack Pids + + Navigation Angles - - groupBox15 + + groupBox2 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 6 + + 5 111, 36 @@ -1152,125 +816,29 @@ 3 - - ENRGY2THR_IMAX + + 12, 339 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 0 - - - label73 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 1 - - - ENRGY2THR_D - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 2 - - - label74 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 3 - - - ENRGY2THR_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 4 - - - label75 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 5 - - - ENRGY2THR_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 6 - - - label76 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox14 - - - 7 - - - 12, 231 - - + 195, 108 - - 17 + + 15 - - Energy/Alt Pid + + Xtrack Pids - - groupBox14 + + groupBox15 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 7 + + 6 111, 82 @@ -1464,125 +1032,29 @@ 7 - - HDNG2RLL_IMAX + + 12, 231 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 0 - - - label61 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 1 - - - HDNG2RLL_D - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 2 - - - label62 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 3 - - - HDNG2RLL_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 4 - - - label63 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 5 - - - HDNG2RLL_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 6 - - - label64 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox11 - - - 7 - - - 12, 123 - - + 195, 108 - - 20 + + 17 - - Nav Roll Pid + + Energy/Alt Pid - - groupBox11 + + groupBox14 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 8 + + 7 111, 82 @@ -1776,6 +1248,30 @@ 7 + + 12, 123 + + + 195, 108 + + + 20 + + + Nav Roll Pid + + + groupBox11 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + 17, 17 @@ -1798,7 +1294,7 @@ BUT_writePIDS - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -1828,7 +1324,7 @@ BUT_rerequestparams - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.36788, Culture=neutral, PublicKeyToken=null $this @@ -2119,6 +1615,6 @@ ConfigArdurover - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs index 1f0a7b85e9..f7acfe7784 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs @@ -50,6 +50,8 @@ this.CMB_batmontype = new System.Windows.Forms.ComboBox(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.timer1 = new System.Windows.Forms.Timer(this.components); + this.CMB_apmversion = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); this.groupBox4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); this.SuspendLayout(); @@ -190,10 +192,28 @@ this.timer1.Interval = 1000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // + // CMB_apmversion + // + this.CMB_apmversion.FormattingEnabled = true; + this.CMB_apmversion.Items.AddRange(new object[] { + resources.GetString("CMB_apmversion.Items"), + resources.GetString("CMB_apmversion.Items1"), + resources.GetString("CMB_apmversion.Items2")}); + resources.ApplyResources(this.CMB_apmversion, "CMB_apmversion"); + this.CMB_apmversion.Name = "CMB_apmversion"; + this.CMB_apmversion.SelectedIndexChanged += new System.EventHandler(this.CMB_apmversion_SelectedIndexChanged); + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // // ConfigBatteryMonitoring // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.CMB_apmversion); this.Controls.Add(this.groupBox4); this.Controls.Add(this.label47); this.Controls.Add(this.CMB_batmonsensortype); @@ -234,5 +254,7 @@ private System.Windows.Forms.ComboBox CMB_batmontype; private System.Windows.Forms.PictureBox pictureBox5; private System.Windows.Forms.Timer timer1; + private System.Windows.Forms.ComboBox CMB_apmversion; + private System.Windows.Forms.Label label1; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.cs index 25c7285a3d..b851bfd0f6 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.cs @@ -251,6 +251,19 @@ namespace ArdupilotMega.GCSViews.ConfigurationView TXT_divider.Text = (maxvolt / topvolt).ToString(); TXT_ampspervolt.Text = (maxamps / topamps).ToString(); } + else if (selection == 4) // 3dr iv + { + float maxvolt = 50f; + float maxamps = 90f; + float mvpervolt = 100f; + float mvperamp = 55.55f; + + float topvolt = (maxvolt * mvpervolt) / 1000; + float topamps = (maxamps * mvperamp) / 1000; + + TXT_divider.Text = (maxvolt / topvolt).ToString(); + TXT_ampspervolt.Text = (maxamps / topamps).ToString(); + } // enable to update TXT_divider.Enabled = true; @@ -333,11 +346,38 @@ namespace ArdupilotMega.GCSViews.ConfigurationView { CMB_batmonsensortype.SelectedIndex = 3; } + else if (TXT_ampspervolt.Text == (18.0018).ToString()) + { + CMB_batmonsensortype.SelectedIndex = 4; + } else { CMB_batmonsensortype.SelectedIndex = 0; } + if (MainV2.comPort.param["BATT_VOLT_PIN"] != null) + { + CMB_apmversion.Enabled = true; + + float value = (float)MainV2.comPort.param["BATT_VOLT_PIN"]; + if (value == 0) // apm1 + { + CMB_apmversion.SelectedIndex = 0; + } + else if (value == 1) // apm2 + { + CMB_apmversion.SelectedIndex = 1; + } + else if (value == 2) // apm2.5 + { + CMB_apmversion.SelectedIndex = 2; + } + } + else + { + CMB_apmversion.Enabled = false; + } + startup = false; timer1.Start(); @@ -359,6 +399,33 @@ namespace ArdupilotMega.GCSViews.ConfigurationView private void timer1_Tick(object sender, EventArgs e) { TXT_voltage.Text = MainV2.cs.battery_voltage.ToString(); - } + } + + private void CMB_apmversion_SelectedIndexChanged(object sender, EventArgs e) + { + if (startup) + return; + + int selection = int.Parse(CMB_batmonsensortype.Text.Substring(0, 1)); + + if (selection == 0) + { + // apm1 + MainV2.comPort.setParam("BATT_VOLT_PIN", 0); + MainV2.comPort.setParam("BATT_CURR_PIN", 1); + } + else if (selection == 1) + { + // apm2 + MainV2.comPort.setParam("BATT_VOLT_PIN", 1); + MainV2.comPort.setParam("BATT_CURR_PIN", 2); + } + else if (selection == 2) + { + //apm2.5 + MainV2.comPort.setParam("BATT_VOLT_PIN", 13); + MainV2.comPort.setParam("BATT_CURR_PIN", 12); + } + } } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.fr.resx index 1bd274beea..7b8e87b0ea 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.fr.resx @@ -117,196 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - - - Manuel - - - PWM 0 - 1230 - - - PWM 1621 - 1749 - - - Mode Courant: - - - Activ. capteur optique - - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - - - Mode Simple - - - PWM 1750 + - - - Elevons CH1 Rev - - - PWM Actuel: - - - APMSetup - - - Swash-Servo position - - - Activ. Boussole - - - Mode Simple - - - ArduCopter2 - - - Mode Simple - - - type de châssis (+ ou x) - - - 60 - - - 1 - - - Mode Simple - - - Mode Simple - - - 2 - - - Modes - - - Mode Simple - - - 3 - - - Réinit. - - - -60 - - - Haut - - - Mouvement Swash - - - Manuel - - - Deplac. du Gouvernail - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - - Calibrer Radio - - - Max - - - Mode de vol 2 - - - Roulis Max - - - Mode de vol 2 - - - Tangage Max - - - en degrés eg 2° 3' W est -2.3 - - - Mode de vol 1 - - - Niveler l'apareil pour copensation des accels - - - Mode de vol 6 - Capacité - - Déclination - - - Activer Sonar - - - PWM 1231 - 1360 - - - Entrée Radio - - - 1500 - - - Mode de vol 4 - - - Mode de vol 5 - - - Gyro - - - PWM 1361 - 1490 - - - Matériel - - - PWM 1491 - 1620 - - - Site Web Déclination - - - 1500 - - - Batterie - - - Zéro - - - Activ. Airspeed - - - 4500 - - - RàZ tout parametres du APM - - - 1000 + + Calibration Moniteur + + 2. Measured battery voltage: + + + 1. APM Input voltage: + + + 4. Voltage divider (Calced): + + + 3. Battery voltage (Calced): + + + 5. Amperes per volt: + + + Sensor + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx index 75fa537774..fcbedf66c5 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx @@ -427,7 +427,7 @@ $this - 0 + 2 NoControl @@ -454,7 +454,7 @@ $this - 1 + 3 0: Other @@ -490,7 +490,7 @@ $this - 2 + 4 Microsoft Sans Serif, 8.25pt @@ -526,7 +526,7 @@ Then subtract 0.3v from that value and enter it in field #1 at left. $this - 3 + 5 True @@ -556,7 +556,7 @@ Then subtract 0.3v from that value and enter it in field #1 at left. $this - 4 + 6 NoControl @@ -583,7 +583,7 @@ Then subtract 0.3v from that value and enter it in field #1 at left. $this - 5 + 7 349, 42 @@ -604,7 +604,7 @@ Then subtract 0.3v from that value and enter it in field #1 at left. $this - 6 + 8 0: Disabled @@ -634,7 +634,7 @@ Then subtract 0.3v from that value and enter it in field #1 at left. $this - 7 + 9 Zoom @@ -661,11 +661,68 @@ Then subtract 0.3v from that value and enter it in field #1 at left. $this - 8 + 10 17, 17 + + 0: APM1 + + + 1: APM2 - 2.5 non 3DR + + + 2: APM2.5 3DR IV + + + 160, 95 + + + 121, 21 + + + 51 + + + CMB_apmversion + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 106, 98 + + + 55, 18 + + + 52 + + + APM Ver + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.fr.resx index 1bd274beea..f6efd42d57 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.fr.resx @@ -117,196 +117,56 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - - - Manuel - - - PWM 0 - 1230 - - - PWM 1621 - 1749 - - - Mode Courant: - - - Activ. capteur optique - - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - - - Mode Simple - - - PWM 1750 + - - - Elevons CH1 Rev - - - PWM Actuel: - - - APMSetup - - - Swash-Servo position - - - Activ. Boussole - - - Mode Simple - - - ArduCopter2 - - - Mode Simple - - - type de châssis (+ ou x) - - - 60 - - - 1 - - - Mode Simple - - - Mode Simple - - - 2 - - - Modes - - - Mode Simple - - - 3 - - - Réinit. - - - -60 - - - Haut - - - Mouvement Swash + + Throttle Failsafe Action Manuel - - Deplac. du Gouvernail - - - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - - - Calibrer Radio - - - Max + + Off, no Action, On, RTL Mode de vol 2 - - Roulis Max + + FailSafe Long (20 sec) Mode de vol 2 - - Tangage Max - - - en degrés eg 2° 3' W est -2.3 + + Throttle FailSafe Mode de vol 1 - - Niveler l'apareil pour copensation des accels + + Enable Failsafe on GCS loss of communication - - Mode de vol 6 + + Off, no Action, On, RTL - - Capacité + + FailSafe Options - - Déclination + + FailSafe Short (1 sec) - - Activer Sonar + + Arducopter Auto: Off, no Action, On, RTL +Arducopter Other: if have gps, RTL, Otherwise Land - - PWM 1231 - 1360 + + Enable Failsafe on low throttle pwm - - Entrée Radio + + GCS FailSafe - - 1500 + + Trigger Throttle Pwm - - Mode de vol 4 - - - Mode de vol 5 - - - Gyro - - - PWM 1361 - 1490 - - - Matériel - - - PWM 1491 - 1620 - - - Site Web Déclination - - - 1500 - - - Batterie - - - Zéro - - - Activ. Airspeed - - - 4500 - - - RàZ tout parametres du APM - - - 1000 - - - Moniteur + + Wiki \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.fr.resx index 1bd274beea..11f59654ed 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.fr.resx @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - - - Manuel - PWM 0 - 1230 @@ -132,181 +126,64 @@ Mode Courant: - - Activ. capteur optique - - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - Mode Simple PWM 1750 + - - Elevons CH1 Rev - PWM Actuel: - - APMSetup - - - Swash-Servo position - - - Activ. Boussole - Mode Simple - - ArduCopter2 - Mode Simple - - type de châssis (+ ou x) - - - 60 - - - 1 - Mode Simple Mode Simple - - 2 - - - Modes - Mode Simple - - 3 - - - Réinit. - - - -60 - - - Haut - - - Mouvement Swash - Manuel - - Deplac. du Gouvernail - - - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - - - Calibrer Radio - - - Max - Mode de vol 2 - - Roulis Max - Mode de vol 2 - - Tangage Max - - - en degrés eg 2° 3' W est -2.3 - Mode de vol 1 - - Niveler l'apareil pour copensation des accels - Mode de vol 6 - - Capacité - - - Déclination - - - Activer Sonar - PWM 1231 - 1360 - - Entrée Radio - - - 1500 - Mode de vol 4 Mode de vol 5 - - Gyro - PWM 1361 - 1490 - - Matériel - PWM 1491 - 1620 - - Site Web Déclination + + 0 - - 1500 - - - Batterie - - - Zéro - - - Activ. Airspeed - - - 4500 - - - RàZ tout parametres du APM - - - 1000 - - - Moniteur + + Save Modes \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.fr.resx index 1bd274beea..e41a561ed9 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.fr.resx @@ -117,196 +117,43 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - - - Manuel - - - PWM 0 - 1230 - - - PWM 1621 - 1749 - - - Mode Courant: + + Log Calibration Activ. capteur optique - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - - - Mode Simple - - - PWM 1750 + - - - Elevons CH1 Rev - - - PWM Actuel: - - - APMSetup - - - Swash-Servo position - Activ. Boussole - - Mode Simple - - - ArduCopter2 - - - Mode Simple - - - type de châssis (+ ou x) - - - 60 - - - 1 - - - Mode Simple - - - Mode Simple - - - 2 - - - Modes - - - Mode Simple - - - 3 - - - Réinit. - - - -60 - - - Haut - - - Mouvement Swash - - - Manuel - - - Deplac. du Gouvernail - - - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - - - Calibrer Radio - - - Max - Mode de vol 2 - - Roulis Max - Mode de vol 2 - - Tangage Max - en degrés eg 2° 3' W est -2.3 Mode de vol 1 - - Niveler l'apareil pour copensation des accels - - - Mode de vol 6 - - - Capacité - Déclination Activer Sonar - - PWM 1231 - 1360 - - - Entrée Radio - - - 1500 - - - Mode de vol 4 - Mode de vol 5 - - Gyro - - - PWM 1361 - 1490 - - - Matériel - - - PWM 1491 - 1620 - Site Web Déclination - - 1500 - - - Batterie - - - Zéro + + Live Calibration Activ. Airspeed - - 4500 - - - RàZ tout parametres du APM - - - 1000 - - - Moniteur - \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.fr.resx new file mode 100644 index 0000000000..c2eb63e341 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.fr.resx @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Min + + + Servo Limits + + + Max + + + Angle Limits + + + Max + + + Min + + + Servo Limits + + + Error Message of some kind + + + Pan + + + Max + + + Min + + + Max + + + Min + + + Input Ch + + + Input Ch + + + Input Ch + + + Servo Limits + + + Max + + + Angle Limits + + + Roll + + + Max + + + Min + + + Tilt + + + Min + + + Angle Limits + + + Reverse + + + Reverse + + + Reverse + + + Wiki + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.fr.resx new file mode 100644 index 0000000000..462cba858a --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.fr.resx @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Map is rotated to follow the plane + + + Alt Warning + + + HUD + + + Stop + + + Battery Warning + + + Enable Speech + + + Track Length + + + Waypoints + + + Time Interval + + + Video Format + + + Position + + + Attitude + + + Map Follow + + + Telemetry Rates + + + RC + + + Mode/Status + + + Enable HUD Overlay + + + APM Reset + + + Load Waypoints on connect? + + + Speed Units + + + Waypoint + + + NOTE: The Configuration Tab will NOT display these units, as those are raw values. + + + + Video Device + + + UI Language + + + Joystick + + + GDI+ (old type) + + + OSD Color + + + Sensor + + + Dist Units + + + Speech + + + Joystick Setup + + + Mavlink Message Debug + + + Reset APM on USB Connect + + + Mode + + + Start + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRadioInput.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRadioInput.fr.resx index 1bd274beea..ec5a647eb8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRadioInput.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRadioInput.fr.resx @@ -117,196 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - - - Manuel - - - PWM 0 - 1230 - - - PWM 1621 - 1749 - - - Mode Courant: - - - Activ. capteur optique - - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - - - Mode Simple - - - PWM 1750 + - Elevons CH1 Rev - - PWM Actuel: - - - APMSetup - - - Swash-Servo position - - - Activ. Boussole - - - Mode Simple - - - ArduCopter2 - - - Mode Simple - - - type de châssis (+ ou x) - - - 60 - - - 1 - - - Mode Simple - - - Mode Simple - - - 2 - - - Modes - - - Mode Simple - - - 3 - - - Réinit. - - - -60 - - - Haut - - - Mouvement Swash - - - Manuel - - - Deplac. du Gouvernail - - - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - Calibrer Radio - - Max + + Elevons CH2 Rev - - Mode de vol 2 + + Elevon Config - - Roulis Max + + Elevons Rev - - Mode de vol 2 + + Elevons - - Tangage Max + + Reverse - - en degrés eg 2° 3' W est -2.3 + + Reverse - - Mode de vol 1 + + Reverse - - Niveler l'apareil pour copensation des accels - - - Mode de vol 6 - - - Capacité - - - Déclination - - - Activer Sonar - - - PWM 1231 - 1360 - - - Entrée Radio - - - 1500 - - - Mode de vol 4 - - - Mode de vol 5 - - - Gyro - - - PWM 1361 - 1490 - - - Matériel - - - PWM 1491 - 1620 - - - Site Web Déclination - - - 1500 - - - Batterie - - - Zéro - - - Activ. Airspeed - - - 4500 - - - RàZ tout parametres du APM - - - 1000 - - - Moniteur + + Reverse \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.fr.resx new file mode 100644 index 0000000000..ad7428d21b --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.fr.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Value + + + Load + + + Command + + + Default + + + Save + + + Write Params + + + mavScale + + + RawValue + + + Compare Params + + + Refresh Params + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.fr.resx index 1bd274beea..9faaa0776c 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.fr.resx @@ -117,108 +117,33 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180 - Manuel - - PWM 0 - 1230 - - - PWM 1621 - 1749 - - - Mode Courant: - - - Activ. capteur optique - - - NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc... - - - Mode Simple - - - PWM 1750 + - - - Elevons CH1 Rev - - - PWM Actuel: - - - APMSetup + + 180 Swash-Servo position - - Activ. Boussole - - - Mode Simple - - - ArduCopter2 - - - Mode Simple - - - type de châssis (+ ou x) - - - 60 - 1 - - Mode Simple - - - Mode Simple - 2 - - Modes - - - Mode Simple - 3 - - Réinit. - - - -60 - Haut Mouvement Swash - - Manuel - Deplac. du Gouvernail - - Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas - - - Calibrer Radio - Max @@ -228,85 +153,85 @@ Roulis Max - - Mode de vol 2 - Tangage Max - - en degrés eg 2° 3' W est -2.3 - Mode de vol 1 - - Niveler l'apareil pour copensation des accels - - - Mode de vol 6 - - - Capacité - - - Déclination - - - Activer Sonar - - - PWM 1231 - 1360 - - - Entrée Radio + + 1000 1500 - - Mode de vol 4 - - - Mode de vol 5 + + Swash Type Gyro - - PWM 1361 - 1490 - - - Matériel - - - PWM 1491 - 1620 - - - Site Web Déclination - 1500 - - Batterie - Zéro - - Activ. Airspeed + + Servo - - 4500 + + 60 - - RàZ tout parametres du APM + + Rev - - 1000 + + Position - - Moniteur + + Trim + + + 1500 + + + CCPM + + + -60 + + + H1 + + + 1500 + + + 1500 + + + Gain + + + Trim + + + Enable + + + Manual + + + Rudder + + + Rev + + + Min + + + Bottom \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.fr.resx index bd8a8f1656..8ed710a4db 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.fr.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Pick previous firmware + Images par Max Levine @@ -129,4 +132,7 @@ APM Setup (Avion et Quad) + + Load custom firmware + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index f42c15e9dd..45fa5ff423 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -152,6 +152,7 @@ // this.MainH.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; resources.ApplyResources(this.MainH, "MainH"); + this.MainH.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; this.MainH.Name = "MainH"; // // MainH.Panel1 @@ -1179,6 +1180,7 @@ this.gMapControl1.Zoom = 0D; this.gMapControl1.Click += new System.EventHandler(this.gMapControl1_Click); this.gMapControl1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.gMapControl1_MouseDown); + this.gMapControl1.MouseLeave += new System.EventHandler(this.gMapControl1_MouseLeave); this.gMapControl1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.gMapControl1_MouseMove); // // panel1 diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index 31a3739033..62fee998c3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -89,6 +89,8 @@ namespace ArdupilotMega.GCSViews bool playingLog = false; double LogPlayBackSpeed = 1.0; + GMapMarker marker; + AviWriter aviwriter; public SplitContainer MainHcopy = null; @@ -100,7 +102,7 @@ namespace ArdupilotMega.GCSViews threadrun = 0; MainV2.comPort.logreadmode = false; MainV2.config["FlightSplitter"] = hud1.Width; - if (!MainV2.MONO) + if (false || !MainV2.MONO) { try { @@ -239,10 +241,10 @@ namespace ArdupilotMega.GCSViews } catch { } - if (MainV2.MONO) + if (true || MainV2.MONO) { - MainH.Dock = DockStyle.Fill; - MainH.Visible = true; + // MainH.Dock = DockStyle.Fill; + // MainH.Visible = true; } else { @@ -495,7 +497,7 @@ namespace ArdupilotMega.GCSViews void tabStatus_Resize(object sender, EventArgs e) { // localise it - Control tabStatus = sender as Control; + //Control tabStatus = sender as Control; // tabStatus.SuspendLayout(); @@ -661,6 +663,13 @@ namespace ArdupilotMega.GCSViews if (MainV2.config["CHK_autopan"] != null) CHK_autopan.Checked = bool.Parse(MainV2.config["CHK_autopan"].ToString()); + + if (MainV2.config.Contains("FlightSplitter")) + { + // hud1.Width = int.Parse(MainV2.config["FlightSplitter"].ToString()); + // MainH.PerformLayout(); + MainH.SplitterDistance = int.Parse(MainV2.config["FlightSplitter"].ToString()); + } } private void mainloop() @@ -1513,6 +1522,22 @@ namespace ArdupilotMega.GCSViews } catch { } } + else + { + // setup a ballon with home distance + if (marker != null) + { + if (routes.Markers.Contains(marker)) + routes.Markers.Remove(marker); + } + + marker = new GMapMarkerRect(point); + marker.ToolTip = new GMapToolTip(marker); + marker.ToolTipMode = MarkerTooltipMode.Always; + marker.ToolTipText = "Home: "+((gMapControl1.Manager.GetDistance(point, MainV2.cs.HomeLocation.Point()) * 1000) * MainV2.cs.multiplierdist).ToString("0"); + + routes.Markers.Add(marker); + } } private void FlightData_ParentChanged(object sender, EventArgs e) @@ -1832,10 +1857,12 @@ namespace ArdupilotMega.GCSViews private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) { - /* + + + if (tabControl1.SelectedTab == tabStatus) { - + tabStatus_Resize(sender, e); } else { @@ -1851,7 +1878,7 @@ namespace ArdupilotMega.GCSViews } } - */ + } private void Gspeed_DoubleClick(object sender, EventArgs e) @@ -2651,7 +2678,9 @@ print 'Roll complete' private void hud1_Resize(object sender, EventArgs e) { - //Console.WriteLine("HUD resize "+ hud1.Width + " " + hud1.Height); + Console.WriteLine("HUD resize "+ hud1.Width + " " + hud1.Height); + + SubMainLeft.SplitterDistance = hud1.Height; try { @@ -2684,5 +2713,14 @@ print 'Roll complete' //MainV2.comPort.setNextWPTargetAlt((ushort)MainV2.cs.wpno, newalt); } + + private void gMapControl1_MouseLeave(object sender, EventArgs e) + { + if (marker != null) + { + if (routes.Markers.Contains(marker)) + routes.Markers.Remove(marker); + } + } } -} \ No newline at end of file +} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx index 89b6174382..d4671641fe 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx @@ -138,6 +138,9 @@ Nagiguez ici + + Double Click me to change + Vitesse actuel du vent @@ -165,6 +168,15 @@ 0 + + Display Battery Info + + + hdop: 0 + + + Arm the Mav + Journal > KML @@ -174,9 +186,15 @@ Efface Trajet + + Arm/ Disarm + Monter + + User Items + Centrer automatiquement sur la position actuel @@ -192,18 +210,27 @@ Centré + + Set MJPEG source + Manette Change niveau du Zoom + + Reset + M.à point Bas + + Sats: 0 + Effectuer @@ -216,6 +243,9 @@ Affiche valeurs brut Gyro et Accel, aussi entrée/sorti du Radio + + Set Aspect Ratio + Double click pour changer Max @@ -231,6 +261,9 @@ Definir alt. d'origine + + Quick + Dir: 0 @@ -261,9 +294,15 @@ 0.00 % + + Flight Planner + Déf. Mode + + x 1.0 + Vitesse lecture @@ -273,4 +312,13 @@ &RTL + + Fly To Here Alt + + + Satallite Count + + + gps hdop + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index ee2c65a0f0..28441db1d2 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -154,10 +154,13 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 354, 0 - + + Fill + + + 0, 0 + 0, 0, 0, 0 @@ -241,7 +244,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -280,7 +283,7 @@ quickView6 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabQuick @@ -304,7 +307,7 @@ quickView5 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabQuick @@ -328,7 +331,7 @@ quickView4 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabQuick @@ -352,7 +355,7 @@ quickView3 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabQuick @@ -376,7 +379,7 @@ quickView2 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabQuick @@ -406,7 +409,7 @@ quickView1 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabQuick @@ -457,7 +460,7 @@ modifyandSetAlt - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -490,7 +493,7 @@ BUT_ARM - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -517,7 +520,7 @@ BUT_script - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -547,7 +550,7 @@ BUT_joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -577,7 +580,7 @@ BUT_quickmanual - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -607,7 +610,7 @@ BUT_quickrtl - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -637,7 +640,7 @@ BUT_quickauto - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -691,7 +694,7 @@ BUT_setwp - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -742,7 +745,7 @@ BUT_setmode - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -772,7 +775,7 @@ BUT_clear_track - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -823,7 +826,7 @@ BUT_Homealt - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -853,7 +856,7 @@ BUT_RAWSensor - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -883,7 +886,7 @@ BUTrestartmission - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -913,7 +916,7 @@ BUTactiondo - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabActions @@ -967,7 +970,7 @@ Gvspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabGauges @@ -997,7 +1000,7 @@ Gheading - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabGauges @@ -1027,7 +1030,7 @@ Galt - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabGauges @@ -1060,7 +1063,7 @@ Gspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabGauges @@ -1144,7 +1147,7 @@ lbl_playbackspeed - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1171,7 +1174,7 @@ lbl_logpercent - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1198,7 +1201,7 @@ NUM_playbackspeed - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1225,7 +1228,7 @@ BUT_log2kml - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1279,7 +1282,7 @@ BUT_playlog - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1306,7 +1309,7 @@ BUT_loadtelem - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1438,7 +1441,7 @@ 4, 4, 4, 4 - 280, 210 + 634, 210 67 @@ -1492,7 +1495,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1522,7 +1525,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1555,7 +1558,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1588,7 +1591,7 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1606,7 +1609,7 @@ 0, 0, 0, 0 - 280, 420 + 634, 420 @@ -1760,7 +1763,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1781,7 +1784,7 @@ 1 - 280, 420 + 634, 420 210 @@ -1823,7 +1826,7 @@ TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null panel1 @@ -1880,7 +1883,7 @@ label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null panel1 @@ -1910,7 +1913,7 @@ TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null panel1 @@ -1940,7 +1943,7 @@ TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null panel1 @@ -2030,7 +2033,7 @@ 0, 0, 0, 0 - 286, 30 + 640, 30 0 @@ -2057,7 +2060,7 @@ 2 - 288, 459 + 642, 459 75 @@ -2090,7 +2093,7 @@ 1 - 654, 461 + 1008, 461 360 @@ -2098,9 +2101,6 @@ 68 - - False - MainH @@ -2282,6 +2282,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4683.30760, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx index 3161de2a98..91fea2e725 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx @@ -117,8 +117,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Charger param. du camera pour superpos. + + Elevation Graph + + + Fly To Here Valider hauteur @@ -126,8 +129,11 @@ Origine - - Carreaux + + Grid + + + Tracker Home Lat @@ -138,6 +144,9 @@ Préced. + + Load and Append + Zoom @@ -156,29 +165,26 @@ Alt absolue - - Charger Param. du camera pour superpos. - Alt par défaut P2 + + Camera + Pivoter carte + + KML Overlay + Lat - - 1. Connecter -2. Charger plan au besoin. -3. Assurez-vous que le point d'origine et ALTsont défini -4. Cliquez sur la cartepour definir des points de navig - - - Enreg. plan de vol + + Auto WP Long @@ -186,12 +192,18 @@ Alt (abs) + + Map Tool + Sans cesse Alt + + Set ROI + Endroit du pointeur @@ -201,18 +213,24 @@ Point d'origine - - Charger plan de vol - Rad. musarder + + Load WP File + Démarrer Lecture PNs + + Load Polygon + + + Prefetch + Téléchager vers @@ -222,6 +240,9 @@ Radius PNs + + Zoom To + Long @@ -249,17 +270,11 @@ P1 - - Tracer le plan courant vs. google earth - - - Tamponner la selection de la carte - Effacer la rangée - - Charger les param du camera pour superpos. + + Takeoff Ajouter point au Polygon @@ -282,9 +297,6 @@ Écrire PNs - - Superpos. KML - Bas @@ -294,15 +306,27 @@ Dessiner Polygon + + GridV2 + Saut + + Land + + + File Load/Save + 100 Limite distance + + Save WP File + Enreg. sur disque @@ -330,21 +354,15 @@ Points de navig. - - Dessine une grille sur la zone défini, avec espacement fourni - - - Zoom à - Charger le fichier + + RTL + Maintenir ALT par défaut - - Graphique d'elevation - Effacer plan @@ -354,16 +372,22 @@ P3 - - Tamponner + + Complex + + + Save Polygon + + + Create Wp Circle Measure Distance - - Camera - Bas + + Reverse WPs + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx index 4b1eadc4e8..1f3d76da68 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx @@ -264,6 +264,9 @@ Affiche vitesse + + Xplane 10 + AeroSimRC diff --git a/Tools/ArdupilotMegaPlanner/Log.fr.resx b/Tools/ArdupilotMegaPlanner/Log.fr.resx index e0801c485a..4e61d07bfc 100644 --- a/Tools/ArdupilotMegaPlanner/Log.fr.resx +++ b/Tools/ArdupilotMegaPlanner/Log.fr.resx @@ -135,4 +135,7 @@ KML Première personne + + (adv) Dump All DF + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/MavlinkLog.fr.resx b/Tools/ArdupilotMegaPlanner/MavlinkLog.fr.resx index c8d3929b3d..1917ada25c 100644 --- a/Tools/ArdupilotMegaPlanner/MavlinkLog.fr.resx +++ b/Tools/ArdupilotMegaPlanner/MavlinkLog.fr.resx @@ -117,12 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Extract Params + Journal Créer KML + + Extract WPs + + + Convert to CSV + + + Graph Log + Convertir en texte diff --git a/Tools/ArdupilotMegaPlanner/OpenGLtest.cs b/Tools/ArdupilotMegaPlanner/OpenGLtest.cs index 972cb2414e..5244ed6546 100644 --- a/Tools/ArdupilotMegaPlanner/OpenGLtest.cs +++ b/Tools/ArdupilotMegaPlanner/OpenGLtest.cs @@ -189,7 +189,7 @@ namespace ArdupilotMega.Controls } catch { return; } - double heightscale = (step / 90.0) * 4; + double heightscale = (step / 90.0) * 1; float scale = 1.0f; @@ -263,11 +263,13 @@ namespace ArdupilotMega.Controls sw.Start(); - double increment = step * 5; + double increment = step *5; double cleanup = area.Bottom % increment; double cleanup2 = area.Left % increment; + + for (double z = (area.Bottom - cleanup); z < area.Top - step; z += increment) { //Makes OpenGL draw a triangle at every three consecutive vertices @@ -294,7 +296,7 @@ namespace ArdupilotMega.Controls //GL.Color3(_terrain.GetPixel(imgx, imgy)); GL.TexCoord2(imgx,imgy); GL.Vertex3(x, heightl * heightscale, z); // _terrain.GetPixel(x, z).R - + try { heightl = srtm.getAltitude(z + increment, area.Right + area.Left - x, 20); diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index cb86c3c195..a056349979 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs +++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Resources; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.1.*")] -[assembly: AssemblyFileVersion("1.2.14")] +[assembly: AssemblyFileVersion("1.2.15")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs index 85dcfa24e7..70a5a3f04c 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs @@ -66,6 +66,7 @@ this.S8 = new System.Windows.Forms.ComboBox(); this.RS8 = new System.Windows.Forms.ComboBox(); this.RS9 = new System.Windows.Forms.ComboBox(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.RS0 = new System.Windows.Forms.TextBox(); this.RTI = new System.Windows.Forms.TextBox(); this.ATI = new System.Windows.Forms.TextBox(); @@ -102,7 +103,7 @@ this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label9 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.BUT_resettodefault = new ArdupilotMega.Controls.MyButton(); this.SPLIT_local.Panel1.SuspendLayout(); this.SPLIT_local.Panel2.SuspendLayout(); this.SPLIT_local.SuspendLayout(); @@ -572,6 +573,14 @@ this.RS9.Name = "RS9"; this.toolTip1.SetToolTip(this.RS9, resources.GetString("RS9.ToolTip")); // + // linkLabel1 + // + resources.ApplyResources(this.linkLabel1, "linkLabel1"); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.TabStop = true; + this.toolTip1.SetToolTip(this.linkLabel1, resources.GetString("linkLabel1.ToolTip")); + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // // RS0 // resources.ApplyResources(this.RS0, "RS0"); @@ -842,18 +851,18 @@ resources.ApplyResources(this.label10, "label10"); this.label10.Name = "label10"; // - // linkLabel1 + // BUT_resettodefault // - resources.ApplyResources(this.linkLabel1, "linkLabel1"); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.TabStop = true; - this.toolTip1.SetToolTip(this.linkLabel1, resources.GetString("linkLabel1.ToolTip")); - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + resources.ApplyResources(this.BUT_resettodefault, "BUT_resettodefault"); + this.BUT_resettodefault.Name = "BUT_resettodefault"; + this.BUT_resettodefault.UseVisualStyleBackColor = true; + this.BUT_resettodefault.Click += new System.EventHandler(this.BUT_resettodefault_Click); // // _3DRradio // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.BUT_resettodefault); this.Controls.Add(this.linkLabel1); this.Controls.Add(this.label10); this.Controls.Add(this.groupBox2); @@ -961,5 +970,6 @@ private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label10; private System.Windows.Forms.LinkLabel linkLabel1; + private Controls.MyButton BUT_resettodefault; } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs index f791da67b2..264d3ecd0b 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs +++ b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs @@ -32,8 +32,8 @@ namespace ArdupilotMega InitializeComponent(); // hide advanced view - SPLIT_local.Panel2Collapsed = true; - SPLIT_remote.Panel2Collapsed = true; + //SPLIT_local.Panel2Collapsed = true; + //SPLIT_remote.Panel2Collapsed = true; // setup netid S3.DataSource = Enumerable.Range(0, 500).ToArray(); @@ -732,5 +732,59 @@ green LED solid - link is established with another radio red LED flashing - transmitting data red LED solid - in firmware update mode"); } + + private void BUT_resettodefault_Click(object sender, EventArgs e) + { + ArdupilotMega.Comms.ICommsSerial comPort = new SerialPort(); + + try + { + comPort.PortName = MainV2.comPort.BaseStream.PortName; + comPort.BaudRate = MainV2.comPort.BaseStream.BaudRate; + + comPort.ReadTimeout = 4000; + + comPort.Open(); + + + } + catch { CustomMessageBox.Show("Invalid ComPort or in use"); return; } + + lbl_status.Text = "Connecting"; + + if (doConnect(comPort)) + { + // cleanup + doCommand(comPort, "AT&T"); + + comPort.DiscardInBuffer(); + + lbl_status.Text = "Doing Command ATI & AT&F"; + + doCommand(comPort, "AT&F"); + + doCommand(comPort, "AT&W"); + + lbl_status.Text = "Reset"; + + doCommand(comPort, "ATZ"); + + comPort.Close(); + + BUT_getcurrent_Click(sender, e); + } + else + { + + // off hook + doCommand(comPort, "ATO"); + + lbl_status.Text = "Fail"; + CustomMessageBox.Show("Failed to enter command mode"); + } + + if (comPort.IsOpen) + comPort.Close(); + } } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx index df00f160bf..030cf34004 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx +++ b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx @@ -138,11 +138,8 @@ $this - 9 + 10 - - 17, 17 - 115 @@ -179,6 +176,9 @@ 4 + + 17, 17 + Serial baud rate in rounded kbps. So 57 means 57600. @@ -733,9 +733,6 @@ 14 - - 17, 17 - 83, 191 @@ -1666,6 +1663,40 @@ which result in a valid packet CRC 1 + + True + + + 689, 11 + + + 63, 13 + + + 83 + + + Status Leds + + + The 3DR Radios have 2 status LEDs, one red and one green. +green LED blinking - searching for another radio +green LED solid - link is established with another radio +red LED flashing - transmitting data +red LED solid - in firmware update mode + + + linkLabel1 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + 83, 3 @@ -1787,7 +1818,7 @@ which result in a valid packet CRC False - 344, 3 + 297, 3 69, 39 @@ -1802,16 +1833,16 @@ which result in a valid packet CRC BUT_savesettings - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4585.14832, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.13822, Culture=neutral, PublicKeyToken=null $this - 6 + 7 - 269, 3 + 222, 3 69, 39 @@ -1826,13 +1857,13 @@ which result in a valid packet CRC BUT_getcurrent - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4585.14832, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.13822, Culture=neutral, PublicKeyToken=null $this - 7 + 8 12, 361 @@ -1853,10 +1884,10 @@ which result in a valid packet CRC $this - 8 + 9 - 419, 3 + 372, 3 121, 39 @@ -1871,13 +1902,13 @@ which result in a valid packet CRC BUT_upload - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4585.14832, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.13822, Culture=neutral, PublicKeyToken=null $this - 10 + 11 True @@ -2543,6 +2574,9 @@ which result in a valid packet CRC Advanced Options + + False + CHK_advanced @@ -2553,7 +2587,7 @@ which result in a valid packet CRC $this - 5 + 6 False @@ -2577,13 +2611,13 @@ which result in a valid packet CRC BUT_Syncoptions - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4585.14832, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.13822, Culture=neutral, PublicKeyToken=null $this - 4 + 5 210, 12 @@ -2628,7 +2662,25 @@ which result in a valid packet CRC $this - 3 + 4 + + + True + + + NoControl + + + 12, 15 + + + 42, 13 + + + 37 + + + Version label9 @@ -2664,37 +2716,7 @@ which result in a valid packet CRC $this - 2 - - - True - - - NoControl - - - 12, 15 - - - 42, 13 - - - 37 - - - Version - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 + 3 True @@ -2721,40 +2743,33 @@ which result in a valid packet CRC $this - 1 + 2 - - True + + NoControl - - 689, 11 + + 499, 3 - - 63, 13 + + 82, 39 - - 83 + + 84 - - Status Leds + + Reset to Defaults - - The 3DR Radios have 2 status LEDs, one red and one green. -green LED blinking - searching for another radio -green LED solid - link is established with another radio -red LED flashing - transmitting data -red LED solid - in firmware update mode + + BUT_resettodefault - - linkLabel1 + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4666.13822, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + $this - + 0 diff --git a/Tools/ArdupilotMegaPlanner/dataflashlog.xml b/Tools/ArdupilotMegaPlanner/dataflashlog.xml index b02da6f24d..9e1ea5fea5 100644 --- a/Tools/ArdupilotMegaPlanner/dataflashlog.xml +++ b/Tools/ArdupilotMegaPlanner/dataflashlog.xml @@ -20,6 +20,8 @@ Yaw IN Yaw Nav Yaw + Roll I + Pitch I WP Dist @@ -30,6 +32,8 @@ Nav Roll X Speed Y Speed + nav lon I + nav lat I Thr IN @@ -40,6 +44,8 @@ Angle boost Climb Rate Throttle Out + alt hold int + Thr iInt Gyro Saturation @@ -88,6 +94,20 @@ FlightMode Thr Cruise + + Stab Roll + Stab Pitch + Stab Yaw + Rate Roll + Rate Pitch + Rate Yaw + Nav Lat + Nav Lon + Loit Rate Lat + Loit Rate Lon + Thr + Thr Cruise + Err P