diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs
index 760c3222da..5ec9e1d4f9 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs
@@ -287,6 +287,8 @@
this.BUT_load = new ArdupilotMega.MyButton();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.BUT_compare = new ArdupilotMega.MyButton();
+ this.label33 = new System.Windows.Forms.Label();
+ this.CMB_ratesensors = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.Params)).BeginInit();
this.ConfigTabs.SuspendLayout();
this.TabAP.SuspendLayout();
@@ -1715,6 +1717,8 @@
//
// TabPlanner
//
+ this.TabPlanner.Controls.Add(this.label33);
+ this.TabPlanner.Controls.Add(this.CMB_ratesensors);
this.TabPlanner.Controls.Add(this.label26);
this.TabPlanner.Controls.Add(this.CMB_videoresolutions);
this.TabPlanner.Controls.Add(this.label12);
@@ -2132,6 +2136,25 @@
this.BUT_compare.UseVisualStyleBackColor = true;
this.BUT_compare.Click += new System.EventHandler(this.BUT_compare_Click);
//
+ // label33
+ //
+ resources.ApplyResources(this.label33, "label33");
+ this.label33.Name = "label33";
+ //
+ // CMB_ratesensors
+ //
+ this.CMB_ratesensors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.CMB_ratesensors.FormattingEnabled = true;
+ this.CMB_ratesensors.Items.AddRange(new object[] {
+ resources.GetString("CMB_ratesensors.Items"),
+ resources.GetString("CMB_ratesensors.Items1"),
+ resources.GetString("CMB_ratesensors.Items2"),
+ resources.GetString("CMB_ratesensors.Items3"),
+ resources.GetString("CMB_ratesensors.Items4")});
+ resources.ApplyResources(this.CMB_ratesensors, "CMB_ratesensors");
+ this.CMB_ratesensors.Name = "CMB_ratesensors";
+ this.CMB_ratesensors.SelectedIndexChanged += new System.EventHandler(this.CMB_ratesensors_SelectedIndexChanged);
+ //
// Configuration
//
resources.ApplyResources(this, "$this");
@@ -2521,5 +2544,7 @@
private System.Windows.Forms.Label lblSTAB_D;
private System.Windows.Forms.NumericUpDown TUNE_LOW;
private System.Windows.Forms.NumericUpDown TUNE_HIGH;
+ private System.Windows.Forms.Label label33;
+ private System.Windows.Forms.ComboBox CMB_ratesensors;
}
}
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs
index 08f7cf31c4..c3e20df7d2 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs
@@ -145,6 +145,7 @@ namespace ArdupilotMega.GCSViews
CMB_rateposition.Text = MainV2.cs.rateposition.ToString();
CMB_raterc.Text = MainV2.cs.raterc.ToString();
CMB_ratestatus.Text = MainV2.cs.ratestatus.ToString();
+ CMB_ratesensors.Text = MainV2.cs.ratesensors.ToString();
if (MainV2.config["CHK_GDIPlus"] != null)
@@ -1183,5 +1184,11 @@ namespace ArdupilotMega.GCSViews
}
return base.ProcessCmdKey(ref msg, keyData);
}
+
+ private void CMB_ratesensors_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ MainV2.config[((ComboBox)sender).Name] = ((ComboBox)sender).Text;
+ MainV2.cs.ratesensors = byte.Parse(((ComboBox)sender).Text);
+ }
}
}
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
index 0cf4249838..58f1fa790f 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
@@ -363,15 +363,6 @@
0
-
- 543, 297
-
-
- 78, 20
-
-
- 22
-
TUNE_LOW
@@ -384,15 +375,6 @@
0
-
- 627, 296
-
-
- 78, 20
-
-
- 21
-
TUNE_HIGH
@@ -405,23 +387,11 @@
1
-
- 534, 270
-
-
- 53, 23
-
-
- 20
-
-
- Ch6 Opt
-
myLabel2
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
TabAC
@@ -429,81 +399,6 @@
2
-
- 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
-
-
- CH6_NAV_I
-
-
- CH6_RATE_KD
-
-
- 593, 270
-
-
- 112, 21
-
-
- 19
-
TUNE
@@ -516,23 +411,11 @@
3
-
- 534, 322
-
-
- 53, 23
-
-
- 18
-
-
- Ch7 Opt
-
myLabel1
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
TabAC
@@ -540,39 +423,6 @@
4
-
- Do Nothing
-
-
-
-
-
-
-
-
- Simple Mode
-
-
- RTL
-
-
-
-
-
-
-
-
- Save WP
-
-
- 593, 322
-
-
- 112, 21
-
-
- 17
-
CH7_OPT
@@ -585,114 +435,6 @@
5
-
- THR_RATE_D
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 0
-
-
- label29
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 1
-
-
- label14
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 2
-
-
- THR_RATE_IMAX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 3
-
-
- THR_RATE_I
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 4
-
-
- label20
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 5
-
-
- THR_RATE_P
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 6
-
-
- label25
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox5
-
-
- 7
-
-
- 6, 260
-
-
- 170, 110
-
-
- 16
-
-
- Throttle Rate
-
groupBox5
@@ -705,21 +447,6 @@
6
-
- True
-
-
- 3, 240
-
-
- 154, 17
-
-
- 13
-
-
- Lock Pitch and Roll Values
-
CHK_lockrollpitch
@@ -732,138 +459,6 @@
7
-
- NAV_LAT_D
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 0
-
-
- label27
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 1
-
-
- WP_SPEED_MAX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 2
-
-
- label9
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 3
-
-
- NAV_LAT_IMAX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 4
-
-
- label13
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 5
-
-
- NAV_LAT_I
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 6
-
-
- label15
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 7
-
-
- NAV_LAT_P
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 8
-
-
- label16
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox4
-
-
- 9
-
-
- 534, 126
-
-
- 170, 131
-
-
- 0
-
-
- Nav WP
-
groupBox4
@@ -876,42 +471,6 @@
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, 260
-
-
- 170, 43
-
-
- 2
-
-
- Crosstrack Correction
-
groupBox6
@@ -924,90 +483,6 @@
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, 260
-
-
- 170, 110
-
-
- 3
-
-
- Altitude Hold
-
groupBox7
@@ -1020,90 +495,6 @@
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
@@ -1116,90 +507,6 @@
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
@@ -1212,114 +519,6 @@
12
-
- STAB_D
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 0
-
-
- lblSTAB_D
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 1
-
-
- STB_PIT_IMAX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 2
-
-
- label36
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 3
-
-
- STB_PIT_I
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 4
-
-
- label41
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 5
-
-
- STB_PIT_P
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 6
-
-
- label42
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox21
-
-
- 7
-
-
- 182, 6
-
-
- 170, 114
-
-
- 8
-
-
- Stabilize Pitch
-
groupBox21
@@ -1332,90 +531,6 @@
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
@@ -1428,114 +543,6 @@
14
-
- RATE_YAW_D
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 0
-
-
- label10
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 1
-
-
- RATE_YAW_IMAX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 2
-
-
- label47
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 3
-
-
- RATE_YAW_I
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 4
-
-
- label77
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 5
-
-
- RATE_YAW_P
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 6
-
-
- label82
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox23
-
-
- 7
-
-
- 358, 126
-
-
- 170, 108
-
-
- 10
-
-
- Rate Yaw
-
groupBox23
@@ -1548,114 +555,6 @@
15
-
- RATE_PIT_D
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 0
-
-
- label11
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 1
-
-
- RATE_PIT_IMAX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 2
-
-
- label84
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 3
-
-
- RATE_PIT_I
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 4
-
-
- label86
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 5
-
-
- RATE_PIT_P
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 6
-
-
- label87
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox24
-
-
- 7
-
-
- 182, 126
-
-
- 170, 108
-
-
- 11
-
-
- Rate Pitch
-
groupBox24
@@ -1668,114 +567,6 @@
16
-
- RATE_RLL_D
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 0
-
-
- label17
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 1
-
-
- RATE_RLL_IMAX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 2
-
-
- label88
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 3
-
-
- RATE_RLL_I
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 4
-
-
- label90
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 5
-
-
- RATE_RLL_P
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 6
-
-
- label91
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox25
-
-
- 7
-
-
- 6, 126
-
-
- 170, 108
-
-
- 12
-
-
- Rate Roll
-
groupBox25
@@ -1815,6 +606,84 @@
1
+
+ NoControl
+
+
+ 532, 244
+
+
+ 43, 13
+
+
+ 42
+
+
+ Sensor
+
+
+ label33
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPlanner
+
+
+ 0
+
+
+ 0
+
+
+ 1
+
+
+ 3
+
+
+ 10
+
+
+ 50
+
+
+ 579, 241
+
+
+ 40, 21
+
+
+ 43
+
+
+ CMB_ratesensors
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabPlanner
+
+
+ 1
+
+
+ NoControl
+
+
+ 30, 50
+
+
+ 100, 23
+
+
+ 41
+
+
+ Video Format
+
label26
@@ -1825,6 +694,15 @@
TabPlanner
+ 2
+
+
+ 139, 47
+
+
+ 408, 21
+
+
0
@@ -1837,7 +715,22 @@
TabPlanner
- 1
+ 3
+
+
+ NoControl
+
+
+ 30, 340
+
+
+ 61, 13
+
+
+ 39
+
+
+ HUD
label12
@@ -1849,7 +742,29 @@
TabPlanner
- 2
+ 4
+
+
+ 17, 17
+
+
+ NoControl
+
+
+ 139, 340
+
+
+ 177, 17
+
+
+ 40
+
+
+ GDI+ (old type)
+
+
+ OpenGL = Disabled
+GDI+ = Enabled
CHK_GDIPlus
@@ -1861,7 +776,22 @@
TabPlanner
- 3
+ 5
+
+
+ NoControl
+
+
+ 30, 318
+
+
+ 61, 13
+
+
+ 37
+
+
+ Waypoints
label24
@@ -1873,7 +803,22 @@
TabPlanner
- 4
+ 6
+
+
+ NoControl
+
+
+ 139, 317
+
+
+ 177, 17
+
+
+ 38
+
+
+ Load Waypoints on connect?
CHK_loadwponconnect
@@ -1885,7 +830,22 @@
TabPlanner
- 5
+ 7
+
+
+ NoControl
+
+
+ 30, 292
+
+
+ 103, 18
+
+
+ 36
+
+
+ Track Length
label23
@@ -1897,7 +857,19 @@
TabPlanner
- 6
+ 8
+
+
+ 139, 291
+
+
+ 67, 20
+
+
+ 35
+
+
+ On the Flight Data Tab
NUM_tracklength
@@ -1909,7 +881,22 @@
TabPlanner
- 7
+ 9
+
+
+ NoControl
+
+
+ 579, 107
+
+
+ 102, 17
+
+
+ 34
+
+
+ Alt Warning
CHK_speechaltwarning
@@ -1921,7 +908,22 @@
TabPlanner
- 8
+ 10
+
+
+ NoControl
+
+
+ 30, 269
+
+
+ 61, 13
+
+
+ 0
+
+
+ APM Reset
label108
@@ -1933,7 +935,22 @@
TabPlanner
- 9
+ 11
+
+
+ NoControl
+
+
+ 139, 267
+
+
+ 163, 17
+
+
+ 1
+
+
+ Reset APM on USB Connect
CHK_resetapmonconnect
@@ -1945,7 +962,25 @@
TabPlanner
- 10
+ 12
+
+
+ Bottom, Left
+
+
+ NoControl
+
+
+ 33, 411
+
+
+ 144, 17
+
+
+ 2
+
+
+ Mavlink Message Debug
CHK_mavdebug
@@ -1957,7 +992,22 @@
TabPlanner
- 11
+ 13
+
+
+ NoControl
+
+
+ 454, 244
+
+
+ 22, 13
+
+
+ 3
+
+
+ RC
label107
@@ -1969,7 +1019,28 @@
TabPlanner
- 12
+ 14
+
+
+ 0
+
+
+ 1
+
+
+ 3
+
+
+ 10
+
+
+ 485, 240
+
+
+ 40, 21
+
+
+ 4
CMB_raterc
@@ -1981,7 +1052,22 @@
TabPlanner
- 13
+ 15
+
+
+ NoControl
+
+
+ 334, 244
+
+
+ 69, 13
+
+
+ 5
+
+
+ Mode/Status
label104
@@ -1993,7 +1079,22 @@
TabPlanner
- 14
+ 16
+
+
+ NoControl
+
+
+ 234, 244
+
+
+ 44, 13
+
+
+ 6
+
+
+ Position
label103
@@ -2005,7 +1106,22 @@
TabPlanner
- 15
+ 17
+
+
+ NoControl
+
+
+ 136, 244
+
+
+ 43, 13
+
+
+ 7
+
+
+ Attitude
label102
@@ -2017,7 +1133,22 @@
TabPlanner
- 16
+ 18
+
+
+ NoControl
+
+
+ 27, 244
+
+
+ 84, 13
+
+
+ 8
+
+
+ Telemetry Rates
label101
@@ -2029,7 +1160,28 @@
TabPlanner
- 17
+ 19
+
+
+ 0
+
+
+ 1
+
+
+ 3
+
+
+ 10
+
+
+ 408, 240
+
+
+ 40, 21
+
+
+ 9
CMB_ratestatus
@@ -2041,7 +1193,28 @@
TabPlanner
- 18
+ 20
+
+
+ 0
+
+
+ 1
+
+
+ 3
+
+
+ 10
+
+
+ 288, 240
+
+
+ 40, 21
+
+
+ 10
CMB_rateposition
@@ -2053,7 +1226,28 @@
TabPlanner
- 19
+ 21
+
+
+ 0
+
+
+ 1
+
+
+ 3
+
+
+ 10
+
+
+ 188, 240
+
+
+ 40, 21
+
+
+ 11
CMB_rateattitude
@@ -2065,7 +1259,23 @@
TabPlanner
- 20
+ 22
+
+
+ NoControl
+
+
+ 283, 209
+
+
+ 402, 13
+
+
+ 12
+
+
+ NOTE: The Configuration Tab will NOT display these units, as those are raw values.
+
label99
@@ -2077,7 +1287,22 @@
TabPlanner
- 21
+ 23
+
+
+ NoControl
+
+
+ 30, 217
+
+
+ 65, 13
+
+
+ 13
+
+
+ Speed Units
label98
@@ -2089,7 +1314,22 @@
TabPlanner
- 22
+ 24
+
+
+ NoControl
+
+
+ 30, 189
+
+
+ 52, 13
+
+
+ 14
+
+
+ Dist Units
label97
@@ -2101,7 +1341,16 @@
TabPlanner
- 23
+ 25
+
+
+ 139, 214
+
+
+ 138, 21
+
+
+ 15
CMB_speedunits
@@ -2113,7 +1362,16 @@
TabPlanner
- 24
+ 26
+
+
+ 139, 187
+
+
+ 138, 21
+
+
+ 16
CMB_distunits
@@ -2125,7 +1383,22 @@
TabPlanner
- 25
+ 27
+
+
+ NoControl
+
+
+ 30, 162
+
+
+ 45, 13
+
+
+ 17
+
+
+ Joystick
label96
@@ -2137,7 +1410,22 @@
TabPlanner
- 26
+ 28
+
+
+ NoControl
+
+
+ 30, 111
+
+
+ 44, 13
+
+
+ 18
+
+
+ Speech
label95
@@ -2149,7 +1437,22 @@
TabPlanner
- 27
+ 29
+
+
+ NoControl
+
+
+ 471, 107
+
+
+ 102, 17
+
+
+ 19
+
+
+ Battery Warning
CHK_speechbattery
@@ -2161,7 +1464,22 @@
TabPlanner
- 28
+ 30
+
+
+ NoControl
+
+
+ 378, 107
+
+
+ 87, 17
+
+
+ 20
+
+
+ Time Interval
CHK_speechcustom
@@ -2173,7 +1491,22 @@
TabPlanner
- 29
+ 31
+
+
+ NoControl
+
+
+ 322, 107
+
+
+ 56, 17
+
+
+ 21
+
+
+ Mode
CHK_speechmode
@@ -2185,7 +1518,22 @@
TabPlanner
- 30
+ 32
+
+
+ NoControl
+
+
+ 245, 107
+
+
+ 71, 17
+
+
+ 22
+
+
+ Waypoint
CHK_speechwaypoint
@@ -2197,7 +1545,22 @@
TabPlanner
- 31
+ 33
+
+
+ NoControl
+
+
+ 30, 83
+
+
+ 57, 13
+
+
+ 23
+
+
+ OSD Color
label94
@@ -2209,7 +1572,16 @@
TabPlanner
- 32
+ 34
+
+
+ 139, 80
+
+
+ 138, 21
+
+
+ 24
CMB_osdcolor
@@ -2221,7 +1593,16 @@
TabPlanner
- 33
+ 35
+
+
+ 139, 131
+
+
+ 138, 21
+
+
+ 25
CMB_language
@@ -2233,7 +1614,22 @@
TabPlanner
- 34
+ 36
+
+
+ NoControl
+
+
+ 30, 135
+
+
+ 69, 13
+
+
+ 26
+
+
+ UI Language
label93
@@ -2245,7 +1641,22 @@
TabPlanner
- 35
+ 37
+
+
+ NoControl
+
+
+ 139, 107
+
+
+ 99, 17
+
+
+ 27
+
+
+ Enable Speech
CHK_enablespeech
@@ -2257,7 +1668,22 @@
TabPlanner
- 36
+ 38
+
+
+ NoControl
+
+
+ 552, 15
+
+
+ 125, 17
+
+
+ 28
+
+
+ Enable HUD Overlay
CHK_hudshow
@@ -2269,7 +1695,22 @@
TabPlanner
- 37
+ 39
+
+
+ NoControl
+
+
+ 30, 16
+
+
+ 100, 23
+
+
+ 29
+
+
+ Video Device
label92
@@ -2281,7 +1722,16 @@
TabPlanner
- 38
+ 40
+
+
+ 139, 13
+
+
+ 245, 21
+
+
+ 30
CMB_videosources
@@ -2293,43 +1743,88 @@
TabPlanner
- 39
+ 41
+
+
+ NoControl
+
+
+ 139, 158
+
+
+ 99, 23
+
+
+ 31
+
+
+ Joystick Setup
BUT_Joystick
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
TabPlanner
- 40
+ 42
+
+
+ NoControl
+
+
+ 471, 11
+
+
+ 75, 23
+
+
+ 32
+
+
+ Stop
BUT_videostop
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
TabPlanner
- 41
+ 43
+
+
+ NoControl
+
+
+ 390, 11
+
+
+ 75, 23
+
+
+ 33
+
+
+ Start
BUT_videostart
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
TabPlanner
- 42
+ 44
4, 22
@@ -5868,6 +5363,348 @@
7
+
+ 543, 297
+
+
+ 78, 20
+
+
+ 22
+
+
+ TUNE_LOW
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabAC
+
+
+ 0
+
+
+ 627, 296
+
+
+ 78, 20
+
+
+ 21
+
+
+ TUNE_HIGH
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabAC
+
+
+ 1
+
+
+ 534, 270
+
+
+ 53, 23
+
+
+ 20
+
+
+ Ch6 Opt
+
+
+ myLabel2
+
+
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+ TabAC
+
+
+ 2
+
+
+ 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
+
+
+ CH6_NAV_I
+
+
+ CH6_RATE_KD
+
+
+ 593, 270
+
+
+ 112, 21
+
+
+ 19
+
+
+ TUNE
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabAC
+
+
+ 3
+
+
+ 534, 322
+
+
+ 53, 23
+
+
+ 18
+
+
+ Ch7 Opt
+
+
+ myLabel1
+
+
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+ TabAC
+
+
+ 4
+
+
+ Do Nothing
+
+
+
+
+
+
+
+
+ Simple Mode
+
+
+ RTL
+
+
+
+
+
+
+
+
+ Save WP
+
+
+ 593, 322
+
+
+ 112, 21
+
+
+ 17
+
+
+ CH7_OPT
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabAC
+
+
+ 5
+
+
+ THR_RATE_D
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 0
+
+
+ label29
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 1
+
+
+ label14
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 2
+
+
+ THR_RATE_IMAX
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 3
+
+
+ THR_RATE_I
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 4
+
+
+ label20
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 5
+
+
+ THR_RATE_P
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 6
+
+
+ label25
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox5
+
+
+ 7
+
+
+ 6, 260
+
+
+ 170, 110
+
+
+ 16
+
+
+ Throttle Rate
+
+
+ groupBox5
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabAC
+
+
+ 6
+
80, 60
@@ -6060,6 +5897,177 @@
7
+
+ 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
+
+
+ 7
+
+
+ NAV_LAT_D
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 0
+
+
+ label27
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 1
+
+
+ WP_SPEED_MAX
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 2
+
+
+ label9
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 3
+
+
+ NAV_LAT_IMAX
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 4
+
+
+ label13
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 5
+
+
+ NAV_LAT_I
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 6
+
+
+ label15
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 7
+
+
+ NAV_LAT_P
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 8
+
+
+ label16
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox4
+
+
+ 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
+
+
+ 8
+
80, 60
@@ -6300,6 +6308,54 @@
9
+
+ 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, 260
+
+
+ 170, 43
+
+
+ 2
+
+
+ Crosstrack Correction
+
+
+ groupBox6
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabAC
+
+
+ 9
+
80, 13
@@ -6348,6 +6404,102 @@
1
+
+ 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, 260
+
+
+ 170, 110
+
+
+ 3
+
+
+ Altitude Hold
+
+
+ groupBox7
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TabAC
+
+
+ 10
+
80, 63
@@ -6492,6 +6644,102 @@
5
+
+ 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
+
80, 61
@@ -6636,6 +6884,102 @@
5
+
+ 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
+
80, 63
@@ -6780,6 +7124,126 @@
5
+
+ STAB_D
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 0
+
+
+ lblSTAB_D
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 1
+
+
+ STB_PIT_IMAX
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 2
+
+
+ label36
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 3
+
+
+ STB_PIT_I
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 4
+
+
+ label41
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 5
+
+
+ STB_PIT_P
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 6
+
+
+ label42
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox21
+
+
+ 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
+
+
+ 13
+
80, 88
@@ -6972,6 +7436,102 @@
7
+
+ 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
+
80, 63
@@ -7116,6 +7676,126 @@
5
+
+ RATE_YAW_D
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 0
+
+
+ label10
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 1
+
+
+ RATE_YAW_IMAX
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 2
+
+
+ label47
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 3
+
+
+ RATE_YAW_I
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 4
+
+
+ label77
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 5
+
+
+ RATE_YAW_P
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 6
+
+
+ label82
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox23
+
+
+ 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
+
+
+ 15
+
80, 60
@@ -7308,6 +7988,126 @@
7
+
+ RATE_PIT_D
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 0
+
+
+ label11
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 1
+
+
+ RATE_PIT_IMAX
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 2
+
+
+ label84
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 3
+
+
+ RATE_PIT_I
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 4
+
+
+ label86
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 5
+
+
+ RATE_PIT_P
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 6
+
+
+ label87
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox24
+
+
+ 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
+
+
+ 16
+
80, 60
@@ -7500,6 +8300,126 @@
7
+
+ RATE_RLL_D
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 0
+
+
+ label17
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 1
+
+
+ RATE_RLL_IMAX
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 2
+
+
+ label88
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 3
+
+
+ RATE_RLL_I
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 4
+
+
+ label90
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 5
+
+
+ RATE_RLL_P
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 6
+
+
+ label91
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox25
+
+
+ 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
+
+
+ 17
+
80, 60
@@ -7692,1163 +8612,6 @@
7
-
- NoControl
-
-
- 30, 50
-
-
- 100, 23
-
-
- 41
-
-
- Video Format
-
-
- label26
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 0
-
-
- 139, 47
-
-
- 408, 21
-
-
- 0
-
-
- CMB_videoresolutions
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 1
-
-
- NoControl
-
-
- 30, 340
-
-
- 61, 13
-
-
- 39
-
-
- HUD
-
-
- label12
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 2
-
-
- 17, 17
-
-
- NoControl
-
-
- 139, 340
-
-
- 177, 17
-
-
- 40
-
-
- GDI+ (old type)
-
-
- OpenGL = Disabled
-GDI+ = Enabled
-
-
- CHK_GDIPlus
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 3
-
-
- NoControl
-
-
- 30, 318
-
-
- 61, 13
-
-
- 37
-
-
- Waypoints
-
-
- label24
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 4
-
-
- NoControl
-
-
- 139, 317
-
-
- 177, 17
-
-
- 38
-
-
- Load Waypoints on connect?
-
-
- CHK_loadwponconnect
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 5
-
-
- NoControl
-
-
- 30, 292
-
-
- 103, 18
-
-
- 36
-
-
- Track Length
-
-
- label23
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 6
-
-
- 139, 291
-
-
- 67, 20
-
-
- 35
-
-
- On the Flight Data Tab
-
-
- NUM_tracklength
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 7
-
-
- NoControl
-
-
- 579, 107
-
-
- 102, 17
-
-
- 34
-
-
- Alt Warning
-
-
- CHK_speechaltwarning
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 8
-
-
- NoControl
-
-
- 30, 269
-
-
- 61, 13
-
-
- 0
-
-
- APM Reset
-
-
- label108
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 9
-
-
- NoControl
-
-
- 139, 267
-
-
- 163, 17
-
-
- 1
-
-
- Reset APM on USB Connect
-
-
- CHK_resetapmonconnect
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 10
-
-
- Bottom, Left
-
-
- NoControl
-
-
- 33, 411
-
-
- 144, 17
-
-
- 2
-
-
- Mavlink Message Debug
-
-
- CHK_mavdebug
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 11
-
-
- NoControl
-
-
- 590, 244
-
-
- 22, 13
-
-
- 3
-
-
- RC
-
-
- label107
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 12
-
-
- 0
-
-
- 1
-
-
- 3
-
-
- 10
-
-
- 621, 240
-
-
- 80, 21
-
-
- 4
-
-
- CMB_raterc
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 13
-
-
- NoControl
-
-
- 425, 244
-
-
- 69, 13
-
-
- 5
-
-
- Mode/Status
-
-
- label104
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 14
-
-
- NoControl
-
-
- 280, 244
-
-
- 44, 13
-
-
- 6
-
-
- Position
-
-
- label103
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 15
-
-
- NoControl
-
-
- 136, 244
-
-
- 43, 13
-
-
- 7
-
-
- Attitude
-
-
- label102
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 16
-
-
- NoControl
-
-
- 27, 244
-
-
- 84, 13
-
-
- 8
-
-
- Telemetry Rates
-
-
- label101
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 17
-
-
- 0
-
-
- 1
-
-
- 3
-
-
- 10
-
-
- 499, 240
-
-
- 80, 21
-
-
- 9
-
-
- CMB_ratestatus
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 18
-
-
- 0
-
-
- 1
-
-
- 3
-
-
- 10
-
-
- 334, 240
-
-
- 80, 21
-
-
- 10
-
-
- CMB_rateposition
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 19
-
-
- 0
-
-
- 1
-
-
- 3
-
-
- 10
-
-
- 188, 240
-
-
- 80, 21
-
-
- 11
-
-
- CMB_rateattitude
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 20
-
-
- NoControl
-
-
- 283, 209
-
-
- 402, 13
-
-
- 12
-
-
- NOTE: The Configuration Tab will NOT display these units, as those are raw values.
-
-
-
- label99
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 21
-
-
- NoControl
-
-
- 30, 217
-
-
- 65, 13
-
-
- 13
-
-
- Speed Units
-
-
- label98
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 22
-
-
- NoControl
-
-
- 30, 189
-
-
- 52, 13
-
-
- 14
-
-
- Dist Units
-
-
- label97
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 23
-
-
- 139, 214
-
-
- 138, 21
-
-
- 15
-
-
- CMB_speedunits
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 24
-
-
- 139, 187
-
-
- 138, 21
-
-
- 16
-
-
- CMB_distunits
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 25
-
-
- NoControl
-
-
- 30, 162
-
-
- 45, 13
-
-
- 17
-
-
- Joystick
-
-
- label96
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 26
-
-
- NoControl
-
-
- 30, 111
-
-
- 44, 13
-
-
- 18
-
-
- Speech
-
-
- label95
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 27
-
-
- NoControl
-
-
- 471, 107
-
-
- 102, 17
-
-
- 19
-
-
- Battery Warning
-
-
- CHK_speechbattery
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 28
-
-
- NoControl
-
-
- 378, 107
-
-
- 87, 17
-
-
- 20
-
-
- Time Interval
-
-
- CHK_speechcustom
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 29
-
-
- NoControl
-
-
- 322, 107
-
-
- 56, 17
-
-
- 21
-
-
- Mode
-
-
- CHK_speechmode
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 30
-
-
- NoControl
-
-
- 245, 107
-
-
- 71, 17
-
-
- 22
-
-
- Waypoint
-
-
- CHK_speechwaypoint
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 31
-
-
- NoControl
-
-
- 30, 83
-
-
- 57, 13
-
-
- 23
-
-
- OSD Color
-
-
- label94
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 32
-
-
- 139, 80
-
-
- 138, 21
-
-
- 24
-
-
- CMB_osdcolor
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 33
-
-
- 139, 131
-
-
- 138, 21
-
-
- 25
-
-
- CMB_language
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 34
-
-
- NoControl
-
-
- 30, 135
-
-
- 69, 13
-
-
- 26
-
-
- UI Language
-
-
- label93
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 35
-
-
- NoControl
-
-
- 139, 107
-
-
- 99, 17
-
-
- 27
-
-
- Enable Speech
-
-
- CHK_enablespeech
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 36
-
-
- NoControl
-
-
- 552, 15
-
-
- 125, 17
-
-
- 28
-
-
- Enable HUD Overlay
-
-
- CHK_hudshow
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 37
-
-
- NoControl
-
-
- 30, 16
-
-
- 100, 23
-
-
- 29
-
-
- Video Device
-
-
- label92
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 38
-
-
- 139, 13
-
-
- 245, 21
-
-
- 30
-
-
- CMB_videosources
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TabPlanner
-
-
- 39
-
-
- NoControl
-
-
- 139, 158
-
-
- 99, 23
-
-
- 31
-
-
- Joystick Setup
-
-
- BUT_Joystick
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
-
-
- TabPlanner
-
-
- 40
-
-
- NoControl
-
-
- 471, 11
-
-
- 75, 23
-
-
- 32
-
-
- Stop
-
-
- BUT_videostop
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
-
-
- TabPlanner
-
-
- 41
-
-
- NoControl
-
-
- 390, 11
-
-
- 75, 23
-
-
- 33
-
-
- Start
-
-
- BUT_videostart
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
-
-
- TabPlanner
-
-
- 42
-
0, 0
@@ -8889,7 +8652,7 @@ GDI+ = Enabled
BUT_rerequestparams
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
$this
@@ -8922,7 +8685,7 @@ GDI+ = Enabled
BUT_writePIDS
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
$this
@@ -8958,7 +8721,7 @@ GDI+ = Enabled
BUT_save
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
$this
@@ -8994,7 +8757,7 @@ GDI+ = Enabled
BUT_load
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
$this
@@ -9027,7 +8790,7 @@ GDI+ = Enabled
BUT_compare
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
$this
@@ -9084,6 +8847,6 @@ GDI+ = Enabled
Configuration
- System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs
index 839114ccca..295cbb8ff0 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs
@@ -1208,6 +1208,7 @@
this.CHK_autopan.Name = "CHK_autopan";
this.toolTip1.SetToolTip(this.CHK_autopan, resources.GetString("CHK_autopan.ToolTip"));
this.CHK_autopan.UseVisualStyleBackColor = true;
+ this.CHK_autopan.CheckedChanged += new System.EventHandler(this.CHK_autopan_CheckedChanged);
//
// CB_tuning
//
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
index f6a6c224c9..fbfc996a31 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
@@ -230,6 +230,9 @@ namespace ArdupilotMega.GCSViews
Zoomlevel.Minimum = gMapControl1.MinZoom;
Zoomlevel.Maximum = gMapControl1.MaxZoom + 1;
Zoomlevel.Value = Convert.ToDecimal(gMapControl1.Zoom);
+
+ if (MainV2.config["CHK_autopan"] != null)
+ CHK_autopan.Checked = bool.Parse(MainV2.config["CHK_autopan"].ToString());
}
private void mainloop()
@@ -1765,5 +1768,10 @@ print 'Roll complete'
scr.runScript(tb.Text);
}
}
+
+ private void CHK_autopan_CheckedChanged(object sender, EventArgs e)
+ {
+ MainV2.config["CHK_autopan"] = CHK_autopan.Checked.ToString();
+ }
}
}
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
index 896d5a711c..2157889864 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
@@ -208,7 +208,7 @@
hud1
- hud.HUD, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ hud.HUD, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
SubMainLeft.Panel1
@@ -247,7 +247,7 @@
BUT_script
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -280,7 +280,7 @@
BUT_joystick
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -310,7 +310,7 @@
BUT_quickmanual
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -340,7 +340,7 @@
BUT_quickrtl
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -370,7 +370,7 @@
BUT_quickauto
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -424,7 +424,7 @@
BUT_setwp
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -475,7 +475,7 @@
BUT_setmode
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -505,7 +505,7 @@
BUT_clear_track
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -556,7 +556,7 @@
BUT_Homealt
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -586,7 +586,7 @@
BUT_RAWSensor
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -616,7 +616,7 @@
BUTrestartmission
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -646,7 +646,7 @@
BUTactiondo
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabActions
@@ -700,7 +700,7 @@
Gvspeed
- AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -730,7 +730,7 @@
Gheading
- AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -760,7 +760,7 @@
Galt
- AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -793,7 +793,7 @@
Gspeed
- AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -874,7 +874,7 @@
lbl_logpercent
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -925,7 +925,7 @@
BUT_log2kml
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -976,7 +976,7 @@
BUT_playlog
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -1003,7 +1003,7 @@
BUT_loadtelem
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -1189,7 +1189,7 @@
lbl_winddir
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -1219,7 +1219,7 @@
lbl_windvel
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -1391,7 +1391,7 @@
gMapControl1
- ArdupilotMega.myGMAP, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.myGMAP, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -1454,7 +1454,7 @@
TXT_lat
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
panel1
@@ -1511,7 +1511,7 @@
label1
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
panel1
@@ -1541,7 +1541,7 @@
TXT_long
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
panel1
@@ -1571,7 +1571,7 @@
TXT_alt
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
panel1
@@ -1772,7 +1772,7 @@
label6
- ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
$this
@@ -1850,6 +1850,6 @@
FlightData
- System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc
+ System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/MAVLink.cs b/Tools/ArdupilotMegaPlanner/MAVLink.cs
index 4eebf9b91b..3d1992ea88 100644
--- a/Tools/ArdupilotMegaPlanner/MAVLink.cs
+++ b/Tools/ArdupilotMegaPlanner/MAVLink.cs
@@ -190,8 +190,8 @@ namespace ArdupilotMega
Thread.Sleep(1000);
}
- byte[] buffer;
- byte[] buffer1;
+ byte[] buffer = new byte[0];
+ byte[] buffer1 = new byte[0];
DateTime start = DateTime.Now;
DateTime deadline = start.AddSeconds(CONNECT_TIMEOUT_SECONDS);
@@ -248,14 +248,18 @@ namespace ArdupilotMega
// incase we are in setup mode
BaseStream.WriteLine("planner\rgcs\r");
- buffer = getHeartBeat();
+ // can see 2 heartbeat packets at any time, and will connect - was one after the other
+
+ if (buffer.Length == 0)
+ buffer = getHeartBeat();
// incase we are in setup mode
BaseStream.WriteLine("planner\rgcs\r");
System.Threading.Thread.Sleep(1);
- buffer1 = getHeartBeat();
+ if (buffer1.Length == 0)
+ buffer1 = getHeartBeat();
try
{
@@ -317,6 +321,7 @@ namespace ArdupilotMega
frmProgressReporter.UpdateProgressAndStatus(100, "Done.");
log.Info("Done open " + sysid + " " + compid);
packetslost = 0;
+ synclost = 0;
}
byte[] getHeartBeat()
@@ -340,19 +345,19 @@ namespace ArdupilotMega
public void sendPacket(object indata)
{
- bool run = false;
+ bool validPacket = false;
byte a = 0;
foreach (Type ty in mavstructs)
{
if (ty == indata.GetType())
{
- run = true;
+ validPacket = true;
generatePacket(a, indata);
return;
}
a++;
}
- if (!run)
+ if (!validPacket)
{
log.Info("Mavlink : NOT VALID PACKET sendPacket() " + indata.GetType().ToString());
}
@@ -603,7 +608,7 @@ namespace ArdupilotMega
// clear old
param = new Hashtable();
- int retrys = 3;
+ int retrys = 6;
int param_count = 0;
int param_total = 5;
@@ -629,8 +634,8 @@ namespace ArdupilotMega
return param;
}
- // 2 seconds between valid packets
- if (!(start.AddMilliseconds(2000) > DateTime.Now))
+ // 4 seconds between valid packets
+ if (!(start.AddMilliseconds(4000) > DateTime.Now))
{
if (retrys > 0)
{
@@ -641,7 +646,7 @@ namespace ArdupilotMega
continue;
}
MainV2.givecomport = false;
- throw new Exception("Timeout on read - getParamList " + param_count + " " + param_total);
+ throw new Exception("Timeout on read - getParamList " + got.Count + " " + param_total + "\n\nYour serial link isn't fast enough\n");
}
byte[] buffer = readPacket();
@@ -671,11 +676,12 @@ namespace ArdupilotMega
// check if we already have it
if (got.Contains(par.param_index))
{
- //Console.WriteLine("Already got '"+paramID+"'");
+ log.Info("Already got "+(par.param_index) + " '" + paramID + "'");
+ this.frmProgressReporter.UpdateProgressAndStatus((got.Count * 100) / param_total, "Already Got param " + paramID);
continue;
}
- log.Info(DateTime.Now.Millisecond + " got param " + (par.param_index) + " of " + (param_total - 1) + " name: " + paramID);
+ log.Info(DateTime.Now.Millisecond + " got param " + (par.param_index) + " of " + (par.param_count - 2) + " name: " + paramID);
modifyParamForDisplay(true, paramID, ref par.param_value);
param[paramID] = (par.param_value);
@@ -2084,7 +2090,7 @@ namespace ArdupilotMega
if (bpstime.Second != DateTime.Now.Second && !logreadmode)
{
- // Console.Write("bps {0} loss {1} left {2} mem {3} \n", bps1, synclost, BaseStream.BytesToRead, System.GC.GetTotalMemory(false));
+ Console.Write("bps {0} loss {1} left {2} mem {3} \n", bps1, synclost, BaseStream.BytesToRead, System.GC.GetTotalMemory(false));
bps2 = bps1; // prev sec
bps1 = 0; // current sec
bpstime = DateTime.Now;
diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs
index 6e7f4a9643..00ef94e611 100644
--- a/Tools/ArdupilotMegaPlanner/MainV2.cs
+++ b/Tools/ArdupilotMegaPlanner/MainV2.cs
@@ -187,12 +187,14 @@ namespace ArdupilotMega
this.Location = startpos;
}
+ if (config["MainMaximised"] != null)
+ this.WindowState = (FormWindowState)Enum.Parse(typeof(FormWindowState), config["MainMaximised"].ToString());
+
if (config["MainHeight"] != null)
this.Height = int.Parse(config["MainHeight"].ToString());
if (config["MainWidth"] != null)
this.Width = int.Parse(config["MainWidth"].ToString());
- if (config["MainMaximised"] != null)
- this.WindowState = (FormWindowState)Enum.Parse(typeof(FormWindowState), config["MainMaximised"].ToString());
+
if (config["CMB_rateattitude"] != null)
MainV2.cs.rateattitude = byte.Parse(config["CMB_rateattitude"].ToString());
@@ -202,10 +204,12 @@ namespace ArdupilotMega
MainV2.cs.ratestatus = byte.Parse(config["CMB_ratestatus"].ToString());
if (config["CMB_rateattitude"] != null)
MainV2.cs.raterc = byte.Parse(config["CMB_raterc"].ToString());
+ if (config["CMB_ratesensors"] != null)
+ MainV2.cs.raterc = byte.Parse(config["CMB_ratesensors"].ToString());
if (config["speechenable"] != null)
MainV2.speechenable = bool.Parse(config["speechenable"].ToString());
-
+
//int fixme;
/*
MainV2.cs.rateattitude = 50;
@@ -277,7 +281,7 @@ namespace ArdupilotMega
}
string[] ports = SerialPort.GetPortNames()
- .Select(p=>p.TrimEnd())
+ .Select(p => p.TrimEnd())
.Select(FixBlueToothPortNameBug)
.ToArray();
@@ -289,26 +293,26 @@ namespace ArdupilotMega
return allPorts;
}
- // .NET bug: sometimes bluetooth ports are enumerated with bogus characters
- // eg 'COM10' becomes 'COM10c' - one workaround is to remove the non numeric
- // char. Annoyingly, sometimes a numeric char is added, which means this
- // does not work in all cases.
- // See http://connect.microsoft.com/VisualStudio/feedback/details/236183/system-io-ports-serialport-getportnames-error-with-bluetooth
- private string FixBlueToothPortNameBug(string portName)
- {
- if (!portName.StartsWith("COM"))
- return portName;
- var newPortName = "COM"; // Start over with "COM"
- foreach (var portChar in portName.Substring(3).ToCharArray()) // Remove "COM", put the rest in a character array
- {
- if (char.IsDigit(portChar))
- newPortName += portChar.ToString(); // Good character, append to portName
- else
- log.WarnFormat("Bad (Non Numeric) character in port name '{0}' - removing", portName);
- }
-
- return newPortName;
- }
+ // .NET bug: sometimes bluetooth ports are enumerated with bogus characters
+ // eg 'COM10' becomes 'COM10c' - one workaround is to remove the non numeric
+ // char. Annoyingly, sometimes a numeric char is added, which means this
+ // does not work in all cases.
+ // See http://connect.microsoft.com/VisualStudio/feedback/details/236183/system-io-ports-serialport-getportnames-error-with-bluetooth
+ private string FixBlueToothPortNameBug(string portName)
+ {
+ if (!portName.StartsWith("COM"))
+ return portName;
+ var newPortName = "COM"; // Start over with "COM"
+ foreach (var portChar in portName.Substring(3).ToCharArray()) // Remove "COM", put the rest in a character array
+ {
+ if (char.IsDigit(portChar))
+ newPortName += portChar.ToString(); // Good character, append to portName
+ else
+ log.WarnFormat("Bad (Non Numeric) character in port name '{0}' - removing", portName);
+ }
+
+ return newPortName;
+ }
internal void ScreenShot()
{
@@ -548,7 +552,6 @@ namespace ArdupilotMega
comPort.BaseStream.toggleDTR();
comPort.BaseStream.DtrEnable = false;
- comPort.BaseStream.RtsEnable = false;
try
{
@@ -557,7 +560,7 @@ namespace ArdupilotMega
try
{
Directory.CreateDirectory(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"logs");
- comPort.logfile = new BinaryWriter(File.Open(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"logs" + Path.DirectorySeparatorChar + DateTime.Now.ToString("yyyy-MM-dd hh-mm-ss") + ".tlog", FileMode.CreateNew,FileAccess.ReadWrite,FileShare.Read));
+ comPort.logfile = new BinaryWriter(File.Open(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"logs" + Path.DirectorySeparatorChar + DateTime.Now.ToString("yyyy-MM-dd hh-mm-ss") + ".tlog", FileMode.CreateNew, FileAccess.ReadWrite, FileShare.Read));
}
catch { CustomMessageBox.Show("Failed to create log - wont log this session"); } // soft fail
@@ -1503,7 +1506,8 @@ namespace ArdupilotMega
log.Info("Quitting existing process");
try
{
- MainV2.instance.BeginInvoke((MethodInvoker)delegate() {
+ MainV2.instance.BeginInvoke((MethodInvoker)delegate()
+ {
Application.Exit();
});
}
@@ -1786,7 +1790,7 @@ namespace ArdupilotMega
((HttpWebRequest)request).AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
- request.Headers.Add("Accept-Encoding", "gzip,deflate");
+ request.Headers.Add("Accept-Encoding", "gzip,deflate");
// Get the response.
response = request.GetResponse();
diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
index 33c9b20f74..db5061360b 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.52")]
+[assembly: AssemblyFileVersion("1.1.53")]
[assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb
index a8ce858821..860d1a0f10 100644
Binary files a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb and b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb differ