From fce50384202f8c7eea537762beda32797a81a93e Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Thu, 2 Feb 2012 21:18:18 +0800 Subject: [PATCH] APM Planner 1.1.31 add D terms for AC fix potenial crash when unpluging usb without disconnecting fix arduinocpp local includes --- .../GCSViews/Configuration.Designer.cs | 338 +- .../GCSViews/Configuration.resx | 4791 ++++------------- Tools/ArdupilotMegaPlanner/MAVLink.cs | 14 +- .../Properties/AssemblyInfo.cs | 2 +- 4 files changed, 1226 insertions(+), 3919 deletions(-) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs index 55fa2ecbeb..460c782ab5 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs @@ -30,8 +30,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Configuration)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.Params = new System.Windows.Forms.DataGridView(); this.Command = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Value = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -141,31 +141,23 @@ this.RLL2SRV_P = new System.Windows.Forms.NumericUpDown(); this.label52 = new System.Windows.Forms.Label(); this.TabAC = new System.Windows.Forms.TabPage(); + this.myLabel2 = new ArdupilotMega.MyLabel(); + this.TUNE = new System.Windows.Forms.ComboBox(); this.myLabel1 = new ArdupilotMega.MyLabel(); this.CH7_OPT = new System.Windows.Forms.ComboBox(); - this.groupBox17 = new System.Windows.Forms.GroupBox(); - this.ACRO_PIT_IMAX = new System.Windows.Forms.NumericUpDown(); - this.label27 = new System.Windows.Forms.Label(); - this.ACRO_PIT_I = new System.Windows.Forms.NumericUpDown(); - this.label29 = new System.Windows.Forms.Label(); - this.ACRO_PIT_P = new System.Windows.Forms.NumericUpDown(); - this.label33 = new System.Windows.Forms.Label(); this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.THR_RATE_D = new System.Windows.Forms.NumericUpDown(); + this.label29 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); this.THR_RATE_IMAX = new System.Windows.Forms.NumericUpDown(); this.THR_RATE_I = new System.Windows.Forms.NumericUpDown(); this.label20 = new System.Windows.Forms.Label(); this.THR_RATE_P = new System.Windows.Forms.NumericUpDown(); this.label25 = new System.Windows.Forms.Label(); - this.groupBox18 = new System.Windows.Forms.GroupBox(); - this.ACRO_RLL_IMAX = new System.Windows.Forms.NumericUpDown(); - this.label40 = new System.Windows.Forms.Label(); - this.ACRO_RLL_I = new System.Windows.Forms.NumericUpDown(); - this.label44 = new System.Windows.Forms.Label(); - this.ACRO_RLL_P = new System.Windows.Forms.NumericUpDown(); - this.label48 = new System.Windows.Forms.Label(); this.CHK_lockrollpitch = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.NAV_LAT_D = new System.Windows.Forms.NumericUpDown(); + this.label27 = new System.Windows.Forms.Label(); this.WP_SPEED_MAX = new System.Windows.Forms.NumericUpDown(); this.label9 = new System.Windows.Forms.Label(); this.NAV_LAT_IMAX = new System.Windows.Forms.NumericUpDown(); @@ -213,6 +205,8 @@ this.STB_RLL_P = new System.Windows.Forms.NumericUpDown(); this.label46 = new System.Windows.Forms.Label(); this.groupBox23 = new System.Windows.Forms.GroupBox(); + this.RATE_YAW_D = new System.Windows.Forms.NumericUpDown(); + this.label10 = new System.Windows.Forms.Label(); this.RATE_YAW_IMAX = new System.Windows.Forms.NumericUpDown(); this.label47 = new System.Windows.Forms.Label(); this.RATE_YAW_I = new System.Windows.Forms.NumericUpDown(); @@ -220,6 +214,8 @@ this.RATE_YAW_P = new System.Windows.Forms.NumericUpDown(); this.label82 = new System.Windows.Forms.Label(); this.groupBox24 = new System.Windows.Forms.GroupBox(); + this.RATE_PIT_D = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); this.RATE_PIT_IMAX = new System.Windows.Forms.NumericUpDown(); this.label84 = new System.Windows.Forms.Label(); this.RATE_PIT_I = new System.Windows.Forms.NumericUpDown(); @@ -227,6 +223,8 @@ this.RATE_PIT_P = new System.Windows.Forms.NumericUpDown(); this.label87 = new System.Windows.Forms.Label(); this.groupBox25 = new System.Windows.Forms.GroupBox(); + this.RATE_RLL_D = new System.Windows.Forms.NumericUpDown(); + this.label17 = new System.Windows.Forms.Label(); this.RATE_RLL_IMAX = new System.Windows.Forms.NumericUpDown(); this.label88 = new System.Windows.Forms.Label(); this.RATE_RLL_I = new System.Windows.Forms.NumericUpDown(); @@ -285,8 +283,8 @@ this.BUT_load = new ArdupilotMega.MyButton(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.BUT_compare = new ArdupilotMega.MyButton(); - this.myLabel2 = new ArdupilotMega.MyLabel(); - this.TUNE = new System.Windows.Forms.ComboBox(); + this.STAB_D = new System.Windows.Forms.NumericUpDown(); + this.lblSTAB_D = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.Params)).BeginInit(); this.ConfigTabs.SuspendLayout(); this.TabAP.SuspendLayout(); @@ -347,19 +345,13 @@ ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_P)).BeginInit(); this.TabAC.SuspendLayout(); - this.groupBox17.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_IMAX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_I)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_P)).BeginInit(); this.groupBox5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_D)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_IMAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_P)).BeginInit(); - this.groupBox18.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_RLL_IMAX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_RLL_I)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_RLL_P)).BeginInit(); this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NAV_LAT_D)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.WP_SPEED_MAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NAV_LAT_IMAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NAV_LAT_I)).BeginInit(); @@ -387,19 +379,23 @@ ((System.ComponentModel.ISupportInitialize)(this.STB_RLL_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.STB_RLL_P)).BeginInit(); this.groupBox23.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_D)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_IMAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_P)).BeginInit(); this.groupBox24.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_D)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_IMAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_P)).BeginInit(); this.groupBox25.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_D)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_IMAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_P)).BeginInit(); this.TabPlanner.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.STAB_D)).BeginInit(); this.SuspendLayout(); // // Params @@ -407,14 +403,14 @@ this.Params.AllowUserToAddRows = false; this.Params.AllowUserToDeleteRows = false; resources.ApplyResources(this.Params, "Params"); - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.Maroon; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.Params.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.Maroon; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.Params.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.Params.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.Params.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Command, @@ -423,14 +419,14 @@ this.mavScale, this.RawValue}); this.Params.Name = "Params"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ActiveCaption; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.Params.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.ActiveCaption; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.Params.RowHeadersDefaultCellStyle = dataGridViewCellStyle2; this.Params.RowHeadersVisible = false; this.Params.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Params_CellValueChanged); // @@ -1095,9 +1091,7 @@ this.TabAC.Controls.Add(this.TUNE); 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); @@ -1112,6 +1106,40 @@ resources.ApplyResources(this.TabAC, "TabAC"); this.TabAC.Name = "TabAC"; // + // myLabel2 + // + resources.ApplyResources(this.myLabel2, "myLabel2"); + this.myLabel2.Name = "myLabel2"; + this.myLabel2.resize = false; + // + // TUNE + // + this.TUNE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.TUNE.FormattingEnabled = true; + this.TUNE.Items.AddRange(new object[] { + resources.GetString("TUNE.Items"), + resources.GetString("TUNE.Items1"), + resources.GetString("TUNE.Items2"), + resources.GetString("TUNE.Items3"), + resources.GetString("TUNE.Items4"), + resources.GetString("TUNE.Items5"), + resources.GetString("TUNE.Items6"), + resources.GetString("TUNE.Items7"), + resources.GetString("TUNE.Items8"), + resources.GetString("TUNE.Items9"), + resources.GetString("TUNE.Items10"), + resources.GetString("TUNE.Items11"), + resources.GetString("TUNE.Items12"), + resources.GetString("TUNE.Items13"), + resources.GetString("TUNE.Items14"), + resources.GetString("TUNE.Items15"), + resources.GetString("TUNE.Items16"), + resources.GetString("TUNE.Items17"), + resources.GetString("TUNE.Items18"), + resources.GetString("TUNE.Items19")}); + resources.ApplyResources(this.TUNE, "TUNE"); + this.TUNE.Name = "TUNE"; + // // myLabel1 // resources.ApplyResources(this.myLabel1, "myLabel1"); @@ -1134,50 +1162,10 @@ resources.ApplyResources(this.CH7_OPT, "CH7_OPT"); this.CH7_OPT.Name = "CH7_OPT"; // - // groupBox17 - // - this.groupBox17.Controls.Add(this.ACRO_PIT_IMAX); - this.groupBox17.Controls.Add(this.label27); - this.groupBox17.Controls.Add(this.ACRO_PIT_I); - this.groupBox17.Controls.Add(this.label29); - this.groupBox17.Controls.Add(this.ACRO_PIT_P); - this.groupBox17.Controls.Add(this.label33); - resources.ApplyResources(this.groupBox17, "groupBox17"); - this.groupBox17.Name = "groupBox17"; - this.groupBox17.TabStop = false; - // - // ACRO_PIT_IMAX - // - resources.ApplyResources(this.ACRO_PIT_IMAX, "ACRO_PIT_IMAX"); - this.ACRO_PIT_IMAX.Name = "ACRO_PIT_IMAX"; - // - // label27 - // - resources.ApplyResources(this.label27, "label27"); - this.label27.Name = "label27"; - // - // ACRO_PIT_I - // - resources.ApplyResources(this.ACRO_PIT_I, "ACRO_PIT_I"); - this.ACRO_PIT_I.Name = "ACRO_PIT_I"; - // - // label29 - // - resources.ApplyResources(this.label29, "label29"); - this.label29.Name = "label29"; - // - // ACRO_PIT_P - // - resources.ApplyResources(this.ACRO_PIT_P, "ACRO_PIT_P"); - this.ACRO_PIT_P.Name = "ACRO_PIT_P"; - // - // label33 - // - resources.ApplyResources(this.label33, "label33"); - this.label33.Name = "label33"; - // // groupBox5 // + this.groupBox5.Controls.Add(this.THR_RATE_D); + this.groupBox5.Controls.Add(this.label29); this.groupBox5.Controls.Add(this.label14); this.groupBox5.Controls.Add(this.THR_RATE_IMAX); this.groupBox5.Controls.Add(this.THR_RATE_I); @@ -1188,6 +1176,16 @@ this.groupBox5.Name = "groupBox5"; this.groupBox5.TabStop = false; // + // THR_RATE_D + // + resources.ApplyResources(this.THR_RATE_D, "THR_RATE_D"); + this.THR_RATE_D.Name = "THR_RATE_D"; + // + // label29 + // + resources.ApplyResources(this.label29, "label29"); + this.label29.Name = "label29"; + // // label14 // resources.ApplyResources(this.label14, "label14"); @@ -1218,48 +1216,6 @@ resources.ApplyResources(this.label25, "label25"); this.label25.Name = "label25"; // - // groupBox18 - // - this.groupBox18.Controls.Add(this.ACRO_RLL_IMAX); - this.groupBox18.Controls.Add(this.label40); - this.groupBox18.Controls.Add(this.ACRO_RLL_I); - this.groupBox18.Controls.Add(this.label44); - this.groupBox18.Controls.Add(this.ACRO_RLL_P); - this.groupBox18.Controls.Add(this.label48); - resources.ApplyResources(this.groupBox18, "groupBox18"); - this.groupBox18.Name = "groupBox18"; - this.groupBox18.TabStop = false; - // - // ACRO_RLL_IMAX - // - resources.ApplyResources(this.ACRO_RLL_IMAX, "ACRO_RLL_IMAX"); - this.ACRO_RLL_IMAX.Name = "ACRO_RLL_IMAX"; - // - // label40 - // - resources.ApplyResources(this.label40, "label40"); - this.label40.Name = "label40"; - // - // ACRO_RLL_I - // - resources.ApplyResources(this.ACRO_RLL_I, "ACRO_RLL_I"); - this.ACRO_RLL_I.Name = "ACRO_RLL_I"; - // - // label44 - // - resources.ApplyResources(this.label44, "label44"); - this.label44.Name = "label44"; - // - // ACRO_RLL_P - // - resources.ApplyResources(this.ACRO_RLL_P, "ACRO_RLL_P"); - this.ACRO_RLL_P.Name = "ACRO_RLL_P"; - // - // label48 - // - resources.ApplyResources(this.label48, "label48"); - this.label48.Name = "label48"; - // // CHK_lockrollpitch // resources.ApplyResources(this.CHK_lockrollpitch, "CHK_lockrollpitch"); @@ -1271,6 +1227,8 @@ // // groupBox4 // + this.groupBox4.Controls.Add(this.NAV_LAT_D); + this.groupBox4.Controls.Add(this.label27); this.groupBox4.Controls.Add(this.WP_SPEED_MAX); this.groupBox4.Controls.Add(this.label9); this.groupBox4.Controls.Add(this.NAV_LAT_IMAX); @@ -1283,6 +1241,16 @@ this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; // + // NAV_LAT_D + // + resources.ApplyResources(this.NAV_LAT_D, "NAV_LAT_D"); + this.NAV_LAT_D.Name = "NAV_LAT_D"; + // + // label27 + // + resources.ApplyResources(this.label27, "label27"); + this.label27.Name = "label27"; + // // WP_SPEED_MAX // resources.ApplyResources(this.WP_SPEED_MAX, "WP_SPEED_MAX"); @@ -1469,6 +1437,8 @@ // // groupBox21 // + this.groupBox21.Controls.Add(this.STAB_D); + this.groupBox21.Controls.Add(this.lblSTAB_D); this.groupBox21.Controls.Add(this.STB_PIT_IMAX); this.groupBox21.Controls.Add(this.label36); this.groupBox21.Controls.Add(this.STB_PIT_I); @@ -1553,6 +1523,8 @@ // // groupBox23 // + this.groupBox23.Controls.Add(this.RATE_YAW_D); + this.groupBox23.Controls.Add(this.label10); this.groupBox23.Controls.Add(this.RATE_YAW_IMAX); this.groupBox23.Controls.Add(this.label47); this.groupBox23.Controls.Add(this.RATE_YAW_I); @@ -1563,6 +1535,16 @@ this.groupBox23.Name = "groupBox23"; this.groupBox23.TabStop = false; // + // RATE_YAW_D + // + resources.ApplyResources(this.RATE_YAW_D, "RATE_YAW_D"); + this.RATE_YAW_D.Name = "RATE_YAW_D"; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // // RATE_YAW_IMAX // resources.ApplyResources(this.RATE_YAW_IMAX, "RATE_YAW_IMAX"); @@ -1595,6 +1577,8 @@ // // groupBox24 // + this.groupBox24.Controls.Add(this.RATE_PIT_D); + this.groupBox24.Controls.Add(this.label11); this.groupBox24.Controls.Add(this.RATE_PIT_IMAX); this.groupBox24.Controls.Add(this.label84); this.groupBox24.Controls.Add(this.RATE_PIT_I); @@ -1605,6 +1589,16 @@ this.groupBox24.Name = "groupBox24"; this.groupBox24.TabStop = false; // + // RATE_PIT_D + // + resources.ApplyResources(this.RATE_PIT_D, "RATE_PIT_D"); + this.RATE_PIT_D.Name = "RATE_PIT_D"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // // RATE_PIT_IMAX // resources.ApplyResources(this.RATE_PIT_IMAX, "RATE_PIT_IMAX"); @@ -1637,6 +1631,8 @@ // // groupBox25 // + this.groupBox25.Controls.Add(this.RATE_RLL_D); + this.groupBox25.Controls.Add(this.label17); this.groupBox25.Controls.Add(this.RATE_RLL_IMAX); this.groupBox25.Controls.Add(this.label88); this.groupBox25.Controls.Add(this.RATE_RLL_I); @@ -1647,6 +1643,16 @@ this.groupBox25.Name = "groupBox25"; this.groupBox25.TabStop = false; // + // RATE_RLL_D + // + resources.ApplyResources(this.RATE_RLL_D, "RATE_RLL_D"); + this.RATE_RLL_D.Name = "RATE_RLL_D"; + // + // label17 + // + resources.ApplyResources(this.label17, "label17"); + this.label17.Name = "label17"; + // // RATE_RLL_IMAX // resources.ApplyResources(this.RATE_RLL_IMAX, "RATE_RLL_IMAX"); @@ -2096,39 +2102,15 @@ this.BUT_compare.UseVisualStyleBackColor = true; this.BUT_compare.Click += new System.EventHandler(this.BUT_compare_Click); // - // myLabel2 + // STAB_D // - resources.ApplyResources(this.myLabel2, "myLabel2"); - this.myLabel2.Name = "myLabel2"; - this.myLabel2.resize = false; + resources.ApplyResources(this.STAB_D, "STAB_D"); + this.STAB_D.Name = "STAB_D"; // - // TUNE + // lblSTAB_D // - this.TUNE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.TUNE.FormattingEnabled = true; - this.TUNE.Items.AddRange(new object[] { - resources.GetString("TUNE.Items"), - resources.GetString("TUNE.Items1"), - resources.GetString("TUNE.Items2"), - resources.GetString("TUNE.Items3"), - resources.GetString("TUNE.Items4"), - resources.GetString("TUNE.Items5"), - resources.GetString("TUNE.Items6"), - resources.GetString("TUNE.Items7"), - resources.GetString("TUNE.Items8"), - resources.GetString("TUNE.Items9"), - resources.GetString("TUNE.Items10"), - resources.GetString("TUNE.Items11"), - resources.GetString("TUNE.Items12"), - resources.GetString("TUNE.Items13"), - resources.GetString("TUNE.Items14"), - resources.GetString("TUNE.Items15"), - resources.GetString("TUNE.Items16"), - resources.GetString("TUNE.Items17"), - resources.GetString("TUNE.Items18"), - resources.GetString("TUNE.Items19")}); - resources.ApplyResources(this.TUNE, "TUNE"); - this.TUNE.Name = "TUNE"; + resources.ApplyResources(this.lblSTAB_D, "lblSTAB_D"); + this.lblSTAB_D.Name = "lblSTAB_D"; // // Configuration // @@ -2205,19 +2187,13 @@ ((System.ComponentModel.ISupportInitialize)(this.RLL2SRV_P)).EndInit(); 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(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_PIT_P)).EndInit(); this.groupBox5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_D)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_IMAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_RATE_P)).EndInit(); - this.groupBox18.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_RLL_IMAX)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_RLL_I)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ACRO_RLL_P)).EndInit(); this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.NAV_LAT_D)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.WP_SPEED_MAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NAV_LAT_IMAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NAV_LAT_I)).EndInit(); @@ -2245,19 +2221,23 @@ ((System.ComponentModel.ISupportInitialize)(this.STB_RLL_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.STB_RLL_P)).EndInit(); this.groupBox23.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_D)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_IMAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_YAW_P)).EndInit(); this.groupBox24.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_D)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_IMAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_PIT_P)).EndInit(); this.groupBox25.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_D)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_IMAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RATE_RLL_P)).EndInit(); this.TabPlanner.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.STAB_D)).EndInit(); this.ResumeLayout(false); } @@ -2501,23 +2481,21 @@ private System.Windows.Forms.Label label109; private System.Windows.Forms.Label label14; private System.Windows.Forms.Label label26; - private System.Windows.Forms.GroupBox groupBox17; - private System.Windows.Forms.NumericUpDown ACRO_PIT_IMAX; - private System.Windows.Forms.Label label27; - private System.Windows.Forms.NumericUpDown ACRO_PIT_I; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.NumericUpDown ACRO_PIT_P; - private System.Windows.Forms.Label label33; - private System.Windows.Forms.GroupBox groupBox18; - private System.Windows.Forms.NumericUpDown ACRO_RLL_IMAX; - private System.Windows.Forms.Label label40; - private System.Windows.Forms.NumericUpDown ACRO_RLL_I; - private System.Windows.Forms.Label label44; - private System.Windows.Forms.NumericUpDown ACRO_RLL_P; - private System.Windows.Forms.Label label48; private MyLabel myLabel1; private System.Windows.Forms.ComboBox CH7_OPT; private MyLabel myLabel2; private System.Windows.Forms.ComboBox TUNE; + private System.Windows.Forms.NumericUpDown RATE_YAW_D; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.NumericUpDown RATE_PIT_D; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.NumericUpDown RATE_RLL_D; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.NumericUpDown NAV_LAT_D; + private System.Windows.Forms.Label label27; + private System.Windows.Forms.NumericUpDown THR_RATE_D; + private System.Windows.Forms.Label label29; + private System.Windows.Forms.NumericUpDown STAB_D; + private System.Windows.Forms.Label lblSTAB_D; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx index 3b22247b59..881a79be9f 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx @@ -192,2346 +192,6 @@ Top, Bottom, Left, Right - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 0 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 1 - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 2 - - - groupBox15 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 3 - - - groupBox16 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 4 - - - groupBox14 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 5 - - - groupBox13 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 6 - - - groupBox12 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 7 - - - groupBox11 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 8 - - - groupBox10 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 9 - - - groupBox9 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 10 - - - groupBox8 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 11 - - - 4, 22 - - - 0, 0, 0, 0 - - - 722, 434 - - - 0 - - - ArduPlane - - - TabAP - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ConfigTabs - - - 0 - - - 358, 297 - - - 53, 23 - - - 20 - - - Ch6 Opt - - - myLabel2 - - - ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - TabAC - - - 0 - - - CH6_NONE - - - CH6_STABILIZE_KP - - - CH6_STABILIZE_KI - - - CH6_YAW_KP - - - CH6_RATE_KP - - - CH6_RATE_KI - - - CH6_YAW_RATE_KP - - - CH6_THROTTLE_KP - - - CH6_TOP_BOTTOM_RATIO - - - CH6_RELAY - - - CH6_TRAVERSE_SPEED - - - CH6_NAV_P - - - CH6_LOITER_P - - - CH6_HELI_EXTERNAL_GYRO - - - CH6_THR_HOLD_KP - - - CH6_Z_GAIN - - - CH6_DAMP - - - CH6_OPTFLOW_KP - - - CH6_OPTFLOW_KI - - - CH6_OPTFLOW_KD - - - 417, 297 - - - 112, 21 - - - 19 - - - TUNE - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 1 - - - 358, 270 - - - 53, 23 - - - 18 - - - Ch7 Opt - - - myLabel1 - - - ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - TabAC - - - 2 - - - Do Nothing - - - - - - - - - Simple Mode - - - RTL - - - - - - - - - Save WP - - - 417, 270 - - - 112, 21 - - - 17 - - - CH7_OPT - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 3 - - - ACRO_PIT_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 0 - - - label27 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 1 - - - ACRO_PIT_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 2 - - - label29 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 3 - - - ACRO_PIT_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 4 - - - label33 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 5 - - - 182, 337 - - - 170, 91 - - - 13 - - - Acro Pitch - - - groupBox17 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 4 - - - label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - - - THR_RATE_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 1 - - - THR_RATE_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 2 - - - label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 3 - - - THR_RATE_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 4 - - - label25 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 5 - - - 6, 221 - - - 170, 110 - - - 16 - - - Throttle Rate - - - groupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 5 - - - ACRO_RLL_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 0 - - - label40 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 1 - - - ACRO_RLL_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 2 - - - label44 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 3 - - - ACRO_RLL_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 4 - - - label48 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 5 - - - 6, 337 - - - 170, 91 - - - 14 - - - Acro Roll - - - groupBox18 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 6 - - - True - - - 3, 198 - - - 154, 17 - - - 13 - - - Lock Pitch and Roll Values - - - CHK_lockrollpitch - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 7 - - - WP_SPEED_MAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 1 - - - NAV_LAT_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 3 - - - NAV_LAT_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 4 - - - label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 5 - - - NAV_LAT_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 6 - - - label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 7 - - - 534, 107 - - - 170, 108 - - - 0 - - - Nav WP - - - groupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 8 - - - XTRK_GAIN_SC1 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 0 - - - label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 1 - - - 358, 221 - - - 170, 43 - - - 2 - - - Crosstrack Correction - - - groupBox6 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 9 - - - THR_ALT_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox7 - - - 0 - - - label19 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox7 - - - 1 - - - THR_ALT_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox7 - - - 2 - - - label21 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox7 - - - 3 - - - THR_ALT_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox7 - - - 4 - - - label22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox7 - - - 5 - - - 182, 221 - - - 170, 110 - - - 3 - - - Altitude Hold - - - groupBox7 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 10 - - - HLD_LAT_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox19 - - - 0 - - - label28 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox19 - - - 1 - - - HLD_LAT_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox19 - - - 2 - - - label30 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox19 - - - 3 - - - HLD_LAT_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox19 - - - 4 - - - label31 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox19 - - - 5 - - - 531, 6 - - - 170, 95 - - - 6 - - - Loiter - - - groupBox19 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 11 - - - STB_YAW_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox20 - - - 0 - - - label32 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox20 - - - 1 - - - STB_YAW_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox20 - - - 2 - - - label34 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox20 - - - 3 - - - STB_YAW_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox20 - - - 4 - - - label35 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox20 - - - 5 - - - 358, 6 - - - 170, 95 - - - 7 - - - Stabilize Yaw - - - groupBox20 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 12 - - - STB_PIT_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox21 - - - 0 - - - label36 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox21 - - - 1 - - - STB_PIT_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox21 - - - 2 - - - label41 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox21 - - - 3 - - - STB_PIT_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox21 - - - 4 - - - label42 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox21 - - - 5 - - - 182, 6 - - - 170, 95 - - - 8 - - - Stabilize Pitch - - - groupBox21 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 13 - - - STB_RLL_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox22 - - - 0 - - - label43 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox22 - - - 1 - - - STB_RLL_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox22 - - - 2 - - - label45 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox22 - - - 3 - - - STB_RLL_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox22 - - - 4 - - - label46 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox22 - - - 5 - - - 6, 6 - - - 170, 95 - - - 9 - - - Stabilize Roll - - - groupBox22 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 14 - - - RATE_YAW_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox23 - - - 0 - - - label47 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox23 - - - 1 - - - RATE_YAW_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox23 - - - 2 - - - label77 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox23 - - - 3 - - - RATE_YAW_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox23 - - - 4 - - - label82 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox23 - - - 5 - - - 358, 107 - - - 170, 91 - - - 10 - - - Rate Yaw - - - groupBox23 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 15 - - - RATE_PIT_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox24 - - - 0 - - - label84 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox24 - - - 1 - - - RATE_PIT_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox24 - - - 2 - - - label86 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox24 - - - 3 - - - RATE_PIT_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox24 - - - 4 - - - label87 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox24 - - - 5 - - - 182, 107 - - - 170, 91 - - - 11 - - - Rate Pitch - - - groupBox24 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 16 - - - RATE_RLL_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox25 - - - 0 - - - label88 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox25 - - - 1 - - - RATE_RLL_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox25 - - - 2 - - - label90 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox25 - - - 3 - - - RATE_RLL_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox25 - - - 4 - - - label91 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox25 - - - 5 - - - 6, 107 - - - 170, 91 - - - 12 - - - Rate Roll - - - groupBox25 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAC - - - 17 - - - 4, 22 - - - 3, 3, 3, 3 - - - 722, 434 - - - 1 - - - ArduCopter - - - TabAC - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ConfigTabs - - - 1 - - - label26 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 0 - - - CMB_videoresolutions - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 1 - - - label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 2 - - - CHK_GDIPlus - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 3 - - - label24 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 4 - - - CHK_loadwponconnect - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 5 - - - label23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 6 - - - NUM_tracklength - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 7 - - - CHK_speechaltwarning - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 8 - - - label108 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 9 - - - CHK_resetapmonconnect - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 10 - - - CHK_mavdebug - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 11 - - - label107 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 12 - - - CMB_raterc - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 13 - - - label104 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 14 - - - label103 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 15 - - - label102 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 16 - - - label101 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 17 - - - CMB_ratestatus - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 18 - - - CMB_rateposition - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 19 - - - CMB_rateattitude - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 20 - - - label99 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 21 - - - label98 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 22 - - - label97 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 23 - - - CMB_speedunits - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 24 - - - CMB_distunits - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 25 - - - label96 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 26 - - - label95 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 27 - - - CHK_speechbattery - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 28 - - - CHK_speechcustom - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 29 - - - CHK_speechmode - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 30 - - - CHK_speechwaypoint - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 31 - - - label94 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 32 - - - CMB_osdcolor - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 33 - - - CMB_language - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 34 - - - label93 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 35 - - - CHK_enablespeech - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 36 - - - CHK_hudshow - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 37 - - - label92 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 38 - - - CMB_videosources - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPlanner - - - 39 - - - BUT_Joystick - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - TabPlanner - - - 40 - - - BUT_videostop - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - TabPlanner - - - 41 - - - BUT_videostart - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - TabPlanner - - - 42 - - - 4, 22 - - - 3, 3, 3, 3 - - - 722, 434 - - - 2 - - - Planner - - - TabPlanner - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ConfigTabs - - - 2 - - - 4, 22 - - - 722, 434 - - - 3 - - - Setup - - - TabSetup - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ConfigTabs - - - 3 - - - 52, 18 - - - 278, 0 - - - 0, 0, 0, 0 - - - 0, 0 - - - 730, 460 - - - 62 - - - ConfigTabs - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - 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 - - - 405, 217 - - - 195, 108 - - - 0 - - - Throttle 0-100% - - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabAP - - - 0 - 111, 82 @@ -2724,125 +384,29 @@ 7 - - ARSPD_RATIO + + 405, 217 - - 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 - - - 406, 325 - - + 195, 108 - - 1 + + 0 - - Airspeed m/s + + Throttle 0-100% - - groupBox1 + + groupBox3 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 1 + + 0 111, 82 @@ -3036,101 +600,29 @@ 7 - - LIM_PITCH_MIN + + 406, 325 - - 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 - - - 205, 325 - - + 195, 108 - - 2 + + 1 - - Navigation Angles + + Airspeed m/s - - groupBox2 + + groupBox1 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 2 + + 1 111, 59 @@ -3276,77 +768,29 @@ 5 - - XTRK_ANGLE_CD + + 205, 325 - - 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 - - - 4, 325 - - + 195, 108 - - 3 + + 2 - - Xtrack Pids + + Navigation Angles - - groupBox15 + + groupBox2 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 3 + + 2 111, 36 @@ -3444,101 +888,29 @@ 3 - - KFF_PTCH2THR + + 4, 325 - - 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 - - - 205, 217 - - + 195, 108 - - 4 + + 3 - - Other Mix's + + Xtrack Pids - - groupBox16 + + groupBox15 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 4 + + 3 111, 13 @@ -3684,125 +1056,29 @@ 5 - - ENRGY2THR_IMAX + + 205, 217 - - 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 - - - 4, 217 - - + 195, 108 - - 5 + + 4 - - Energy/Alt Pid + + Other Mix's - - groupBox14 + + groupBox16 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 5 + + 4 111, 82 @@ -3996,125 +1272,29 @@ 7 - - ALT2PTCH_IMAX + + 4, 217 - - 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 - - - 406, 109 - - + 195, 108 - - 6 + + 5 - - 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 - + TabAP - - 6 + + 5 111, 82 @@ -4308,125 +1488,29 @@ 7 - - ARSP2PTCH_IMAX + + 406, 109 - - 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 - - - 205, 109 - - + 195, 108 - - 7 + + 6 - - 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 - + TabAP - - 7 + + 6 111, 82 @@ -4620,125 +1704,29 @@ 7 - - HDNG2RLL_IMAX + + 205, 109 - - 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 - - - 4, 109 - - + 195, 108 - - 8 + + 7 - - 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 - + TabAP - - 8 + + 7 111, 82 @@ -4932,125 +1920,29 @@ 7 - - YW2SRV_IMAX + + 4, 109 - - 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 - - - 406, 1 - - + 195, 108 - - 9 + + 8 - - Servo Yaw Pid + + Nav Roll Pid - - groupBox10 + + groupBox11 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 9 + + 8 111, 82 @@ -5244,125 +2136,29 @@ 7 - - PTCH2SRV_IMAX + + 406, 1 - - 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 - - - 205, 1 - - + 195, 108 - - 10 + + 9 - - Servo Pitch Pid + + Servo Yaw Pid - - groupBox9 + + groupBox10 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 10 + + 9 111, 82 @@ -5556,125 +2352,29 @@ 7 - - RLL2SRV_IMAX + + 205, 1 - - 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 - - - 4, 1 - - + 195, 108 - - 11 + + 10 - - Servo Roll Pid + + Servo Pitch Pid - - groupBox8 + + groupBox9 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabAP - - 11 + + 10 111, 82 @@ -5868,89 +2568,266 @@ 7 - - 80, 63 + + 4, 1 - - 78, 20 + + 195, 108 - + + 11 + + + Servo Roll Pid + + + groupBox8 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAP + + + 11 + + + 4, 22 + + + 0, 0, 0, 0 + + + 722, 434 + + 0 - - ACRO_PIT_IMAX + + ArduPlane - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TabAP - - groupBox17 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + ConfigTabs + + 0 - - NoControl + + 358, 336 - - 6, 66 + + 53, 23 - - 65, 13 + + 20 - + + Ch6 Opt + + + myLabel2 + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + TabAC + + + 0 + + + CH6_NONE + + + CH6_STABILIZE_KP + + + CH6_STABILIZE_KI + + + CH6_YAW_KP + + + CH6_RATE_KP + + + CH6_RATE_KI + + + CH6_YAW_RATE_KP + + + CH6_THROTTLE_KP + + + CH6_TOP_BOTTOM_RATIO + + + CH6_RELAY + + + CH6_TRAVERSE_SPEED + + + CH6_NAV_P + + + CH6_LOITER_P + + + CH6_HELI_EXTERNAL_GYRO + + + CH6_THR_HOLD_KP + + + CH6_Z_GAIN + + + CH6_DAMP + + + CH6_OPTFLOW_KP + + + CH6_OPTFLOW_KI + + + CH6_OPTFLOW_KD + + + 417, 336 + + + 112, 21 + + + 19 + + + TUNE + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + 1 - - IMAX + + 358, 309 - - label27 + + 53, 23 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 18 - - groupBox17 + + Ch7 Opt - - 1 + + myLabel1 - - 80, 37 + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - 78, 20 + + TabAC - - 4 - - - ACRO_PIT_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - + 2 + + Do Nothing + + + + + + + + + Simple Mode + + + RTL + + + + + + + + + Save WP + + + 417, 309 + + + 112, 21 + + + 17 + + + CH7_OPT + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 3 + + + 80, 60 + + + 78, 20 + + + 14 + + + THR_RATE_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 0 + NoControl - 6, 40 + 6, 63 10, 13 - 5 + 15 - I + D label29 @@ -5959,64 +2836,16 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox17 + groupBox5 - 3 - - - 80, 13 - - - 78, 20 - - - 6 - - - ACRO_PIT_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 4 - - - NoControl - - - 6, 16 - - - 14, 13 - - - 7 - - - P - - - label33 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox17 - - - 5 + 1 NoControl - 6, 66 + 6, 86 65, 13 @@ -6037,10 +2866,10 @@ groupBox5 - 0 + 2 - 80, 63 + 80, 83 78, 20 @@ -6058,7 +2887,7 @@ groupBox5 - 1 + 3 80, 37 @@ -6079,7 +2908,7 @@ groupBox5 - 2 + 4 NoControl @@ -6106,7 +2935,7 @@ groupBox5 - 3 + 5 80, 13 @@ -6127,7 +2956,7 @@ groupBox5 - 4 + 6 NoControl @@ -6154,154 +2983,109 @@ groupBox5 - 5 - - - 80, 63 - - - 78, 20 - - - 0 - - - ACRO_RLL_IMAX - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 0 - - - NoControl - - - 6, 66 - - - 68, 13 - - - 1 - - - IMAX - - - label40 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 1 - - - 80, 37 - - - 78, 20 - - - 4 - - - ACRO_RLL_I - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 2 - - - NoControl - - - 6, 40 - - - 10, 13 - - - 5 - - - I - - - label44 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 3 - - - 80, 13 - - - 78, 20 - - - 6 - - - ACRO_RLL_P - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox18 - - - 4 - - - NoControl - - - 6, 16 - - - 14, 13 - - 7 - - P + + 6, 260 - - label48 + + 170, 110 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 16 - - groupBox18 + + Throttle Rate - + + groupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 4 + + + True + + + 3, 240 + + + 154, 17 + + + 13 + + + Lock Pitch and Roll Values + + + CHK_lockrollpitch + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + 5 + + 80, 60 + + + 78, 20 + + + 18 + + + NAV_LAT_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 19 + + + D + + + label27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 1 + - 80, 86 + 80, 107 78, 20 @@ -6319,13 +3103,13 @@ groupBox4 - 0 + 2 NoControl - 6, 89 + 6, 110 54, 13 @@ -6346,10 +3130,10 @@ groupBox4 - 1 + 3 - 80, 63 + 80, 84 78, 20 @@ -6367,13 +3151,13 @@ groupBox4 - 2 + 4 NoControl - 6, 66 + 6, 87 65, 13 @@ -6394,7 +3178,7 @@ groupBox4 - 3 + 5 80, 37 @@ -6415,7 +3199,7 @@ groupBox4 - 4 + 6 NoControl @@ -6442,7 +3226,7 @@ groupBox4 - 5 + 7 80, 13 @@ -6463,7 +3247,7 @@ groupBox4 - 6 + 8 NoControl @@ -6490,7 +3274,31 @@ groupBox4 - 7 + 9 + + + 534, 126 + + + 170, 131 + + + 0 + + + Nav WP + + + groupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 6 80, 13 @@ -6540,6 +3348,30 @@ 1 + + 358, 260 + + + 170, 43 + + + 2 + + + Crosstrack Correction + + + groupBox6 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 7 + 80, 63 @@ -6684,6 +3516,30 @@ 5 + + 182, 260 + + + 170, 110 + + + 3 + + + Altitude Hold + + + groupBox7 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 8 + 80, 61 @@ -6828,6 +3684,30 @@ 5 + + 531, 6 + + + 170, 95 + + + 6 + + + Loiter + + + groupBox19 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 9 + 80, 63 @@ -6972,6 +3852,78 @@ 5 + + 358, 6 + + + 170, 95 + + + 7 + + + Stabilize Yaw + + + groupBox20 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 10 + + + 80, 88 + + + 78, 20 + + + 16 + + + STAB_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 0 + + + NoControl + + + 6, 91 + + + 65, 13 + + + 17 + + + Stabalize D + + + lblSTAB_D + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 1 + 80, 63 @@ -6991,7 +3943,7 @@ groupBox21 - 0 + 2 NoControl @@ -7018,7 +3970,7 @@ groupBox21 - 1 + 3 80, 37 @@ -7039,7 +3991,7 @@ groupBox21 - 2 + 4 NoControl @@ -7066,7 +4018,7 @@ groupBox21 - 3 + 5 80, 13 @@ -7087,7 +4039,7 @@ groupBox21 - 4 + 6 NoControl @@ -7114,7 +4066,31 @@ groupBox21 - 5 + 7 + + + 182, 6 + + + 170, 114 + + + 8 + + + Stabilize Pitch + + + groupBox21 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 11 80, 63 @@ -7260,8 +4236,80 @@ 5 + + 6, 6 + + + 170, 95 + + + 9 + + + Stabilize Roll + + + groupBox22 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 12 + + + 80, 60 + + + 78, 20 + + + 8 + + + RATE_YAW_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 9 + + + D + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 1 + - 80, 63 + 80, 84 78, 20 @@ -7279,13 +4327,13 @@ groupBox23 - 0 + 2 NoControl - 6, 66 + 6, 87 65, 13 @@ -7306,7 +4354,7 @@ groupBox23 - 1 + 3 80, 37 @@ -7327,7 +4375,7 @@ groupBox23 - 2 + 4 NoControl @@ -7354,7 +4402,7 @@ groupBox23 - 3 + 5 80, 13 @@ -7375,7 +4423,7 @@ groupBox23 - 4 + 6 NoControl @@ -7402,10 +4450,82 @@ groupBox23 - 5 + 7 + + + 358, 126 + + + 170, 108 + + + 10 + + + Rate Yaw + + + groupBox23 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 13 + + + 80, 60 + + + 78, 20 + + + 10 + + + RATE_PIT_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 11 + + + D + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 1 - 80, 63 + 80, 83 78, 20 @@ -7423,13 +4543,13 @@ groupBox24 - 0 + 2 NoControl - 6, 66 + 6, 86 65, 13 @@ -7450,7 +4570,7 @@ groupBox24 - 1 + 3 80, 37 @@ -7471,7 +4591,7 @@ groupBox24 - 2 + 4 NoControl @@ -7498,7 +4618,7 @@ groupBox24 - 3 + 5 80, 13 @@ -7519,7 +4639,7 @@ groupBox24 - 4 + 6 NoControl @@ -7546,10 +4666,82 @@ groupBox24 - 5 + 7 + + + 182, 126 + + + 170, 108 + + + 11 + + + Rate Pitch + + + groupBox24 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 14 + + + 80, 60 + + + 78, 20 + + + 12 + + + RATE_RLL_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 13 + + + D + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 1 - 80, 63 + 80, 83 78, 20 @@ -7567,13 +4759,13 @@ groupBox25 - 0 + 2 NoControl - 6, 66 + 6, 86 68, 13 @@ -7594,7 +4786,7 @@ groupBox25 - 1 + 3 80, 37 @@ -7615,7 +4807,7 @@ groupBox25 - 2 + 4 NoControl @@ -7642,7 +4834,7 @@ groupBox25 - 3 + 5 80, 13 @@ -7663,7 +4855,7 @@ groupBox25 - 4 + 6 NoControl @@ -7690,7 +4882,58 @@ groupBox25 - 5 + 7 + + + 6, 126 + + + 170, 108 + + + 12 + + + Rate Roll + + + groupBox25 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabAC + + + 15 + + + 4, 22 + + + 3, 3, 3, 3 + + + 722, 434 + + + 1 + + + ArduCopter + + + TabAC + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigTabs + + + 1 NoControl @@ -7767,9 +5010,6 @@ 2 - - 17, 17 - NoControl @@ -7785,6 +5025,9 @@ GDI+ (old type) + + 17, 17 + OpenGL = Disabled GDI+ = Enabled @@ -8849,6 +6092,87 @@ GDI+ = Enabled 42 + + 4, 22 + + + 3, 3, 3, 3 + + + 722, 434 + + + 2 + + + Planner + + + TabPlanner + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigTabs + + + 2 + + + 4, 22 + + + 722, 434 + + + 3 + + + Setup + + + TabSetup + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigTabs + + + 3 + + + 52, 18 + + + 278, 0 + + + 0, 0, 0, 0 + + + 0, 0 + + + 730, 460 + + + 62 + + + ConfigTabs + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 0, 0 @@ -9002,9 +6326,6 @@ GDI+ = Enabled 5 - - 17, 17 - Bottom, Left diff --git a/Tools/ArdupilotMegaPlanner/MAVLink.cs b/Tools/ArdupilotMegaPlanner/MAVLink.cs index 6581e2e9df..ee4f9ddb9f 100644 --- a/Tools/ArdupilotMegaPlanner/MAVLink.cs +++ b/Tools/ArdupilotMegaPlanner/MAVLink.cs @@ -2001,12 +2001,13 @@ namespace ArdupilotMega else { MainV2.cs.datetime = DateTime.Now; - temp[count] = (byte)BaseStream.ReadByte(); + if (BaseStream.IsOpen) + temp[count] = (byte)BaseStream.ReadByte(); } } catch (Exception e) { Console.WriteLine("MAVLink readpacket read error: " + e.Message); break; } - if (temp[0] != 254 && temp[0] != 'U' || lastbad[0] == 'I' && lastbad[1] == 'M' || lastbad[1] == 'G') // out of sync + if (temp[0] != 254 && temp[0] != 'U' || lastbad[0] == 'I' && lastbad[1] == 'M' || lastbad[1] == 'G' || lastbad[1] == 'A') // out of sync "AUTO" "GUIDED" "IMU" { if (temp[0] >= 0x20 && temp[0] <= 127 || temp[0] == '\n' || temp[0] == '\r') { @@ -2058,7 +2059,10 @@ namespace ArdupilotMega //Console.WriteLine("data " + 0 + " " + length + " aval " + BaseStream.BytesToRead); } - int read = BaseStream.Read(temp, 6, length - 4); + if (BaseStream.IsOpen) + { + int read = BaseStream.Read(temp, 6, length - 4); + } } //Console.WriteLine("data " + read + " " + length + " aval " + this.BytesToRead); count = length + 2; @@ -2113,6 +2117,10 @@ namespace ArdupilotMega if (temp.Length > 5 && temp[1] != MAVLINK_MESSAGE_LENGTHS[temp[5]]) { Console.WriteLine("Mavlink Bad Packet (Len Fail) len {0} pkno {1}", temp.Length, temp[5]); +#if MAVLINK10 + if (temp.Length == 11 && temp[0] == 'U' && temp[5] == 0) + throw new Exception("Mavlink 0.9 Heartbeat, Please upgrade your AP, This planner is for Mavlink 1.0\n\n"); +#endif return new byte[0]; } diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 13bdc50258..c8579df1be 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.30")] +[assembly: AssemblyFileVersion("1.1.31")] [assembly: NeutralResourcesLanguageAttribute("")]