APM Planner 1.1.18

fix heli setup screen

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.TabAP);
-            this.ConfigTabs.Controls.Add(this.TabAC2);
+            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.TabAP.BackColor = System.Drawing.Color.Transparent;
-            this.TabAPM2.Controls.Add(this.groupBox3);
+            this.TabAP.Controls.Add(this.groupBox3);
-            this.TabAPM2.Controls.Add(this.groupBox1);
+            this.TabAP.Controls.Add(this.groupBox1);
-            this.TabAPM2.Controls.Add(this.groupBox2);
+            this.TabAP.Controls.Add(this.groupBox2);
-            this.TabAPM2.Controls.Add(this.groupBox15);
+            this.TabAP.Controls.Add(this.groupBox15);
-            this.TabAPM2.Controls.Add(this.groupBox16);
+            this.TabAP.Controls.Add(this.groupBox16);
-            this.TabAPM2.Controls.Add(this.groupBox14);
+            this.TabAP.Controls.Add(this.groupBox14);
-            this.TabAPM2.Controls.Add(this.groupBox13);
+            this.TabAP.Controls.Add(this.groupBox13);
-            this.TabAPM2.Controls.Add(this.groupBox12);
+            this.TabAP.Controls.Add(this.groupBox12);
-            this.TabAPM2.Controls.Add(this.groupBox11);
+            this.TabAP.Controls.Add(this.groupBox11);
-            this.TabAPM2.Controls.Add(this.groupBox10);
+            this.TabAP.Controls.Add(this.groupBox10);
-            this.TabAPM2.Controls.Add(this.groupBox9);
+            this.TabAP.Controls.Add(this.groupBox9);
-            this.TabAPM2.Controls.Add(this.groupBox8);
+            this.TabAP.Controls.Add(this.groupBox8);
-            resources.ApplyResources(this.TabAPM2, "TabAPM2");
+            resources.ApplyResources(this.TabAP, "TabAP");
-            this.TabAPM2.Name = "TabAPM2";
+            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.TabAC.Controls.Add(this.myLabel1);
-            this.TabAC2.Controls.Add(this.CH7_OPT);
+            this.TabAC.Controls.Add(this.CH7_OPT);
-            this.TabAC2.Controls.Add(this.groupBox17);
+            this.TabAC.Controls.Add(this.groupBox17);
-            this.TabAC2.Controls.Add(this.groupBox5);
+            this.TabAC.Controls.Add(this.groupBox5);
-            this.TabAC2.Controls.Add(this.groupBox18);
+            this.TabAC.Controls.Add(this.groupBox18);
-            this.TabAC2.Controls.Add(this.CHK_lockrollpitch);
+            this.TabAC.Controls.Add(this.CHK_lockrollpitch);
-            this.TabAC2.Controls.Add(this.groupBox4);
+            this.TabAC.Controls.Add(this.groupBox4);
-            this.TabAC2.Controls.Add(this.groupBox6);
+            this.TabAC.Controls.Add(this.groupBox6);
-            this.TabAC2.Controls.Add(this.groupBox7);
+            this.TabAC.Controls.Add(this.groupBox7);
-            this.TabAC2.Controls.Add(this.groupBox19);
+            this.TabAC.Controls.Add(this.groupBox19);
-            this.TabAC2.Controls.Add(this.groupBox20);
+            this.TabAC.Controls.Add(this.groupBox20);
-            this.TabAC2.Controls.Add(this.groupBox21);
+            this.TabAC.Controls.Add(this.groupBox21);
-            this.TabAC2.Controls.Add(this.groupBox22);
+            this.TabAC.Controls.Add(this.groupBox22);
-            this.TabAC2.Controls.Add(this.groupBox23);
+            this.TabAC.Controls.Add(this.groupBox23);
-            this.TabAC2.Controls.Add(this.groupBox24);
+            this.TabAC.Controls.Add(this.groupBox24);
-            this.TabAC2.Controls.Add(this.groupBox25);
+            this.TabAC.Controls.Add(this.groupBox25);
-            resources.ApplyResources(this.TabAC2, "TabAC2");
+            resources.ApplyResources(this.TabAC, "TabAC");
-            this.TabAC2.Name = "TabAC2";
+            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.TabAC.ResumeLayout(false);
-            this.TabAC2.PerformLayout();
+            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 TabAP;
-        private System.Windows.Forms.TabPage TabAC2;
+        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;

Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs

@@ -77,14 +77,14 @@ namespace ArdupilotMega.GCSViews
             if (MainV2.APMFirmware == MainV2.Firmwares.ArduPlane)
             {
                 ConfigTabs.SelectedIndex = 0;
-                TabAPM2.Enabled = true;
+                TabAP.Enabled = true;
-                TabAC2.Enabled = false;
+                TabAC.Enabled = false;
             }
             else
             {
                 ConfigTabs.SelectedIndex = 1;
-                TabAPM2.Enabled = false;
+                TabAP.Enabled = false;
-                TabAC2.Enabled = true;
+                TabAC.Enabled = true;
             }
 
             // read tooltips
@@ -314,8 +314,8 @@ namespace ArdupilotMega.GCSViews
             toolTip1.RemoveAll();
             Params.Rows.Clear();
 
-            disableNumericUpDownControls(TabAC2);
+            disableNumericUpDownControls(TabAC);
-            disableNumericUpDownControls(TabAPM2);
+            disableNumericUpDownControls(TabAP);
 
             // process hashdefines and update display
             foreach (string value in param.Keys)

Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx

@@ -121,28 +121,28 @@
   <data name="Params.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <metadata name="Command.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-  <data name="Command.UserAddedColumn" type="System.Boolean, mscorlib">
     <value>True</value>
-  </data>
+  </metadata>
   <data name="Command.HeaderText" xml:space="preserve">
     <value>Command</value>
   </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Command.Width" type="System.Int32, mscorlib">
     <value>150</value>
   </data>
-  <data name="Value.UserAddedColumn" type="System.Boolean, mscorlib">
+  <metadata name="Value.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
-  </data>
+  </metadata>
   <data name="Value.HeaderText" xml:space="preserve">
     <value>Value</value>
   </data>
   <data name="Value.Width" type="System.Int32, mscorlib">
     <value>80</value>
   </data>
-  <data name="Default.UserAddedColumn" type="System.Boolean, mscorlib">
+  <metadata name="Default.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
-  </data>
+  </metadata>
   <data name="Default.HeaderText" xml:space="preserve">
     <value>Default</value>
   </data>
@@ -155,9 +155,9 @@
   <data name="mavScale.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="RawValue.UserAddedColumn" type="System.Boolean, mscorlib">
+  <metadata name="RawValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
-  </data>
+  </metadata>
   <data name="RawValue.HeaderText" xml:space="preserve">
     <value>RawValue</value>
   </data>
@@ -403,7 +403,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox3.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox3.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -619,7 +619,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -787,7 +787,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -907,7 +907,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox15.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox15.ZOrder" xml:space="preserve">
     <value>3</value>
@@ -1075,7 +1075,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox16.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox16.ZOrder" xml:space="preserve">
     <value>4</value>
@@ -1291,7 +1291,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox14.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox14.ZOrder" xml:space="preserve">
     <value>5</value>
@@ -1507,7 +1507,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox13.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox13.ZOrder" xml:space="preserve">
     <value>6</value>
@@ -1723,7 +1723,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox12.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox12.ZOrder" xml:space="preserve">
     <value>7</value>
@@ -1939,7 +1939,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox11.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox11.ZOrder" xml:space="preserve">
     <value>8</value>
@@ -2155,7 +2155,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox10.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox10.ZOrder" xml:space="preserve">
     <value>9</value>
@@ -2371,7 +2371,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox9.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox9.ZOrder" xml:space="preserve">
     <value>10</value>
@@ -2587,36 +2587,36 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox8.Parent" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
   <data name="&gt;&gt;groupBox8.ZOrder" xml:space="preserve">
     <value>11</value>
   </data>
-  <data name="TabAPM2.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="TabAP.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
-  <data name="TabAPM2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+  <data name="TabAP.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>
-  <data name="TabAPM2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="TabAP.Size" type="System.Drawing.Size, System.Drawing">
     <value>722, 434</value>
   </data>
-  <data name="TabAPM2.TabIndex" type="System.Int32, mscorlib">
+  <data name="TabAP.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="TabAPM2.Text" xml:space="preserve">
+  <data name="TabAP.Text" xml:space="preserve">
-    <value>APM 2.x</value>
+    <value>ArduPlane</value>
   </data>
-  <data name="&gt;&gt;TabAPM2.Name" xml:space="preserve">
+  <data name="&gt;&gt;TabAP.Name" xml:space="preserve">
-    <value>TabAPM2</value>
+    <value>TabAP</value>
   </data>
-  <data name="&gt;&gt;TabAPM2.Type" xml:space="preserve">
+  <data name="&gt;&gt;TabAP.Type" xml:space="preserve">
     <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;TabAPM2.Parent" xml:space="preserve">
+  <data name="&gt;&gt;TabAP.Parent" xml:space="preserve">
     <value>ConfigTabs</value>
   </data>
-  <data name="&gt;&gt;TabAPM2.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;TabAP.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <data name="myLabel1.Location" type="System.Drawing.Point, System.Drawing">
@@ -2638,7 +2638,7 @@
     <value>ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
   </data>
   <data name="&gt;&gt;myLabel1.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;myLabel1.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -2683,7 +2683,7 @@
     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;CH7_OPT.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;CH7_OPT.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -2851,7 +2851,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox17.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox17.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -3019,7 +3019,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox5.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox5.ZOrder" xml:space="preserve">
     <value>3</value>
@@ -3187,7 +3187,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox18.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox18.ZOrder" xml:space="preserve">
     <value>4</value>
@@ -3214,7 +3214,7 @@
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;CHK_lockrollpitch.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;CHK_lockrollpitch.ZOrder" xml:space="preserve">
     <value>5</value>
@@ -3430,7 +3430,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox4.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox4.ZOrder" xml:space="preserve">
     <value>6</value>
@@ -3502,7 +3502,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox6.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox6.ZOrder" xml:space="preserve">
     <value>7</value>
@@ -3670,7 +3670,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox7.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox7.ZOrder" xml:space="preserve">
     <value>8</value>
@@ -3838,7 +3838,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox19.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox19.ZOrder" xml:space="preserve">
     <value>9</value>
@@ -4006,7 +4006,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox20.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox20.ZOrder" xml:space="preserve">
     <value>10</value>
@@ -4174,7 +4174,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox21.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox21.ZOrder" xml:space="preserve">
     <value>11</value>
@@ -4342,7 +4342,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox22.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox22.ZOrder" xml:space="preserve">
     <value>12</value>
@@ -4510,7 +4510,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox23.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox23.ZOrder" xml:space="preserve">
     <value>13</value>
@@ -4678,7 +4678,7 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox24.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox24.ZOrder" xml:space="preserve">
     <value>14</value>
@@ -4846,36 +4846,36 @@
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;groupBox25.Parent" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
   <data name="&gt;&gt;groupBox25.ZOrder" xml:space="preserve">
     <value>15</value>
   </data>
-  <data name="TabAC2.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="TabAC.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
-  <data name="TabAC2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+  <data name="TabAC.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 3, 3, 3</value>
   </data>
-  <data name="TabAC2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="TabAC.Size" type="System.Drawing.Size, System.Drawing">
     <value>722, 434</value>
   </data>
-  <data name="TabAC2.TabIndex" type="System.Int32, mscorlib">
+  <data name="TabAC.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="TabAC2.Text" xml:space="preserve">
+  <data name="TabAC.Text" xml:space="preserve">
-    <value>AC2</value>
+    <value>ArduCopter</value>
   </data>
-  <data name="&gt;&gt;TabAC2.Name" xml:space="preserve">
+  <data name="&gt;&gt;TabAC.Name" xml:space="preserve">
-    <value>TabAC2</value>
+    <value>TabAC</value>
   </data>
-  <data name="&gt;&gt;TabAC2.Type" xml:space="preserve">
+  <data name="&gt;&gt;TabAC.Type" xml:space="preserve">
     <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;TabAC2.Parent" xml:space="preserve">
+  <data name="&gt;&gt;TabAC.Parent" xml:space="preserve">
     <value>ConfigTabs</value>
   </data>
-  <data name="&gt;&gt;TabAC2.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;TabAC.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
   <data name="label26.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
@@ -4968,9 +4968,9 @@
   <data name="CHK_GDIPlus.Text" xml:space="preserve">
     <value>GDI+ (old type)</value>
   </data>
-  <data name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
-  </data>
+  </metadata>
   <data name="CHK_GDIPlus.ToolTip" xml:space="preserve">
     <value>OpenGL = Disabled
 GDI+ = Enabled</value>
@@ -6299,9 +6299,9 @@ GDI+ = Enabled</value>
   <data name="&gt;&gt;BUT_compare.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="$this.Localizable" type="System.Boolean, mscorlib">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
-  </data>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
@@ -6350,7 +6350,4 @@ GDI+ = Enabled</value>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
     <value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
   </data>
-  <data name="MAVParam" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\MAVParam.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
 </root>

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 dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1;
+            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;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2;
+            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;

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 { }
         }

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("")]

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)))));

Tools/ArdupilotMegaPlanner/Setup/Setup.resx

@@ -2566,6 +2566,60 @@ will work with hexa's etc</value>
   <data name="&gt;&gt;tabArducopter.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
+  <data name="BUT_HS4save.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="BUT_HS4save.Location" type="System.Drawing.Point, System.Drawing">
+    <value>479, 131</value>
+  </data>
+  <data name="BUT_HS4save.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 23</value>
+  </data>
+  <data name="BUT_HS4save.TabIndex" type="System.Int32, mscorlib">
+    <value>131</value>
+  </data>
+  <data name="BUT_HS4save.Text" xml:space="preserve">
+    <value>Manual</value>
+  </data>
+  <data name="&gt;&gt;BUT_HS4save.Name" xml:space="preserve">
+    <value>BUT_HS4save</value>
+  </data>
+  <data name="&gt;&gt;BUT_HS4save.Type" xml:space="preserve">
+    <value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
+  </data>
+  <data name="&gt;&gt;BUT_HS4save.Parent" xml:space="preserve">
+    <value>tabHeli</value>
+  </data>
+  <data name="&gt;&gt;BUT_HS4save.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="BUT_swash_manual.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="BUT_swash_manual.Location" type="System.Drawing.Point, System.Drawing">
+    <value>298, 40</value>
+  </data>
+  <data name="BUT_swash_manual.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 23</value>
+  </data>
+  <data name="BUT_swash_manual.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="BUT_swash_manual.Text" xml:space="preserve">
+    <value>Manual</value>
+  </data>
+  <data name="&gt;&gt;BUT_swash_manual.Name" xml:space="preserve">
+    <value>BUT_swash_manual</value>
+  </data>
+  <data name="&gt;&gt;BUT_swash_manual.Type" xml:space="preserve">
+    <value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
+  </data>
+  <data name="&gt;&gt;BUT_swash_manual.Parent" xml:space="preserve">
+    <value>tabHeli</value>
+  </data>
+  <data name="&gt;&gt;BUT_swash_manual.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="label46.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -2699,7 +2753,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;groupBox3.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>2</value>
   </data>
   <data name="label44.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2729,7 +2783,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label44.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="label43.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2759,7 +2813,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label43.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="label42.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2789,7 +2843,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label42.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="label24.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2918,7 +2972,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="label41.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3098,7 +3152,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="HS4_TRIM.Location" type="System.Drawing.Point, System.Drawing">
     <value>535, 241</value>
@@ -3119,7 +3173,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS4_TRIM.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="HS3_TRIM.Location" type="System.Drawing.Point, System.Drawing">
     <value>122, 271</value>
@@ -3140,7 +3194,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS3_TRIM.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="HS2_TRIM.Location" type="System.Drawing.Point, System.Drawing">
     <value>122, 245</value>
@@ -3161,7 +3215,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS2_TRIM.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="HS1_TRIM.Location" type="System.Drawing.Point, System.Drawing">
     <value>122, 219</value>
@@ -3182,7 +3236,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS1_TRIM.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="label39.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3212,7 +3266,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label39.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="label38.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3242,7 +3296,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label38.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
   </data>
   <data name="label37.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3272,7 +3326,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label37.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>14</value>
   </data>
   <data name="label36.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3302,7 +3356,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label36.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>15</value>
   </data>
   <data name="label26.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3332,7 +3386,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label26.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>16</value>
   </data>
   <data name="PIT_MAX_.Location" type="System.Drawing.Point, System.Drawing">
     <value>310, 342</value>
@@ -3356,7 +3410,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;PIT_MAX_.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>17</value>
   </data>
   <data name="label25.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3386,7 +3440,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label25.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>18</value>
   </data>
   <data name="ROL_MAX_.Location" type="System.Drawing.Point, System.Drawing">
     <value>310, 316</value>
@@ -3410,7 +3464,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;ROL_MAX_.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>19</value>
   </data>
   <data name="label23.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3440,7 +3494,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>20</value>
   </data>
   <data name="label22.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3470,7 +3524,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label22.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>21</value>
   </data>
   <data name="HS4_REV.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3497,7 +3551,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS4_REV.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>22</value>
   </data>
   <data name="label20.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3527,7 +3581,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>23</value>
   </data>
   <data name="label19.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3557,7 +3611,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>24</value>
   </data>
   <data name="label18.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3587,7 +3641,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>25</value>
   </data>
   <data name="SV3_POS_.Location" type="System.Drawing.Point, System.Drawing">
     <value>53, 271</value>
@@ -3611,7 +3665,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;SV3_POS_.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>26</value>
   </data>
   <data name="SV2_POS_.Location" type="System.Drawing.Point, System.Drawing">
     <value>53, 245</value>
@@ -3635,7 +3689,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;SV2_POS_.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>27</value>
   </data>
   <data name="SV1_POS_.Location" type="System.Drawing.Point, System.Drawing">
     <value>53, 219</value>
@@ -3659,7 +3713,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;SV1_POS_.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>28</value>
   </data>
   <data name="HS3_REV.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3686,7 +3740,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS3_REV.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>29</value>
   </data>
   <data name="HS2_REV.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3713,7 +3767,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS2_REV.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>30</value>
   </data>
   <data name="HS1_REV.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3740,7 +3794,7 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;HS1_REV.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>31</value>
   </data>
   <data name="label17.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -3770,60 +3824,6 @@ will work with hexa's etc</value>
     <value>tabHeli</value>
   </data>
   <data name="&gt;&gt;label17.ZOrder" xml:space="preserve">
-    <value>30</value>
-  </data>
-  <data name="BUT_HS4save.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="BUT_HS4save.Location" type="System.Drawing.Point, System.Drawing">
-    <value>479, 138</value>
-  </data>
-  <data name="BUT_HS4save.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 23</value>
-  </data>
-  <data name="BUT_HS4save.TabIndex" type="System.Int32, mscorlib">
-    <value>131</value>
-  </data>
-  <data name="BUT_HS4save.Text" xml:space="preserve">
-    <value>Manual</value>
-  </data>
-  <data name="&gt;&gt;BUT_HS4save.Name" xml:space="preserve">
-    <value>BUT_HS4save</value>
-  </data>
-  <data name="&gt;&gt;BUT_HS4save.Type" xml:space="preserve">
-    <value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
-  </data>
-  <data name="&gt;&gt;BUT_HS4save.Parent" xml:space="preserve">
-    <value>tabHeli</value>
-  </data>
-  <data name="&gt;&gt;BUT_HS4save.ZOrder" xml:space="preserve">
-    <value>31</value>
-  </data>
-  <data name="BUT_swash_manual.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="BUT_swash_manual.Location" type="System.Drawing.Point, System.Drawing">
-    <value>298, 47</value>
-  </data>
-  <data name="BUT_swash_manual.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 23</value>
-  </data>
-  <data name="BUT_swash_manual.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="BUT_swash_manual.Text" xml:space="preserve">
-    <value>Manual</value>
-  </data>
-  <data name="&gt;&gt;BUT_swash_manual.Name" xml:space="preserve">
-    <value>BUT_swash_manual</value>
-  </data>
-  <data name="&gt;&gt;BUT_swash_manual.Type" xml:space="preserve">
-    <value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
-  </data>
-  <data name="&gt;&gt;BUT_swash_manual.Parent" xml:space="preserve">
-    <value>tabHeli</value>
-  </data>
-  <data name="&gt;&gt;BUT_swash_manual.ZOrder" xml:space="preserve">
     <value>32</value>
   </data>
   <data name="HS4.Location" type="System.Drawing.Point, System.Drawing">