diff --git a/Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt b/Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt index a98d7181f0..f3252770c0 100644 --- a/Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt +++ b/Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt @@ -1,4 +1,5 @@ -0.7 - fix typos - log rssi screen to log as well +0.8 - fix settings saving. +0.7 - fix typos - log rssi screen to log as well 0.6 - add terminal logging to file, fix remote radio config 0.5 - add terminal 0.4 - adjust erase timeout - to prevent lost bootloader sync error. diff --git a/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx b/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx index 07de3c487c..c1ca88b13b 100644 --- a/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx +++ b/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx @@ -1588,7 +1588,7 @@ - 3DRRadio Config 0.7 + 3DRRadio Config 0.8 settingsToolStripMenuItem diff --git a/Tools/ArdupilotMegaPlanner/Controls/HUD.cs b/Tools/ArdupilotMegaPlanner/Controls/HUD.cs index 600f36bab4..25eeb4772e 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/HUD.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/HUD.cs @@ -1341,7 +1341,7 @@ namespace ArdupilotMega.Controls gps = ("GPS: 3D Fix"); } - drawstring(graphicsObject, gps, font, fontsize + 2, whiteBrush, this.Width - 10 * fontsize, this.Height - 30 - fontoffset); + drawstring(graphicsObject, gps, font, fontsize + 2, whiteBrush, this.Width - 13 * fontsize, this.Height - 30 - fontoffset); if (isNaN) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx index 97fe1d611c..3f8066d9bb 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.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 - - - 2 - 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 - - Airspeed m/s + + Throttle 0-100% - - groupBox1 + + groupBox3 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 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 + + Airspeed m/s - - groupBox2 + + groupBox1 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 4 + + 3 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 - - 5 + + 4 111, 36 @@ -1152,101 +816,29 @@ 3 - - KFF_PTCH2THR + + 12, 339 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox16 - - - 0 - - - label83 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox16 - - - 1 - - - KFF_RDDRMIX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox16 - - - 2 - - - label78 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox16 - - - 3 - - - KFF_PTCHCOMP - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox16 - - - 4 - - - label81 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox16 - - - 5 - - - 213, 231 - - + 195, 108 - - 16 + + 15 - - Other Mix's + + Xtrack Pids - - groupBox16 + + groupBox15 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 6 + + 5 111, 13 @@ -1392,125 +984,29 @@ 5 - - ENRGY2THR_IMAX + + 213, 231 - - 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 + + 16 - - Energy/Alt Pid + + Other Mix's - - groupBox14 + + groupBox16 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 7 + + 6 111, 82 @@ -1704,125 +1200,29 @@ 7 - - ALT2PTCH_IMAX + + 12, 231 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 0 - - - label69 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 1 - - - ALT2PTCH_D - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 2 - - - label70 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 3 - - - ALT2PTCH_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 4 - - - label71 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 5 - - - ALT2PTCH_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 6 - - - label72 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox13 - - - 7 - - - 414, 123 - - + 195, 108 - - 18 + + 17 - - Nav Pitch Alt Pid + + Energy/Alt Pid - - groupBox13 + + groupBox14 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 8 + + 7 111, 82 @@ -2016,125 +1416,29 @@ 7 - - ARSP2PTCH_IMAX + + 414, 123 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 0 - - - label65 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 1 - - - ARSP2PTCH_D - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 2 - - - label66 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 3 - - - ARSP2PTCH_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 4 - - - label67 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 5 - - - ARSP2PTCH_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 6 - - - label68 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox12 - - - 7 - - - 213, 123 - - + 195, 108 - - 19 + + 18 - - Nav Pitch AS Pid + + Nav Pitch Alt Pid - - groupBox12 + + groupBox13 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 9 + + 8 111, 82 @@ -2328,125 +1632,29 @@ 7 - - HDNG2RLL_IMAX + + 213, 123 - - 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 + + 19 - - Nav Roll Pid + + Nav Pitch AS Pid - - groupBox11 + + groupBox12 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 10 + + 9 111, 82 @@ -2640,125 +1848,29 @@ 7 - - YW2SRV_IMAX + + 12, 123 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 0 - - - label57 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 1 - - - YW2SRV_D - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 2 - - - label58 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 3 - - - YW2SRV_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 4 - - - label59 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 5 - - - YW2SRV_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 6 - - - label60 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox10 - - - 7 - - - 414, 15 - - + 195, 108 - - 21 + + 20 - - Servo Yaw Pid + + Nav Roll Pid - - groupBox10 + + groupBox11 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 11 + + 10 111, 82 @@ -2952,125 +2064,29 @@ 7 - - PTCH2SRV_IMAX + + 414, 15 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 0 - - - label53 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 1 - - - PTCH2SRV_D - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 2 - - - label54 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 3 - - - PTCH2SRV_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 4 - - - label55 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 5 - - - PTCH2SRV_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 6 - - - label56 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox9 - - - 7 - - - 213, 15 - - + 195, 108 - - 22 + + 21 - - Servo Pitch Pid + + Servo Yaw Pid - - groupBox9 + + groupBox10 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 12 + + 11 111, 82 @@ -3264,125 +2280,29 @@ 7 - - RLL2SRV_IMAX + + 213, 15 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 0 - - - label49 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 1 - - - RLL2SRV_D - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 2 - - - label50 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 3 - - - RLL2SRV_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 4 - - - label51 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 5 - - - RLL2SRV_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 6 - - - label52 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox8 - - - 7 - - - 12, 15 - - + 195, 108 - - 23 + + 22 - - Servo Roll Pid + + Servo Pitch Pid - - groupBox8 + + groupBox9 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 13 + + 12 111, 82 @@ -3576,12 +2496,33 @@ 7 + + 12, 15 + + + 195, 108 + + + 23 + + + Servo Roll Pid + + + groupBox8 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + 17, 17 - - Top, Right - NoControl @@ -3601,7 +2542,7 @@ BUT_writePIDS - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null $this @@ -3631,7 +2572,7 @@ BUT_rerequestparams - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null $this @@ -3658,6 +2599,6 @@ ConfigArduplane - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs index c348172cac..fb8ba958ff 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs @@ -19,12 +19,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView public ConfigFlightModes() { InitializeComponent(); - - timer.Tick += new EventHandler(timer_Tick); - - timer.Enabled = true; - timer.Interval = 100; - timer.Start(); } void timer_Tick(object sender, EventArgs e) @@ -284,6 +278,14 @@ namespace ArdupilotMega.GCSViews.ConfigurationView } catch { } } + + + + timer.Tick += new EventHandler(timer_Tick); + + timer.Enabled = true; + timer.Interval = 100; + timer.Start(); } } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs index d09899a166..2f5974bf97 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs @@ -93,7 +93,14 @@ resources.GetString("CMB_ratesensors.Items1"), resources.GetString("CMB_ratesensors.Items2"), resources.GetString("CMB_ratesensors.Items3"), - resources.GetString("CMB_ratesensors.Items4")}); + resources.GetString("CMB_ratesensors.Items4"), + resources.GetString("CMB_ratesensors.Items5"), + resources.GetString("CMB_ratesensors.Items6"), + resources.GetString("CMB_ratesensors.Items7"), + resources.GetString("CMB_ratesensors.Items8"), + resources.GetString("CMB_ratesensors.Items9"), + resources.GetString("CMB_ratesensors.Items10"), + resources.GetString("CMB_ratesensors.Items11")}); resources.ApplyResources(this.CMB_ratesensors, "CMB_ratesensors"); this.CMB_ratesensors.Name = "CMB_ratesensors"; this.CMB_ratesensors.SelectedIndexChanged += new System.EventHandler(this.CMB_ratesensors_SelectedIndexChanged); @@ -206,7 +213,14 @@ resources.GetString("CMB_raterc.Items"), resources.GetString("CMB_raterc.Items1"), resources.GetString("CMB_raterc.Items2"), - resources.GetString("CMB_raterc.Items3")}); + resources.GetString("CMB_raterc.Items3"), + resources.GetString("CMB_raterc.Items4"), + resources.GetString("CMB_raterc.Items5"), + resources.GetString("CMB_raterc.Items6"), + resources.GetString("CMB_raterc.Items7"), + resources.GetString("CMB_raterc.Items8"), + resources.GetString("CMB_raterc.Items9"), + resources.GetString("CMB_raterc.Items10")}); resources.ApplyResources(this.CMB_raterc, "CMB_raterc"); this.CMB_raterc.Name = "CMB_raterc"; this.CMB_raterc.SelectedIndexChanged += new System.EventHandler(this.CMB_raterc_SelectedIndexChanged); @@ -239,7 +253,14 @@ resources.GetString("CMB_ratestatus.Items"), resources.GetString("CMB_ratestatus.Items1"), resources.GetString("CMB_ratestatus.Items2"), - resources.GetString("CMB_ratestatus.Items3")}); + resources.GetString("CMB_ratestatus.Items3"), + resources.GetString("CMB_ratestatus.Items4"), + resources.GetString("CMB_ratestatus.Items5"), + resources.GetString("CMB_ratestatus.Items6"), + resources.GetString("CMB_ratestatus.Items7"), + resources.GetString("CMB_ratestatus.Items8"), + resources.GetString("CMB_ratestatus.Items9"), + resources.GetString("CMB_ratestatus.Items10")}); resources.ApplyResources(this.CMB_ratestatus, "CMB_ratestatus"); this.CMB_ratestatus.Name = "CMB_ratestatus"; this.CMB_ratestatus.SelectedIndexChanged += new System.EventHandler(this.CMB_ratestatus_SelectedIndexChanged); @@ -252,7 +273,14 @@ resources.GetString("CMB_rateposition.Items"), resources.GetString("CMB_rateposition.Items1"), resources.GetString("CMB_rateposition.Items2"), - resources.GetString("CMB_rateposition.Items3")}); + resources.GetString("CMB_rateposition.Items3"), + resources.GetString("CMB_rateposition.Items4"), + resources.GetString("CMB_rateposition.Items5"), + resources.GetString("CMB_rateposition.Items6"), + resources.GetString("CMB_rateposition.Items7"), + resources.GetString("CMB_rateposition.Items8"), + resources.GetString("CMB_rateposition.Items9"), + resources.GetString("CMB_rateposition.Items10")}); resources.ApplyResources(this.CMB_rateposition, "CMB_rateposition"); this.CMB_rateposition.Name = "CMB_rateposition"; this.CMB_rateposition.SelectedIndexChanged += new System.EventHandler(this.CMB_rateposition_SelectedIndexChanged); @@ -265,7 +293,14 @@ resources.GetString("CMB_rateattitude.Items"), resources.GetString("CMB_rateattitude.Items1"), resources.GetString("CMB_rateattitude.Items2"), - resources.GetString("CMB_rateattitude.Items3")}); + resources.GetString("CMB_rateattitude.Items3"), + resources.GetString("CMB_rateattitude.Items4"), + resources.GetString("CMB_rateattitude.Items5"), + resources.GetString("CMB_rateattitude.Items6"), + resources.GetString("CMB_rateattitude.Items7"), + resources.GetString("CMB_rateattitude.Items8"), + resources.GetString("CMB_rateattitude.Items9"), + resources.GetString("CMB_rateattitude.Items10")}); resources.ApplyResources(this.CMB_rateattitude, "CMB_rateattitude"); this.CMB_rateattitude.Name = "CMB_rateattitude"; this.CMB_rateattitude.SelectedIndexChanged += new System.EventHandler(this.CMB_rateattitude_SelectedIndexChanged); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx index 820dacd6a5..25503f22c3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx @@ -154,12 +154,33 @@ 1 - 3 + 2 - 10 + 3 + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + + 10 + + 50 @@ -532,9 +553,30 @@ 1 - 3 + 2 + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + 10 @@ -673,9 +715,30 @@ 1 - 3 + 2 + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + 10 @@ -706,9 +769,30 @@ 1 - 3 + 2 + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + 10 @@ -739,9 +823,30 @@ 1 - 3 + 2 + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + 10 @@ -1268,7 +1373,7 @@ BUT_Joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null $this @@ -1295,7 +1400,7 @@ BUT_videostop - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null $this @@ -1322,7 +1427,7 @@ BUT_videostart - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null $this @@ -1397,6 +1502,6 @@ ConfigPlanner - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4534.12553, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs index c330ec60cb..bdcc18764c 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs @@ -63,7 +63,12 @@ namespace ArdupilotMega.GCSViews.ConfigurationView continue; string name = items[0]; - float value = float.Parse(items[1], new System.Globalization.CultureInfo("en-US")); + float value = 0; + try + { + value = float.Parse(items[1], System.Globalization.CultureInfo.InvariantCulture);// new System.Globalization.CultureInfo("en-US")); + } + catch (Exception ex) { log.Error(ex); throw new FormatException("Invalid number on param " + name + " : " + items[1].ToString()); } MAVLink.modifyParamForDisplay(true, name, ref value); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index 59c8dd5ec1..f86424e8cb 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -21,6 +21,7 @@ this.stopRecordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.setMJPEGSourceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.setAspectRatioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayBatteryInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabActions = new System.Windows.Forms.TabPage(); @@ -216,7 +217,8 @@ this.recordHudToAVIToolStripMenuItem, this.stopRecordToolStripMenuItem, this.setMJPEGSourceToolStripMenuItem, - this.setAspectRatioToolStripMenuItem}); + this.setAspectRatioToolStripMenuItem, + this.displayBatteryInfoToolStripMenuItem}); this.contextMenuStrip2.Name = "contextMenuStrip2"; resources.ApplyResources(this.contextMenuStrip2, "contextMenuStrip2"); // @@ -244,6 +246,12 @@ resources.ApplyResources(this.setAspectRatioToolStripMenuItem, "setAspectRatioToolStripMenuItem"); this.setAspectRatioToolStripMenuItem.Click += new System.EventHandler(this.setAspectRatioToolStripMenuItem_Click); // + // displayBatteryInfoToolStripMenuItem + // + this.displayBatteryInfoToolStripMenuItem.Name = "displayBatteryInfoToolStripMenuItem"; + resources.ApplyResources(this.displayBatteryInfoToolStripMenuItem, "displayBatteryInfoToolStripMenuItem"); + this.displayBatteryInfoToolStripMenuItem.Click += new System.EventHandler(this.displayBatteryInfoToolStripMenuItem_Click); + // // bindingSource1 // this.bindingSource1.DataSource = typeof(ArdupilotMega.CurrentState); @@ -1247,5 +1255,6 @@ private Controls.MyLabel lbl_playbackspeed; private System.Windows.Forms.ToolStripMenuItem setMJPEGSourceToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem setAspectRatioToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayBatteryInfoToolStripMenuItem; } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index 014291ec21..fa3eb1105c 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -1868,15 +1868,21 @@ print 'Roll complete' { string url = MainV2.config["mjpeg_url"] != null ? MainV2.config["mjpeg_url"].ToString() : @"http://127.0.0.1:56781/map.jpg"; - Common.InputBox("Mjpeg url", "Enter the url to the mjpeg source url", ref url); + if (DialogResult.OK == Common.InputBox("Mjpeg url", "Enter the url to the mjpeg source url", ref url)) + { - MainV2.config["mjpeg_url"] = url; + MainV2.config["mjpeg_url"] = url; - Utilities.CaptureMJPEG.URL = url; + Utilities.CaptureMJPEG.URL = url; - Utilities.CaptureMJPEG.OnNewImage += new EventHandler(CaptureMJPEG_OnNewImage); + Utilities.CaptureMJPEG.OnNewImage += new EventHandler(CaptureMJPEG_OnNewImage); - Utilities.CaptureMJPEG.runAsync(); + Utilities.CaptureMJPEG.runAsync(); + } + else + { + Utilities.CaptureMJPEG.Stop(); + } } void CaptureMJPEG_OnNewImage(object sender, EventArgs e) @@ -1890,5 +1896,10 @@ print 'Roll complete' // force a redraw SubMainHT_Panel1_Resize(null, null); } + + private void displayBatteryInfoToolStripMenuItem_Click(object sender, EventArgs e) + { + hud1.batteryon = !hud1.batteryon; + } } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 1e69217ea4..a4d22f16e0 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -168,31 +168,37 @@ 542, 17 - 172, 22 + 176, 22 Record Hud to AVI - 172, 22 + 176, 22 Stop Record - 172, 22 + 176, 22 Set MJPEG source - 172, 22 + 176, 22 Set Aspect Ratio + + 176, 22 + + + Display Battery Info + - 173, 92 + 177, 136 contextMenuStrip2 @@ -220,7 +226,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -259,7 +265,7 @@ BUT_script - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -292,7 +298,7 @@ BUT_joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -322,7 +328,7 @@ BUT_quickmanual - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -352,7 +358,7 @@ BUT_quickrtl - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -382,7 +388,7 @@ BUT_quickauto - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -436,7 +442,7 @@ BUT_setwp - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -487,7 +493,7 @@ BUT_setmode - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -517,7 +523,7 @@ BUT_clear_track - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -568,7 +574,7 @@ BUT_Homealt - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -598,7 +604,7 @@ BUT_RAWSensor - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -628,7 +634,7 @@ BUTrestartmission - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -658,7 +664,7 @@ BUTactiondo - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabActions @@ -712,7 +718,7 @@ Gvspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabGauges @@ -742,7 +748,7 @@ Gheading - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabGauges @@ -772,7 +778,7 @@ Galt - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabGauges @@ -805,7 +811,7 @@ Gspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabGauges @@ -889,7 +895,7 @@ lbl_playbackspeed - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabTLogs @@ -916,7 +922,7 @@ lbl_logpercent - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabTLogs @@ -943,7 +949,7 @@ NUM_playbackspeed - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabTLogs @@ -970,7 +976,7 @@ BUT_log2kml - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1024,7 +1030,7 @@ BUT_playlog - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1051,7 +1057,7 @@ BUT_loadtelem - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1240,7 +1246,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1273,7 +1279,7 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1303,7 +1309,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1333,7 +1339,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1505,7 +1511,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1568,7 +1574,7 @@ TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null panel1 @@ -1625,7 +1631,7 @@ label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null panel1 @@ -1655,7 +1661,7 @@ TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null panel1 @@ -1685,7 +1691,7 @@ TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null panel1 @@ -1886,7 +1892,7 @@ label6 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null $this @@ -1942,6 +1948,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + displayBatteryInfoToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + bindingSource1 @@ -1976,6 +1988,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4532.32583, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs index 11ce2b36c6..4b6f3ccd96 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs @@ -1006,11 +1006,11 @@ namespace ArdupilotMega.GCSViews #else imu.usec = ((ulong)DateTime.Now.ToBinary()); #endif - imu.xgyro = (short)(fdm.phidot); // roll - yes + imu.xgyro = (short)(fdm.phidot * 1000); // roll - yes //imu.xmag = (short)(Math.Sin(head * deg2rad) * 1000); - imu.ygyro = (short)(fdm.thetadot); // pitch - yes + imu.ygyro = (short)(fdm.thetadot * 1000); // pitch - yes //imu.ymag = (short)(Math.Cos(head * deg2rad) * 1000); - imu.zgyro = (short)(fdm.psidot); + imu.zgyro = (short)(fdm.psidot * 1000); imu.zmag = 0; imu.xacc = (Int16)Math.Min(Int16.MaxValue, Math.Max(Int16.MinValue, (fdm.A_X_pilot * 9808 / 32.2))); // pitch @@ -1019,7 +1019,7 @@ namespace ArdupilotMega.GCSViews //Console.WriteLine("ax " + imu.xacc + " ay " + imu.yacc + " az " + imu.zacc); #if MAVLINK10 - gps.alt = ((int)(fdm.altitude * ft2m * 1000)); + gps.alt = ((int)(fdm.altitude * 1000)); gps.fix_type = 3; gps.cog = (ushort)((((Math.Atan2(fdm.v_east, fdm.v_north) * rad2deg) + 360) % 360) * 100); gps.lat = (int)(fdm.latitude * rad2deg * 1.0e7); @@ -1027,7 +1027,7 @@ namespace ArdupilotMega.GCSViews gps.time_usec = ((ulong)DateTime.Now.Ticks); gps.vel = (ushort)(Math.Sqrt((fdm.v_north * fdm.v_north) + (fdm.v_east * fdm.v_east)) * ft2m * 100); #else - gps.alt = ((float)(fdm.altitude * ft2m)); + gps.alt = ((float)(fdm.altitude)); gps.fix_type = 3; gps.hdg = (float)(((Math.Atan2(fdm.v_east, fdm.v_north) * rad2deg) + 360) % 360); //Console.WriteLine(gps.hdg); @@ -1037,7 +1037,7 @@ namespace ArdupilotMega.GCSViews gps.v = ((float)Math.Sqrt((fdm.v_north * fdm.v_north) + (fdm.v_east * fdm.v_east)) * ft2m); #endif - asp.airspeed = fdm.vcas * ft2m; + asp.airspeed = fdm.vcas * 0.5144444f;// knots to m/s } else { diff --git a/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs b/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs index e3a2e5fa00..e1edde8989 100644 --- a/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs +++ b/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs @@ -215,23 +215,23 @@ namespace ArdupilotMega.HIL foreach (var i in range((self.motors.Length))) { - roll_accel += -5000.0 * sin(radians(self.motors[i].angle)) * m[i]; - pitch_accel += 5000.0 * cos(radians(self.motors[i].angle)) * m[i]; + roll_accel += (-5000.0 * deg2rad) * sin(radians(self.motors[i].angle)) * m[i]; + pitch_accel += (5000.0 * deg2rad) * cos(radians(self.motors[i].angle)) * m[i]; if (self.motors[i].clockwise) { - yaw_accel -= m[i] * 400.0; + yaw_accel -= m[i] * 400.0 * deg2rad; } else { - yaw_accel += m[i] * 400.0; + yaw_accel += m[i] * 400.0 * deg2rad; } thrust += m[i] * self.thrust_scale; // newtons } // rotational resistance - roll_accel -= (self.pDeg / self.terminal_rotation_rate) * 5000.0; - pitch_accel -= (self.qDeg / self.terminal_rotation_rate) * 5000.0; - yaw_accel -= (self.rDeg / self.terminal_rotation_rate) * 400.0; + roll_accel -= (self.pDeg / self.terminal_rotation_rate) * (5000.0 * deg2rad); + pitch_accel -= (self.qDeg / self.terminal_rotation_rate) * (5000.0 * deg2rad); + yaw_accel -= (self.rDeg / self.terminal_rotation_rate) * (400.0 * deg2rad); //Console.WriteLine("roll {0} {1} {2}", roll_accel, roll_rate, roll); @@ -250,9 +250,9 @@ namespace ArdupilotMega.HIL self.pitch_rate = answer.Item2; self.yaw_rate = answer.Item3; - //self.roll_rate = pDeg; - //self.pitch_rate = qDeg; - //self.yaw_rate = rDeg; + // self.roll_rate = pDeg; + // self.pitch_rate = qDeg; + // self.yaw_rate = rDeg; //# update rotation roll += roll_rate * delta_time.TotalSeconds; diff --git a/Tools/ArdupilotMegaPlanner/MavlinkLog.cs b/Tools/ArdupilotMegaPlanner/MavlinkLog.cs index 3b4f8458b3..603b09f25f 100644 --- a/Tools/ArdupilotMegaPlanner/MavlinkLog.cs +++ b/Tools/ArdupilotMegaPlanner/MavlinkLog.cs @@ -375,6 +375,12 @@ namespace ArdupilotMega if (openFileDialog1.ShowDialog() == DialogResult.OK) { + if (MainV2.comPort.logplaybackfile != null) + { + MainV2.comPort.logreadmode = false; + MainV2.comPort.logplaybackfile.Close(); + } + foreach (string logfile in openFileDialog1.FileNames) { @@ -537,6 +543,12 @@ namespace ArdupilotMega if (openFileDialog1.ShowDialog() == DialogResult.OK) { + if (MainV2.comPort.logplaybackfile != null) + { + MainV2.comPort.logreadmode = false; + MainV2.comPort.logplaybackfile.Close(); + } + foreach (string logfile in openFileDialog1.FileNames) { @@ -599,6 +611,12 @@ namespace ArdupilotMega if (openFileDialog1.ShowDialog() == DialogResult.OK) { + if (MainV2.comPort.logplaybackfile != null) + { + MainV2.comPort.logreadmode = false; + MainV2.comPort.logplaybackfile.Close(); + } + List fields = GetLogFileValidFields(openFileDialog1.FileName); zg1.GraphPane.CurveList.Clear(); diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index 7fc3ca9210..c8fa517040 100644 --- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs +++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs @@ -2,14 +2,14 @@ - + - - + + @@ -31,7 +31,7 @@ - + @@ -94,11 +94,11 @@ - + - + @@ -109,20 +109,20 @@ - + - + - + @@ -136,7 +136,7 @@ - + @@ -148,13 +148,13 @@ - + - + @@ -165,7 +165,7 @@ - + @@ -176,33 +176,33 @@ - + - + - + - + - + - + @@ -211,28 +211,28 @@ - + - + - + - + - + diff --git a/Tools/ArdupilotMegaPlanner/Program.cs b/Tools/ArdupilotMegaPlanner/Program.cs index 690d0a2084..30beb88a83 100644 --- a/Tools/ArdupilotMegaPlanner/Program.cs +++ b/Tools/ArdupilotMegaPlanner/Program.cs @@ -43,14 +43,6 @@ namespace ArdupilotMega //Console.WriteLine(srtm.getAltitude(-35.115676879882812, 117.94178754638671,20)); - PointLatLngAlt plla = new PointLatLngAlt(54.0359, 5.4253, 0, ""); - PointLatLngAlt plla2 = new PointLatLngAlt(54.3838, 3.0412, 0, ""); - - Console.WriteLine(plla.GetDistance(plla2)); - Console.WriteLine(plla.GetDistance2(plla2)); - - - if (System.Diagnostics.Debugger.IsAttached) { // testing diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index ee18b2c2ab..bf68a51ff9 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.1.89")] +[assembly: AssemblyFileVersion("1.1.90")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs index 9e56ea16ec..7ff0c7169e 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs +++ b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs @@ -278,7 +278,7 @@ namespace ArdupilotMega if (values.Length == 3) { - Control[] controls = this.Controls.Find("R" + values[0].Trim(), false); + Control[] controls = this.Controls.Find("R" + values[0].Trim(), true); if (controls.Length > 0) { @@ -345,7 +345,7 @@ namespace ArdupilotMega if (values.Length == 3) { - Control[] controls = this.Controls.Find(values[0].Trim(), false); + Control[] controls = this.Controls.Find(values[0].Trim(), true); if (controls.Length > 0) { diff --git a/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs b/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs index a7c2baafec..87fc18b050 100644 --- a/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs +++ b/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs @@ -41,6 +41,11 @@ namespace ArdupilotMega.Utilities asyncthread.Start(); } + public static void Stop() + { + running = false; + } + static void getUrl() { @@ -116,7 +121,11 @@ namespace ArdupilotMega.Utilities } catch (Exception ex) { log.Info(ex); break; } } - + + // clear last image + if (OnNewImage != null) + OnNewImage(null, new EventArgs()); + dataStream.Close(); response.Close();