diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs index 7fb114ddfe..b41cf713b8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs @@ -39,7 +39,7 @@ this.mavScale = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.RawValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ConfigTabs = new System.Windows.Forms.TabControl(); - this.TabAPM2 = new System.Windows.Forms.TabPage(); + this.TabAP = new System.Windows.Forms.TabPage(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.THR_FS_VALUE = new System.Windows.Forms.NumericUpDown(); this.label5 = new System.Windows.Forms.Label(); @@ -140,7 +140,7 @@ this.label51 = new System.Windows.Forms.Label(); this.RLL2SRV_P = new System.Windows.Forms.NumericUpDown(); this.label52 = new System.Windows.Forms.Label(); - this.TabAC2 = new System.Windows.Forms.TabPage(); + this.TabAC = new System.Windows.Forms.TabPage(); this.myLabel1 = new ArdupilotMega.MyLabel(); this.CH7_OPT = new System.Windows.Forms.ComboBox(); this.groupBox17 = new System.Windows.Forms.GroupBox(); @@ -287,7 +287,7 @@ this.BUT_compare = new ArdupilotMega.MyButton(); ((System.ComponentModel.ISupportInitialize)(this.Params)).BeginInit(); this.ConfigTabs.SuspendLayout(); - this.TabAPM2.SuspendLayout(); + this.TabAP.SuspendLayout(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.THR_FS_VALUE)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_MAX)).BeginInit(); @@ -344,7 +344,7 @@ ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_D)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_P)).BeginInit(); - this.TabAC2.SuspendLayout(); + this.TabAC.SuspendLayout(); this.groupBox17.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_IMAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_I)).BeginInit(); @@ -461,31 +461,31 @@ // ConfigTabs // resources.ApplyResources(this.ConfigTabs, "ConfigTabs"); - this.ConfigTabs.Controls.Add(this.TabAPM2); - this.ConfigTabs.Controls.Add(this.TabAC2); + this.ConfigTabs.Controls.Add(this.TabAP); + this.ConfigTabs.Controls.Add(this.TabAC); this.ConfigTabs.Controls.Add(this.TabPlanner); this.ConfigTabs.Controls.Add(this.TabSetup); this.ConfigTabs.Name = "ConfigTabs"; this.ConfigTabs.SelectedIndex = 0; this.ConfigTabs.SelectedIndexChanged += new System.EventHandler(this.Planner_TabIndexChanged); // - // TabAPM2 + // TabAP // - this.TabAPM2.BackColor = System.Drawing.Color.Transparent; - this.TabAPM2.Controls.Add(this.groupBox3); - this.TabAPM2.Controls.Add(this.groupBox1); - this.TabAPM2.Controls.Add(this.groupBox2); - this.TabAPM2.Controls.Add(this.groupBox15); - this.TabAPM2.Controls.Add(this.groupBox16); - this.TabAPM2.Controls.Add(this.groupBox14); - this.TabAPM2.Controls.Add(this.groupBox13); - this.TabAPM2.Controls.Add(this.groupBox12); - this.TabAPM2.Controls.Add(this.groupBox11); - this.TabAPM2.Controls.Add(this.groupBox10); - this.TabAPM2.Controls.Add(this.groupBox9); - this.TabAPM2.Controls.Add(this.groupBox8); - resources.ApplyResources(this.TabAPM2, "TabAPM2"); - this.TabAPM2.Name = "TabAPM2"; + this.TabAP.BackColor = System.Drawing.Color.Transparent; + this.TabAP.Controls.Add(this.groupBox3); + this.TabAP.Controls.Add(this.groupBox1); + this.TabAP.Controls.Add(this.groupBox2); + this.TabAP.Controls.Add(this.groupBox15); + this.TabAP.Controls.Add(this.groupBox16); + this.TabAP.Controls.Add(this.groupBox14); + this.TabAP.Controls.Add(this.groupBox13); + this.TabAP.Controls.Add(this.groupBox12); + this.TabAP.Controls.Add(this.groupBox11); + this.TabAP.Controls.Add(this.groupBox10); + this.TabAP.Controls.Add(this.groupBox9); + this.TabAP.Controls.Add(this.groupBox8); + resources.ApplyResources(this.TabAP, "TabAP"); + this.TabAP.Name = "TabAP"; // // groupBox3 // @@ -1087,26 +1087,26 @@ resources.ApplyResources(this.label52, "label52"); this.label52.Name = "label52"; // - // TabAC2 + // TabAC // - this.TabAC2.Controls.Add(this.myLabel1); - this.TabAC2.Controls.Add(this.CH7_OPT); - this.TabAC2.Controls.Add(this.groupBox17); - this.TabAC2.Controls.Add(this.groupBox5); - this.TabAC2.Controls.Add(this.groupBox18); - this.TabAC2.Controls.Add(this.CHK_lockrollpitch); - this.TabAC2.Controls.Add(this.groupBox4); - this.TabAC2.Controls.Add(this.groupBox6); - this.TabAC2.Controls.Add(this.groupBox7); - this.TabAC2.Controls.Add(this.groupBox19); - this.TabAC2.Controls.Add(this.groupBox20); - this.TabAC2.Controls.Add(this.groupBox21); - this.TabAC2.Controls.Add(this.groupBox22); - this.TabAC2.Controls.Add(this.groupBox23); - this.TabAC2.Controls.Add(this.groupBox24); - this.TabAC2.Controls.Add(this.groupBox25); - resources.ApplyResources(this.TabAC2, "TabAC2"); - this.TabAC2.Name = "TabAC2"; + this.TabAC.Controls.Add(this.myLabel1); + this.TabAC.Controls.Add(this.CH7_OPT); + this.TabAC.Controls.Add(this.groupBox17); + this.TabAC.Controls.Add(this.groupBox5); + this.TabAC.Controls.Add(this.groupBox18); + this.TabAC.Controls.Add(this.CHK_lockrollpitch); + this.TabAC.Controls.Add(this.groupBox4); + this.TabAC.Controls.Add(this.groupBox6); + this.TabAC.Controls.Add(this.groupBox7); + this.TabAC.Controls.Add(this.groupBox19); + this.TabAC.Controls.Add(this.groupBox20); + this.TabAC.Controls.Add(this.groupBox21); + this.TabAC.Controls.Add(this.groupBox22); + this.TabAC.Controls.Add(this.groupBox23); + this.TabAC.Controls.Add(this.groupBox24); + this.TabAC.Controls.Add(this.groupBox25); + resources.ApplyResources(this.TabAC, "TabAC"); + this.TabAC.Name = "TabAC"; // // myLabel1 // @@ -2108,7 +2108,7 @@ this.Load += new System.EventHandler(this.Configuration_Load); ((System.ComponentModel.ISupportInitialize)(this.Params)).EndInit(); this.ConfigTabs.ResumeLayout(false); - this.TabAPM2.ResumeLayout(false); + this.TabAP.ResumeLayout(false); this.groupBox3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.THR_FS_VALUE)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_MAX)).EndInit(); @@ -2165,8 +2165,8 @@ ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_D)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_P)).EndInit(); - this.TabAC2.ResumeLayout(false); - this.TabAC2.PerformLayout(); + this.TabAC.ResumeLayout(false); + this.TabAC.PerformLayout(); this.groupBox17.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_IMAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_I)).EndInit(); @@ -2231,8 +2231,8 @@ private System.Windows.Forms.DataGridView Params; private MyButton BUT_writePIDS; private System.Windows.Forms.TabControl ConfigTabs; - private System.Windows.Forms.TabPage TabAPM2; - private System.Windows.Forms.TabPage TabAC2; + private System.Windows.Forms.TabPage TabAP; + private System.Windows.Forms.TabPage TabAC; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.NumericUpDown THR_FS_VALUE; private System.Windows.Forms.Label label5; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs index 7ac4586654..e298d7ab15 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs @@ -77,14 +77,14 @@ namespace ArdupilotMega.GCSViews if (MainV2.APMFirmware == MainV2.Firmwares.ArduPlane) { ConfigTabs.SelectedIndex = 0; - TabAPM2.Enabled = true; - TabAC2.Enabled = false; + TabAP.Enabled = true; + TabAC.Enabled = false; } else { ConfigTabs.SelectedIndex = 1; - TabAPM2.Enabled = false; - TabAC2.Enabled = true; + TabAP.Enabled = false; + TabAC.Enabled = true; } // read tooltips @@ -314,8 +314,8 @@ namespace ArdupilotMega.GCSViews toolTip1.RemoveAll(); Params.Rows.Clear(); - disableNumericUpDownControls(TabAC2); - disableNumericUpDownControls(TabAPM2); + disableNumericUpDownControls(TabAC); + disableNumericUpDownControls(TabAP); // process hashdefines and update display foreach (string value in param.Keys) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx index e9b9c455f0..e77e622e34 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx @@ -121,28 +121,28 @@ Top, Bottom, Left - - + True - + Command + 150 - + True - + Value 80 - + True - + Default @@ -155,9 +155,9 @@ False - + True - + RawValue @@ -403,7 +403,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 0 @@ -619,7 +619,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 1 @@ -787,7 +787,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 2 @@ -907,7 +907,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 3 @@ -1075,7 +1075,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 4 @@ -1291,7 +1291,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 5 @@ -1507,7 +1507,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 6 @@ -1723,7 +1723,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 7 @@ -1939,7 +1939,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 8 @@ -2155,7 +2155,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 9 @@ -2371,7 +2371,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 10 @@ -2587,36 +2587,36 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAPM2 + TabAP 11 - + 4, 22 - + 0, 0, 0, 0 - + 722, 434 - + 0 - - APM 2.x + + ArduPlane - - TabAPM2 + + TabAP - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ConfigTabs - + 0 @@ -2638,7 +2638,7 @@ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - TabAC2 + TabAC 0 @@ -2683,7 +2683,7 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 1 @@ -2851,7 +2851,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 2 @@ -3019,7 +3019,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 3 @@ -3187,7 +3187,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 4 @@ -3214,7 +3214,7 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 5 @@ -3430,7 +3430,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 6 @@ -3502,7 +3502,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 7 @@ -3670,7 +3670,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 8 @@ -3838,7 +3838,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 9 @@ -4006,7 +4006,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 10 @@ -4174,7 +4174,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 11 @@ -4342,7 +4342,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 12 @@ -4510,7 +4510,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 13 @@ -4678,7 +4678,7 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 14 @@ -4846,36 +4846,36 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabAC2 + TabAC 15 - + 4, 22 - + 3, 3, 3, 3 - + 722, 434 - + 1 - - AC2 + + ArduCopter - - TabAC2 + + TabAC - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ConfigTabs - + 1 @@ -4968,9 +4968,9 @@ GDI+ (old type) - + 17, 17 - + OpenGL = Disabled GDI+ = Enabled @@ -6299,9 +6299,9 @@ GDI+ = Enabled 0 - + True - + 6, 13 @@ -6350,7 +6350,4 @@ GDI+ = Enabled System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - ..\Resources\MAVParam.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index f1e59edcc1..835662dd76 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -8,8 +8,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pointCameraHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -1217,8 +1217,8 @@ // // dataGridViewImageColumn1 // - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle7; resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1"); this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up; this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; @@ -1226,8 +1226,8 @@ // // dataGridViewImageColumn2 // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle8; resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2"); this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down; this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 6eb95e738d..e4cf5f65e3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -121,6 +121,15 @@ 290, 17 + + 175, 48 + + + contextMenuStrip1 + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 174, 22 @@ -133,15 +142,6 @@ Point Camera Here - - 175, 48 - - - contextMenuStrip1 - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Fill @@ -167,18 +167,6 @@ 542, 17 - - 172, 22 - - - Record Hud to AVI - - - 172, 22 - - - Stop Record - 173, 48 @@ -228,444 +216,6 @@ 0 - - NoControl - - - 17, 93 - - - 66, 23 - - - 78 - - - Script - - - BUT_script - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 0 - - - NoControl - - - 101, 93 - - - 66, 23 - - - 77 - - - Joystick - - - 445, 17 - - - Setup and enable your joystick - - - BUT_joystick - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 1 - - - NoControl - - - 173, 35 - - - 57, 23 - - - 76 - - - &Manual - - - Change Mode to Manual/Stabalize - - - BUT_quickmanual - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 2 - - - NoControl - - - 173, 64 - - - 57, 23 - - - 75 - - - &RTL - - - Change Mode to RTL - - - BUT_quickrtl - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 3 - - - NoControl - - - 173, 6 - - - 57, 23 - - - 74 - - - &Auto - - - Change mode to Auto - - - BUT_quickauto - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 4 - - - 0 (Home) - - - 4, 35 - - - 91, 21 - - - 72 - - - CMB_setwp - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 5 - - - NoControl - - - 101, 35 - - - 66, 23 - - - 73 - - - Set WP - - - Changes the current target waypoint - - - BUT_setwp - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 6 - - - 4, 64 - - - 91, 21 - - - 70 - - - CMB_modes - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 7 - - - NoControl - - - 101, 64 - - - 66, 23 - - - 71 - - - Set Mode - - - Changes to the Mode on the left - - - BUT_setmode - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 8 - - - NoControl - - - 236, 93 - - - 97, 23 - - - 52 - - - Clear Track - - - Clear the recorded path on the map - - - BUT_clear_track - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 9 - - - 4, 6 - - - 91, 21 - - - 59 - - - CMB_action - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 10 - - - NoControl - - - 236, 6 - - - 97, 23 - - - 69 - - - Set Home Alt - - - Set the current display alt as 0, ie home alt is shown as 0 - - - BUT_Homealt - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 11 - - - NoControl - - - 236, 64 - - - 97, 23 - - - 68 - - - Raw Sensor View - - - View raw Gyro and Accel values, and Raw Radio ins/outs - - - BUT_RAWSensor - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 12 - - - NoControl - - - 236, 35 - - - 97, 23 - - - 63 - - - Restart Mission - - - Restarts the mission from the beginning - - - BUTrestartmission - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 13 - - - NoControl - - - 101, 6 - - - 66, 23 - - - 60 - - - Do Action - - - Preform the action ot the left - - - BUTactiondo - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 14 - - - 4, 22 - - - 407, 116 - - - 2 - - - Actions - tabActions @@ -678,144 +228,6 @@ 0 - - Zoom - - - Microsoft Sans Serif, 9pt - - - 3, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 82 - - - Gvspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 0 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 303, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 80 - - - Gheading - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 1 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 203, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 81 - - - Galt - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 2 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 103, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 79 - - - Double click me to change Max - - - Gspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 0 - - - Gauges - tabGauges @@ -828,24 +240,6 @@ 1 - - True - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 1 - - - Status - tabStatus @@ -858,171 +252,6 @@ 2 - - 298, 35 - - - 51, 20 - - - 78 - - - 0.00 % - - - lbl_logpercent - - - ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 0 - - - 178, 35 - - - 54, 20 - - - 77 - - - Playback Speed - - - NUM_playbackspeed - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTLogs - - - 1 - - - NoControl - - - 51, 32 - - - 80, 23 - - - 76 - - - Log > KML - - - BUT_log2kml - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 2 - - - NoControl - - - 178, 3 - - - 171, 45 - - - 75 - - - tracklog - - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTLogs - - - 3 - - - NoControl - - - 89, 3 - - - 80, 23 - - - 73 - - - Play/Pause - - - BUT_playlog - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 4 - - - NoControl - - - 3, 3 - - - 80, 23 - - - 71 - - - Load Log - - - BUT_loadtelem - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 5 - - - 4, 22 - - - 407, 116 - - - 3 - - - Telemetry Logs - tabTLogs @@ -1432,6 +661,1299 @@ 0 + + TXT_lat + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 0 + + + Zoomlevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 1 + + + label1 + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 2 + + + TXT_long + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 3 + + + TXT_alt + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 4 + + + CHK_autopan + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 5 + + + CB_tuning + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 6 + + + Fill + + + 1, 428 + + + 0, 0, 0, 0 + + + 583, 30 + + + 0 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableMap + + + 1 + + + Fill + + + 0, 0 + + + 2 + + + 585, 459 + + + 75 + + + tableMap + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainH.Panel2 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,Absolute,30,Absolute,20" /></TableLayoutSettings> + + + MainH.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainH + + + 1 + + + 1008, 461 + + + 417 + + + 68 + + + MainH + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 172, 22 + + + Record Hud to AVI + + + 172, 22 + + + Stop Record + + + BUT_script + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 0 + + + BUT_joystick + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 1 + + + BUT_quickmanual + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 2 + + + BUT_quickrtl + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 3 + + + BUT_quickauto + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 4 + + + CMB_setwp + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 5 + + + BUT_setwp + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 6 + + + CMB_modes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 7 + + + BUT_setmode + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 8 + + + BUT_clear_track + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 9 + + + CMB_action + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 10 + + + BUT_Homealt + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 11 + + + BUT_RAWSensor + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 12 + + + BUTrestartmission + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 13 + + + BUTactiondo + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 14 + + + 4, 22 + + + 407, 116 + + + 2 + + + Actions + + + tabActions + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + + + NoControl + + + 17, 93 + + + 66, 23 + + + 78 + + + Script + + + BUT_script + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 0 + + + 445, 17 + + + NoControl + + + 101, 93 + + + 66, 23 + + + 77 + + + Joystick + + + Setup and enable your joystick + + + BUT_joystick + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 1 + + + NoControl + + + 173, 35 + + + 57, 23 + + + 76 + + + &Manual + + + Change Mode to Manual/Stabalize + + + BUT_quickmanual + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 2 + + + NoControl + + + 173, 64 + + + 57, 23 + + + 75 + + + &RTL + + + Change Mode to RTL + + + BUT_quickrtl + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 3 + + + NoControl + + + 173, 6 + + + 57, 23 + + + 74 + + + &Auto + + + Change mode to Auto + + + BUT_quickauto + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 4 + + + 0 (Home) + + + 4, 35 + + + 91, 21 + + + 72 + + + CMB_setwp + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 5 + + + NoControl + + + 101, 35 + + + 66, 23 + + + 73 + + + Set WP + + + Changes the current target waypoint + + + BUT_setwp + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 6 + + + 4, 64 + + + 91, 21 + + + 70 + + + CMB_modes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 7 + + + NoControl + + + 101, 64 + + + 66, 23 + + + 71 + + + Set Mode + + + Changes to the Mode on the left + + + BUT_setmode + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 8 + + + NoControl + + + 236, 93 + + + 97, 23 + + + 52 + + + Clear Track + + + Clear the recorded path on the map + + + BUT_clear_track + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 9 + + + 4, 6 + + + 91, 21 + + + 59 + + + CMB_action + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 10 + + + NoControl + + + 236, 6 + + + 97, 23 + + + 69 + + + Set Home Alt + + + Set the current display alt as 0, ie home alt is shown as 0 + + + BUT_Homealt + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 11 + + + NoControl + + + 236, 64 + + + 97, 23 + + + 68 + + + Raw Sensor View + + + View raw Gyro and Accel values, and Raw Radio ins/outs + + + BUT_RAWSensor + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 12 + + + NoControl + + + 236, 35 + + + 97, 23 + + + 63 + + + Restart Mission + + + Restarts the mission from the beginning + + + BUTrestartmission + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 13 + + + NoControl + + + 101, 6 + + + 66, 23 + + + 60 + + + Do Action + + + Preform the action ot the left + + + BUTactiondo + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 14 + + + Gvspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 0 + + + Gheading + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 1 + + + Galt + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 2 + + + Gspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 407, 116 + + + 0 + + + Gauges + + + tabGauges + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 3, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 82 + + + Gvspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 0 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 303, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 80 + + + Gheading + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 1 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 203, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 81 + + + Galt + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 2 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 103, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 79 + + + Double click me to change Max + + + Gspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 3 + + + True + + + 4, 22 + + + 3, 3, 3, 3 + + + 407, 116 + + + 1 + + + Status + + + tabStatus + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 2 + + + lbl_logpercent + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 0 + + + NUM_playbackspeed + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 1 + + + BUT_log2kml + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 2 + + + tracklog + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 3 + + + BUT_playlog + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 4 + + + BUT_loadtelem + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 5 + + + 4, 22 + + + 407, 116 + + + 3 + + + Telemetry Logs + + + tabTLogs + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 3 + + + 298, 35 + + + 51, 20 + + + 78 + + + 0.00 % + + + lbl_logpercent + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 0 + + + 178, 35 + + + 54, 20 + + + 77 + + + Playback Speed + + + NUM_playbackspeed + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 1 + + + NoControl + + + 51, 32 + + + 80, 23 + + + 76 + + + Log > KML + + + BUT_log2kml + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 2 + + + NoControl + + + 178, 3 + + + 171, 45 + + + 75 + + + tracklog + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 3 + + + NoControl + + + 89, 3 + + + 80, 23 + + + 73 + + + Play/Pause + + + BUT_playlog + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 4 + + + NoControl + + + 3, 3 + + + 80, 23 + + + 71 + + + Load Log + + + BUT_loadtelem + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 5 + Bottom, Left @@ -1651,96 +2173,6 @@ 6 - - Fill - - - 1, 428 - - - 0, 0, 0, 0 - - - 583, 30 - - - 0 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableMap - - - 1 - - - Fill - - - 0, 0 - - - 2 - - - 585, 459 - - - 75 - - - tableMap - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainH.Panel2 - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,Absolute,30,Absolute,20" /></TableLayoutSettings> - - - MainH.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainH - - - 1 - - - 1008, 461 - - - 417 - - - 68 - - - MainH - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Up @@ -1756,6 +2188,9 @@ 17, 17 + + 445, 17 + NoControl diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs index 9711b2bb74..eafaaa3c24 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.cs @@ -794,14 +794,12 @@ namespace ArdupilotMega { comPort.BaseStream.PortName = CMB_serialport.Text; + MainV2.comPort.BaseStream.BaudRate = int.Parse(CMB_baudrate.Text); + if (config[CMB_serialport.Text + "_BAUD"] != null) { CMB_baudrate.Text = config[CMB_serialport.Text + "_BAUD"].ToString(); } - else - { - MainV2.comPort.BaseStream.BaudRate = int.Parse(CMB_baudrate.Text); - } } catch { } } diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index df622d1284..013c0d911d 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.0.0.0")] -[assembly: AssemblyFileVersion("1.1.17")] +[assembly: AssemblyFileVersion("1.1.18")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs index 00f243da38..485a424270 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs @@ -120,6 +120,8 @@ this.pictureBoxQuadX = new System.Windows.Forms.PictureBox(); this.pictureBoxQuad = new System.Windows.Forms.PictureBox(); this.tabHeli = new System.Windows.Forms.TabPage(); + this.BUT_HS4save = new ArdupilotMega.MyButton(); + this.BUT_swash_manual = new ArdupilotMega.MyButton(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label46 = new System.Windows.Forms.Label(); this.label45 = new System.Windows.Forms.Label(); @@ -165,8 +167,6 @@ this.HS2_REV = new System.Windows.Forms.CheckBox(); this.HS1_REV = new System.Windows.Forms.CheckBox(); this.label17 = new System.Windows.Forms.Label(); - this.BUT_HS4save = new ArdupilotMega.MyButton(); - this.BUT_swash_manual = new ArdupilotMega.MyButton(); this.HS4 = new ArdupilotMega.HorizontalProgressBar2(); this.HS3 = new ArdupilotMega.VerticalProgressBar2(); this.Gservoloc = new AGaugeApp.AGauge(); @@ -944,6 +944,8 @@ // // tabHeli // + this.tabHeli.Controls.Add(this.BUT_HS4save); + this.tabHeli.Controls.Add(this.BUT_swash_manual); this.tabHeli.Controls.Add(this.groupBox3); this.tabHeli.Controls.Add(this.label44); this.tabHeli.Controls.Add(this.label43); @@ -975,8 +977,6 @@ this.tabHeli.Controls.Add(this.HS2_REV); this.tabHeli.Controls.Add(this.HS1_REV); this.tabHeli.Controls.Add(this.label17); - this.tabHeli.Controls.Add(this.BUT_HS4save); - this.tabHeli.Controls.Add(this.BUT_swash_manual); this.tabHeli.Controls.Add(this.HS4); this.tabHeli.Controls.Add(this.HS3); this.tabHeli.Controls.Add(this.Gservoloc); @@ -985,6 +985,20 @@ this.tabHeli.UseVisualStyleBackColor = true; this.tabHeli.Click += new System.EventHandler(this.tabHeli_Click); // + // BUT_HS4save + // + resources.ApplyResources(this.BUT_HS4save, "BUT_HS4save"); + this.BUT_HS4save.Name = "BUT_HS4save"; + this.BUT_HS4save.UseVisualStyleBackColor = true; + this.BUT_HS4save.Click += new System.EventHandler(this.BUT_HS4save_Click); + // + // BUT_swash_manual + // + resources.ApplyResources(this.BUT_swash_manual, "BUT_swash_manual"); + this.BUT_swash_manual.Name = "BUT_swash_manual"; + this.BUT_swash_manual.UseVisualStyleBackColor = true; + this.BUT_swash_manual.Click += new System.EventHandler(this.BUT_swash_manual_Click); + // // groupBox3 // this.groupBox3.Controls.Add(this.label46); @@ -1322,20 +1336,6 @@ resources.ApplyResources(this.label17, "label17"); this.label17.Name = "label17"; // - // BUT_HS4save - // - resources.ApplyResources(this.BUT_HS4save, "BUT_HS4save"); - this.BUT_HS4save.Name = "BUT_HS4save"; - this.BUT_HS4save.UseVisualStyleBackColor = true; - this.BUT_HS4save.Click += new System.EventHandler(this.BUT_HS4save_Click); - // - // BUT_swash_manual - // - resources.ApplyResources(this.BUT_swash_manual, "BUT_swash_manual"); - this.BUT_swash_manual.Name = "BUT_swash_manual"; - this.BUT_swash_manual.UseVisualStyleBackColor = true; - this.BUT_swash_manual.Click += new System.EventHandler(this.BUT_swash_manual_Click); - // // HS4 // this.HS4.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69))))); diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx index 9bc8bb3031..5f938f54f0 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx @@ -2566,6 +2566,60 @@ will work with hexa's etc 4 + + NoControl + + + 479, 131 + + + 69, 23 + + + 131 + + + Manual + + + BUT_HS4save + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabHeli + + + 0 + + + NoControl + + + 298, 40 + + + 69, 23 + + + 0 + + + Manual + + + BUT_swash_manual + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabHeli + + + 1 + True @@ -2699,7 +2753,7 @@ will work with hexa's etc tabHeli - 0 + 2 True @@ -2729,7 +2783,7 @@ will work with hexa's etc tabHeli - 1 + 3 True @@ -2759,7 +2813,7 @@ will work with hexa's etc tabHeli - 2 + 4 True @@ -2789,7 +2843,7 @@ will work with hexa's etc tabHeli - 3 + 5 True @@ -2918,7 +2972,7 @@ will work with hexa's etc tabHeli - 4 + 6 True @@ -3098,7 +3152,7 @@ will work with hexa's etc tabHeli - 5 + 7 535, 241 @@ -3119,7 +3173,7 @@ will work with hexa's etc tabHeli - 6 + 8 122, 271 @@ -3140,7 +3194,7 @@ will work with hexa's etc tabHeli - 7 + 9 122, 245 @@ -3161,7 +3215,7 @@ will work with hexa's etc tabHeli - 8 + 10 122, 219 @@ -3182,7 +3236,7 @@ will work with hexa's etc tabHeli - 9 + 11 True @@ -3212,7 +3266,7 @@ will work with hexa's etc tabHeli - 10 + 12 True @@ -3242,7 +3296,7 @@ will work with hexa's etc tabHeli - 11 + 13 True @@ -3272,7 +3326,7 @@ will work with hexa's etc tabHeli - 12 + 14 True @@ -3302,7 +3356,7 @@ will work with hexa's etc tabHeli - 13 + 15 True @@ -3332,7 +3386,7 @@ will work with hexa's etc tabHeli - 14 + 16 310, 342 @@ -3356,7 +3410,7 @@ will work with hexa's etc tabHeli - 15 + 17 True @@ -3386,7 +3440,7 @@ will work with hexa's etc tabHeli - 16 + 18 310, 316 @@ -3410,7 +3464,7 @@ will work with hexa's etc tabHeli - 17 + 19 True @@ -3440,7 +3494,7 @@ will work with hexa's etc tabHeli - 18 + 20 True @@ -3470,7 +3524,7 @@ will work with hexa's etc tabHeli - 19 + 21 True @@ -3497,7 +3551,7 @@ will work with hexa's etc tabHeli - 20 + 22 True @@ -3527,7 +3581,7 @@ will work with hexa's etc tabHeli - 21 + 23 True @@ -3557,7 +3611,7 @@ will work with hexa's etc tabHeli - 22 + 24 True @@ -3587,7 +3641,7 @@ will work with hexa's etc tabHeli - 23 + 25 53, 271 @@ -3611,7 +3665,7 @@ will work with hexa's etc tabHeli - 24 + 26 53, 245 @@ -3635,7 +3689,7 @@ will work with hexa's etc tabHeli - 25 + 27 53, 219 @@ -3659,7 +3713,7 @@ will work with hexa's etc tabHeli - 26 + 28 True @@ -3686,7 +3740,7 @@ will work with hexa's etc tabHeli - 27 + 29 True @@ -3713,7 +3767,7 @@ will work with hexa's etc tabHeli - 28 + 30 True @@ -3740,7 +3794,7 @@ will work with hexa's etc tabHeli - 29 + 31 True @@ -3770,60 +3824,6 @@ will work with hexa's etc tabHeli - 30 - - - NoControl - - - 479, 138 - - - 69, 23 - - - 131 - - - Manual - - - BUT_HS4save - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabHeli - - - 31 - - - NoControl - - - 298, 47 - - - 69, 23 - - - 0 - - - Manual - - - BUT_swash_manual - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabHeli - - 32