diff --git a/Tools/ArdupilotMegaPlanner/Antenna/Tracker.Designer.cs b/Tools/ArdupilotMegaPlanner/Antenna/Tracker.Designer.cs index ad27415397..7ac7ab2cdc 100644 --- a/Tools/ArdupilotMegaPlanner/Antenna/Tracker.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Antenna/Tracker.Designer.cs @@ -1,32 +1,32 @@ -namespace ArdupilotMega.Antenna -{ - partial class Tracker - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +namespace ArdupilotMega.Antenna +{ + partial class Tracker + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Tracker)); this.CMB_interface = new System.Windows.Forms.ComboBox(); @@ -61,11 +61,11 @@ // // CMB_interface // - resources.ApplyResources(this.CMB_interface, "CMB_interface"); this.CMB_interface.FormattingEnabled = true; this.CMB_interface.Items.AddRange(new object[] { resources.GetString("CMB_interface.Items"), resources.GetString("CMB_interface.Items1")}); + resources.ApplyResources(this.CMB_interface, "CMB_interface"); this.CMB_interface.Name = "CMB_interface"; // // label1 @@ -75,7 +75,6 @@ // // CMB_baudrate // - resources.ApplyResources(this.CMB_baudrate, "CMB_baudrate"); this.CMB_baudrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_baudrate.FormattingEnabled = true; this.CMB_baudrate.Items.AddRange(new object[] { @@ -87,13 +86,14 @@ resources.GetString("CMB_baudrate.Items5"), resources.GetString("CMB_baudrate.Items6"), resources.GetString("CMB_baudrate.Items7")}); + resources.ApplyResources(this.CMB_baudrate, "CMB_baudrate"); this.CMB_baudrate.Name = "CMB_baudrate"; // // CMB_serialport // - resources.ApplyResources(this.CMB_serialport, "CMB_serialport"); this.CMB_serialport.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_serialport.FormattingEnabled = true; + resources.ApplyResources(this.CMB_serialport, "CMB_serialport"); this.CMB_serialport.Name = "CMB_serialport"; // // TRK_pantrim @@ -259,35 +259,35 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private System.Windows.Forms.ComboBox CMB_interface; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.ComboBox CMB_baudrate; - private MyButton BUT_connect; - private System.Windows.Forms.ComboBox CMB_serialport; - private System.Windows.Forms.TrackBar TRK_pantrim; - private System.Windows.Forms.TextBox TXT_panrange; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.TextBox TXT_tiltrange; - private System.Windows.Forms.TrackBar TRK_tilttrim; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.CheckBox CHK_revpan; - private System.Windows.Forms.CheckBox CHK_revtilt; - private System.Windows.Forms.TextBox TXT_pwmrangepan; - private System.Windows.Forms.TextBox TXT_pwmrangetilt; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label LBL_pantrim; - private System.Windows.Forms.Label LBL_tilttrim; - } + } + + #endregion + + private System.Windows.Forms.ComboBox CMB_interface; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox CMB_baudrate; + private MyButton BUT_connect; + private System.Windows.Forms.ComboBox CMB_serialport; + private System.Windows.Forms.TrackBar TRK_pantrim; + private System.Windows.Forms.TextBox TXT_panrange; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox TXT_tiltrange; + private System.Windows.Forms.TrackBar TRK_tilttrim; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.CheckBox CHK_revpan; + private System.Windows.Forms.CheckBox CHK_revtilt; + private System.Windows.Forms.TextBox TXT_pwmrangepan; + private System.Windows.Forms.TextBox TXT_pwmrangetilt; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label LBL_pantrim; + private System.Windows.Forms.Label LBL_tilttrim; + } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Antenna/Tracker.resx b/Tools/ArdupilotMegaPlanner/Antenna/Tracker.resx index 5074ca4fba..ee9137adcd 100644 --- a/Tools/ArdupilotMegaPlanner/Antenna/Tracker.resx +++ b/Tools/ArdupilotMegaPlanner/Antenna/Tracker.resx @@ -117,198 +117,675 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 + + Maestro - - LBL_pantrim + + ArduTracker - - 27, 13 + + 83, 10 - - 115200 + + 121, 21 - + + + 0 + + + Maestro + + + CMB_interface + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label6 + + $this - + + 25 + + + True + + + 13, 13 + + + 49, 13 + + 1 - - True - - - True - - - 153, 81 + + Interface label1 - - 38400 - - - 7 - - - 11 - - - TXT_panrange - - - Angle - - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 30 - - - 7 - - - 83, 107 - - - 17 - - - 14400 - - - $this - - - Trim - - - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 - - - 20 - - + $this - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 45, 84 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 46, 17 - - - $this - - - True - - - 9 - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - $this - - - $this - - - TXT_pwmrangetilt - 24 - - label10 + + 4800 - - 75, 23 + + 9600 - - 83, 10 + + 14400 - - 375, 45 + + 19200 - - 10 + + 28800 - - 403, 13 + + 38400 - - 19 + + 57600 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True + + 115200 337, 9 - - 39, 13 + + 121, 21 + + + 2 + + + CMB_baudrate + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + 210, 10 + + + 121, 21 + + + 1 + + + CMB_serialport + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 23 + + + 153, 81 + + + 375, 45 + + + 5 + + + TRK_pantrim + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + 83, 81 + + + 64, 20 + + + 4 + + + 360 + + + TXT_panrange System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 326, 113 + + $this + + + 19 + + + True + + + 326, 65 + + + 27, 13 + + + 10 + + + Trim + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + True + + + 83, 65 + + + 39, 13 + + + 11 + + + Range + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + True + + + 83, 141 + + + 39, 13 + + + 17 + + + Range + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + True + + + 326, 141 + + + 27, 13 + + + 16 + + + Trim + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + 83, 157 + + + 64, 20 + + + 6 + + + 90 + + + TXT_tiltrange + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + 153, 157 + + + 375, 45 + + + 7 + + + TRK_tilttrim + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + True + + + 12, 65 + + + 26, 13 + + + 18 + + + Pan + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + 12, 141 + + + 21, 13 + + + 19 + + + Tilt + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + True + + + 534, 83 + + + 46, 17 + + + 20 + + + Rev + + + CHK_revpan + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + 534, 159 + + + 46, 17 + + + 21 + + + Rev + + + CHK_revtilt + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 83, 107 + + + 64, 20 + + + 22 + + + 1000 + + + TXT_pwmrangepan + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 83, 183 + + + 64, 20 + + + 23 + + + 1000 + + + TXT_pwmrangetilt + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + True + + + 43, 110 + + + 34, 13 + + + 24 + + + PWM + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + 43, 186 + + + 34, 13 + + + 25 + + + PWM + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + True + + + 45, 160 + + + 34, 13 + + + 27 Angle + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + 45, 84 + + + 34, 13 + + + 26 + + + Angle + label11 - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 23 + + $this - - Range + + 4 - - 23 + + True - - 360 + + Microsoft Sans Serif, 8.25pt, style=Bold - + + 94, 40 + + + 403, 13 + + + 28 + + + Miss using this interface can cause servo damage, use with caution!!! + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 476, 9 + + + 75, 23 + + + 3 + + + Connect + + + BUT_connect + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 22 + + + True + + + 326, 113 + + + 34, 13 + + + 29 + + + Angle + + + LBL_pantrim + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + True @@ -317,514 +794,37 @@ 34, 13 - - True - - - 83, 81 - - - 375, 45 - - - 0 - - - BUT_connect - - - CHK_revpan - - - $this - - - 90 - - - 9600 - - - 12 - - - 29 - - - 22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 13, 13 - - - Miss using this interface can cause servo damage, use with caution!!! - - - 1000 - - - PWM - - - 34, 13 - - - label5 - - - 21, 13 - - - 17 - - - 15 - - - 83, 65 - - - 21 - - - CHK_revtilt - - - 6, 13 - - - 27 - - - Tracker - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - 83, 141 - - - TXT_pwmrangepan - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - $this - - - 22 - - - 10 - - - 26, 13 - - - Connect - - - 43, 110 - - - 34, 13 - - - 43, 186 - - - 11 - - - $this - - - $this - - - Rev - - - 25 - - - label9 - - - TXT_tiltrange - - - 64, 20 - - - 28 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 83, 183 - - - 16 - - - 0 - - - 20 - - - 34, 13 - - - 64, 20 - - - 45, 160 - - - 34, 13 - - - label4 - - - 28800 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 64, 20 - - - Tilt - - - 3 - - - 6 - - - label12 - - - 1 - - - $this - - - 46, 17 - - - $this - - - 326, 65 - - - 18 - - - TRK_pantrim - - - 587, 212 - - - 8 - - - $this - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - $this - - - 5 - - - 121, 21 - - - 121, 21 - - - Angle - - - 534, 83 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 21 - - - $this - - - 4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this + + 30 Angle - - ArduTracker - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 26 - - - Pan - - - CMB_interface - - - True - - - True - - - $this - - - $this - - - 12, 141 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label8 - - - Trim - - - PWM - - - 13 - - - 1000 - - - 49, 13 - - - 326, 141 - - - 57600 - - - True - - - True - - - 34, 13 - - - Interface - - - TRK_tilttrim - - - 3 - - - 24 - - - 64, 20 - - - label3 - - - 27, 13 - - - 94, 40 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 19200 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 83, 157 - - - label2 - - - 534, 159 - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12, 65 - - - 4800 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Maestro - LBL_tilttrim - - 4 - - - label7 - - - Microsoft Sans Serif, 8.25pt, style=Bold - - - 25 - - - 121, 21 - - - 14 - - - $this - - - CMB_serialport - - - $this - - - 18 - - - 6 - - - 19 - - - 476, 9 - - - Maestro - - - $this - - - 16 - - - Rev - - + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 39, 13 - - - 210, 10 - - - 153, 157 - - + $this - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CMB_baudrate - - - True - - - Range - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 5 + + 0 True + + 6, 13 + + + 587, 212 + + + Tracker + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Camera.Designer.cs b/Tools/ArdupilotMegaPlanner/Camera.Designer.cs index 61c62bb569..a748b9749f 100644 --- a/Tools/ArdupilotMegaPlanner/Camera.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Camera.Designer.cs @@ -1,32 +1,32 @@ -namespace ArdupilotMega -{ - partial class Camera - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +namespace ArdupilotMega +{ + partial class Camera + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Camera)); this.num_agl = new System.Windows.Forms.NumericUpDown(); @@ -70,12 +70,12 @@ // // num_agl // - resources.ApplyResources(this.num_agl, "num_agl"); this.num_agl.Increment = new decimal(new int[] { 10, 0, 0, 0}); + resources.ApplyResources(this.num_agl, "num_agl"); this.num_agl.Maximum = new decimal(new int[] { 10000, 0, @@ -96,13 +96,13 @@ // // num_focallength // - resources.ApplyResources(this.num_focallength, "num_focallength"); this.num_focallength.DecimalPlaces = 1; this.num_focallength.Increment = new decimal(new int[] { 1, 0, 0, 65536}); + resources.ApplyResources(this.num_focallength, "num_focallength"); this.num_focallength.Maximum = new decimal(new int[] { 180, 0, @@ -227,11 +227,11 @@ // // num_overlap // - resources.ApplyResources(this.num_overlap, "num_overlap"); this.num_overlap.DecimalPlaces = 1; + resources.ApplyResources(this.num_overlap, "num_overlap"); this.num_overlap.Name = "num_overlap"; this.num_overlap.Value = new decimal(new int[] { - 60, + 70, 0, 0, 0}); @@ -244,11 +244,11 @@ // // num_sidelap // - resources.ApplyResources(this.num_sidelap, "num_sidelap"); this.num_sidelap.DecimalPlaces = 1; + resources.ApplyResources(this.num_sidelap, "num_sidelap"); this.num_sidelap.Name = "num_sidelap"; this.num_sidelap.Value = new decimal(new int[] { - 30, + 60, 0, 0, 0}); @@ -285,8 +285,8 @@ // // CMB_camera // - resources.ApplyResources(this.CMB_camera, "CMB_camera"); this.CMB_camera.FormattingEnabled = true; + resources.ApplyResources(this.CMB_camera, "CMB_camera"); this.CMB_camera.Name = "CMB_camera"; this.CMB_camera.SelectedIndexChanged += new System.EventHandler(this.CMB_camera_SelectedIndexChanged); // @@ -343,42 +343,42 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private System.Windows.Forms.NumericUpDown num_agl; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.NumericUpDown num_focallength; - private System.Windows.Forms.TextBox TXT_fovH; - private System.Windows.Forms.TextBox TXT_fovV; - private System.Windows.Forms.TextBox TXT_fovAV; - private System.Windows.Forms.TextBox TXT_fovAH; - private System.Windows.Forms.TextBox TXT_cmpixel; - private System.Windows.Forms.TextBox TXT_imgwidth; - private System.Windows.Forms.TextBox TXT_imgheight; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox TXT_sensheight; - private System.Windows.Forms.TextBox TXT_senswidth; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.NumericUpDown num_overlap; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.NumericUpDown num_sidelap; - private System.Windows.Forms.CheckBox CHK_camdirection; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.TextBox TXT_distacflphotos; - private System.Windows.Forms.TextBox TXT_distflphotos; - private System.Windows.Forms.ComboBox CMB_camera; - private MyButton BUT_save; - } + } + + #endregion + + private System.Windows.Forms.NumericUpDown num_agl; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.NumericUpDown num_focallength; + private System.Windows.Forms.TextBox TXT_fovH; + private System.Windows.Forms.TextBox TXT_fovV; + private System.Windows.Forms.TextBox TXT_fovAV; + private System.Windows.Forms.TextBox TXT_fovAH; + private System.Windows.Forms.TextBox TXT_cmpixel; + private System.Windows.Forms.TextBox TXT_imgwidth; + private System.Windows.Forms.TextBox TXT_imgheight; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox TXT_sensheight; + private System.Windows.Forms.TextBox TXT_senswidth; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.NumericUpDown num_overlap; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.NumericUpDown num_sidelap; + private System.Windows.Forms.CheckBox CHK_camdirection; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.TextBox TXT_distacflphotos; + private System.Windows.Forms.TextBox TXT_distflphotos; + private System.Windows.Forms.ComboBox CMB_camera; + private MyButton BUT_save; + } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Camera.resx b/Tools/ArdupilotMegaPlanner/Camera.resx index e0bac49750..b5668d74bf 100644 --- a/Tools/ArdupilotMegaPlanner/Camera.resx +++ b/Tools/ArdupilotMegaPlanner/Camera.resx @@ -118,827 +118,827 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 60, 13 + + 12, 38 - - 6.16 - - - 74, 13 + + 64, 20 - - True + + 1 num_agl - - label6 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 32 - + True - - 19 + + 82, 40 + + + 72, 13 + + + 4 + + + Height m (agl) + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 31 + + + 12, 64 + + + 64, 20 + + + 6 + + + num_focallength + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - True + + 30 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 361, 12 - - 12, 168 + + 100, 20 - - 32 + + 10 - - True + + TXT_fovH - + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 29 + + + 361, 39 + + + 100, 20 + + + 11 + + + TXT_fovV + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 28 + + + 361, 92 + + + 100, 20 + + + 14 + + + TXT_fovAV + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + 361, 65 + + + 100, 20 + + + 13 + + + TXT_fovAH + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 27 + + + 361, 118 + + + 100, 20 + + + 16 + + + TXT_cmpixel + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + 12, 90 + + + 64, 20 + + + 17 + + + 4608 + + + TXT_imgwidth + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + 12, 116 + + + 64, 20 + + + 18 + + + 3456 + + + TXT_imgheight + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this 23 - - 10 - - - 100, 20 - - - 13 - - - 38 - - - 35 - - - 13, 13 - - - 361, 12 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Sidelap - - - $this - - - 64, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17 - - - $this - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 42 - - - 12, 64 - - - 28 - - - 24 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 25 - - - 361, 65 - - - TXT_fovH - - - 100, 20 - - + True - - 17 - - - 16 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Camera - - - 6 - - - 22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label10 - - - $this - - - 33 - - - FOV H (m) - - - 50, 13 - - - 22 - - - $this - - - 82, 227 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 13 - - - Pixel Width - - - 12, 142 - - - 44, 13 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - FOV V (m) - - - label11 - - - $this - - - Overlap - - - 361, 118 - - - True - - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 36 - - - 21 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 39 - - - $this - - - TXT_cmpixel - - - 44 - - - 31 - - - 25 - - - num_focallength - - - 15 - - - CM/Pixel - - - Angle V - - - 100, 20 - - - $this - - - Height m (agl) - - - label5 - - - $this - - - 8 - - - 31 - - - 64, 20 - - - 82, 145 - - - Save - 82, 71 - - 26 + + 69, 13 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 19 - - 11 + + Focal Length - - Camera + + label1 - - 7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 64, 20 - - - CMB_camera - - - 30 - - - TXT_sensheight - - - $this - - - 82, 201 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 13, 247 - - - 143, 21 - - - 12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - num_sidelap - - - $this - - - TXT_senswidth - - - 64, 20 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12, 194 - - - 72, 13 - - - 4 - - - 16 - - - 4.62 - - - 300, 99 - - - TXT_fovAV - - - 361, 92 - - - 261, 198 - - - 20 - - - 100, 20 - - - 3456 - - - 2 - - - label9 - - - TXT_fovV - - - 13 - - - $this - - - 64, 20 - - - 14 - - - TXT_fovAH - - - 27 - - - $this - - - $this - - - 12, 220 - - - 12, 116 - - - True - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - $this - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 37 - - - CHK_camdirection - - - 261, 171 - - - 299, 46 - - - 86, 13 - - - label4 - - - $this - - - TXT_imgwidth - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - Across Flight line - - - label12 - - - 150, 17 - - - 32 - - - 18 - - - 82, 171 - - - 4 - - - 361, 195 - - - $this - - - Camera top facing forward - - - 12, 90 - - - 64, 20 - - - 10 - - - $this - - - 64, 20 - - - True - - - 12, 38 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 361, 168 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Flight line distance - - - 64, 20 - - - True - - - $this - - - 6 - - - label13 - - - 3 - - + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - TXT_distflphotos + + 22 - - System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 19 - - - 41 - - - 55, 13 - - + True - - 29 - - - TXT_imgheight - - - 75, 23 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label8 - - - BUT_save - - - Pixel Height - - - Sensor Height - - - 163, 10 - - - 9 - - - 69, 13 - - - True - - - 34 - - - 299, 125 - - - True - - - Focal Length - - - $this - - - 23 - - - $this - - - 56, 13 - - - 1 - - - $this - - - $this - - - 45, 13 - - - TXT_distacflphotos - - - 361, 39 - - - 94, 13 - - - 18 - - - label2 - - - 5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 100, 20 - - - 82, 40 - - - 82, 119 - - - 473, 275 - - - 299, 72 - - - True - - - label7 - - - 27 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 21 - - - label14 - - - 40 - - - $this - - - 4608 - - - 63, 13 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 43 - - - 100, 20 - - - $this - - - 82, 93 - - - num_overlap - - - 30 - - - 44, 13 - - - label1 - - - 28 - - - 42, 13 - - - 71, 13 - - - $this - - - 29 - - - label15 - - - 0 - - - $this - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 100, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 298, 19 - + + 56, 13 + + + 21 + + + FOV H (m) + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + True - - Sensor Width + + 299, 72 + + + 45, 13 + + + 22 Angle H - - 14 + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + True + + + 300, 99 + + + 44, 13 + + + 23 + + + Angle V + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + True + + + 299, 46 + + + 55, 13 + + + 25 + + + FOV V (m) + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + True + + + 299, 125 + + + 50, 13 + + + 27 + + + CM/Pixel + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + True + + + 82, 93 + + + 60, 13 + + + 28 + + + Pixel Width + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + True + + + 82, 119 + + + 63, 13 + + + 29 + + + Pixel Height + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + True + + + 82, 171 + + + 74, 13 + + + 33 + + + Sensor Height label3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + True + + + 82, 145 + + + 71, 13 + + + 32 + + + Sensor Width + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + 12, 168 + + + 64, 20 + + + 31 + + + 4.62 + + + TXT_sensheight + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + 12, 142 + + + 64, 20 + + + 30 + + + 6.16 + + + TXT_senswidth + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + True + + + 82, 201 + + + 44, 13 + + + 35 + + + Overlap + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 12, 194 + + + 64, 20 + + + 34 + + + num_overlap + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + 82, 227 + + + 42, 13 + + + 37 + + + Sidelap + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + 12, 220 + + + 64, 20 + + + 36 + + + num_sidelap + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + True + + + 13, 247 + + + 150, 17 + + + 38 + + + Camera top facing forward + + + CHK_camdirection + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + 261, 198 + + + 86, 13 + + + 42 + + + Across Flight line + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 261, 171 + + + 94, 13 + + + 41 + + + Flight line distance + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 361, 195 + + + 100, 20 + + + 40 + + + TXT_distacflphotos + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 361, 168 + + + 100, 20 + + + 39 + + + TXT_distflphotos + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 13, 13 + + + 143, 21 + + + 43 + + + CMB_camera + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 163, 10 + + + 75, 23 + + + 44 + + + Save + + + BUT_save + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + True + + 6, 13 + + + 473, 275 + + + Camera + + + Camera + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Common.cs b/Tools/ArdupilotMegaPlanner/Common.cs index 3768265e06..3f441511a0 100644 --- a/Tools/ArdupilotMegaPlanner/Common.cs +++ b/Tools/ArdupilotMegaPlanner/Common.cs @@ -134,7 +134,7 @@ namespace ArdupilotMega try { - float desired_lead_dist = 75; + float desired_lead_dist = 100; float alpha = (desired_lead_dist / MainV2.cs.radius) * rad2deg; @@ -142,11 +142,11 @@ namespace ArdupilotMega { // fixme - float p1 = (float)Math.Cos((heading) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; + float p1 = (float)Math.Cos((cog) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; - float p2 = (float)Math.Sin((heading) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; + float p2 = (float)Math.Sin((cog) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; - g.DrawArc(new Pen(Color.HotPink, 2), p1, p2, Math.Abs(MainV2.cs.radius) * 2, Math.Abs(MainV2.cs.radius) * 2, heading, alpha); + g.DrawArc(new Pen(Color.HotPink, 2), p1, p2, Math.Abs(MainV2.cs.radius) * 2, Math.Abs(MainV2.cs.radius) * 2, cog, alpha); } @@ -154,11 +154,11 @@ namespace ArdupilotMega { // correct - float p1 = (float)Math.Cos((heading - 180) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; + float p1 = (float)Math.Cos((cog - 180) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; - float p2 = (float)Math.Sin((heading - 180) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; + float p2 = (float)Math.Sin((cog - 180) * deg2rad) * MainV2.cs.radius + MainV2.cs.radius; - g.DrawArc(new Pen(Color.HotPink, 2), -p1, -p2, MainV2.cs.radius * 2, MainV2.cs.radius * 2, heading - 180, alpha); + g.DrawArc(new Pen(Color.HotPink, 2), -p1, -p2, MainV2.cs.radius * 2, MainV2.cs.radius * 2, cog - 180, alpha); } } @@ -364,7 +364,8 @@ namespace ArdupilotMega CIRCLE = 7, POSITION = 8, LAND = 9, // AUTO control - OF_LOITER = 10 + OF_LOITER = 10, + APPROACH = 11 } public enum ac2ch7modes diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs index d37611961e..519df12561 100644 --- a/Tools/ArdupilotMegaPlanner/CurrentState.cs +++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs @@ -531,6 +531,9 @@ namespace ArdupilotMega case (byte)(100 + Common.ac2modes.LAND): mode = "Land"; break; + case (byte)(100 + Common.ac2modes.APPROACH): + mode = "APPROACH"; + break; case (byte)(100 + Common.ac2modes.POSITION): mode = "Position"; break; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs index f34863ea54..a67ec30bdb 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigArducopter)); this.myLabel3 = new ArdupilotMega.MyLabel(); this.TUNE_LOW = new System.Windows.Forms.NumericUpDown(); this.TUNE_HIGH = new System.Windows.Forms.NumericUpDown(); @@ -180,35 +181,25 @@ // // myLabel3 // - this.myLabel3.Location = new System.Drawing.Point(540, 302); + resources.ApplyResources(this.myLabel3, "myLabel3"); this.myLabel3.Name = "myLabel3"; this.myLabel3.resize = false; - this.myLabel3.Size = new System.Drawing.Size(29, 23); - this.myLabel3.TabIndex = 42; - this.myLabel3.Text = "Min"; // // TUNE_LOW // - this.TUNE_LOW.Location = new System.Drawing.Point(575, 305); + resources.ApplyResources(this.TUNE_LOW, "TUNE_LOW"); this.TUNE_LOW.Name = "TUNE_LOW"; - this.TUNE_LOW.Size = new System.Drawing.Size(51, 20); - this.TUNE_LOW.TabIndex = 41; // // TUNE_HIGH // - this.TUNE_HIGH.Location = new System.Drawing.Point(665, 305); + resources.ApplyResources(this.TUNE_HIGH, "TUNE_HIGH"); this.TUNE_HIGH.Name = "TUNE_HIGH"; - this.TUNE_HIGH.Size = new System.Drawing.Size(46, 20); - this.TUNE_HIGH.TabIndex = 40; // // myLabel2 // - this.myLabel2.Location = new System.Drawing.Point(540, 277); + resources.ApplyResources(this.myLabel2, "myLabel2"); this.myLabel2.Name = "myLabel2"; this.myLabel2.resize = false; - this.myLabel2.Size = new System.Drawing.Size(53, 23); - this.myLabel2.TabIndex = 39; - this.myLabel2.Text = "Ch6 Opt"; // // TUNE // @@ -216,41 +207,36 @@ this.TUNE.DropDownWidth = 150; this.TUNE.FormattingEnabled = true; this.TUNE.Items.AddRange(new object[] { - "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"}); - this.TUNE.Location = new System.Drawing.Point(599, 277); + resources.GetString("TUNE.Items"), + resources.GetString("TUNE.Items1"), + resources.GetString("TUNE.Items2"), + resources.GetString("TUNE.Items3"), + resources.GetString("TUNE.Items4"), + resources.GetString("TUNE.Items5"), + resources.GetString("TUNE.Items6"), + resources.GetString("TUNE.Items7"), + resources.GetString("TUNE.Items8"), + resources.GetString("TUNE.Items9"), + resources.GetString("TUNE.Items10"), + resources.GetString("TUNE.Items11"), + resources.GetString("TUNE.Items12"), + resources.GetString("TUNE.Items13"), + resources.GetString("TUNE.Items14"), + resources.GetString("TUNE.Items15"), + resources.GetString("TUNE.Items16"), + resources.GetString("TUNE.Items17"), + resources.GetString("TUNE.Items18"), + resources.GetString("TUNE.Items19"), + resources.GetString("TUNE.Items20"), + resources.GetString("TUNE.Items21")}); + resources.ApplyResources(this.TUNE, "TUNE"); this.TUNE.Name = "TUNE"; - this.TUNE.Size = new System.Drawing.Size(112, 21); - this.TUNE.TabIndex = 38; // // myLabel1 // - this.myLabel1.Location = new System.Drawing.Point(540, 329); + resources.ApplyResources(this.myLabel1, "myLabel1"); this.myLabel1.Name = "myLabel1"; this.myLabel1.resize = false; - this.myLabel1.Size = new System.Drawing.Size(53, 23); - this.myLabel1.TabIndex = 37; - this.myLabel1.Text = "Ch7 Opt"; // // CH7_OPT // @@ -258,18 +244,16 @@ this.CH7_OPT.DropDownWidth = 150; this.CH7_OPT.FormattingEnabled = true; this.CH7_OPT.Items.AddRange(new object[] { - "Do Nothing", - "", - "", - "Simple Mode", - "RTL", - "", - "", - "Save WP"}); - this.CH7_OPT.Location = new System.Drawing.Point(599, 329); + resources.GetString("CH7_OPT.Items"), + resources.GetString("CH7_OPT.Items1"), + resources.GetString("CH7_OPT.Items2"), + resources.GetString("CH7_OPT.Items3"), + resources.GetString("CH7_OPT.Items4"), + resources.GetString("CH7_OPT.Items5"), + resources.GetString("CH7_OPT.Items6"), + resources.GetString("CH7_OPT.Items7")}); + resources.ApplyResources(this.CH7_OPT, "CH7_OPT"); this.CH7_OPT.Name = "CH7_OPT"; - this.CH7_OPT.Size = new System.Drawing.Size(112, 21); - this.CH7_OPT.TabIndex = 36; // // groupBox5 // @@ -281,88 +265,56 @@ this.groupBox5.Controls.Add(this.label20); this.groupBox5.Controls.Add(this.THR_RATE_P); this.groupBox5.Controls.Add(this.label25); - this.groupBox5.Location = new System.Drawing.Point(12, 267); + resources.ApplyResources(this.groupBox5, "groupBox5"); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(170, 110); - this.groupBox5.TabIndex = 35; this.groupBox5.TabStop = false; - this.groupBox5.Text = "Throttle Rate"; // // THR_RATE_D // - this.THR_RATE_D.Location = new System.Drawing.Point(80, 60); + resources.ApplyResources(this.THR_RATE_D, "THR_RATE_D"); this.THR_RATE_D.Name = "THR_RATE_D"; - this.THR_RATE_D.Size = new System.Drawing.Size(78, 20); - this.THR_RATE_D.TabIndex = 14; // // label29 // - this.label29.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label29.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label29, "label29"); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(10, 13); - this.label29.TabIndex = 15; - this.label29.Text = "D"; // // label14 // - this.label14.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label14.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label14, "label14"); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(65, 13); - this.label14.TabIndex = 16; - this.label14.Text = "IMAX"; // // THR_RATE_IMAX // - this.THR_RATE_IMAX.Location = new System.Drawing.Point(80, 83); + resources.ApplyResources(this.THR_RATE_IMAX, "THR_RATE_IMAX"); this.THR_RATE_IMAX.Name = "THR_RATE_IMAX"; - this.THR_RATE_IMAX.Size = new System.Drawing.Size(78, 20); - this.THR_RATE_IMAX.TabIndex = 11; // // THR_RATE_I // - this.THR_RATE_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.THR_RATE_I, "THR_RATE_I"); this.THR_RATE_I.Name = "THR_RATE_I"; - this.THR_RATE_I.Size = new System.Drawing.Size(78, 20); - this.THR_RATE_I.TabIndex = 7; // // label20 // - this.label20.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label20.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label20, "label20"); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(10, 13); - this.label20.TabIndex = 14; - this.label20.Text = "I"; // // THR_RATE_P // - this.THR_RATE_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.THR_RATE_P, "THR_RATE_P"); this.THR_RATE_P.Name = "THR_RATE_P"; - this.THR_RATE_P.Size = new System.Drawing.Size(78, 20); - this.THR_RATE_P.TabIndex = 5; // // label25 // - this.label25.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label25.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label25, "label25"); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(14, 13); - this.label25.TabIndex = 15; - this.label25.Text = "P"; // // CHK_lockrollpitch // - this.CHK_lockrollpitch.AutoSize = true; + resources.ApplyResources(this.CHK_lockrollpitch, "CHK_lockrollpitch"); this.CHK_lockrollpitch.Checked = true; this.CHK_lockrollpitch.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_lockrollpitch.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_lockrollpitch.Location = new System.Drawing.Point(9, 247); this.CHK_lockrollpitch.Name = "CHK_lockrollpitch"; - this.CHK_lockrollpitch.Size = new System.Drawing.Size(154, 17); - this.CHK_lockrollpitch.TabIndex = 34; - this.CHK_lockrollpitch.Text = "Lock Pitch and Roll Values"; this.CHK_lockrollpitch.UseVisualStyleBackColor = true; // // groupBox4 @@ -377,119 +329,77 @@ this.groupBox4.Controls.Add(this.label15); this.groupBox4.Controls.Add(this.NAV_LAT_P); this.groupBox4.Controls.Add(this.label16); - this.groupBox4.Location = new System.Drawing.Point(540, 133); + resources.ApplyResources(this.groupBox4, "groupBox4"); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(170, 131); - this.groupBox4.TabIndex = 24; this.groupBox4.TabStop = false; - this.groupBox4.Text = "Nav WP"; // // NAV_LAT_D // - this.NAV_LAT_D.Location = new System.Drawing.Point(80, 60); + resources.ApplyResources(this.NAV_LAT_D, "NAV_LAT_D"); this.NAV_LAT_D.Name = "NAV_LAT_D"; - this.NAV_LAT_D.Size = new System.Drawing.Size(78, 20); - this.NAV_LAT_D.TabIndex = 18; // // label27 // - this.label27.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label27.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label27, "label27"); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(10, 13); - this.label27.TabIndex = 19; - this.label27.Text = "D"; // // WP_SPEED_MAX // - this.WP_SPEED_MAX.Location = new System.Drawing.Point(80, 107); + resources.ApplyResources(this.WP_SPEED_MAX, "WP_SPEED_MAX"); this.WP_SPEED_MAX.Name = "WP_SPEED_MAX"; - this.WP_SPEED_MAX.Size = new System.Drawing.Size(78, 20); - this.WP_SPEED_MAX.TabIndex = 16; // // label9 // - this.label9.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label9.Location = new System.Drawing.Point(6, 110); + resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(54, 13); - this.label9.TabIndex = 17; - this.label9.Text = "m/s"; // // NAV_LAT_IMAX // - this.NAV_LAT_IMAX.Location = new System.Drawing.Point(80, 84); + resources.ApplyResources(this.NAV_LAT_IMAX, "NAV_LAT_IMAX"); this.NAV_LAT_IMAX.Name = "NAV_LAT_IMAX"; - this.NAV_LAT_IMAX.Size = new System.Drawing.Size(78, 20); - this.NAV_LAT_IMAX.TabIndex = 11; // // label13 // - this.label13.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label13.Location = new System.Drawing.Point(6, 87); + resources.ApplyResources(this.label13, "label13"); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(65, 13); - this.label13.TabIndex = 12; - this.label13.Text = "IMAX"; // // NAV_LAT_I // - this.NAV_LAT_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.NAV_LAT_I, "NAV_LAT_I"); this.NAV_LAT_I.Name = "NAV_LAT_I"; - this.NAV_LAT_I.Size = new System.Drawing.Size(78, 20); - this.NAV_LAT_I.TabIndex = 7; // // label15 // - this.label15.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label15.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label15, "label15"); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(10, 13); - this.label15.TabIndex = 14; - this.label15.Text = "I"; // // NAV_LAT_P // - this.NAV_LAT_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.NAV_LAT_P, "NAV_LAT_P"); this.NAV_LAT_P.Name = "NAV_LAT_P"; - this.NAV_LAT_P.Size = new System.Drawing.Size(78, 20); - this.NAV_LAT_P.TabIndex = 5; // // label16 // - this.label16.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label16.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label16, "label16"); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(14, 13); - this.label16.TabIndex = 15; - this.label16.Text = "P"; // // groupBox6 // this.groupBox6.Controls.Add(this.XTRK_GAIN_SC1); this.groupBox6.Controls.Add(this.label18); - this.groupBox6.Location = new System.Drawing.Point(364, 267); + resources.ApplyResources(this.groupBox6, "groupBox6"); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(170, 43); - this.groupBox6.TabIndex = 25; this.groupBox6.TabStop = false; - this.groupBox6.Text = "Crosstrack Correction"; // // XTRK_GAIN_SC1 // - this.XTRK_GAIN_SC1.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.XTRK_GAIN_SC1, "XTRK_GAIN_SC1"); this.XTRK_GAIN_SC1.Name = "XTRK_GAIN_SC1"; - this.XTRK_GAIN_SC1.Size = new System.Drawing.Size(78, 20); - this.XTRK_GAIN_SC1.TabIndex = 5; // // label18 // - this.label18.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label18.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label18, "label18"); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(38, 13); - this.label18.TabIndex = 15; - this.label18.Text = "Gain"; // // groupBox7 // @@ -499,60 +409,39 @@ this.groupBox7.Controls.Add(this.label21); this.groupBox7.Controls.Add(this.THR_ALT_P); this.groupBox7.Controls.Add(this.label22); - this.groupBox7.Location = new System.Drawing.Point(188, 267); + resources.ApplyResources(this.groupBox7, "groupBox7"); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(170, 110); - this.groupBox7.TabIndex = 26; this.groupBox7.TabStop = false; - this.groupBox7.Text = "Altitude Hold"; // // THR_ALT_IMAX // - this.THR_ALT_IMAX.Location = new System.Drawing.Point(80, 63); + resources.ApplyResources(this.THR_ALT_IMAX, "THR_ALT_IMAX"); this.THR_ALT_IMAX.Name = "THR_ALT_IMAX"; - this.THR_ALT_IMAX.Size = new System.Drawing.Size(78, 20); - this.THR_ALT_IMAX.TabIndex = 11; // // label19 // - this.label19.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label19.Location = new System.Drawing.Point(6, 66); + resources.ApplyResources(this.label19, "label19"); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(65, 13); - this.label19.TabIndex = 12; - this.label19.Text = "IMAX"; // // THR_ALT_I // - this.THR_ALT_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.THR_ALT_I, "THR_ALT_I"); this.THR_ALT_I.Name = "THR_ALT_I"; - this.THR_ALT_I.Size = new System.Drawing.Size(78, 20); - this.THR_ALT_I.TabIndex = 7; // // label21 // - this.label21.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label21.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label21, "label21"); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(10, 13); - this.label21.TabIndex = 14; - this.label21.Text = "I"; // // THR_ALT_P // - this.THR_ALT_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.THR_ALT_P, "THR_ALT_P"); this.THR_ALT_P.Name = "THR_ALT_P"; - this.THR_ALT_P.Size = new System.Drawing.Size(78, 20); - this.THR_ALT_P.TabIndex = 5; // // label22 // - this.label22.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label22.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label22, "label22"); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(14, 13); - this.label22.TabIndex = 15; - this.label22.Text = "P"; // // groupBox19 // @@ -562,60 +451,39 @@ this.groupBox19.Controls.Add(this.label30); this.groupBox19.Controls.Add(this.HLD_LAT_P); this.groupBox19.Controls.Add(this.label31); - this.groupBox19.Location = new System.Drawing.Point(537, 13); + resources.ApplyResources(this.groupBox19, "groupBox19"); this.groupBox19.Name = "groupBox19"; - this.groupBox19.Size = new System.Drawing.Size(170, 95); - this.groupBox19.TabIndex = 27; this.groupBox19.TabStop = false; - this.groupBox19.Text = "Loiter"; // // HLD_LAT_IMAX // - this.HLD_LAT_IMAX.Location = new System.Drawing.Point(80, 61); + resources.ApplyResources(this.HLD_LAT_IMAX, "HLD_LAT_IMAX"); this.HLD_LAT_IMAX.Name = "HLD_LAT_IMAX"; - this.HLD_LAT_IMAX.Size = new System.Drawing.Size(78, 20); - this.HLD_LAT_IMAX.TabIndex = 11; // // label28 // - this.label28.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label28.Location = new System.Drawing.Point(6, 64); + resources.ApplyResources(this.label28, "label28"); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(65, 13); - this.label28.TabIndex = 12; - this.label28.Text = "IMAX"; // // HLD_LAT_I // - this.HLD_LAT_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.HLD_LAT_I, "HLD_LAT_I"); this.HLD_LAT_I.Name = "HLD_LAT_I"; - this.HLD_LAT_I.Size = new System.Drawing.Size(78, 20); - this.HLD_LAT_I.TabIndex = 7; // // label30 // - this.label30.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label30.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label30, "label30"); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(10, 13); - this.label30.TabIndex = 14; - this.label30.Text = "I"; // // HLD_LAT_P // - this.HLD_LAT_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.HLD_LAT_P, "HLD_LAT_P"); this.HLD_LAT_P.Name = "HLD_LAT_P"; - this.HLD_LAT_P.Size = new System.Drawing.Size(78, 20); - this.HLD_LAT_P.TabIndex = 5; // // label31 // - this.label31.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label31.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label31, "label31"); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(14, 13); - this.label31.TabIndex = 15; - this.label31.Text = "P"; // // groupBox20 // @@ -625,60 +493,39 @@ this.groupBox20.Controls.Add(this.label34); this.groupBox20.Controls.Add(this.STB_YAW_P); this.groupBox20.Controls.Add(this.label35); - this.groupBox20.Location = new System.Drawing.Point(364, 13); + resources.ApplyResources(this.groupBox20, "groupBox20"); this.groupBox20.Name = "groupBox20"; - this.groupBox20.Size = new System.Drawing.Size(170, 95); - this.groupBox20.TabIndex = 28; this.groupBox20.TabStop = false; - this.groupBox20.Text = "Stabilize Yaw"; // // STB_YAW_IMAX // - this.STB_YAW_IMAX.Location = new System.Drawing.Point(80, 63); + resources.ApplyResources(this.STB_YAW_IMAX, "STB_YAW_IMAX"); this.STB_YAW_IMAX.Name = "STB_YAW_IMAX"; - this.STB_YAW_IMAX.Size = new System.Drawing.Size(78, 20); - this.STB_YAW_IMAX.TabIndex = 11; // // label32 // - this.label32.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label32.Location = new System.Drawing.Point(6, 66); + resources.ApplyResources(this.label32, "label32"); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(65, 13); - this.label32.TabIndex = 12; - this.label32.Text = "IMAX "; // // STB_YAW_I // - this.STB_YAW_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.STB_YAW_I, "STB_YAW_I"); this.STB_YAW_I.Name = "STB_YAW_I"; - this.STB_YAW_I.Size = new System.Drawing.Size(78, 20); - this.STB_YAW_I.TabIndex = 7; // // label34 // - this.label34.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label34.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label34, "label34"); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(10, 13); - this.label34.TabIndex = 14; - this.label34.Text = "I"; // // STB_YAW_P // - this.STB_YAW_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.STB_YAW_P, "STB_YAW_P"); this.STB_YAW_P.Name = "STB_YAW_P"; - this.STB_YAW_P.Size = new System.Drawing.Size(78, 20); - this.STB_YAW_P.TabIndex = 5; // // label35 // - this.label35.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label35.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label35, "label35"); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(14, 13); - this.label35.TabIndex = 15; - this.label35.Text = "P"; // // groupBox21 // @@ -690,76 +537,49 @@ this.groupBox21.Controls.Add(this.label41); this.groupBox21.Controls.Add(this.STB_PIT_P); this.groupBox21.Controls.Add(this.label42); - this.groupBox21.Location = new System.Drawing.Point(188, 13); + resources.ApplyResources(this.groupBox21, "groupBox21"); this.groupBox21.Name = "groupBox21"; - this.groupBox21.Size = new System.Drawing.Size(170, 114); - this.groupBox21.TabIndex = 29; this.groupBox21.TabStop = false; - this.groupBox21.Text = "Stabilize Pitch"; // // STAB_D // - this.STAB_D.Location = new System.Drawing.Point(80, 88); + resources.ApplyResources(this.STAB_D, "STAB_D"); this.STAB_D.Name = "STAB_D"; - this.STAB_D.Size = new System.Drawing.Size(78, 20); - this.STAB_D.TabIndex = 16; // // lblSTAB_D // - this.lblSTAB_D.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lblSTAB_D.Location = new System.Drawing.Point(6, 91); + resources.ApplyResources(this.lblSTAB_D, "lblSTAB_D"); this.lblSTAB_D.Name = "lblSTAB_D"; - this.lblSTAB_D.Size = new System.Drawing.Size(65, 13); - this.lblSTAB_D.TabIndex = 17; - this.lblSTAB_D.Text = "Stabilize D"; // // STB_PIT_IMAX // - this.STB_PIT_IMAX.Location = new System.Drawing.Point(80, 63); + resources.ApplyResources(this.STB_PIT_IMAX, "STB_PIT_IMAX"); this.STB_PIT_IMAX.Name = "STB_PIT_IMAX"; - this.STB_PIT_IMAX.Size = new System.Drawing.Size(78, 20); - this.STB_PIT_IMAX.TabIndex = 11; // // label36 // - this.label36.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label36.Location = new System.Drawing.Point(6, 66); + resources.ApplyResources(this.label36, "label36"); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(65, 13); - this.label36.TabIndex = 12; - this.label36.Text = "IMAX"; // // STB_PIT_I // - this.STB_PIT_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.STB_PIT_I, "STB_PIT_I"); this.STB_PIT_I.Name = "STB_PIT_I"; - this.STB_PIT_I.Size = new System.Drawing.Size(78, 20); - this.STB_PIT_I.TabIndex = 7; // // label41 // - this.label41.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label41.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label41, "label41"); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(10, 13); - this.label41.TabIndex = 14; - this.label41.Text = "I"; // // STB_PIT_P // - this.STB_PIT_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.STB_PIT_P, "STB_PIT_P"); this.STB_PIT_P.Name = "STB_PIT_P"; - this.STB_PIT_P.Size = new System.Drawing.Size(78, 20); - this.STB_PIT_P.TabIndex = 5; // // label42 // - this.label42.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label42.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label42, "label42"); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(14, 13); - this.label42.TabIndex = 15; - this.label42.Text = "P"; // // groupBox22 // @@ -769,60 +589,39 @@ this.groupBox22.Controls.Add(this.label45); this.groupBox22.Controls.Add(this.STB_RLL_P); this.groupBox22.Controls.Add(this.label46); - this.groupBox22.Location = new System.Drawing.Point(12, 13); + resources.ApplyResources(this.groupBox22, "groupBox22"); this.groupBox22.Name = "groupBox22"; - this.groupBox22.Size = new System.Drawing.Size(170, 95); - this.groupBox22.TabIndex = 30; this.groupBox22.TabStop = false; - this.groupBox22.Text = "Stabilize Roll"; // // STB_RLL_IMAX // - this.STB_RLL_IMAX.Location = new System.Drawing.Point(80, 63); + resources.ApplyResources(this.STB_RLL_IMAX, "STB_RLL_IMAX"); this.STB_RLL_IMAX.Name = "STB_RLL_IMAX"; - this.STB_RLL_IMAX.Size = new System.Drawing.Size(78, 20); - this.STB_RLL_IMAX.TabIndex = 11; // // label43 // - this.label43.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label43.Location = new System.Drawing.Point(6, 66); + resources.ApplyResources(this.label43, "label43"); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(65, 13); - this.label43.TabIndex = 12; - this.label43.Text = "IMAX"; // // STB_RLL_I // - this.STB_RLL_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.STB_RLL_I, "STB_RLL_I"); this.STB_RLL_I.Name = "STB_RLL_I"; - this.STB_RLL_I.Size = new System.Drawing.Size(78, 20); - this.STB_RLL_I.TabIndex = 7; // // label45 // - this.label45.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label45.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label45, "label45"); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(10, 13); - this.label45.TabIndex = 14; - this.label45.Text = "I"; // // STB_RLL_P // - this.STB_RLL_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.STB_RLL_P, "STB_RLL_P"); this.STB_RLL_P.Name = "STB_RLL_P"; - this.STB_RLL_P.Size = new System.Drawing.Size(78, 20); - this.STB_RLL_P.TabIndex = 5; // // label46 // - this.label46.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label46.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label46, "label46"); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(14, 13); - this.label46.TabIndex = 15; - this.label46.Text = "P"; // // groupBox23 // @@ -834,76 +633,49 @@ this.groupBox23.Controls.Add(this.label77); this.groupBox23.Controls.Add(this.RATE_YAW_P); this.groupBox23.Controls.Add(this.label82); - this.groupBox23.Location = new System.Drawing.Point(364, 133); + resources.ApplyResources(this.groupBox23, "groupBox23"); this.groupBox23.Name = "groupBox23"; - this.groupBox23.Size = new System.Drawing.Size(170, 108); - this.groupBox23.TabIndex = 31; this.groupBox23.TabStop = false; - this.groupBox23.Text = "Rate Yaw"; // // RATE_YAW_D // - this.RATE_YAW_D.Location = new System.Drawing.Point(80, 60); + resources.ApplyResources(this.RATE_YAW_D, "RATE_YAW_D"); this.RATE_YAW_D.Name = "RATE_YAW_D"; - this.RATE_YAW_D.Size = new System.Drawing.Size(78, 20); - this.RATE_YAW_D.TabIndex = 8; // // label10 // - this.label10.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label10.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label10, "label10"); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(10, 13); - this.label10.TabIndex = 9; - this.label10.Text = "D"; // // RATE_YAW_IMAX // - this.RATE_YAW_IMAX.Location = new System.Drawing.Point(80, 84); + resources.ApplyResources(this.RATE_YAW_IMAX, "RATE_YAW_IMAX"); this.RATE_YAW_IMAX.Name = "RATE_YAW_IMAX"; - this.RATE_YAW_IMAX.Size = new System.Drawing.Size(78, 20); - this.RATE_YAW_IMAX.TabIndex = 0; // // label47 // - this.label47.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label47.Location = new System.Drawing.Point(6, 87); + resources.ApplyResources(this.label47, "label47"); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(65, 13); - this.label47.TabIndex = 1; - this.label47.Text = "IMAX"; // // RATE_YAW_I // - this.RATE_YAW_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.RATE_YAW_I, "RATE_YAW_I"); this.RATE_YAW_I.Name = "RATE_YAW_I"; - this.RATE_YAW_I.Size = new System.Drawing.Size(78, 20); - this.RATE_YAW_I.TabIndex = 4; // // label77 // - this.label77.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label77.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label77, "label77"); this.label77.Name = "label77"; - this.label77.Size = new System.Drawing.Size(10, 13); - this.label77.TabIndex = 5; - this.label77.Text = "I"; // // RATE_YAW_P // - this.RATE_YAW_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.RATE_YAW_P, "RATE_YAW_P"); this.RATE_YAW_P.Name = "RATE_YAW_P"; - this.RATE_YAW_P.Size = new System.Drawing.Size(78, 20); - this.RATE_YAW_P.TabIndex = 6; // // label82 // - this.label82.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label82.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label82, "label82"); this.label82.Name = "label82"; - this.label82.Size = new System.Drawing.Size(14, 13); - this.label82.TabIndex = 7; - this.label82.Text = "P"; // // groupBox24 // @@ -915,76 +687,49 @@ this.groupBox24.Controls.Add(this.label86); this.groupBox24.Controls.Add(this.RATE_PIT_P); this.groupBox24.Controls.Add(this.label87); - this.groupBox24.Location = new System.Drawing.Point(188, 133); + resources.ApplyResources(this.groupBox24, "groupBox24"); this.groupBox24.Name = "groupBox24"; - this.groupBox24.Size = new System.Drawing.Size(170, 108); - this.groupBox24.TabIndex = 32; this.groupBox24.TabStop = false; - this.groupBox24.Text = "Rate Pitch"; // // RATE_PIT_D // - this.RATE_PIT_D.Location = new System.Drawing.Point(80, 60); + resources.ApplyResources(this.RATE_PIT_D, "RATE_PIT_D"); this.RATE_PIT_D.Name = "RATE_PIT_D"; - this.RATE_PIT_D.Size = new System.Drawing.Size(78, 20); - this.RATE_PIT_D.TabIndex = 10; // // label11 // - this.label11.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label11.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label11, "label11"); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(10, 13); - this.label11.TabIndex = 11; - this.label11.Text = "D"; // // RATE_PIT_IMAX // - this.RATE_PIT_IMAX.Location = new System.Drawing.Point(80, 83); + resources.ApplyResources(this.RATE_PIT_IMAX, "RATE_PIT_IMAX"); this.RATE_PIT_IMAX.Name = "RATE_PIT_IMAX"; - this.RATE_PIT_IMAX.Size = new System.Drawing.Size(78, 20); - this.RATE_PIT_IMAX.TabIndex = 0; // // label84 // - this.label84.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label84.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label84, "label84"); this.label84.Name = "label84"; - this.label84.Size = new System.Drawing.Size(65, 13); - this.label84.TabIndex = 1; - this.label84.Text = "IMAX"; // // RATE_PIT_I // - this.RATE_PIT_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.RATE_PIT_I, "RATE_PIT_I"); this.RATE_PIT_I.Name = "RATE_PIT_I"; - this.RATE_PIT_I.Size = new System.Drawing.Size(78, 20); - this.RATE_PIT_I.TabIndex = 4; // // label86 // - this.label86.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label86.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label86, "label86"); this.label86.Name = "label86"; - this.label86.Size = new System.Drawing.Size(10, 13); - this.label86.TabIndex = 5; - this.label86.Text = "I"; // // RATE_PIT_P // - this.RATE_PIT_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.RATE_PIT_P, "RATE_PIT_P"); this.RATE_PIT_P.Name = "RATE_PIT_P"; - this.RATE_PIT_P.Size = new System.Drawing.Size(78, 20); - this.RATE_PIT_P.TabIndex = 6; // // label87 // - this.label87.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label87.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label87, "label87"); this.label87.Name = "label87"; - this.label87.Size = new System.Drawing.Size(14, 13); - this.label87.TabIndex = 7; - this.label87.Text = "P"; // // groupBox25 // @@ -996,82 +741,54 @@ this.groupBox25.Controls.Add(this.label90); this.groupBox25.Controls.Add(this.RATE_RLL_P); this.groupBox25.Controls.Add(this.label91); - this.groupBox25.Location = new System.Drawing.Point(12, 133); + resources.ApplyResources(this.groupBox25, "groupBox25"); this.groupBox25.Name = "groupBox25"; - this.groupBox25.Size = new System.Drawing.Size(170, 108); - this.groupBox25.TabIndex = 33; this.groupBox25.TabStop = false; - this.groupBox25.Text = "Rate Roll"; // // RATE_RLL_D // - this.RATE_RLL_D.Location = new System.Drawing.Point(80, 60); + resources.ApplyResources(this.RATE_RLL_D, "RATE_RLL_D"); this.RATE_RLL_D.Name = "RATE_RLL_D"; - this.RATE_RLL_D.Size = new System.Drawing.Size(78, 20); - this.RATE_RLL_D.TabIndex = 12; // // label17 // - this.label17.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label17.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label17, "label17"); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(10, 13); - this.label17.TabIndex = 13; - this.label17.Text = "D"; // // RATE_RLL_IMAX // - this.RATE_RLL_IMAX.Location = new System.Drawing.Point(80, 83); + resources.ApplyResources(this.RATE_RLL_IMAX, "RATE_RLL_IMAX"); this.RATE_RLL_IMAX.Name = "RATE_RLL_IMAX"; - this.RATE_RLL_IMAX.Size = new System.Drawing.Size(78, 20); - this.RATE_RLL_IMAX.TabIndex = 0; // // label88 // - this.label88.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label88.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label88, "label88"); this.label88.Name = "label88"; - this.label88.Size = new System.Drawing.Size(68, 13); - this.label88.TabIndex = 1; - this.label88.Text = "IMAX"; // // RATE_RLL_I // - this.RATE_RLL_I.Location = new System.Drawing.Point(80, 37); + resources.ApplyResources(this.RATE_RLL_I, "RATE_RLL_I"); this.RATE_RLL_I.Name = "RATE_RLL_I"; - this.RATE_RLL_I.Size = new System.Drawing.Size(78, 20); - this.RATE_RLL_I.TabIndex = 4; // // label90 // - this.label90.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label90.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label90, "label90"); this.label90.Name = "label90"; - this.label90.Size = new System.Drawing.Size(10, 13); - this.label90.TabIndex = 5; - this.label90.Text = "I"; // // RATE_RLL_P // - this.RATE_RLL_P.Location = new System.Drawing.Point(80, 13); + resources.ApplyResources(this.RATE_RLL_P, "RATE_RLL_P"); this.RATE_RLL_P.Name = "RATE_RLL_P"; - this.RATE_RLL_P.Size = new System.Drawing.Size(78, 20); - this.RATE_RLL_P.TabIndex = 6; // // label91 // - this.label91.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label91.Location = new System.Drawing.Point(6, 16); + resources.ApplyResources(this.label91, "label91"); this.label91.Name = "label91"; - this.label91.Size = new System.Drawing.Size(14, 13); - this.label91.TabIndex = 7; - this.label91.Text = "P"; // // ConfigArducopter // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoScroll = true; this.Controls.Add(this.myLabel3); this.Controls.Add(this.TUNE_LOW); this.Controls.Add(this.TUNE_HIGH); @@ -1092,7 +809,6 @@ this.Controls.Add(this.groupBox24); this.Controls.Add(this.groupBox25); this.Name = "ConfigArducopter"; - this.Size = new System.Drawing.Size(728, 529); this.Load += new System.EventHandler(this.ConfigArducopter_Load); ((System.ComponentModel.ISupportInitialize)(this.TUNE_LOW)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.TUNE_HIGH)).EndInit(); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx index 271670364a..1be2fe2b20 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx @@ -117,7 +117,2398 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 540, 302 + + + 29, 23 + + + + 42 + + + Min + + + myLabel3 + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + + + 575, 305 + + + 51, 20 + + + 41 + + + TUNE_LOW + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 665, 305 + + + 46, 20 + + + 40 + + + TUNE_HIGH + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 540, 277 + + + 53, 23 + + + 39 + + + Ch6 Opt + + + myLabel2 + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + 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 + + + 599, 277 + + + 112, 21 + + + 38 + + + TUNE + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 540, 329 + + + 53, 23 + + + 37 + + + Ch7 Opt + + + myLabel1 + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 5 + + + Do Nothing + + + + + + + + + Simple Mode + + + RTL + + + + + + + + + Save WP + + + 599, 329 + + + 112, 21 + + + 36 + + + CH7_OPT + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + 80, 60 + + + 78, 20 + + + 14 + + + THR_RATE_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 0 + + + + NoControl + + + 6, 63 + + + 10, 13 + + + 15 + + + D + + + label29 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 1 + + + NoControl + + + 6, 86 + + + 65, 13 + + + 16 + + + IMAX + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 2 + + + 80, 83 + + + 78, 20 + + + 11 + + + THR_RATE_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 3 + + + 80, 37 + + + 78, 20 + + + 7 + + + THR_RATE_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 5 + + + 80, 13 + + + 78, 20 + + + 5 + + + THR_RATE_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 6 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 15 + + + P + + + label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 7 + + + 12, 267 + + + 170, 110 + + + 35 + + + Throttle Rate + + + groupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + True + + + NoControl + + + 9, 247 + + + 154, 17 + + + 34 + + + Lock Pitch and Roll Values + + + CHK_lockrollpitch + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 80, 60 + + + 78, 20 + + + 18 + + + NAV_LAT_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 19 + + + D + + + label27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 1 + + + 80, 107 + + + 78, 20 + + + 16 + + + WP_SPEED_MAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 2 + + + NoControl + + + 6, 110 + + + 54, 13 + + + 17 + + + m/s + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 3 + + + 80, 84 + + + 78, 20 + + + 11 + + + NAV_LAT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 4 + + + NoControl + + + 6, 87 + + + 65, 13 + + + 12 + + + IMAX + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 5 + + + 80, 37 + + + 78, 20 + + + 7 + + + NAV_LAT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 6 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 7 + + + 80, 13 + + + 78, 20 + + + 5 + + + NAV_LAT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 8 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 15 + + + P + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 9 + + + 540, 133 + + + 170, 131 + + + 24 + + + Nav WP + + + groupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 80, 13 + + + 78, 20 + + + 5 + + + XTRK_GAIN_SC1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + 0 + + + NoControl + + + 6, 16 + + + 38, 13 + + + 15 + + + Gain + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + 1 + + + 364, 267 + + + 170, 43 + + + 25 + + + Crosstrack Correction + + + groupBox6 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + 80, 63 + + + 78, 20 + + + 11 + + + THR_ALT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 0 + + + NoControl + + + 6, 66 + + + 65, 13 + + + 12 + + + IMAX + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 1 + + + 80, 37 + + + 78, 20 + + + 7 + + + THR_ALT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 2 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label21 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 3 + + + 80, 13 + + + 78, 20 + + + 5 + + + THR_ALT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 4 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 15 + + + P + + + label22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 5 + + + 188, 267 + + + 170, 110 + + + 26 + + + Altitude Hold + + + groupBox7 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + 80, 61 + + + 78, 20 + + + 11 + + + HLD_LAT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 0 + + + NoControl + + + 6, 64 + + + 65, 13 + + + 12 + + + IMAX + + + label28 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 1 + + + 80, 37 + + + 78, 20 + + + 7 + + + HLD_LAT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 2 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label30 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 3 + + + 80, 13 + + + 78, 20 + + + 5 + + + HLD_LAT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 4 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 15 + + + P + + + label31 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 5 + + + 537, 13 + + + 170, 95 + + + 27 + + + Loiter + + + groupBox19 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + 80, 63 + + + 78, 20 + + + 11 + + + STB_YAW_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 0 + + + NoControl + + + 6, 66 + + + 65, 13 + + + 12 + + + IMAX + + + label32 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 1 + + + 80, 37 + + + 78, 20 + + + 7 + + + STB_YAW_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 2 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label34 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 3 + + + 80, 13 + + + 78, 20 + + + 5 + + + STB_YAW_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 4 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 15 + + + P + + + label35 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 5 + + + 364, 13 + + + 170, 95 + + + 28 + + + Stabilize Yaw + + + groupBox20 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + 80, 88 + + + 78, 20 + + + 16 + + + STAB_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 0 + + + NoControl + + + 6, 91 + + + 65, 13 + + + 17 + + + Stabilize D + + + lblSTAB_D + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 1 + + + 80, 63 + + + 78, 20 + + + 11 + + + STB_PIT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 2 + + + NoControl + + + 6, 66 + + + 65, 13 + + + 12 + + + IMAX + + + label36 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 3 + + + 80, 37 + + + 78, 20 + + + 7 + + + STB_PIT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label41 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 5 + + + 80, 13 + + + 78, 20 + + + 5 + + + STB_PIT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 6 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 15 + + + P + + + label42 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 7 + + + 188, 13 + + + 170, 114 + + + 29 + + + Stabilize Pitch + + + groupBox21 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + 80, 63 + + + 78, 20 + + + 11 + + + STB_RLL_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 0 + + + NoControl + + + 6, 66 + + + 65, 13 + + + 12 + + + IMAX + + + label43 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 1 + + + 80, 37 + + + 78, 20 + + + 7 + + + STB_RLL_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 2 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label45 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 3 + + + 80, 13 + + + 78, 20 + + + 5 + + + STB_RLL_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 4 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 15 + + + P + + + label46 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 5 + + + 12, 13 + + + 170, 95 + + + 30 + + + Stabilize Roll + + + groupBox22 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + 80, 60 + + + 78, 20 + + + 8 + + + RATE_YAW_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 9 + + + D + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 1 + + + 80, 84 + + + 78, 20 + + + 0 + + + RATE_YAW_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 2 + + + NoControl + + + 6, 87 + + + 65, 13 + + + 1 + + + IMAX + + + label47 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 3 + + + 80, 37 + + + 78, 20 + + + 4 + + + RATE_YAW_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 5 + + + I + + + label77 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 5 + + + 80, 13 + + + 78, 20 + + + 6 + + + RATE_YAW_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 6 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 7 + + + P + + + label82 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 7 + + + 364, 133 + + + 170, 108 + + + 31 + + + Rate Yaw + + + groupBox23 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + 80, 60 + + + 78, 20 + + + 10 + + + RATE_PIT_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 11 + + + D + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 1 + + + 80, 83 + + + 78, 20 + + + 0 + + + RATE_PIT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 2 + + + NoControl + + + 6, 86 + + + 65, 13 + + + 1 + + + IMAX + + + label84 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 3 + + + 80, 37 + + + 78, 20 + + + 4 + + + RATE_PIT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 5 + + + I + + + label86 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 5 + + + 80, 13 + + + 78, 20 + + + 6 + + + RATE_PIT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 6 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 7 + + + P + + + label87 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 7 + + + 188, 133 + + + 170, 108 + + + 32 + + + Rate Pitch + + + groupBox24 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + 80, 60 + + + 78, 20 + + + 12 + + + RATE_RLL_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 0 + + + NoControl + + + 6, 63 + + + 10, 13 + + + 13 + + + D + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 1 + + + 80, 83 + + + 78, 20 + + + 0 + + + RATE_RLL_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 2 + + + NoControl + + + 6, 86 + + + 68, 13 + + + 1 + + + IMAX + + + label88 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 3 + + + 80, 37 + + + 78, 20 + + + 4 + + + RATE_RLL_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 5 + + + I + + + label90 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 5 + + + 80, 13 + + + 78, 20 + + + 6 + + + RATE_RLL_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 6 + + + NoControl + + + 6, 16 + + + 14, 13 + + + 7 + + + P + + + label91 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 7 + + + 12, 133 + + + 170, 108 + + + 33 + + + Rate Roll + + + groupBox25 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + 17, 17 + + True + + + 6, 13 + + + True + + + 728, 529 + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigArducopter + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs index f30b039741..90e96df593 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigArduplane)); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.THR_FS_VALUE = new System.Windows.Forms.NumericUpDown(); this.label5 = new System.Windows.Forms.Label(); @@ -198,76 +199,49 @@ this.groupBox3.Controls.Add(this.label7); this.groupBox3.Controls.Add(this.TRIM_THROTTLE); this.groupBox3.Controls.Add(this.label8); - this.groupBox3.Location = new System.Drawing.Point(413, 231); + resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(195, 108); - this.groupBox3.TabIndex = 12; this.groupBox3.TabStop = false; - this.groupBox3.Text = "Throttle 0-100%"; // // THR_FS_VALUE // - this.THR_FS_VALUE.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.THR_FS_VALUE, "THR_FS_VALUE"); this.THR_FS_VALUE.Name = "THR_FS_VALUE"; - this.THR_FS_VALUE.Size = new System.Drawing.Size(78, 20); - this.THR_FS_VALUE.TabIndex = 11; // // label5 // - this.label5.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label5.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(50, 13); - this.label5.TabIndex = 12; - this.label5.Text = "FS Value"; // // THR_MAX // - this.THR_MAX.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.THR_MAX, "THR_MAX"); this.THR_MAX.Name = "THR_MAX"; - this.THR_MAX.Size = new System.Drawing.Size(78, 20); - this.THR_MAX.TabIndex = 9; // // label6 // - this.label6.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label6.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(27, 13); - this.label6.TabIndex = 13; - this.label6.Text = "Max"; // // THR_MIN // - this.THR_MIN.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.THR_MIN, "THR_MIN"); this.THR_MIN.Name = "THR_MIN"; - this.THR_MIN.Size = new System.Drawing.Size(78, 20); - this.THR_MIN.TabIndex = 7; // // label7 // - this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label7.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(24, 13); - this.label7.TabIndex = 14; - this.label7.Text = "Min"; // // TRIM_THROTTLE // - this.TRIM_THROTTLE.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.TRIM_THROTTLE, "TRIM_THROTTLE"); this.TRIM_THROTTLE.Name = "TRIM_THROTTLE"; - this.TRIM_THROTTLE.Size = new System.Drawing.Size(78, 20); - this.TRIM_THROTTLE.TabIndex = 5; // // label8 // - this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label8.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label8, "label8"); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(36, 13); - this.label8.TabIndex = 15; - this.label8.Text = "Cruise"; // // groupBox1 // @@ -279,76 +253,49 @@ this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.TRIM_ARSPD_CM); this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Location = new System.Drawing.Point(414, 339); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(195, 108); - this.groupBox1.TabIndex = 13; this.groupBox1.TabStop = false; - this.groupBox1.Text = "Airspeed m/s"; // // ARSPD_RATIO // - this.ARSPD_RATIO.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.ARSPD_RATIO, "ARSPD_RATIO"); this.ARSPD_RATIO.Name = "ARSPD_RATIO"; - this.ARSPD_RATIO.Size = new System.Drawing.Size(78, 20); - this.ARSPD_RATIO.TabIndex = 0; // // label1 // - this.label1.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label1.Location = new System.Drawing.Point(6, 87); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(32, 13); - this.label1.TabIndex = 1; - this.label1.Text = "Ratio"; // // ARSPD_FBW_MAX // - this.ARSPD_FBW_MAX.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.ARSPD_FBW_MAX, "ARSPD_FBW_MAX"); this.ARSPD_FBW_MAX.Name = "ARSPD_FBW_MAX"; - this.ARSPD_FBW_MAX.Size = new System.Drawing.Size(78, 20); - this.ARSPD_FBW_MAX.TabIndex = 2; // // label2 // - this.label2.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label2.Location = new System.Drawing.Point(6, 59); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 13); - this.label2.TabIndex = 3; - this.label2.Text = "FBW max"; // // ARSPD_FBW_MIN // - this.ARSPD_FBW_MIN.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.ARSPD_FBW_MIN, "ARSPD_FBW_MIN"); this.ARSPD_FBW_MIN.Name = "ARSPD_FBW_MIN"; - this.ARSPD_FBW_MIN.Size = new System.Drawing.Size(78, 20); - this.ARSPD_FBW_MIN.TabIndex = 4; // // label3 // - this.label3.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label3.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(50, 13); - this.label3.TabIndex = 5; - this.label3.Text = "FBW min"; // // TRIM_ARSPD_CM // - this.TRIM_ARSPD_CM.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.TRIM_ARSPD_CM, "TRIM_ARSPD_CM"); this.TRIM_ARSPD_CM.Name = "TRIM_ARSPD_CM"; - this.TRIM_ARSPD_CM.Size = new System.Drawing.Size(78, 20); - this.TRIM_ARSPD_CM.TabIndex = 5; // // label4 // - this.label4.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label4.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(64, 13); - this.label4.TabIndex = 6; - this.label4.Text = "Cruise"; // // groupBox2 // @@ -358,60 +305,39 @@ this.groupBox2.Controls.Add(this.label38); this.groupBox2.Controls.Add(this.LIM_ROLL_CD); this.groupBox2.Controls.Add(this.label37); - this.groupBox2.Location = new System.Drawing.Point(213, 339); + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(195, 108); - this.groupBox2.TabIndex = 14; this.groupBox2.TabStop = false; - this.groupBox2.Text = "Navigation Angles"; // // LIM_PITCH_MIN // - this.LIM_PITCH_MIN.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.LIM_PITCH_MIN, "LIM_PITCH_MIN"); this.LIM_PITCH_MIN.Name = "LIM_PITCH_MIN"; - this.LIM_PITCH_MIN.Size = new System.Drawing.Size(78, 20); - this.LIM_PITCH_MIN.TabIndex = 9; // // label39 // - this.label39.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label39.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label39, "label39"); this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(51, 13); - this.label39.TabIndex = 10; - this.label39.Text = "Pitch Min"; // // LIM_PITCH_MAX // - this.LIM_PITCH_MAX.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.LIM_PITCH_MAX, "LIM_PITCH_MAX"); this.LIM_PITCH_MAX.Name = "LIM_PITCH_MAX"; - this.LIM_PITCH_MAX.Size = new System.Drawing.Size(78, 20); - this.LIM_PITCH_MAX.TabIndex = 7; // // label38 // - this.label38.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label38.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label38, "label38"); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(54, 13); - this.label38.TabIndex = 11; - this.label38.Text = "Pitch Max"; // // LIM_ROLL_CD // - this.LIM_ROLL_CD.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.LIM_ROLL_CD, "LIM_ROLL_CD"); this.LIM_ROLL_CD.Name = "LIM_ROLL_CD"; - this.LIM_ROLL_CD.Size = new System.Drawing.Size(78, 20); - this.LIM_ROLL_CD.TabIndex = 5; // // label37 // - this.label37.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label37.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label37, "label37"); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(55, 13); - this.label37.TabIndex = 12; - this.label37.Text = "Bank Max"; // // groupBox15 // @@ -419,44 +345,29 @@ this.groupBox15.Controls.Add(this.label79); this.groupBox15.Controls.Add(this.XTRK_GAIN_SC); this.groupBox15.Controls.Add(this.label80); - this.groupBox15.Location = new System.Drawing.Point(12, 339); + resources.ApplyResources(this.groupBox15, "groupBox15"); this.groupBox15.Name = "groupBox15"; - this.groupBox15.Size = new System.Drawing.Size(195, 108); - this.groupBox15.TabIndex = 15; this.groupBox15.TabStop = false; - this.groupBox15.Text = "Xtrack Pids"; // // XTRK_ANGLE_CD // - this.XTRK_ANGLE_CD.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.XTRK_ANGLE_CD, "XTRK_ANGLE_CD"); this.XTRK_ANGLE_CD.Name = "XTRK_ANGLE_CD"; - this.XTRK_ANGLE_CD.Size = new System.Drawing.Size(78, 20); - this.XTRK_ANGLE_CD.TabIndex = 7; // // label79 // - this.label79.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label79.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label79, "label79"); this.label79.Name = "label79"; - this.label79.Size = new System.Drawing.Size(61, 13); - this.label79.TabIndex = 8; - this.label79.Text = "Entry Angle"; // // XTRK_GAIN_SC // - this.XTRK_GAIN_SC.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.XTRK_GAIN_SC, "XTRK_GAIN_SC"); this.XTRK_GAIN_SC.Name = "XTRK_GAIN_SC"; - this.XTRK_GAIN_SC.Size = new System.Drawing.Size(78, 20); - this.XTRK_GAIN_SC.TabIndex = 5; // // label80 // - this.label80.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label80.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label80, "label80"); this.label80.Name = "label80"; - this.label80.Size = new System.Drawing.Size(52, 13); - this.label80.TabIndex = 9; - this.label80.Text = "Gain (cm)"; // // groupBox16 // @@ -466,60 +377,39 @@ this.groupBox16.Controls.Add(this.label78); this.groupBox16.Controls.Add(this.KFF_PTCHCOMP); this.groupBox16.Controls.Add(this.label81); - this.groupBox16.Location = new System.Drawing.Point(213, 231); + resources.ApplyResources(this.groupBox16, "groupBox16"); this.groupBox16.Name = "groupBox16"; - this.groupBox16.Size = new System.Drawing.Size(195, 108); - this.groupBox16.TabIndex = 16; this.groupBox16.TabStop = false; - this.groupBox16.Text = "Other Mix\'s"; // // KFF_PTCH2THR // - this.KFF_PTCH2THR.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.KFF_PTCH2THR, "KFF_PTCH2THR"); this.KFF_PTCH2THR.Name = "KFF_PTCH2THR"; - this.KFF_PTCH2THR.Size = new System.Drawing.Size(78, 20); - this.KFF_PTCH2THR.TabIndex = 13; // // label83 // - this.label83.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label83.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label83, "label83"); this.label83.Name = "label83"; - this.label83.Size = new System.Drawing.Size(36, 13); - this.label83.TabIndex = 14; - this.label83.Text = "P to T"; // // KFF_RDDRMIX // - this.KFF_RDDRMIX.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.KFF_RDDRMIX, "KFF_RDDRMIX"); this.KFF_RDDRMIX.Name = "KFF_RDDRMIX"; - this.KFF_RDDRMIX.Size = new System.Drawing.Size(78, 20); - this.KFF_RDDRMIX.TabIndex = 9; // // label78 // - this.label78.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label78.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label78, "label78"); this.label78.Name = "label78"; - this.label78.Size = new System.Drawing.Size(61, 13); - this.label78.TabIndex = 15; - this.label78.Text = "Rudder Mix"; // // KFF_PTCHCOMP // - this.KFF_PTCHCOMP.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.KFF_PTCHCOMP, "KFF_PTCHCOMP"); this.KFF_PTCHCOMP.Name = "KFF_PTCHCOMP"; - this.KFF_PTCHCOMP.Size = new System.Drawing.Size(78, 20); - this.KFF_PTCHCOMP.TabIndex = 7; // // label81 // - this.label81.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label81.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label81, "label81"); this.label81.Name = "label81"; - this.label81.Size = new System.Drawing.Size(61, 13); - this.label81.TabIndex = 16; - this.label81.Text = "Pitch Comp"; // // groupBox14 // @@ -531,76 +421,49 @@ this.groupBox14.Controls.Add(this.label75); this.groupBox14.Controls.Add(this.ENRGY2THR_P); this.groupBox14.Controls.Add(this.label76); - this.groupBox14.Location = new System.Drawing.Point(12, 231); + resources.ApplyResources(this.groupBox14, "groupBox14"); this.groupBox14.Name = "groupBox14"; - this.groupBox14.Size = new System.Drawing.Size(195, 108); - this.groupBox14.TabIndex = 17; this.groupBox14.TabStop = false; - this.groupBox14.Text = "Energy/Alt Pid"; // // ENRGY2THR_IMAX // - this.ENRGY2THR_IMAX.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.ENRGY2THR_IMAX, "ENRGY2THR_IMAX"); this.ENRGY2THR_IMAX.Name = "ENRGY2THR_IMAX"; - this.ENRGY2THR_IMAX.Size = new System.Drawing.Size(78, 20); - this.ENRGY2THR_IMAX.TabIndex = 11; // // label73 // - this.label73.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label73.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label73, "label73"); this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(54, 13); - this.label73.TabIndex = 12; - this.label73.Text = "INT_MAX"; // // ENRGY2THR_D // - this.ENRGY2THR_D.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.ENRGY2THR_D, "ENRGY2THR_D"); this.ENRGY2THR_D.Name = "ENRGY2THR_D"; - this.ENRGY2THR_D.Size = new System.Drawing.Size(78, 20); - this.ENRGY2THR_D.TabIndex = 9; // // label74 // - this.label74.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label74.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label74, "label74"); this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(15, 13); - this.label74.TabIndex = 13; - this.label74.Text = "D"; // // ENRGY2THR_I // - this.ENRGY2THR_I.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.ENRGY2THR_I, "ENRGY2THR_I"); this.ENRGY2THR_I.Name = "ENRGY2THR_I"; - this.ENRGY2THR_I.Size = new System.Drawing.Size(78, 20); - this.ENRGY2THR_I.TabIndex = 7; // // label75 // - this.label75.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label75.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label75, "label75"); this.label75.Name = "label75"; - this.label75.Size = new System.Drawing.Size(10, 13); - this.label75.TabIndex = 14; - this.label75.Text = "I"; // // ENRGY2THR_P // - this.ENRGY2THR_P.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.ENRGY2THR_P, "ENRGY2THR_P"); this.ENRGY2THR_P.Name = "ENRGY2THR_P"; - this.ENRGY2THR_P.Size = new System.Drawing.Size(78, 20); - this.ENRGY2THR_P.TabIndex = 5; // // label76 // - this.label76.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label76.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label76, "label76"); this.label76.Name = "label76"; - this.label76.Size = new System.Drawing.Size(14, 13); - this.label76.TabIndex = 15; - this.label76.Text = "P"; // // groupBox13 // @@ -612,76 +475,49 @@ this.groupBox13.Controls.Add(this.label71); this.groupBox13.Controls.Add(this.ALT2PTCH_P); this.groupBox13.Controls.Add(this.label72); - this.groupBox13.Location = new System.Drawing.Point(414, 123); + resources.ApplyResources(this.groupBox13, "groupBox13"); this.groupBox13.Name = "groupBox13"; - this.groupBox13.Size = new System.Drawing.Size(195, 108); - this.groupBox13.TabIndex = 18; this.groupBox13.TabStop = false; - this.groupBox13.Text = "Nav Pitch Alt Pid"; // // ALT2PTCH_IMAX // - this.ALT2PTCH_IMAX.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.ALT2PTCH_IMAX, "ALT2PTCH_IMAX"); this.ALT2PTCH_IMAX.Name = "ALT2PTCH_IMAX"; - this.ALT2PTCH_IMAX.Size = new System.Drawing.Size(78, 20); - this.ALT2PTCH_IMAX.TabIndex = 0; // // label69 // - this.label69.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label69.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label69, "label69"); this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(54, 13); - this.label69.TabIndex = 1; - this.label69.Text = "INT_MAX"; // // ALT2PTCH_D // - this.ALT2PTCH_D.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.ALT2PTCH_D, "ALT2PTCH_D"); this.ALT2PTCH_D.Name = "ALT2PTCH_D"; - this.ALT2PTCH_D.Size = new System.Drawing.Size(78, 20); - this.ALT2PTCH_D.TabIndex = 2; // // label70 // - this.label70.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label70.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label70, "label70"); this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(15, 13); - this.label70.TabIndex = 3; - this.label70.Text = "D"; // // ALT2PTCH_I // - this.ALT2PTCH_I.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.ALT2PTCH_I, "ALT2PTCH_I"); this.ALT2PTCH_I.Name = "ALT2PTCH_I"; - this.ALT2PTCH_I.Size = new System.Drawing.Size(78, 20); - this.ALT2PTCH_I.TabIndex = 4; // // label71 // - this.label71.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label71.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label71, "label71"); this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(10, 13); - this.label71.TabIndex = 5; - this.label71.Text = "I"; // // ALT2PTCH_P // - this.ALT2PTCH_P.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.ALT2PTCH_P, "ALT2PTCH_P"); this.ALT2PTCH_P.Name = "ALT2PTCH_P"; - this.ALT2PTCH_P.Size = new System.Drawing.Size(78, 20); - this.ALT2PTCH_P.TabIndex = 6; // // label72 // - this.label72.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label72.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label72, "label72"); this.label72.Name = "label72"; - this.label72.Size = new System.Drawing.Size(14, 13); - this.label72.TabIndex = 7; - this.label72.Text = "P"; // // groupBox12 // @@ -693,76 +529,49 @@ this.groupBox12.Controls.Add(this.label67); this.groupBox12.Controls.Add(this.ARSP2PTCH_P); this.groupBox12.Controls.Add(this.label68); - this.groupBox12.Location = new System.Drawing.Point(213, 123); + resources.ApplyResources(this.groupBox12, "groupBox12"); this.groupBox12.Name = "groupBox12"; - this.groupBox12.Size = new System.Drawing.Size(195, 108); - this.groupBox12.TabIndex = 19; this.groupBox12.TabStop = false; - this.groupBox12.Text = "Nav Pitch AS Pid"; // // ARSP2PTCH_IMAX // - this.ARSP2PTCH_IMAX.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.ARSP2PTCH_IMAX, "ARSP2PTCH_IMAX"); this.ARSP2PTCH_IMAX.Name = "ARSP2PTCH_IMAX"; - this.ARSP2PTCH_IMAX.Size = new System.Drawing.Size(78, 20); - this.ARSP2PTCH_IMAX.TabIndex = 0; // // label65 // - this.label65.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label65.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label65, "label65"); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(54, 13); - this.label65.TabIndex = 1; - this.label65.Text = "INT_MAX"; // // ARSP2PTCH_D // - this.ARSP2PTCH_D.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.ARSP2PTCH_D, "ARSP2PTCH_D"); this.ARSP2PTCH_D.Name = "ARSP2PTCH_D"; - this.ARSP2PTCH_D.Size = new System.Drawing.Size(78, 20); - this.ARSP2PTCH_D.TabIndex = 2; // // label66 // - this.label66.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label66.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label66, "label66"); this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(15, 13); - this.label66.TabIndex = 3; - this.label66.Text = "D"; // // ARSP2PTCH_I // - this.ARSP2PTCH_I.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.ARSP2PTCH_I, "ARSP2PTCH_I"); this.ARSP2PTCH_I.Name = "ARSP2PTCH_I"; - this.ARSP2PTCH_I.Size = new System.Drawing.Size(78, 20); - this.ARSP2PTCH_I.TabIndex = 4; // // label67 // - this.label67.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label67.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label67, "label67"); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(10, 13); - this.label67.TabIndex = 5; - this.label67.Text = "I"; // // ARSP2PTCH_P // - this.ARSP2PTCH_P.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.ARSP2PTCH_P, "ARSP2PTCH_P"); this.ARSP2PTCH_P.Name = "ARSP2PTCH_P"; - this.ARSP2PTCH_P.Size = new System.Drawing.Size(78, 20); - this.ARSP2PTCH_P.TabIndex = 6; // // label68 // - this.label68.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label68.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label68, "label68"); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(14, 13); - this.label68.TabIndex = 7; - this.label68.Text = "P"; // // groupBox11 // @@ -774,76 +583,49 @@ this.groupBox11.Controls.Add(this.label63); this.groupBox11.Controls.Add(this.HDNG2RLL_P); this.groupBox11.Controls.Add(this.label64); - this.groupBox11.Location = new System.Drawing.Point(12, 123); + resources.ApplyResources(this.groupBox11, "groupBox11"); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Size = new System.Drawing.Size(195, 108); - this.groupBox11.TabIndex = 20; this.groupBox11.TabStop = false; - this.groupBox11.Text = "Nav Roll Pid"; // // HDNG2RLL_IMAX // - this.HDNG2RLL_IMAX.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.HDNG2RLL_IMAX, "HDNG2RLL_IMAX"); this.HDNG2RLL_IMAX.Name = "HDNG2RLL_IMAX"; - this.HDNG2RLL_IMAX.Size = new System.Drawing.Size(78, 20); - this.HDNG2RLL_IMAX.TabIndex = 11; // // label61 // - this.label61.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label61.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label61, "label61"); this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(54, 13); - this.label61.TabIndex = 12; - this.label61.Text = "INT_MAX"; // // HDNG2RLL_D // - this.HDNG2RLL_D.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.HDNG2RLL_D, "HDNG2RLL_D"); this.HDNG2RLL_D.Name = "HDNG2RLL_D"; - this.HDNG2RLL_D.Size = new System.Drawing.Size(78, 20); - this.HDNG2RLL_D.TabIndex = 9; // // label62 // - this.label62.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label62.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label62, "label62"); this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(15, 13); - this.label62.TabIndex = 13; - this.label62.Text = "D"; // // HDNG2RLL_I // - this.HDNG2RLL_I.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.HDNG2RLL_I, "HDNG2RLL_I"); this.HDNG2RLL_I.Name = "HDNG2RLL_I"; - this.HDNG2RLL_I.Size = new System.Drawing.Size(78, 20); - this.HDNG2RLL_I.TabIndex = 7; // // label63 // - this.label63.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label63.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label63, "label63"); this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(10, 13); - this.label63.TabIndex = 14; - this.label63.Text = "I"; // // HDNG2RLL_P // - this.HDNG2RLL_P.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.HDNG2RLL_P, "HDNG2RLL_P"); this.HDNG2RLL_P.Name = "HDNG2RLL_P"; - this.HDNG2RLL_P.Size = new System.Drawing.Size(78, 20); - this.HDNG2RLL_P.TabIndex = 5; // // label64 // - this.label64.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label64.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label64, "label64"); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(14, 13); - this.label64.TabIndex = 15; - this.label64.Text = "P"; // // groupBox10 // @@ -855,76 +637,49 @@ this.groupBox10.Controls.Add(this.label59); this.groupBox10.Controls.Add(this.YW2SRV_P); this.groupBox10.Controls.Add(this.label60); - this.groupBox10.Location = new System.Drawing.Point(414, 15); + resources.ApplyResources(this.groupBox10, "groupBox10"); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Size = new System.Drawing.Size(195, 108); - this.groupBox10.TabIndex = 21; this.groupBox10.TabStop = false; - this.groupBox10.Text = "Servo Yaw Pid"; // // YW2SRV_IMAX // - this.YW2SRV_IMAX.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.YW2SRV_IMAX, "YW2SRV_IMAX"); this.YW2SRV_IMAX.Name = "YW2SRV_IMAX"; - this.YW2SRV_IMAX.Size = new System.Drawing.Size(78, 20); - this.YW2SRV_IMAX.TabIndex = 11; // // label57 // - this.label57.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label57.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label57, "label57"); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(54, 13); - this.label57.TabIndex = 12; - this.label57.Text = "INT_MAX"; // // YW2SRV_D // - this.YW2SRV_D.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.YW2SRV_D, "YW2SRV_D"); this.YW2SRV_D.Name = "YW2SRV_D"; - this.YW2SRV_D.Size = new System.Drawing.Size(78, 20); - this.YW2SRV_D.TabIndex = 9; // // label58 // - this.label58.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label58.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label58, "label58"); this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(15, 13); - this.label58.TabIndex = 13; - this.label58.Text = "D"; // // YW2SRV_I // - this.YW2SRV_I.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.YW2SRV_I, "YW2SRV_I"); this.YW2SRV_I.Name = "YW2SRV_I"; - this.YW2SRV_I.Size = new System.Drawing.Size(78, 20); - this.YW2SRV_I.TabIndex = 7; // // label59 // - this.label59.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label59.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label59, "label59"); this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(10, 13); - this.label59.TabIndex = 14; - this.label59.Text = "I"; // // YW2SRV_P // - this.YW2SRV_P.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.YW2SRV_P, "YW2SRV_P"); this.YW2SRV_P.Name = "YW2SRV_P"; - this.YW2SRV_P.Size = new System.Drawing.Size(78, 20); - this.YW2SRV_P.TabIndex = 5; // // label60 // - this.label60.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label60.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label60, "label60"); this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(14, 13); - this.label60.TabIndex = 15; - this.label60.Text = "P"; // // groupBox9 // @@ -936,76 +691,49 @@ this.groupBox9.Controls.Add(this.label55); this.groupBox9.Controls.Add(this.PTCH2SRV_P); this.groupBox9.Controls.Add(this.label56); - this.groupBox9.Location = new System.Drawing.Point(213, 15); + resources.ApplyResources(this.groupBox9, "groupBox9"); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Size = new System.Drawing.Size(195, 108); - this.groupBox9.TabIndex = 22; this.groupBox9.TabStop = false; - this.groupBox9.Text = "Servo Pitch Pid"; // // PTCH2SRV_IMAX // - this.PTCH2SRV_IMAX.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.PTCH2SRV_IMAX, "PTCH2SRV_IMAX"); this.PTCH2SRV_IMAX.Name = "PTCH2SRV_IMAX"; - this.PTCH2SRV_IMAX.Size = new System.Drawing.Size(78, 20); - this.PTCH2SRV_IMAX.TabIndex = 11; // // label53 // - this.label53.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label53.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label53, "label53"); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(54, 13); - this.label53.TabIndex = 12; - this.label53.Text = "INT_MAX"; // // PTCH2SRV_D // - this.PTCH2SRV_D.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.PTCH2SRV_D, "PTCH2SRV_D"); this.PTCH2SRV_D.Name = "PTCH2SRV_D"; - this.PTCH2SRV_D.Size = new System.Drawing.Size(78, 20); - this.PTCH2SRV_D.TabIndex = 9; // // label54 // - this.label54.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label54.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label54, "label54"); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(15, 13); - this.label54.TabIndex = 13; - this.label54.Text = "D"; // // PTCH2SRV_I // - this.PTCH2SRV_I.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.PTCH2SRV_I, "PTCH2SRV_I"); this.PTCH2SRV_I.Name = "PTCH2SRV_I"; - this.PTCH2SRV_I.Size = new System.Drawing.Size(78, 20); - this.PTCH2SRV_I.TabIndex = 7; // // label55 // - this.label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label55.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label55, "label55"); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(10, 13); - this.label55.TabIndex = 14; - this.label55.Text = "I"; // // PTCH2SRV_P // - this.PTCH2SRV_P.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.PTCH2SRV_P, "PTCH2SRV_P"); this.PTCH2SRV_P.Name = "PTCH2SRV_P"; - this.PTCH2SRV_P.Size = new System.Drawing.Size(78, 20); - this.PTCH2SRV_P.TabIndex = 5; // // label56 // - this.label56.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label56.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label56, "label56"); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(14, 13); - this.label56.TabIndex = 15; - this.label56.Text = "P"; // // groupBox8 // @@ -1017,80 +745,53 @@ this.groupBox8.Controls.Add(this.label51); this.groupBox8.Controls.Add(this.RLL2SRV_P); this.groupBox8.Controls.Add(this.label52); - this.groupBox8.Location = new System.Drawing.Point(12, 15); + resources.ApplyResources(this.groupBox8, "groupBox8"); this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(195, 108); - this.groupBox8.TabIndex = 23; this.groupBox8.TabStop = false; - this.groupBox8.Text = "Servo Roll Pid"; // // RLL2SRV_IMAX // - this.RLL2SRV_IMAX.Location = new System.Drawing.Point(111, 82); + resources.ApplyResources(this.RLL2SRV_IMAX, "RLL2SRV_IMAX"); this.RLL2SRV_IMAX.Name = "RLL2SRV_IMAX"; - this.RLL2SRV_IMAX.Size = new System.Drawing.Size(78, 20); - this.RLL2SRV_IMAX.TabIndex = 11; // // label49 // - this.label49.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label49.Location = new System.Drawing.Point(6, 86); + resources.ApplyResources(this.label49, "label49"); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(54, 13); - this.label49.TabIndex = 12; - this.label49.Text = "INT_MAX"; // // RLL2SRV_D // - this.RLL2SRV_D.Location = new System.Drawing.Point(111, 59); + resources.ApplyResources(this.RLL2SRV_D, "RLL2SRV_D"); this.RLL2SRV_D.Name = "RLL2SRV_D"; - this.RLL2SRV_D.Size = new System.Drawing.Size(78, 20); - this.RLL2SRV_D.TabIndex = 9; // // label50 // - this.label50.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label50.Location = new System.Drawing.Point(6, 63); + resources.ApplyResources(this.label50, "label50"); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(15, 13); - this.label50.TabIndex = 13; - this.label50.Text = "D"; // // RLL2SRV_I // - this.RLL2SRV_I.Location = new System.Drawing.Point(111, 36); + resources.ApplyResources(this.RLL2SRV_I, "RLL2SRV_I"); this.RLL2SRV_I.Name = "RLL2SRV_I"; - this.RLL2SRV_I.Size = new System.Drawing.Size(78, 20); - this.RLL2SRV_I.TabIndex = 7; // // label51 // - this.label51.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label51.Location = new System.Drawing.Point(6, 40); + resources.ApplyResources(this.label51, "label51"); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(10, 13); - this.label51.TabIndex = 14; - this.label51.Text = "I"; // // RLL2SRV_P // - this.RLL2SRV_P.Location = new System.Drawing.Point(111, 13); + resources.ApplyResources(this.RLL2SRV_P, "RLL2SRV_P"); this.RLL2SRV_P.Name = "RLL2SRV_P"; - this.RLL2SRV_P.Size = new System.Drawing.Size(78, 20); - this.RLL2SRV_P.TabIndex = 5; // // label52 // - this.label52.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label52.Location = new System.Drawing.Point(6, 17); + resources.ApplyResources(this.label52, "label52"); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(14, 13); - this.label52.TabIndex = 15; - this.label52.Text = "P"; // // ConfigArduplane // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox1); @@ -1105,7 +806,6 @@ this.Controls.Add(this.groupBox9); this.Controls.Add(this.groupBox8); this.Name = "ConfigArduplane"; - this.Size = new System.Drawing.Size(621, 456); this.Load += new System.EventHandler(this.ConfigArduplane_Load); this.groupBox3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.THR_FS_VALUE)).EndInit(); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx index 271670364a..e78598b5a3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.resx @@ -117,7 +117,2431 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 111, 82 + + + 78, 20 + + + + 11 + + + THR_FS_VALUE + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 0 + + + + NoControl + + + 6, 86 + + + 50, 13 + + + 12 + + + FS Value + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + THR_MAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 2 + + + NoControl + + + 6, 63 + + + 27, 13 + + + 13 + + + Max + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 3 + + + 111, 36 + + + 78, 20 + + + 7 + + + THR_MIN + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 4 + + + NoControl + + + 6, 40 + + + 24, 13 + + + 14 + + + Min + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 5 + + + 111, 13 + + + 78, 20 + + + 5 + + + TRIM_THROTTLE + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 6 + + + NoControl + + + 6, 17 + + + 36, 13 + + + 15 + + + Cruise + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 7 + + + 413, 231 + + + 195, 108 + + + 12 + + + Throttle 0-100% + + + groupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 111, 82 + + + 78, 20 + + + 0 + + + ARSPD_RATIO + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + NoControl + + + 6, 87 + + + 32, 13 + + + 1 + + + Ratio + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 111, 59 + + + 78, 20 + + + 2 + + + ARSPD_FBW_MAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + NoControl + + + 6, 59 + + + 53, 13 + + + 3 + + + FBW max + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + 111, 36 + + + 78, 20 + + + 4 + + + ARSPD_FBW_MIN + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + NoControl + + + 6, 40 + + + 50, 13 + + + 5 + + + FBW min + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + 111, 13 + + + 78, 20 + + + 5 + + + TRIM_ARSPD_CM + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + NoControl + + + 6, 17 + + + 64, 13 + + + 6 + + + Cruise + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 7 + + + 414, 339 + + + 195, 108 + + + 13 + + + Airspeed m/s + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + LIM_PITCH_MIN + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + NoControl + + + 6, 63 + + + 51, 13 + + + 10 + + + Pitch Min + + + label39 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + 111, 36 + + + 78, 20 + + + 7 + + + LIM_PITCH_MAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + NoControl + + + 6, 40 + + + 54, 13 + + + 11 + + + Pitch Max + + + label38 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + + 111, 13 + + + 78, 20 + + + 5 + + + LIM_ROLL_CD + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 4 + + + NoControl + + + 6, 17 + + + 55, 13 + + + 12 + + + Bank Max + + + label37 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 5 + + + 213, 339 + + + 195, 108 + + + 14 + + + Navigation Angles + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 111, 36 + + + 78, 20 + + + 7 + + + XTRK_ANGLE_CD + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox15 + + + 0 + + + NoControl + + + 6, 40 + + + 61, 13 + + + 8 + + + Entry Angle + + + label79 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox15 + + + 1 + + + 111, 13 + + + 78, 20 + + + 5 + + + XTRK_GAIN_SC + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox15 + + + 2 + + + NoControl + + + 6, 17 + + + 52, 13 + + + 9 + + + Gain (cm) + + + label80 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox15 + + + 3 + + + 12, 339 + + + 195, 108 + + + 15 + + + Xtrack Pids + + + groupBox15 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 111, 13 + + + 78, 20 + + + 13 + + + KFF_PTCH2THR + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox16 + + + 0 + + + NoControl + + + 6, 17 + + + 36, 13 + + + 14 + + + P to T + + + label83 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox16 + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + KFF_RDDRMIX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox16 + + + 2 + + + NoControl + + + 6, 63 + + + 61, 13 + + + 15 + + + Rudder Mix + + + label78 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox16 + + + 3 + + + 111, 36 + + + 78, 20 + + + 7 + + + KFF_PTCHCOMP + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox16 + + + 4 + + + NoControl + + + 6, 40 + + + 61, 13 + + + 16 + + + Pitch Comp + + + label81 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox16 + + + 5 + + + 213, 231 + + + 195, 108 + + + 16 + + + Other Mix's + + + groupBox16 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 111, 82 + + + 78, 20 + + + 11 + + + ENRGY2THR_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 0 + + + NoControl + + + 6, 86 + + + 54, 13 + + + 12 + + + INT_MAX + + + label73 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + ENRGY2THR_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 2 + + + NoControl + + + 6, 63 + + + 15, 13 + + + 13 + + + D + + + label74 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 3 + + + 111, 36 + + + 78, 20 + + + 7 + + + ENRGY2THR_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label75 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 5 + + + 111, 13 + + + 78, 20 + + + 5 + + + ENRGY2THR_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 6 + + + NoControl + + + 6, 17 + + + 14, 13 + + + 15 + + + P + + + label76 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox14 + + + 7 + + + 12, 231 + + + 195, 108 + + + 17 + + + Energy/Alt Pid + + + groupBox14 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 111, 82 + + + 78, 20 + + + 0 + + + ALT2PTCH_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 0 + + + NoControl + + + 6, 86 + + + 54, 13 + + + 1 + + + INT_MAX + + + label69 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 1 + + + 111, 59 + + + 78, 20 + + + 2 + + + ALT2PTCH_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 2 + + + NoControl + + + 6, 63 + + + 15, 13 + + + 3 + + + D + + + label70 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 3 + + + 111, 36 + + + 78, 20 + + + 4 + + + ALT2PTCH_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 5 + + + I + + + label71 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 5 + + + 111, 13 + + + 78, 20 + + + 6 + + + ALT2PTCH_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 6 + + + NoControl + + + 6, 17 + + + 14, 13 + + + 7 + + + P + + + label72 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox13 + + + 7 + + + 414, 123 + + + 195, 108 + + + 18 + + + Nav Pitch Alt Pid + + + groupBox13 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + 111, 82 + + + 78, 20 + + + 0 + + + ARSP2PTCH_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 0 + + + NoControl + + + 6, 86 + + + 54, 13 + + + 1 + + + INT_MAX + + + label65 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 1 + + + 111, 59 + + + 78, 20 + + + 2 + + + ARSP2PTCH_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 2 + + + NoControl + + + 6, 63 + + + 15, 13 + + + 3 + + + D + + + label66 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 3 + + + 111, 36 + + + 78, 20 + + + 4 + + + ARSP2PTCH_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 5 + + + I + + + label67 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 5 + + + 111, 13 + + + 78, 20 + + + 6 + + + ARSP2PTCH_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 6 + + + NoControl + + + 6, 17 + + + 14, 13 + + + 7 + + + P + + + label68 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox12 + + + 7 + + + 213, 123 + + + 195, 108 + + + 19 + + + Nav Pitch AS Pid + + + groupBox12 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + 111, 82 + + + 78, 20 + + + 11 + + + HDNG2RLL_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 0 + + + NoControl + + + 6, 86 + + + 54, 13 + + + 12 + + + INT_MAX + + + label61 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + HDNG2RLL_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 2 + + + NoControl + + + 6, 63 + + + 15, 13 + + + 13 + + + D + + + label62 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 3 + + + 111, 36 + + + 78, 20 + + + 7 + + + HDNG2RLL_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label63 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 5 + + + 111, 13 + + + 78, 20 + + + 5 + + + HDNG2RLL_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 6 + + + NoControl + + + 6, 17 + + + 14, 13 + + + 15 + + + P + + + label64 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox11 + + + 7 + + + 12, 123 + + + 195, 108 + + + 20 + + + Nav Roll Pid + + + groupBox11 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 111, 82 + + + 78, 20 + + + 11 + + + YW2SRV_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 0 + + + NoControl + + + 6, 86 + + + 54, 13 + + + 12 + + + INT_MAX + + + label57 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + YW2SRV_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 2 + + + NoControl + + + 6, 63 + + + 15, 13 + + + 13 + + + D + + + label58 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 3 + + + 111, 36 + + + 78, 20 + + + 7 + + + YW2SRV_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label59 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 5 + + + 111, 13 + + + 78, 20 + + + 5 + + + YW2SRV_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 6 + + + NoControl + + + 6, 17 + + + 14, 13 + + + 15 + + + P + + + label60 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox10 + + + 7 + + + 414, 15 + + + 195, 108 + + + 21 + + + Servo Yaw Pid + + + groupBox10 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 111, 82 + + + 78, 20 + + + 11 + + + PTCH2SRV_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 0 + + + NoControl + + + 6, 86 + + + 54, 13 + + + 12 + + + INT_MAX + + + label53 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + PTCH2SRV_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 2 + + + NoControl + + + 6, 63 + + + 15, 13 + + + 13 + + + D + + + label54 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 3 + + + 111, 36 + + + 78, 20 + + + 7 + + + PTCH2SRV_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label55 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 5 + + + 111, 13 + + + 78, 20 + + + 5 + + + PTCH2SRV_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 6 + + + NoControl + + + 6, 17 + + + 14, 13 + + + 15 + + + P + + + label56 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox9 + + + 7 + + + 213, 15 + + + 195, 108 + + + 22 + + + Servo Pitch Pid + + + groupBox9 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + 111, 82 + + + 78, 20 + + + 11 + + + RLL2SRV_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 0 + + + NoControl + + + 6, 86 + + + 54, 13 + + + 12 + + + INT_MAX + + + label49 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 1 + + + 111, 59 + + + 78, 20 + + + 9 + + + RLL2SRV_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 2 + + + NoControl + + + 6, 63 + + + 15, 13 + + + 13 + + + D + + + label50 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 3 + + + 111, 36 + + + 78, 20 + + + 7 + + + RLL2SRV_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 4 + + + NoControl + + + 6, 40 + + + 10, 13 + + + 14 + + + I + + + label51 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 5 + + + 111, 13 + + + 78, 20 + + + 5 + + + RLL2SRV_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 6 + + + NoControl + + + 6, 17 + + + 14, 13 + + + 15 + + + P + + + label52 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 7 + + + 12, 15 + + + 195, 108 + + + 23 + + + Servo Roll Pid + + + groupBox8 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + 17, 17 + + True + + + 6, 13 + + + 621, 456 + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigArduplane + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs index d72d2cfcd7..93895d3e93 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs @@ -1,32 +1,32 @@ -namespace ArdupilotMega.GCSViews.ConfigurationView -{ - partial class ConfigBatteryMonitoring - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +namespace ArdupilotMega.GCSViews.ConfigurationView +{ + partial class ConfigBatteryMonitoring + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigBatteryMonitoring)); this.groupBox4 = new System.Windows.Forms.GroupBox(); @@ -54,7 +54,6 @@ // // groupBox4 // - resources.ApplyResources(this.groupBox4, "groupBox4"); this.groupBox4.Controls.Add(this.label31); this.groupBox4.Controls.Add(this.label32); this.groupBox4.Controls.Add(this.label33); @@ -65,6 +64,7 @@ this.groupBox4.Controls.Add(this.TXT_voltage); this.groupBox4.Controls.Add(this.TXT_inputvoltage); this.groupBox4.Controls.Add(this.TXT_measuredvoltage); + resources.ApplyResources(this.groupBox4, "groupBox4"); this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; // @@ -130,13 +130,13 @@ // // CMB_batmonsensortype // - resources.ApplyResources(this.CMB_batmonsensortype, "CMB_batmonsensortype"); this.CMB_batmonsensortype.FormattingEnabled = true; this.CMB_batmonsensortype.Items.AddRange(new object[] { resources.GetString("CMB_batmonsensortype.Items"), resources.GetString("CMB_batmonsensortype.Items1"), resources.GetString("CMB_batmonsensortype.Items2"), resources.GetString("CMB_batmonsensortype.Items3")}); + resources.ApplyResources(this.CMB_batmonsensortype, "CMB_batmonsensortype"); this.CMB_batmonsensortype.Name = "CMB_batmonsensortype"; this.CMB_batmonsensortype.SelectedIndexChanged += new System.EventHandler(this.CMB_batmonsensortype_SelectedIndexChanged); // @@ -164,20 +164,20 @@ // // CMB_batmontype // - resources.ApplyResources(this.CMB_batmontype, "CMB_batmontype"); this.CMB_batmontype.FormattingEnabled = true; this.CMB_batmontype.Items.AddRange(new object[] { resources.GetString("CMB_batmontype.Items"), resources.GetString("CMB_batmontype.Items1"), resources.GetString("CMB_batmontype.Items2")}); + resources.ApplyResources(this.CMB_batmontype, "CMB_batmontype"); this.CMB_batmontype.Name = "CMB_batmontype"; this.CMB_batmontype.SelectedIndexChanged += new System.EventHandler(this.CMB_batmontype_SelectedIndexChanged); // // pictureBox5 // - resources.ApplyResources(this.pictureBox5, "pictureBox5"); this.pictureBox5.BackColor = System.Drawing.Color.White; this.pictureBox5.BackgroundImage = global::ArdupilotMega.Properties.Resources.attocurrent; + resources.ApplyResources(this.pictureBox5, "pictureBox5"); this.pictureBox5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox5.Name = "pictureBox5"; this.pictureBox5.TabStop = false; @@ -203,28 +203,28 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.Label label32; - private System.Windows.Forms.Label label33; - private System.Windows.Forms.TextBox TXT_ampspervolt; - private System.Windows.Forms.Label label34; - private System.Windows.Forms.TextBox TXT_divider; - private System.Windows.Forms.Label label35; - private System.Windows.Forms.TextBox TXT_voltage; - private System.Windows.Forms.TextBox TXT_inputvoltage; - private System.Windows.Forms.TextBox TXT_measuredvoltage; - private System.Windows.Forms.Label label47; - private System.Windows.Forms.ComboBox CMB_batmonsensortype; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.TextBox TXT_battcapacity; - private System.Windows.Forms.ComboBox CMB_batmontype; - private System.Windows.Forms.PictureBox pictureBox5; - } -} + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.Label label31; + private System.Windows.Forms.Label label32; + private System.Windows.Forms.Label label33; + private System.Windows.Forms.TextBox TXT_ampspervolt; + private System.Windows.Forms.Label label34; + private System.Windows.Forms.TextBox TXT_divider; + private System.Windows.Forms.Label label35; + private System.Windows.Forms.TextBox TXT_voltage; + private System.Windows.Forms.TextBox TXT_inputvoltage; + private System.Windows.Forms.TextBox TXT_measuredvoltage; + private System.Windows.Forms.Label label47; + private System.Windows.Forms.ComboBox CMB_batmonsensortype; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label29; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.TextBox TXT_battcapacity; + private System.Windows.Forms.ComboBox CMB_batmontype; + private System.Windows.Forms.PictureBox pictureBox5; + } +} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx index 624882adef..8e44b5f462 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx @@ -117,562 +117,562 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 48, 13 - - - 3 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True - + + NoControl + + + + 5, 16 + + 2, 0, 2, 0 - + + 110, 13 + + + 29 + + + 1. APM Input voltage: + + + label31 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 0 + + + True + + + NoControl + + + 5, 38 + + + 2, 0, 2, 0 + + + 142, 13 + 30 - - 42, 13 + + 2. Measured battery voltage: label32 - - groupBox4 - - - 33 - - - NoControl - - - NoControl - - - $this - - - TXT_inputvoltage - - - $this - - - 2, 2, 2, 2 - - - TXT_voltage - - - True - - - 238, 131 - - - 2: AttoPilot 90A - - - label33 - - - textBox3 - - - 349, 42 - - - 288, 45 - - - Voltage sensor calibration: -To calibrate your sensor, use a multimeter to measure the voltage coming out of your ESC's battery-elimination circuit (these are black and red wires in the three-wire cable that is powering your APM board). -Then subtract 0.3v from that value and enter it in field #1 at left. - - - - 42, 13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox4 - + + 1 + + + True + + + NoControl + + + 5, 60 + + + 2, 0, 2, 0 + + + 135, 13 + + + 31 + + + 3. Battery voltage (Calced): + + + label33 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox4 - - TXT_ampspervolt - - - 3: Battery Volts + + 2 149, 100 + + 2, 2, 2, 2 + + + 76, 20 + + + 38 + + + TXT_ampspervolt + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 3 + + + True + + + NoControl + + + 5, 81 + + + 2, 0, 2, 0 + + + 134, 13 + + + 32 + + + 4. Voltage divider (Calced): + + + label34 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 4 + + + 149, 78 + + + 2, 2, 2, 2 + + + 76, 20 + + + 37 + + + TXT_divider + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 5 + + + True + + + NoControl + + + 6, 103 + + + 2, 0, 2, 0 + + + 101, 13 + + + 33 + + + 5. Amperes per volt: + + + label35 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 6 + + + 149, 57 + + + 2, 2, 2, 2 + + + 76, 20 + + + 36 + + + TXT_voltage + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox4 + + + 7 + + + 149, 13 + + + 2, 2, 2, 2 + + + 76, 20 + + + 34 + + + TXT_inputvoltage + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 8 + + + 149, 35 + + + 2, 2, 2, 2 + + + 76, 20 + + + 35 + + + TXT_measuredvoltage + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 9 + + + 14, 172 + + + 238, 131 + + + 50 + Calibration + + groupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + NoControl + + + 106, 71 + + + 42, 13 + 49 Sensor - - 6, 13 - - - 2, 0, 2, 0 - - - 2. Measured battery voltage: - - - NoControl - - - 2, 0, 2, 0 - - - 2, 0, 2, 0 - - - groupBox4 - label47 - - NoControl - - - Zoom - - - 3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - 1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label34 + + $this - - 282, 172 + + 1 - - 14, 16 - - - 110, 13 - - - 38 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 42 - - - 5. Amperes per volt: - - - 76, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 134, 13 - - - 160, 41 - - - 6 - - - label29 - - - 2, 0, 2, 0 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 32 - - - ConfigBatteryMonitoring - - - 46 - - - 101, 13 + + 0: Other 1: AttoPilot 45A - - NoControl - - - groupBox4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2, 2, 2, 2 - - - 2 - - - 106, 45 - - - 2, 2, 2, 2 - - - groupBox4 - - - 135, 13 - - - 4: Volts & Current - - - 35 - - - 6, 103 - - - Monitor - - - 2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0: Disabled - - - 2, 2, 2, 2 + + 2: AttoPilot 90A 3: AttoPilot 180A - - TXT_divider + + 160, 68 - + + 121, 21 + + + 48 + + + CMB_batmonsensortype + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Microsoft Sans Serif, 8.25pt + + + 282, 172 + + + 2, 2, 2, 2 + + + True + + + 219, 131 + + + 47 + + + Voltage sensor calibration: +To calibrate your sensor, use a multimeter to measure the voltage coming out of your ESC's battery-elimination circuit (these are black and red wires in the three-wire cable that is powering your APM board). +Then subtract 0.3v from that value and enter it in field #1 at left. + + + + textBox3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + NoControl - - 0 + + 288, 45 - + + 48, 13 + + + 43 + + + Capacity + + + label29 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 4 + + NoControl + + + 106, 45 + + + 42, 13 + + + 44 + + + Monitor + + + label30 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 349, 42 + + + 83, 20 + + + 45 + + + TXT_battcapacity + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + 0: Disabled + + + 3: Battery Volts + + + 4: Volts & Current + + + 160, 41 + + + 121, 21 + + + 46 + + + CMB_batmontype + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + $this - - TXT_measuredvoltage + + 7 - - 149, 57 + + Zoom - - 149, 78 + + NoControl - + + 14, 16 + + + 75, 75 + + + 42 + + + pictureBox5 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this 8 - + True - - - 7 - - - Capacity - - - 121, 21 - - - 76, 20 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 8 - - - label30 - - - 36 - - - 29 - - - 106, 71 - - - 6 - - - 43 - - - 160, 68 - - - $this - - - 5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label35 + + + 6, 13 518, 322 - - 1 - - - 149, 13 - - - 4. Voltage divider (Calced): - - - 142, 13 - - - 5, 38 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TXT_battcapacity - - - 4 - - - groupBox4 - - - Microsoft Sans Serif, 8.25pt - - - CMB_batmontype - - - 34 - - - 0: Other - - - 37 + + ConfigBatteryMonitoring - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - - label31 - - - 3. Battery voltage (Calced): - - - 45 - - - True - - - 47 - - - 9 - - - 31 - - - 50 - - - True - - - 2, 2, 2, 2 - - - 2, 2, 2, 2 - - - 48 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5, 60 - - - 76, 20 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 83, 20 - - - groupBox4 - - - 149, 35 - - - NoControl - - - $this - - - 76, 20 - - - 5 - - - $this - - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 44 - - - True - - - pictureBox5 - - - True - - - 14, 172 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1. APM Input voltage: - - - groupBox4 - - - 0 - - - 75, 75 - - - 5, 81 - - - 76, 20 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CMB_batmonsensortype - - - 5, 16 - - - NoControl - - - 219, 131 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - 121, 21 - - - True - \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs index 47140bd749..ed3be8b223 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.Designer.cs @@ -1,32 +1,32 @@ -namespace ArdupilotMega.GCSViews.ConfigurationView -{ - partial class ConfigFlightModes - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +namespace ArdupilotMega.GCSViews.ConfigurationView +{ + partial class ConfigFlightModes + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigFlightModes)); @@ -157,11 +157,11 @@ // // CMB_fmode6 // - resources.ApplyResources(this.CMB_fmode6, "CMB_fmode6"); this.CMB_fmode6.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CMB_fmode6.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CMB_fmode6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_fmode6.FormattingEnabled = true; + resources.ApplyResources(this.CMB_fmode6, "CMB_fmode6"); this.CMB_fmode6.Name = "CMB_fmode6"; // // label5 @@ -171,11 +171,11 @@ // // CMB_fmode5 // - resources.ApplyResources(this.CMB_fmode5, "CMB_fmode5"); this.CMB_fmode5.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CMB_fmode5.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CMB_fmode5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_fmode5.FormattingEnabled = true; + resources.ApplyResources(this.CMB_fmode5, "CMB_fmode5"); this.CMB_fmode5.Name = "CMB_fmode5"; // // label4 @@ -185,11 +185,11 @@ // // CMB_fmode4 // - resources.ApplyResources(this.CMB_fmode4, "CMB_fmode4"); this.CMB_fmode4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CMB_fmode4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CMB_fmode4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_fmode4.FormattingEnabled = true; + resources.ApplyResources(this.CMB_fmode4, "CMB_fmode4"); this.CMB_fmode4.Name = "CMB_fmode4"; // // label3 @@ -199,11 +199,11 @@ // // CMB_fmode3 // - resources.ApplyResources(this.CMB_fmode3, "CMB_fmode3"); this.CMB_fmode3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CMB_fmode3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CMB_fmode3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_fmode3.FormattingEnabled = true; + resources.ApplyResources(this.CMB_fmode3, "CMB_fmode3"); this.CMB_fmode3.Name = "CMB_fmode3"; // // label2 @@ -213,11 +213,11 @@ // // CMB_fmode2 // - resources.ApplyResources(this.CMB_fmode2, "CMB_fmode2"); this.CMB_fmode2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CMB_fmode2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CMB_fmode2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_fmode2.FormattingEnabled = true; + resources.ApplyResources(this.CMB_fmode2, "CMB_fmode2"); this.CMB_fmode2.Name = "CMB_fmode2"; // // label1 @@ -227,11 +227,11 @@ // // CMB_fmode1 // - resources.ApplyResources(this.CMB_fmode1, "CMB_fmode1"); this.CMB_fmode1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CMB_fmode1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CMB_fmode1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_fmode1.FormattingEnabled = true; + resources.ApplyResources(this.CMB_fmode1, "CMB_fmode1"); this.CMB_fmode1.Name = "CMB_fmode1"; // // BUT_SaveModes @@ -280,39 +280,39 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private System.Windows.Forms.CheckBox CB_simple6; - private System.Windows.Forms.CheckBox CB_simple5; - private System.Windows.Forms.CheckBox CB_simple4; - private System.Windows.Forms.CheckBox CB_simple3; - private System.Windows.Forms.CheckBox CB_simple2; - private System.Windows.Forms.CheckBox CB_simple1; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label LBL_flightmodepwm; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label lbl_currentmode; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.ComboBox CMB_fmode6; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.ComboBox CMB_fmode5; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.ComboBox CMB_fmode4; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.ComboBox CMB_fmode3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.ComboBox CMB_fmode2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.ComboBox CMB_fmode1; - private MyButton BUT_SaveModes; - private System.Windows.Forms.BindingSource currentStateBindingSource; - } -} + } + + #endregion + + private System.Windows.Forms.CheckBox CB_simple6; + private System.Windows.Forms.CheckBox CB_simple5; + private System.Windows.Forms.CheckBox CB_simple4; + private System.Windows.Forms.CheckBox CB_simple3; + private System.Windows.Forms.CheckBox CB_simple2; + private System.Windows.Forms.CheckBox CB_simple1; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label LBL_flightmodepwm; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label lbl_currentmode; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.ComboBox CMB_fmode6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox CMB_fmode5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox CMB_fmode4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox CMB_fmode3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox CMB_fmode2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox CMB_fmode1; + private MyButton BUT_SaveModes; + private System.Windows.Forms.BindingSource currentStateBindingSource; + } +} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx index 4efeae4c12..7f2a0fb988 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.resx @@ -117,862 +117,862 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + + NoControl + - - 74, 13 + + 232, 200 - - 27 + + 2, 2, 2, 2 - - 71, 13 - - + 87, 17 - - label6 + + 148 - - CMB_fmode1 + + Simple Mode - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - True - - - 14 - - - True - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + CB_simple6 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl + + $this - - CMB_fmode4 - - - 139 + + 0 True - - $this - - - 129 - - - CB_simple4 - - - 21 - - - ConfigFlightModes - - - 5 - - - 94, 32 - - - 20, 120 - - - 132 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 358, 147 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + NoControl - - 10 + + 232, 173 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 135 - - - $this - - - label1 - - + 2, 2, 2, 2 - - Simple Mode - - - $this - - - 71, 13 - - - 9 - - - NoControl - - - 17 - - - NoControl - - - True + + 87, 17 147 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Simple Mode - - 7 + + CB_simple5 - - 8 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 97, 198 + + $this - + + 1 + + + True + + NoControl - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 232, 146 - - NoControl + + 2, 2, 2, 2 - - NoControl + + 87, 17 - - NoControl - - - 26 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label10 + + 146 Simple Mode + + CB_simple4 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + NoControl - - True + + 232, 119 - - lbl_currentmode + + 2, 2, 2, 2 - - Flight Mode 6 + + 87, 17 - - 76, 13 + + 145 - - 133 + + Simple Mode - - 20, 174 + + CB_simple3 - - NoControl + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 13 - - - Current Mode: - - + $this - - NoControl + + 3 - - NoControl + + True - + NoControl 232, 92 - - PWM 1621 - 1749 - - - label11 - - - Flight Mode 5 - - - 0 - - - True - - - True - - - 0 - - - 140 - - - Manual - - - 2 - - - 87, 17 - - - 127 - 2, 2, 2, 2 - - $this - - - $this - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CB_simple3 - - - 94, 13 - - - 126 - - - 232, 200 - - - 6 - - - 71, 13 - - - True - - - 148 - - - PWM 0 - 1230 - - - 87, 17 - - - PWM 1361 - 1490 - 87, 17 - - 25 - - - Flight Mode 2 - - - $this - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 125 - - - 121, 21 - - - 20, 147 - - - $this - - - 121, 21 - - - $this - - - 20, 66 - - - NoControl - - - NoControl - - - 136 - - - NoControl - - - 2, 2, 2, 2 - - - True - - - 19 - - - 130 - - - 232, 146 - - - 28 - - - 232, 65 - - - 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 24 - - - Simple Mode - - - LBL_flightmodepwm - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CMB_fmode5 - - - $this - - - $this - - - 358, 120 - - - 15 - - - label5 - - - $this - - - 97, 63 - - - $this - - - $this - - - label9 - - - True - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 138 - - - 143 - - - 97, 90 - - - $this - - - True - - - $this - - - 97, 144 - - - CMB_fmode2 - - - 2, 2, 2, 2 - - - 358, 201 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 358, 174 - - - 94, 13 - - - NoControl - - - label4 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - CB_simple2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PWM 1231 - 1360 - - - True - - - PWM 1491 - 1620 - - - label12 - - - 121 - - - 500, 270 - - - 174, 32 - - - 12 - - - 42, 13 - - - 123 - - - $this - - - 131 + + 144 Simple Mode - - CMB_fmode3 + + CB_simple2 - - 128 - - - 97, 117 - - - True - - - True - - - 1 - - - label7 - - - BUT_SaveModes - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 120 + + $this 4 - - PWM 1750 + + + True - + + NoControl + + + 232, 65 + + 2, 2, 2, 2 - - $this + + 87, 17 - - True + + 143 - - True + + Simple Mode - - $this + + CB_simple1 - - 141 - - - label13 - - - $this - - - 11 - - - $this - - - $this - - + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null + + $this - - 2, 2, 2, 2 + + 5 - - 137 - - - 94, 13 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - True + + 94, 32 - - 146 + + 74, 13 - - 358, 93 - - - label8 + + 142 Current PWM: - - Flight Mode 3 + + label14 - - CB_simple6 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 18 + + 6 - - 174, 15 + + True - - 232, 173 + + NoControl - - 121, 21 + + 174, 32 - - 71, 13 + + 13, 13 + + + 141 + + + 0 + + + LBL_flightmodepwm + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 True + + NoControl + + + 94, 15 + + + 74, 13 + + + 140 + + + Current Mode: + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + True + + + 17, 17 + + + NoControl + + + 174, 15 + + + 42, 13 + + + 139 + + + Manual + + + lbl_currentmode + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + $this + + + 9 + + + True + + NoControl 358, 66 - + + 76, 13 + + + 138 + + + PWM 0 - 1230 + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + True - - Flight Mode 1 + + NoControl - + + 358, 201 + + + 70, 13 + + + 137 + + + PWM 1750 + + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 122 + + 11 - - 134 + + True - - $this + + NoControl - - 145 + + 358, 174 - - 97, 225 + + 94, 13 - - CB_simple1 + + 136 - - 71, 13 + + PWM 1621 - 1749 - - 232, 119 + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this + + 12 + + + True + + + NoControl + + + 358, 147 + + + 94, 13 + + + 135 + + + PWM 1491 - 1620 + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + 13 - - 94, 13 - - - 97, 171 + + True NoControl - + + 358, 120 + + + 94, 13 + + + 134 + + + PWM 1361 - 1490 + + + label8 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - label2 + + 14 - + + True + + NoControl - - 87, 17 + + 358, 93 - - 20, 93 + + 94, 13 - - currentStateBindingSource + + 133 - - Save Modes + + PWM 1231 - 1360 - - CMB_fmode6 + + label7 - - 121, 21 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 70, 13 + + $this - - 144 + + 15 - - CB_simple5 + + True + + + NoControl + + + 20, 201 + + + 71, 13 + + + 131 + + + Flight Mode 6 + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this 16 - + + 97, 198 + + + 121, 21 + + + 130 + + + CMB_fmode6 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + True + + NoControl - - label14 + + 20, 174 - - 142 + + 71, 13 - - 74, 13 + + 129 - + + Flight Mode 5 + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + 97, 171 + + + 121, 21 + + + 128 + + + CMB_fmode5 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + True + + + NoControl + + + 20, 147 + + + 71, 13 + + + 127 + + + Flight Mode 4 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + 97, 144 + + + 121, 21 + + + 126 + + + CMB_fmode4 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + True + + + NoControl + + + 20, 120 + + + 71, 13 + + + 125 + + + Flight Mode 3 + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this 22 - - Simple Mode + + 97, 117 - + 121, 21 - - 94, 15 - - - NoControl - - - 13, 13 - - - 121, 21 - - - 3 - - - 71, 13 - 124 + + CMB_fmode3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 23 + + + True + + + NoControl + + + 20, 93 + + + 71, 13 + + + 123 + + + Flight Mode 2 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + 97, 90 + + + 121, 21 + + + 122 + + + CMB_fmode2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + True + + + NoControl + + + 20, 66 + + + 71, 13 + + + 121 + + + Flight Mode 1 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + 97, 63 + + + 121, 21 + + + 120 + + + CMB_fmode1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 27 + + + NoControl + + + 97, 225 + 121, 23 - + + 132 + + + Save Modes + + + BUT_SaveModes + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + $this - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 28 - - 20, 201 - - - 87, 17 - - - NoControl - - - Flight Mode 4 - - - Simple Mode - - - label3 - - - 17, 17 - True + + 6, 13 + + + 500, 270 + + + currentStateBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigFlightModes + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.Designer.cs index 78f87edff2..e5a2e07eae 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.Designer.cs @@ -1,32 +1,32 @@ -namespace ArdupilotMega.GCSViews.ConfigurationView -{ - partial class ConfigHardwareOptions - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +namespace ArdupilotMega.GCSViews.ConfigurationView +{ + partial class ConfigHardwareOptions + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigHardwareOptions)); this.BUT_MagCalibrationLive = new ArdupilotMega.MyButton(); @@ -44,6 +44,7 @@ this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.BUT_MagCalibrationLog = new ArdupilotMega.MyButton(); + this.CHK_autodec = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -64,12 +65,12 @@ // // CMB_sonartype // - resources.ApplyResources(this.CMB_sonartype, "CMB_sonartype"); this.CMB_sonartype.FormattingEnabled = true; this.CMB_sonartype.Items.AddRange(new object[] { resources.GetString("CMB_sonartype.Items"), resources.GetString("CMB_sonartype.Items1"), resources.GetString("CMB_sonartype.Items2")}); + resources.ApplyResources(this.CMB_sonartype, "CMB_sonartype"); this.CMB_sonartype.Name = "CMB_sonartype"; this.CMB_sonartype.SelectedIndexChanged += new System.EventHandler(this.CMB_sonartype_SelectedIndexChanged); // @@ -82,9 +83,9 @@ // // pictureBox2 // - resources.ApplyResources(this.pictureBox2, "pictureBox2"); this.pictureBox2.BackColor = System.Drawing.Color.White; this.pictureBox2.BackgroundImage = global::ArdupilotMega.Properties.Resources.opticalflow; + resources.ApplyResources(this.pictureBox2, "pictureBox2"); this.pictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.TabStop = false; @@ -130,26 +131,26 @@ // // pictureBox4 // - resources.ApplyResources(this.pictureBox4, "pictureBox4"); this.pictureBox4.BackColor = System.Drawing.Color.White; this.pictureBox4.BackgroundImage = global::ArdupilotMega.Properties.Resources.airspeed; + resources.ApplyResources(this.pictureBox4, "pictureBox4"); this.pictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox4.Name = "pictureBox4"; this.pictureBox4.TabStop = false; // // pictureBox3 // - resources.ApplyResources(this.pictureBox3, "pictureBox3"); this.pictureBox3.BackColor = System.Drawing.Color.White; this.pictureBox3.BackgroundImage = global::ArdupilotMega.Properties.Resources.sonar; + resources.ApplyResources(this.pictureBox3, "pictureBox3"); this.pictureBox3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.TabStop = false; // // pictureBox1 // - resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.BackgroundImage = global::ArdupilotMega.Properties.Resources.compass; + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.TabStop = false; @@ -161,10 +162,18 @@ this.BUT_MagCalibrationLog.UseVisualStyleBackColor = true; this.BUT_MagCalibrationLog.Click += new System.EventHandler(this.BUT_MagCalibrationLog_Click); // + // CHK_autodec + // + resources.ApplyResources(this.CHK_autodec, "CHK_autodec"); + this.CHK_autodec.Name = "CHK_autodec"; + this.CHK_autodec.UseVisualStyleBackColor = true; + this.CHK_autodec.CheckedChanged += new System.EventHandler(this.CHK_autodec_CheckedChanged); + // // ConfigHardwareOptions // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.CHK_autodec); this.Controls.Add(this.BUT_MagCalibrationLog); this.Controls.Add(this.BUT_MagCalibrationLive); this.Controls.Add(this.label27); @@ -189,24 +198,25 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private MyButton BUT_MagCalibrationLive; - private System.Windows.Forms.Label label27; - private System.Windows.Forms.ComboBox CMB_sonartype; - private System.Windows.Forms.CheckBox CHK_enableoptflow; - private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.LinkLabel linkLabelmagdec; - private System.Windows.Forms.Label label100; - private System.Windows.Forms.TextBox TXT_declination; - private System.Windows.Forms.CheckBox CHK_enableairspeed; - private System.Windows.Forms.CheckBox CHK_enablesonar; - private System.Windows.Forms.CheckBox CHK_enablecompass; - private System.Windows.Forms.PictureBox pictureBox4; - private System.Windows.Forms.PictureBox pictureBox3; - private System.Windows.Forms.PictureBox pictureBox1; - private MyButton BUT_MagCalibrationLog; - } -} + } + + #endregion + + private MyButton BUT_MagCalibrationLive; + private System.Windows.Forms.Label label27; + private System.Windows.Forms.ComboBox CMB_sonartype; + private System.Windows.Forms.CheckBox CHK_enableoptflow; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.LinkLabel linkLabelmagdec; + private System.Windows.Forms.Label label100; + private System.Windows.Forms.TextBox TXT_declination; + private System.Windows.Forms.CheckBox CHK_enableairspeed; + private System.Windows.Forms.CheckBox CHK_enablesonar; + private System.Windows.Forms.CheckBox CHK_enablecompass; + private System.Windows.Forms.PictureBox pictureBox4; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.PictureBox pictureBox1; + private MyButton BUT_MagCalibrationLog; + private System.Windows.Forms.CheckBox CHK_autodec; + } +} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.cs index fbae833da6..e804b80529 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.cs @@ -129,6 +129,17 @@ namespace ArdupilotMega.GCSViews.ConfigurationView private void CHK_enablecompass_CheckedChanged(object sender, EventArgs e) { + if (((CheckBox)sender).Checked == true) + { + CHK_autodec.Enabled = true; + TXT_declination.Enabled = true; + } + else + { + CHK_autodec.Enabled = false; + TXT_declination.Enabled = false; + } + if (startup) return; try @@ -250,6 +261,9 @@ namespace ArdupilotMega.GCSViews.ConfigurationView if (MainV2.comPort.param["FLOW_ENABLE"] != null) CHK_enableoptflow.Checked = MainV2.comPort.param["FLOW_ENABLE"].ToString() == "1" ? true : false; + if (MainV2.comPort.param["COMPASS_AUTODEC"] != null) + CHK_autodec.Checked = MainV2.comPort.param["COMPASS_AUTODEC"].ToString() == "1" ? true : false; + startup = false; } @@ -264,5 +278,32 @@ namespace ArdupilotMega.GCSViews.ConfigurationView MagCalib.ProcessLog(ans); } + + private void CHK_autodec_CheckedChanged(object sender, EventArgs e) + { + if (((CheckBox)sender).Checked == true) + { + TXT_declination.Enabled = false; + } + else + { + TXT_declination.Enabled = true; + } + + if (startup) + return; + try + { + if (MainV2.comPort.param["COMPASS_AUTODEC"] == null) + { + CustomMessageBox.Show("Not Available on " + MainV2.cs.firmware.ToString()); + } + else + { + MainV2.comPort.setParam("COMPASS_AUTODEC", ((CheckBox)sender).Checked == true ? 1 : 0); + } + } + catch { CustomMessageBox.Show("Set COMPASS_AUTODEC Failed"); } + } } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.resx index b0d7994e81..b15fe2836a 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.resx @@ -117,433 +117,466 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13 + + + NoControl - - 240, 45 + + 331, 13 - - 75, 75 + + 60, 23 + + + + 47 + + + Live Calibration BUT_MagCalibrationLive - + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.32704, Culture=neutral, PublicKeyToken=null + + + $this + + 2 - - - 38 + + NoControl - - 94, 124 + + 455, 45 + + + 145, 20 + + + 46 in Degrees eg 2° 3' W is -2.3 - - - NoControl - - - CHK_enablecompass - - - pictureBox4 - - - 121, 20 - - - LV-EZ0 - - - 13, 176 - - - CHK_enablesonar - - - 3 - - - 37 - - - pictureBox2 - - - 150, 20 - - - 318, 13 - - - 39 - - - 121, 21 - - - 13, 94 - - - NoControl - - - Zoom - - - Zoom - - - NoControl - - - 243, 122 - - - $this - - - pictureBox1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 60, 23 - - - XL-EZ0 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label27 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 10 + + $this - - NoControl + + 3 - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null + + XL-EZ0 - - 325, 68 - - - - - - NoControl - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - 1 + + LV-EZ0 XL-EZL0 + + 243, 122 + + + 121, 21 + + + 45 + + + CMB_sonartype + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + NoControl + + + 97, 285 + + + 134, 19 + + + 44 + + + Enable Optical Flow + + + CHK_enableoptflow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Zoom + + + NoControl + + + 13, 259 + + + 75, 75 + + + 43 + + + pictureBox2 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + NoControl + + + 338, 68 + 104, 13 42 - - $this - - - $this - - - 35 - - - $this - - - Zoom - - - 36 - - - $this - - - 6, 13 - - - TXT_declination - - - 13, 259 - - - 97, 202 - - - $this - - - 97, 285 - - - $this - - - 44 - - - Live Calibration - - - 40 - - - $this - - - Log Calibration - - - NoControl - - - $this - - - 47 - - - 5 - - - Enable Airspeed - - - $this - - - NoControl - - - NoControl - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 318, 45 - - - pictureBox3 - - - 379, 13 - - - Enable Sonar - Declination WebSite - - True - - - 46 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4 - - - 0 - - - NoControl - - - 602, 351 - - - CHK_enableoptflow - - - 105, 17 - - - 45 - - - 9 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - $this - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Enable Compass - - - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 60, 23 - - - Zoom - - - ConfigHardwareOptions - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 41 - - - CHK_enableairspeed - - - 103, 17 - - - 8 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 14 - - - Declination - - - 134, 19 - - - 43 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - $this - - - 13, 13 - - - NoControl - - - $this - - - 48 - - - 6 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 90, 17 - linkLabelmagdec - - BUT_MagCalibrationLog + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + NoControl + + + 240, 45 + + + 72, 16 + + + 38 + + + Declination label100 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + False + + + 331, 45 + + + 121, 20 + + + 37 + + + TXT_declination + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + NoControl + + + 97, 202 + + + 103, 17 + + + 39 + + + Enable Airspeed + + + CHK_enableairspeed + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + NoControl + + + 94, 124 + + + 90, 17 + + + 40 + + + Enable Sonar + + + CHK_enablesonar + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + NoControl 97, 44 - - Enable Optical Flow + + 105, 17 - - 445, 45 + + 41 + + + Enable Compass + + + CHK_enablecompass System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + + 12 + + + Zoom + + + NoControl + + + 13, 176 + 75, 75 - + + 36 + + + pictureBox4 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - label27 + + 13 - - CMB_sonartype + + Zoom - - 34 + + NoControl - - 72, 16 + + 13, 94 75, 75 + + 35 + + + pictureBox3 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + Zoom + - + + NoControl + + + + + + 13, 13 + + 75, 75 - - 11 + + 34 - + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + NoControl + + 392, 13 + + + 60, 23 + + + 48 + + + Log Calibration + + + BUT_MagCalibrationLog + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.32704, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + False + + + NoControl + + + 243, 25 + + + 82, 17 + + + 49 + + + Auto Dec + + + CHK_autodec + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True + + 6, 13 + + + 602, 351 + + + ConfigHardwareOptions + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.32704, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs index ec5a15499e..3b6108454f 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigPlanner)); this.label33 = new System.Windows.Forms.Label(); this.CMB_ratesensors = new System.Windows.Forms.ComboBox(); this.label26 = new System.Windows.Forms.Label(); @@ -78,94 +79,62 @@ // // label33 // - this.label33.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label33.Location = new System.Drawing.Point(517, 246); + resources.ApplyResources(this.label33, "label33"); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(43, 13); - this.label33.TabIndex = 87; - this.label33.Text = "Sensor"; // // CMB_ratesensors // this.CMB_ratesensors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_ratesensors.FormattingEnabled = true; this.CMB_ratesensors.Items.AddRange(new object[] { - "0", - "1", - "3", - "10", - "50"}); - this.CMB_ratesensors.Location = new System.Drawing.Point(564, 243); + 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.Size = new System.Drawing.Size(40, 21); - this.CMB_ratesensors.TabIndex = 88; // // label26 // - this.label26.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label26.Location = new System.Drawing.Point(15, 52); + resources.ApplyResources(this.label26, "label26"); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(100, 23); - this.label26.TabIndex = 86; - this.label26.Text = "Video Format"; // // CMB_videoresolutions // this.CMB_videoresolutions.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_videoresolutions.FormattingEnabled = true; - this.CMB_videoresolutions.Location = new System.Drawing.Point(124, 49); + resources.ApplyResources(this.CMB_videoresolutions, "CMB_videoresolutions"); this.CMB_videoresolutions.Name = "CMB_videoresolutions"; - this.CMB_videoresolutions.Size = new System.Drawing.Size(408, 21); - this.CMB_videoresolutions.TabIndex = 44; // // label12 // - this.label12.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label12.Location = new System.Drawing.Point(15, 342); + resources.ApplyResources(this.label12, "label12"); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(61, 13); - this.label12.TabIndex = 84; - this.label12.Text = "HUD"; // // CHK_GDIPlus // - this.CHK_GDIPlus.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_GDIPlus.Location = new System.Drawing.Point(124, 342); + resources.ApplyResources(this.CHK_GDIPlus, "CHK_GDIPlus"); this.CHK_GDIPlus.Name = "CHK_GDIPlus"; - this.CHK_GDIPlus.Size = new System.Drawing.Size(177, 17); - this.CHK_GDIPlus.TabIndex = 85; - this.CHK_GDIPlus.Text = "GDI+ (old type)"; this.CHK_GDIPlus.UseVisualStyleBackColor = true; this.CHK_GDIPlus.CheckedChanged += new System.EventHandler(this.CHK_GDIPlus_CheckedChanged); // // label24 // - this.label24.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label24.Location = new System.Drawing.Point(15, 320); + resources.ApplyResources(this.label24, "label24"); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(61, 13); - this.label24.TabIndex = 82; - this.label24.Text = "Waypoints"; // // CHK_loadwponconnect // - this.CHK_loadwponconnect.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_loadwponconnect.Location = new System.Drawing.Point(124, 319); + resources.ApplyResources(this.CHK_loadwponconnect, "CHK_loadwponconnect"); this.CHK_loadwponconnect.Name = "CHK_loadwponconnect"; - this.CHK_loadwponconnect.Size = new System.Drawing.Size(177, 17); - this.CHK_loadwponconnect.TabIndex = 83; - this.CHK_loadwponconnect.Text = "Load Waypoints on connect?"; this.CHK_loadwponconnect.UseVisualStyleBackColor = true; this.CHK_loadwponconnect.CheckedChanged += new System.EventHandler(this.CHK_loadwponconnect_CheckedChanged); // // label23 // - this.label23.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label23.Location = new System.Drawing.Point(15, 294); + resources.ApplyResources(this.label23, "label23"); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(103, 18); - this.label23.TabIndex = 81; - this.label23.Text = "Track Length"; // // NUM_tracklength // @@ -174,7 +143,7 @@ 0, 0, 0}); - this.NUM_tracklength.Location = new System.Drawing.Point(124, 293); + resources.ApplyResources(this.NUM_tracklength, "NUM_tracklength"); this.NUM_tracklength.Maximum = new decimal(new int[] { 2000, 0, @@ -186,8 +155,6 @@ 0, 0}); this.NUM_tracklength.Name = "NUM_tracklength"; - this.NUM_tracklength.Size = new System.Drawing.Size(67, 20); - this.NUM_tracklength.TabIndex = 80; this.NUM_tracklength.Value = new decimal(new int[] { 200, 0, @@ -197,122 +164,81 @@ // // CHK_speechaltwarning // - this.CHK_speechaltwarning.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_speechaltwarning.Location = new System.Drawing.Point(564, 109); + resources.ApplyResources(this.CHK_speechaltwarning, "CHK_speechaltwarning"); this.CHK_speechaltwarning.Name = "CHK_speechaltwarning"; - this.CHK_speechaltwarning.Size = new System.Drawing.Size(102, 17); - this.CHK_speechaltwarning.TabIndex = 79; - this.CHK_speechaltwarning.Text = "Alt Warning"; this.CHK_speechaltwarning.UseVisualStyleBackColor = true; this.CHK_speechaltwarning.CheckedChanged += new System.EventHandler(this.CHK_speechaltwarning_CheckedChanged); // // label108 // - this.label108.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label108.Location = new System.Drawing.Point(15, 271); + resources.ApplyResources(this.label108, "label108"); this.label108.Name = "label108"; - this.label108.Size = new System.Drawing.Size(61, 13); - this.label108.TabIndex = 45; - this.label108.Text = "APM Reset"; // // CHK_resetapmonconnect // this.CHK_resetapmonconnect.Checked = true; this.CHK_resetapmonconnect.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_resetapmonconnect.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_resetapmonconnect.Location = new System.Drawing.Point(124, 269); + resources.ApplyResources(this.CHK_resetapmonconnect, "CHK_resetapmonconnect"); this.CHK_resetapmonconnect.Name = "CHK_resetapmonconnect"; - this.CHK_resetapmonconnect.Size = new System.Drawing.Size(163, 17); - this.CHK_resetapmonconnect.TabIndex = 46; - this.CHK_resetapmonconnect.Text = "Reset APM on USB Connect"; this.CHK_resetapmonconnect.UseVisualStyleBackColor = true; this.CHK_resetapmonconnect.CheckedChanged += new System.EventHandler(this.CHK_resetapmonconnect_CheckedChanged); // // CHK_mavdebug // - this.CHK_mavdebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.CHK_mavdebug.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_mavdebug.Location = new System.Drawing.Point(15, 378); + resources.ApplyResources(this.CHK_mavdebug, "CHK_mavdebug"); this.CHK_mavdebug.Name = "CHK_mavdebug"; - this.CHK_mavdebug.Size = new System.Drawing.Size(144, 17); - this.CHK_mavdebug.TabIndex = 47; - this.CHK_mavdebug.Text = "Mavlink Message Debug"; this.CHK_mavdebug.UseVisualStyleBackColor = true; this.CHK_mavdebug.CheckedChanged += new System.EventHandler(this.CHK_mavdebug_CheckedChanged); // // label107 // - this.label107.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label107.Location = new System.Drawing.Point(439, 246); + resources.ApplyResources(this.label107, "label107"); this.label107.Name = "label107"; - this.label107.Size = new System.Drawing.Size(22, 13); - this.label107.TabIndex = 48; - this.label107.Text = "RC"; // // CMB_raterc // this.CMB_raterc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_raterc.FormattingEnabled = true; this.CMB_raterc.Items.AddRange(new object[] { - "0", - "1", - "3", - "10"}); - this.CMB_raterc.Location = new System.Drawing.Point(470, 242); + resources.GetString("CMB_raterc.Items"), + resources.GetString("CMB_raterc.Items1"), + resources.GetString("CMB_raterc.Items2"), + resources.GetString("CMB_raterc.Items3")}); + resources.ApplyResources(this.CMB_raterc, "CMB_raterc"); this.CMB_raterc.Name = "CMB_raterc"; - this.CMB_raterc.Size = new System.Drawing.Size(40, 21); - this.CMB_raterc.TabIndex = 49; this.CMB_raterc.SelectedIndexChanged += new System.EventHandler(this.CMB_raterc_SelectedIndexChanged); // // label104 // - this.label104.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label104.Location = new System.Drawing.Point(319, 246); + resources.ApplyResources(this.label104, "label104"); this.label104.Name = "label104"; - this.label104.Size = new System.Drawing.Size(69, 13); - this.label104.TabIndex = 50; - this.label104.Text = "Mode/Status"; // // label103 // - this.label103.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label103.Location = new System.Drawing.Point(219, 246); + resources.ApplyResources(this.label103, "label103"); this.label103.Name = "label103"; - this.label103.Size = new System.Drawing.Size(44, 13); - this.label103.TabIndex = 51; - this.label103.Text = "Position"; // // label102 // - this.label102.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label102.Location = new System.Drawing.Point(121, 246); + resources.ApplyResources(this.label102, "label102"); this.label102.Name = "label102"; - this.label102.Size = new System.Drawing.Size(43, 13); - this.label102.TabIndex = 52; - this.label102.Text = "Attitude"; // // label101 // - this.label101.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label101.Location = new System.Drawing.Point(12, 246); + resources.ApplyResources(this.label101, "label101"); this.label101.Name = "label101"; - this.label101.Size = new System.Drawing.Size(84, 13); - this.label101.TabIndex = 53; - this.label101.Text = "Telemetry Rates"; // // CMB_ratestatus // this.CMB_ratestatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_ratestatus.FormattingEnabled = true; this.CMB_ratestatus.Items.AddRange(new object[] { - "0", - "1", - "3", - "10"}); - this.CMB_ratestatus.Location = new System.Drawing.Point(393, 242); + resources.GetString("CMB_ratestatus.Items"), + resources.GetString("CMB_ratestatus.Items1"), + resources.GetString("CMB_ratestatus.Items2"), + resources.GetString("CMB_ratestatus.Items3")}); + resources.ApplyResources(this.CMB_ratestatus, "CMB_ratestatus"); this.CMB_ratestatus.Name = "CMB_ratestatus"; - this.CMB_ratestatus.Size = new System.Drawing.Size(40, 21); - this.CMB_ratestatus.TabIndex = 54; this.CMB_ratestatus.SelectedIndexChanged += new System.EventHandler(this.CMB_ratestatus_SelectedIndexChanged); // // CMB_rateposition @@ -320,14 +246,12 @@ this.CMB_rateposition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_rateposition.FormattingEnabled = true; this.CMB_rateposition.Items.AddRange(new object[] { - "0", - "1", - "3", - "10"}); - this.CMB_rateposition.Location = new System.Drawing.Point(273, 242); + resources.GetString("CMB_rateposition.Items"), + resources.GetString("CMB_rateposition.Items1"), + resources.GetString("CMB_rateposition.Items2"), + resources.GetString("CMB_rateposition.Items3")}); + resources.ApplyResources(this.CMB_rateposition, "CMB_rateposition"); this.CMB_rateposition.Name = "CMB_rateposition"; - this.CMB_rateposition.Size = new System.Drawing.Size(40, 21); - this.CMB_rateposition.TabIndex = 55; this.CMB_rateposition.SelectedIndexChanged += new System.EventHandler(this.CMB_rateposition_SelectedIndexChanged); // // CMB_rateattitude @@ -335,173 +259,114 @@ this.CMB_rateattitude.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_rateattitude.FormattingEnabled = true; this.CMB_rateattitude.Items.AddRange(new object[] { - "0", - "1", - "3", - "10"}); - this.CMB_rateattitude.Location = new System.Drawing.Point(173, 242); + resources.GetString("CMB_rateattitude.Items"), + resources.GetString("CMB_rateattitude.Items1"), + resources.GetString("CMB_rateattitude.Items2"), + resources.GetString("CMB_rateattitude.Items3")}); + resources.ApplyResources(this.CMB_rateattitude, "CMB_rateattitude"); this.CMB_rateattitude.Name = "CMB_rateattitude"; - this.CMB_rateattitude.Size = new System.Drawing.Size(40, 21); - this.CMB_rateattitude.TabIndex = 56; this.CMB_rateattitude.SelectedIndexChanged += new System.EventHandler(this.CMB_rateattitude_SelectedIndexChanged); // // label99 // - this.label99.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label99.Location = new System.Drawing.Point(268, 211); + resources.ApplyResources(this.label99, "label99"); this.label99.Name = "label99"; - this.label99.Size = new System.Drawing.Size(402, 13); - this.label99.TabIndex = 57; - this.label99.Text = "NOTE: The Configuration Tab will NOT display these units, as those are raw values" + - ".\r\n"; // // label98 // - this.label98.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label98.Location = new System.Drawing.Point(15, 219); + resources.ApplyResources(this.label98, "label98"); this.label98.Name = "label98"; - this.label98.Size = new System.Drawing.Size(65, 13); - this.label98.TabIndex = 58; - this.label98.Text = "Speed Units"; // // label97 // - this.label97.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label97.Location = new System.Drawing.Point(15, 191); + resources.ApplyResources(this.label97, "label97"); this.label97.Name = "label97"; - this.label97.Size = new System.Drawing.Size(52, 13); - this.label97.TabIndex = 59; - this.label97.Text = "Dist Units"; // // CMB_speedunits // this.CMB_speedunits.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_speedunits.FormattingEnabled = true; - this.CMB_speedunits.Location = new System.Drawing.Point(124, 216); + resources.ApplyResources(this.CMB_speedunits, "CMB_speedunits"); this.CMB_speedunits.Name = "CMB_speedunits"; - this.CMB_speedunits.Size = new System.Drawing.Size(138, 21); - this.CMB_speedunits.TabIndex = 60; this.CMB_speedunits.SelectedIndexChanged += new System.EventHandler(this.CMB_speedunits_SelectedIndexChanged); // // CMB_distunits // this.CMB_distunits.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_distunits.FormattingEnabled = true; - this.CMB_distunits.Location = new System.Drawing.Point(124, 189); + resources.ApplyResources(this.CMB_distunits, "CMB_distunits"); this.CMB_distunits.Name = "CMB_distunits"; - this.CMB_distunits.Size = new System.Drawing.Size(138, 21); - this.CMB_distunits.TabIndex = 61; this.CMB_distunits.SelectedIndexChanged += new System.EventHandler(this.CMB_distunits_SelectedIndexChanged); // // label96 // - this.label96.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label96.Location = new System.Drawing.Point(15, 164); + resources.ApplyResources(this.label96, "label96"); this.label96.Name = "label96"; - this.label96.Size = new System.Drawing.Size(45, 13); - this.label96.TabIndex = 62; - this.label96.Text = "Joystick"; // // label95 // - this.label95.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label95.Location = new System.Drawing.Point(15, 113); + resources.ApplyResources(this.label95, "label95"); this.label95.Name = "label95"; - this.label95.Size = new System.Drawing.Size(44, 13); - this.label95.TabIndex = 63; - this.label95.Text = "Speech"; // // CHK_speechbattery // - this.CHK_speechbattery.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_speechbattery.Location = new System.Drawing.Point(456, 109); + resources.ApplyResources(this.CHK_speechbattery, "CHK_speechbattery"); this.CHK_speechbattery.Name = "CHK_speechbattery"; - this.CHK_speechbattery.Size = new System.Drawing.Size(102, 17); - this.CHK_speechbattery.TabIndex = 64; - this.CHK_speechbattery.Text = "Battery Warning"; this.CHK_speechbattery.UseVisualStyleBackColor = true; this.CHK_speechbattery.CheckedChanged += new System.EventHandler(this.CHK_speechbattery_CheckedChanged); // // CHK_speechcustom // - this.CHK_speechcustom.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_speechcustom.Location = new System.Drawing.Point(363, 109); + resources.ApplyResources(this.CHK_speechcustom, "CHK_speechcustom"); this.CHK_speechcustom.Name = "CHK_speechcustom"; - this.CHK_speechcustom.Size = new System.Drawing.Size(87, 17); - this.CHK_speechcustom.TabIndex = 65; - this.CHK_speechcustom.Text = "Time Interval"; this.CHK_speechcustom.UseVisualStyleBackColor = true; this.CHK_speechcustom.CheckedChanged += new System.EventHandler(this.CHK_speechcustom_CheckedChanged); // // CHK_speechmode // - this.CHK_speechmode.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_speechmode.Location = new System.Drawing.Point(307, 109); + resources.ApplyResources(this.CHK_speechmode, "CHK_speechmode"); this.CHK_speechmode.Name = "CHK_speechmode"; - this.CHK_speechmode.Size = new System.Drawing.Size(56, 17); - this.CHK_speechmode.TabIndex = 66; - this.CHK_speechmode.Text = "Mode "; this.CHK_speechmode.UseVisualStyleBackColor = true; this.CHK_speechmode.CheckedChanged += new System.EventHandler(this.CHK_speechmode_CheckedChanged); // // CHK_speechwaypoint // - this.CHK_speechwaypoint.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_speechwaypoint.Location = new System.Drawing.Point(230, 109); + resources.ApplyResources(this.CHK_speechwaypoint, "CHK_speechwaypoint"); this.CHK_speechwaypoint.Name = "CHK_speechwaypoint"; - this.CHK_speechwaypoint.Size = new System.Drawing.Size(71, 17); - this.CHK_speechwaypoint.TabIndex = 67; - this.CHK_speechwaypoint.Text = "Waypoint"; this.CHK_speechwaypoint.UseVisualStyleBackColor = true; this.CHK_speechwaypoint.CheckedChanged += new System.EventHandler(this.CHK_speechwaypoint_CheckedChanged); // // label94 // - this.label94.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label94.Location = new System.Drawing.Point(15, 85); + resources.ApplyResources(this.label94, "label94"); this.label94.Name = "label94"; - this.label94.Size = new System.Drawing.Size(57, 13); - this.label94.TabIndex = 68; - this.label94.Text = "OSD Color"; // // CMB_osdcolor // this.CMB_osdcolor.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.CMB_osdcolor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_osdcolor.FormattingEnabled = true; - this.CMB_osdcolor.Location = new System.Drawing.Point(124, 82); + resources.ApplyResources(this.CMB_osdcolor, "CMB_osdcolor"); this.CMB_osdcolor.Name = "CMB_osdcolor"; - this.CMB_osdcolor.Size = new System.Drawing.Size(138, 21); - this.CMB_osdcolor.TabIndex = 69; this.CMB_osdcolor.SelectedIndexChanged += new System.EventHandler(this.CMB_osdcolor_SelectedIndexChanged); // // CMB_language // this.CMB_language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_language.FormattingEnabled = true; - this.CMB_language.Location = new System.Drawing.Point(124, 133); + resources.ApplyResources(this.CMB_language, "CMB_language"); this.CMB_language.Name = "CMB_language"; - this.CMB_language.Size = new System.Drawing.Size(138, 21); - this.CMB_language.TabIndex = 70; this.CMB_language.SelectedIndexChanged += new System.EventHandler(this.CMB_language_SelectedIndexChanged); // // label93 // - this.label93.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label93.Location = new System.Drawing.Point(15, 137); + resources.ApplyResources(this.label93, "label93"); this.label93.Name = "label93"; - this.label93.Size = new System.Drawing.Size(69, 13); - this.label93.TabIndex = 71; - this.label93.Text = "UI Language"; // // CHK_enablespeech // - this.CHK_enablespeech.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_enablespeech.Location = new System.Drawing.Point(124, 109); + resources.ApplyResources(this.CHK_enablespeech, "CHK_enablespeech"); this.CHK_enablespeech.Name = "CHK_enablespeech"; - this.CHK_enablespeech.Size = new System.Drawing.Size(99, 17); - this.CHK_enablespeech.TabIndex = 72; - this.CHK_enablespeech.Text = "Enable Speech"; this.CHK_enablespeech.UseVisualStyleBackColor = true; this.CHK_enablespeech.CheckedChanged += new System.EventHandler(this.CHK_enablespeech_CheckedChanged); // @@ -509,70 +374,48 @@ // this.CHK_hudshow.Checked = true; this.CHK_hudshow.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_hudshow.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CHK_hudshow.Location = new System.Drawing.Point(537, 17); + resources.ApplyResources(this.CHK_hudshow, "CHK_hudshow"); this.CHK_hudshow.Name = "CHK_hudshow"; - this.CHK_hudshow.Size = new System.Drawing.Size(125, 17); - this.CHK_hudshow.TabIndex = 73; - this.CHK_hudshow.Text = "Enable HUD Overlay"; this.CHK_hudshow.UseVisualStyleBackColor = true; this.CHK_hudshow.Click += new System.EventHandler(this.CHK_hudshow_CheckedChanged); // // label92 // - this.label92.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label92.Location = new System.Drawing.Point(15, 18); + resources.ApplyResources(this.label92, "label92"); this.label92.Name = "label92"; - this.label92.Size = new System.Drawing.Size(100, 23); - this.label92.TabIndex = 74; - this.label92.Text = "Video Device"; // // CMB_videosources // this.CMB_videosources.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CMB_videosources.FormattingEnabled = true; - this.CMB_videosources.Location = new System.Drawing.Point(124, 15); + resources.ApplyResources(this.CMB_videosources, "CMB_videosources"); this.CMB_videosources.Name = "CMB_videosources"; - this.CMB_videosources.Size = new System.Drawing.Size(245, 21); - this.CMB_videosources.TabIndex = 75; this.CMB_videosources.SelectedIndexChanged += new System.EventHandler(this.CMB_videosources_SelectedIndexChanged); // // BUT_Joystick // - this.BUT_Joystick.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_Joystick.Location = new System.Drawing.Point(124, 160); + resources.ApplyResources(this.BUT_Joystick, "BUT_Joystick"); this.BUT_Joystick.Name = "BUT_Joystick"; - this.BUT_Joystick.Size = new System.Drawing.Size(99, 23); - this.BUT_Joystick.TabIndex = 76; - this.BUT_Joystick.Text = "Joystick Setup"; this.BUT_Joystick.UseVisualStyleBackColor = true; this.BUT_Joystick.Click += new System.EventHandler(this.BUT_Joystick_Click); // // BUT_videostop // - this.BUT_videostop.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_videostop.Location = new System.Drawing.Point(456, 13); + resources.ApplyResources(this.BUT_videostop, "BUT_videostop"); this.BUT_videostop.Name = "BUT_videostop"; - this.BUT_videostop.Size = new System.Drawing.Size(75, 23); - this.BUT_videostop.TabIndex = 77; - this.BUT_videostop.Text = "Stop"; this.BUT_videostop.UseVisualStyleBackColor = true; this.BUT_videostop.Click += new System.EventHandler(this.BUT_videostop_Click); // // BUT_videostart // - this.BUT_videostart.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_videostart.Location = new System.Drawing.Point(375, 13); + resources.ApplyResources(this.BUT_videostart, "BUT_videostart"); this.BUT_videostart.Name = "BUT_videostart"; - this.BUT_videostart.Size = new System.Drawing.Size(75, 23); - this.BUT_videostart.TabIndex = 78; - this.BUT_videostart.Text = "Start"; this.BUT_videostart.UseVisualStyleBackColor = true; this.BUT_videostart.Click += new System.EventHandler(this.BUT_videostart_Click); // // ConfigPlanner // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.label33); this.Controls.Add(this.CMB_ratesensors); @@ -620,7 +463,6 @@ this.Controls.Add(this.BUT_videostop); this.Controls.Add(this.BUT_videostart); this.Name = "ConfigPlanner"; - this.Size = new System.Drawing.Size(682, 398); ((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).EndInit(); this.ResumeLayout(false); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx index 7080a7d118..6e75804078 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx @@ -117,4 +117,1232 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + + 517, 246 + + + 43, 13 + + + + 87 + + + Sensor + + + label33 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 0 + + + 1 + + + 3 + + + 10 + + + 50 + + + 564, 243 + + + 40, 21 + + + 88 + + + CMB_ratesensors + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 15, 52 + + + 100, 23 + + + 86 + + + Video Format + + + label26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 124, 49 + + + 408, 21 + + + 44 + + + CMB_videoresolutions + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + NoControl + + + 15, 342 + + + 61, 13 + + + 84 + + + HUD + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + NoControl + + + 124, 342 + + + 177, 17 + + + 85 + + + GDI+ (old type) + + + CHK_GDIPlus + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + NoControl + + + 15, 320 + + + 61, 13 + + + 82 + + + Waypoints + + + label24 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + NoControl + + + 124, 319 + + + 177, 17 + + + 83 + + + Load Waypoints on connect? + + + CHK_loadwponconnect + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + NoControl + + + 15, 294 + + + 103, 18 + + + 81 + + + Track Length + + + label23 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 124, 293 + + + 67, 20 + + + 80 + + + NUM_tracklength + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + NoControl + + + 564, 109 + + + 102, 17 + + + 79 + + + Alt Warning + + + CHK_speechaltwarning + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + NoControl + + + 15, 271 + + + 61, 13 + + + 45 + + + APM Reset + + + label108 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + NoControl + + + 124, 269 + + + 163, 17 + + + 46 + + + Reset APM on USB Connect + + + CHK_resetapmonconnect + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + Bottom, Left + + + NoControl + + + 15, 378 + + + 144, 17 + + + 47 + + + Mavlink Message Debug + + + CHK_mavdebug + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + NoControl + + + 439, 246 + + + 22, 13 + + + 48 + + + RC + + + label107 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + 0 + + + 1 + + + 3 + + + 10 + + + 470, 242 + + + 40, 21 + + + 49 + + + CMB_raterc + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + NoControl + + + 319, 246 + + + 69, 13 + + + 50 + + + Mode/Status + + + label104 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + NoControl + + + 219, 246 + + + 44, 13 + + + 51 + + + Position + + + label103 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + NoControl + + + 121, 246 + + + 43, 13 + + + 52 + + + Attitude + + + label102 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + NoControl + + + 12, 246 + + + 84, 13 + + + 53 + + + Telemetry Rates + + + label101 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + 0 + + + 1 + + + 3 + + + 10 + + + 393, 242 + + + 40, 21 + + + 54 + + + CMB_ratestatus + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + 0 + + + 1 + + + 3 + + + 10 + + + 273, 242 + + + 40, 21 + + + 55 + + + CMB_rateposition + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + 0 + + + 1 + + + 3 + + + 10 + + + 173, 242 + + + 40, 21 + + + 56 + + + CMB_rateattitude + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 22 + + + NoControl + + + 268, 211 + + + 402, 13 + + + 57 + + + 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 + + + $this + + + 23 + + + NoControl + + + 15, 219 + + + 65, 13 + + + 58 + + + Speed Units + + + label98 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + NoControl + + + 15, 191 + + + 52, 13 + + + 59 + + + Dist Units + + + label97 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + 124, 216 + + + 138, 21 + + + 60 + + + CMB_speedunits + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + 124, 189 + + + 138, 21 + + + 61 + + + CMB_distunits + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 27 + + + NoControl + + + 15, 164 + + + 45, 13 + + + 62 + + + Joystick + + + label96 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 28 + + + NoControl + + + 15, 113 + + + 44, 13 + + + 63 + + + Speech + + + label95 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 29 + + + NoControl + + + 456, 109 + + + 102, 17 + + + 64 + + + Battery Warning + + + CHK_speechbattery + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 30 + + + NoControl + + + 363, 109 + + + 87, 17 + + + 65 + + + Time Interval + + + CHK_speechcustom + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 31 + + + NoControl + + + 307, 109 + + + 56, 17 + + + 66 + + + Mode + + + CHK_speechmode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 32 + + + NoControl + + + 230, 109 + + + 71, 17 + + + 67 + + + Waypoint + + + CHK_speechwaypoint + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 33 + + + NoControl + + + 15, 85 + + + 57, 13 + + + 68 + + + OSD Color + + + label94 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 34 + + + 124, 82 + + + 138, 21 + + + 69 + + + CMB_osdcolor + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 35 + + + 124, 133 + + + 138, 21 + + + 70 + + + CMB_language + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 36 + + + NoControl + + + 15, 137 + + + 69, 13 + + + 71 + + + UI Language + + + label93 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 37 + + + NoControl + + + 124, 109 + + + 99, 17 + + + 72 + + + Enable Speech + + + CHK_enablespeech + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 38 + + + NoControl + + + 537, 17 + + + 125, 17 + + + 73 + + + Enable HUD Overlay + + + CHK_hudshow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 39 + + + NoControl + + + 15, 18 + + + 100, 23 + + + 74 + + + Video Device + + + label92 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 40 + + + 124, 15 + + + 245, 21 + + + 75 + + + CMB_videosources + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 41 + + + NoControl + + + 124, 160 + + + 99, 23 + + + 76 + + + Joystick Setup + + + BUT_Joystick + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 42 + + + NoControl + + + 456, 13 + + + 75, 23 + + + 77 + + + Stop + + + BUT_videostop + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 43 + + + NoControl + + + 375, 13 + + + 75, 23 + + + 78 + + + Start + + + BUT_videostart + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 44 + + + True + + + 6, 13 + + + 682, 398 + + + ConfigPlanner + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs index 8ef9695b92..389ce857b8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigRawParams)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.BUT_compare = new ArdupilotMega.MyButton(); @@ -48,63 +49,36 @@ // // BUT_compare // - this.BUT_compare.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BUT_compare.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_compare.Location = new System.Drawing.Point(341, 119); + resources.ApplyResources(this.BUT_compare, "BUT_compare"); this.BUT_compare.Name = "BUT_compare"; - this.BUT_compare.Size = new System.Drawing.Size(103, 19); - this.BUT_compare.TabIndex = 72; - this.BUT_compare.Text = "Compare Params"; this.BUT_compare.UseVisualStyleBackColor = true; this.BUT_compare.Click += new System.EventHandler(this.BUT_compare_Click); // // BUT_rerequestparams // - this.BUT_rerequestparams.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BUT_rerequestparams.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_rerequestparams.Location = new System.Drawing.Point(341, 94); + resources.ApplyResources(this.BUT_rerequestparams, "BUT_rerequestparams"); this.BUT_rerequestparams.Name = "BUT_rerequestparams"; - this.BUT_rerequestparams.Size = new System.Drawing.Size(103, 19); - this.BUT_rerequestparams.TabIndex = 67; - this.BUT_rerequestparams.Text = "Refresh Params"; this.BUT_rerequestparams.UseVisualStyleBackColor = true; this.BUT_rerequestparams.Click += new System.EventHandler(this.BUT_rerequestparams_Click); // // BUT_writePIDS // - this.BUT_writePIDS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BUT_writePIDS.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_writePIDS.Location = new System.Drawing.Point(341, 69); + resources.ApplyResources(this.BUT_writePIDS, "BUT_writePIDS"); this.BUT_writePIDS.Name = "BUT_writePIDS"; - this.BUT_writePIDS.Size = new System.Drawing.Size(103, 19); - this.BUT_writePIDS.TabIndex = 69; - this.BUT_writePIDS.Text = "Write Params"; this.BUT_writePIDS.UseVisualStyleBackColor = true; this.BUT_writePIDS.Click += new System.EventHandler(this.BUT_writePIDS_Click); // // BUT_save // - this.BUT_save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BUT_save.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_save.Location = new System.Drawing.Point(341, 35); - this.BUT_save.Margin = new System.Windows.Forms.Padding(0); + resources.ApplyResources(this.BUT_save, "BUT_save"); this.BUT_save.Name = "BUT_save"; - this.BUT_save.Size = new System.Drawing.Size(104, 19); - this.BUT_save.TabIndex = 70; - this.BUT_save.Text = "Save"; this.BUT_save.UseVisualStyleBackColor = true; this.BUT_save.Click += new System.EventHandler(this.BUT_save_Click); // // BUT_load // - this.BUT_load.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.BUT_load.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.BUT_load.Location = new System.Drawing.Point(341, 7); - this.BUT_load.Margin = new System.Windows.Forms.Padding(0); + resources.ApplyResources(this.BUT_load, "BUT_load"); this.BUT_load.Name = "BUT_load"; - this.BUT_load.Size = new System.Drawing.Size(104, 19); - this.BUT_load.TabIndex = 71; - this.BUT_load.Text = "Load"; this.BUT_load.UseVisualStyleBackColor = true; this.BUT_load.Click += new System.EventHandler(this.BUT_load_Click); // @@ -112,9 +86,7 @@ // this.Params.AllowUserToAddRows = false; this.Params.AllowUserToDeleteRows = false; - this.Params.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.Params, "Params"); dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.BackColor = System.Drawing.Color.Maroon; dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -130,7 +102,6 @@ this.Default, this.mavScale, this.RawValue}); - this.Params.Location = new System.Drawing.Point(14, 3); this.Params.Name = "Params"; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.ActiveCaption; @@ -141,45 +112,37 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.Params.RowHeadersDefaultCellStyle = dataGridViewCellStyle2; this.Params.RowHeadersVisible = false; - this.Params.RowHeadersWidth = 150; - this.Params.Size = new System.Drawing.Size(321, 302); - this.Params.TabIndex = 68; this.Params.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Params_CellValueChanged); // // Command // - this.Command.HeaderText = "Command"; + resources.ApplyResources(this.Command, "Command"); this.Command.Name = "Command"; this.Command.ReadOnly = true; - this.Command.Width = 150; // // Value // - this.Value.HeaderText = "Value"; + resources.ApplyResources(this.Value, "Value"); this.Value.Name = "Value"; - this.Value.Width = 80; // // Default // - this.Default.HeaderText = "Default"; + resources.ApplyResources(this.Default, "Default"); this.Default.Name = "Default"; - this.Default.Visible = false; // // mavScale // - this.mavScale.HeaderText = "mavScale"; + resources.ApplyResources(this.mavScale, "mavScale"); this.mavScale.Name = "mavScale"; - this.mavScale.Visible = false; // // RawValue // - this.RawValue.HeaderText = "RawValue"; + resources.ApplyResources(this.RawValue, "RawValue"); this.RawValue.Name = "RawValue"; - this.RawValue.Visible = false; // // ConfigRawParams // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.BUT_compare); this.Controls.Add(this.BUT_rerequestparams); @@ -188,7 +151,6 @@ this.Controls.Add(this.BUT_load); this.Controls.Add(this.Params); this.Name = "ConfigRawParams"; - this.Size = new System.Drawing.Size(460, 305); this.Load += new System.EventHandler(this.ConfigRawParams_Load); ((System.ComponentModel.ISupportInitialize)(this.Params)).EndInit(); this.ResumeLayout(false); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.resx index a5480f3926..3a3f70f565 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.resx @@ -117,19 +117,286 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Right + + + NoControl + + + + 341, 119 + + + 103, 19 + + + + 72 + + + Compare Params + + + BUT_compare + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + + + Top, Right + + + NoControl + + + 341, 94 + + + 103, 19 + + + 67 + + + Refresh Params + + + BUT_rerequestparams + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + Top, Right + + + NoControl + + + 341, 69 + + + 103, 19 + + + 69 + + + Write Params + + + BUT_writePIDS + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + Top, Right + + + NoControl + + + 341, 35 + + + 0, 0, 0, 0 + + + 104, 19 + + + 70 + + + Save + + + BUT_save + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + Top, Right + + + NoControl + + + 341, 7 + + + 0, 0, 0, 0 + + + 104, 19 + + + 71 + + + Load + + + BUT_load + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 4 + + + Top, Bottom, Left, Right + True + + Command + + + 150 + True + + Value + + + 80 + True + + Default + + + False + + + mavScale + + + False + True + + RawValue + + + False + + + 14, 3 + + + 150 + + + 321, 302 + + + 68 + + + Params + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + 17, 17 + + True + + + 6, 13 + + + 460, 305 + + + Command + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Value + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Default + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mavScale + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + RawValue + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigRawParams + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs index 493b00d9ae..ca8b57a6bf 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs @@ -1,32 +1,32 @@ -namespace ArdupilotMega.GCSViews.ConfigurationView -{ - partial class ConfigTradHeli - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +namespace ArdupilotMega.GCSViews.ConfigurationView +{ + partial class ConfigTradHeli + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigTradHeli)); @@ -97,9 +97,9 @@ // // groupBox5 // - resources.ApplyResources(this.groupBox5, "groupBox5"); this.groupBox5.Controls.Add(this.H1_ENABLE); this.groupBox5.Controls.Add(this.CCPM); + resources.ApplyResources(this.groupBox5, "groupBox5"); this.groupBox5.Name = "groupBox5"; this.groupBox5.TabStop = false; // @@ -132,11 +132,11 @@ // // groupBox3 // - resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.Controls.Add(this.label46); this.groupBox3.Controls.Add(this.label45); this.groupBox3.Controls.Add(this.GYR_ENABLE); this.groupBox3.Controls.Add(this.GYR_GAIN); + resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.Name = "groupBox3"; this.groupBox3.TabStop = false; // @@ -182,13 +182,13 @@ // // groupBox1 // - resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.label41); this.groupBox1.Controls.Add(this.label21); this.groupBox1.Controls.Add(this.COL_MIN); this.groupBox1.Controls.Add(this.COL_MID); this.groupBox1.Controls.Add(this.COL_MAX); this.groupBox1.Controls.Add(this.BUT_0collective); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // @@ -215,11 +215,11 @@ // // groupBox2 // - resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Controls.Add(this.label24); this.groupBox2.Controls.Add(this.HS4_MIN); this.groupBox2.Controls.Add(this.HS4_MAX); this.groupBox2.Controls.Add(this.label40); + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // @@ -422,11 +422,11 @@ // // HS4 // - resources.ApplyResources(this.HS4, "HS4"); this.HS4.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69))))); this.HS4.BorderColor = System.Drawing.SystemColors.ActiveBorder; this.HS4.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch4in", true)); this.HS4.Label = "Rudder"; + resources.ApplyResources(this.HS4, "HS4"); this.HS4.Maximum = 2200; this.HS4.maxline = 0; this.HS4.Minimum = 800; @@ -442,11 +442,11 @@ // // HS3 // - resources.ApplyResources(this.HS3, "HS3"); this.HS3.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69))))); this.HS3.BorderColor = System.Drawing.SystemColors.ActiveBorder; this.HS3.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch3in", true)); this.HS3.Label = "Collective"; + resources.ApplyResources(this.HS3, "HS3"); this.HS3.Maximum = 2200; this.HS3.maxline = 0; this.HS3.Minimum = 800; @@ -458,9 +458,9 @@ // // Gservoloc // - resources.ApplyResources(this.Gservoloc, "Gservoloc"); this.Gservoloc.BackColor = System.Drawing.Color.Transparent; this.Gservoloc.BackgroundImage = global::ArdupilotMega.Properties.Resources.Gaugebg; + resources.ApplyResources(this.Gservoloc, "Gservoloc"); this.Gservoloc.BaseArcColor = System.Drawing.Color.Transparent; this.Gservoloc.BaseArcRadius = 60; this.Gservoloc.BaseArcStart = 90; @@ -702,63 +702,63 @@ this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.RadioButton H1_ENABLE; - private System.Windows.Forms.RadioButton CCPM; - private MyButton BUT_swash_manual; - private System.Windows.Forms.Label label41; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.Label label46; - private System.Windows.Forms.Label label45; - private System.Windows.Forms.CheckBox GYR_ENABLE; - private System.Windows.Forms.TextBox GYR_GAIN; - private MyButton BUT_HS4save; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.TextBox COL_MIN; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.TextBox COL_MID; - private System.Windows.Forms.TextBox COL_MAX; - private MyButton BUT_0collective; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.TextBox HS4_MIN; - private System.Windows.Forms.TextBox HS4_MAX; - private System.Windows.Forms.Label label40; - private System.Windows.Forms.NumericUpDown HS3_TRIM; - private System.Windows.Forms.NumericUpDown HS2_TRIM; - private System.Windows.Forms.NumericUpDown HS1_TRIM; - private System.Windows.Forms.Label label39; - private System.Windows.Forms.Label label38; - private System.Windows.Forms.Label label37; - private System.Windows.Forms.Label label36; - private System.Windows.Forms.Label label26; - private System.Windows.Forms.TextBox PIT_MAX; - private System.Windows.Forms.Label label25; - private System.Windows.Forms.TextBox ROL_MAX; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.Label label19; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.TextBox SV3_POS; - private System.Windows.Forms.TextBox SV2_POS; - private System.Windows.Forms.TextBox SV1_POS; - private System.Windows.Forms.CheckBox HS3_REV; - private System.Windows.Forms.CheckBox HS2_REV; - private System.Windows.Forms.CheckBox HS1_REV; - private System.Windows.Forms.Label label17; - private HorizontalProgressBar2 HS4; - private VerticalProgressBar2 HS3; - private AGaugeApp.AGauge Gservoloc; - private System.Windows.Forms.BindingSource currentStateBindingSource; - private System.Windows.Forms.Label label44; - private System.Windows.Forms.Label label43; - private System.Windows.Forms.Label label42; - private System.Windows.Forms.NumericUpDown HS4_TRIM; - private System.Windows.Forms.CheckBox HS4_REV; - } -} + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox5; + private System.Windows.Forms.RadioButton H1_ENABLE; + private System.Windows.Forms.RadioButton CCPM; + private MyButton BUT_swash_manual; + private System.Windows.Forms.Label label41; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Label label46; + private System.Windows.Forms.Label label45; + private System.Windows.Forms.CheckBox GYR_ENABLE; + private System.Windows.Forms.TextBox GYR_GAIN; + private MyButton BUT_HS4save; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.TextBox COL_MIN; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.TextBox COL_MID; + private System.Windows.Forms.TextBox COL_MAX; + private MyButton BUT_0collective; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.TextBox HS4_MIN; + private System.Windows.Forms.TextBox HS4_MAX; + private System.Windows.Forms.Label label40; + private System.Windows.Forms.NumericUpDown HS3_TRIM; + private System.Windows.Forms.NumericUpDown HS2_TRIM; + private System.Windows.Forms.NumericUpDown HS1_TRIM; + private System.Windows.Forms.Label label39; + private System.Windows.Forms.Label label38; + private System.Windows.Forms.Label label37; + private System.Windows.Forms.Label label36; + private System.Windows.Forms.Label label26; + private System.Windows.Forms.TextBox PIT_MAX; + private System.Windows.Forms.Label label25; + private System.Windows.Forms.TextBox ROL_MAX; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.TextBox SV3_POS; + private System.Windows.Forms.TextBox SV2_POS; + private System.Windows.Forms.TextBox SV1_POS; + private System.Windows.Forms.CheckBox HS3_REV; + private System.Windows.Forms.CheckBox HS2_REV; + private System.Windows.Forms.CheckBox HS1_REV; + private System.Windows.Forms.Label label17; + private HorizontalProgressBar2 HS4; + private VerticalProgressBar2 HS3; + private AGaugeApp.AGauge Gservoloc; + private System.Windows.Forms.BindingSource currentStateBindingSource; + private System.Windows.Forms.Label label44; + private System.Windows.Forms.Label label43; + private System.Windows.Forms.Label label42; + private System.Windows.Forms.NumericUpDown HS4_TRIM; + private System.Windows.Forms.CheckBox HS4_REV; + } +} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx index 89df3762cd..99fe5c163d 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx @@ -117,1465 +117,1465 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - currentStateBindingSource - - - label25 - - - Roll Max - - - - 54, 249 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 26, 13 - - - 1500 - - - 163 - - - 17, 117 - - - label45 - - - 134 - - - PIT_MAX - - - 105, 317 - - - $this - - - 3 - - - 164 - - - ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 143 - - - 165 - - - 0 - - - BUT_0collective - - - $this - - - 145 - - - 4500 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - HS4_REV + + True - - Zoom - - - groupBox2 - - - True - - - Zero - - - label39 - - - 3 - - - 20, 93 - - + NoControl - - 144 + + + 67, 19 - - 153 + + 39, 17 - - $this - - - NoControl - - - NoControl - - - 1 - - - HS3_REV - - - Gain - - - True - - - 147 - - - groupBox3 - - - groupBox5 - - - True - - - 80, 209 - - - 41, 35 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top - - - groupBox5 - - - False - - - True - - - groupBox3 - - - $this - - - Manual - - - HS2_REV - - - 44, 20 - - - HS4_MAX - - - 118 - - - 3 - - - 44, 20 - - - 39, 20 - - - 169, 78 - - - 168 - - - Pitch Max - - - label21 - - - COL_MAX - - - 3 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 13 - - - Bottom - - - 166 - - - 142 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CCPM - - - Swash Travel - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label26 - - - 151 - - - 6, 19 - - - 101, 63 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 141 - - - 7 - - - True - - - 29, 13 - - - 60 - - - 3 - - - 10 - - - NoControl - - - 1000 - - - label46 - - - False - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - HS1_TRIM - - - 57, 19 - - - True - - - 115 - - - 257, 11 - - - 47, 20 - - - 105, 291 - - - 43, 20 - - - Enable - - - 2 - - - $this - - - 31 - - - groupBox3 - - - 6, 13 - - - $this - - - $this - - - $this - - - 58, 23 - - - NoControl - - - $this - - - True - - - 152 - - - 0 - - - 44, 20 - - - 55, 17 - - - groupBox3 - - - ROL_MAX - - - 27, 13 - - - 1500 - - - 27, 291 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 133 - - - NoControl - - - NoControl - - - groupBox2 - - - label38 - - - True - - - 167 - - - 29 - - - $this - - + 137 - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 11, 89 - - - 17 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - True - - - 1 - - - $this - - - NoControl - - - 126, 262 - - - True - - - HS4 - - - 499, 287 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - 16 - - - $this - - - 36 - - - label40 - - - 47, 20 - - - 140 - - - label23 - H1 - - $this - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - 119 - - - 67, 19 - - - 0 - - - groupBox1 - - - 30 - - - groupBox1 - - - groupBox2 - - - 40, 13 - - - label41 - - - HS3_TRIM - - - 135 - - - label37 - - - NoControl - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 117 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 156 - - - 102, 249 - - - 21, 40 - - - 40, 13 - - - 0, 0, 0, 0 - - - 4 - - - 28 - - - NoControl - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6 - - - Manual - - - groupBox1 - - - Min - - - True - - - 131, 249 - - - 314, 362 - - - False - - - 155 - - - 27, 13 - - - 242, 42 - - - 146 - - - 47, 20 - - - label19 - - - 15, 14 + + H1_ENABLE System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 35, 13 + + groupBox5 - - 43, 20 + + 0 - - 19 + + True - - 297, 95 + + NoControl - - 15, 14 + + 6, 19 - - 158 + + 55, 17 - - GYR_ENABLE - - - groupBox1 - - - HS1_REV - - - 18, 173 - - - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 27, 317 - - - 27, 23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 119 + + 136 CCPM - + + CCPM + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 1 + + + 257, 11 + + + 120, 43 + + + 169 + + + Swash Type + + + groupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + NoControl + + + 302, 83 + + + 69, 23 + + + 138 + + + Manual + + + BUT_swash_manual + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4485.38897, Culture=neutral, PublicKeyToken=null + + + $this + + + 6 + + True - - COL_MIN + + NoControl - + + 19, 157 + + + 40, 13 + + + 122 + + + Bottom + + + label41 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + True - - label22 + + NoControl 6, 38 - + + 29, 13 + + + 137 + + + Gain + + + label46 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 260, 341 + + groupBox3 - - $this + + 0 - + True - + + NoControl + + + 6, 19 + + + 40, 13 + + + 136 + + + Enable + + + label45 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 1 + + + True + + + NoControl + + + 57, 19 + + + 15, 14 + + + 118 + + + GYR_ENABLE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 2 + + + 41, 35 + + + 47, 20 + + + 119 + + + 1000 + + + GYR_GAIN + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox3 - - 138 - - - True - - - 44, 20 - - - True - - - True - - - 17, 249 - - - 15, 14 - - - 148 - - - 126, 314 - - - 18, 45 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - NoControl - - - 44, 20 - - - 27, 13 - - - 5 - - - 27, 13 - - - 42, 213 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 437, 314 - - Position + + 101, 63 - - label42 - - - 1 - - - 154 - - - 160 - - - 21 - - - True - - - Rev - - - 396, 93 - - - 174 - - - 14 - - - NoControl - - - HS4_MIN - - - 120, 43 - - - 126, 288 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label18 - - - 69, 23 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 150 - - - 18 - - - NoControl - - - NoControl - - - label43 - - - 33 - - - $this - - - 437, 186 - - - NoControl - - - 0 - - - False - - - 173 - - - label36 - - - 4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 496, 268 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 314, 336 - - - NoControl - - - $this - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 43, 20 - - - 39, 20 - - - groupBox1 - - - 162 - - - 137 - - - 24, 13 - - - 20 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 170 - - - NoControl - - - True - - - 42, 13 - - - $this - - - $this - - - 6, 19 - - - ConfigTradHeli - - - GYR_GAIN - - - BUT_swash_manual - - - 48, 13 - - - True - - - COL_MID - - - NoControl - - - 1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 57, 288 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - Swash-Servo position - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 105, 268 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - HS2_TRIM - - - NoControl - - - 1500 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - $this - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 136 - - - 106, 40 - - - NoControl - - - True - - - 23 - - - NoControl - - - 32 - - - 11 - - - 15, 14 - - - 8 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Rev - - - 1500 - - - $this - - - $this - - - NoControl - - - 122 - - - $this - - - 22 - - - Microsoft Sans Serif, 9pt - - - SV3_POS - - - 172 - - - $this - - - 27, 265 - - - 26 - - - True - - - True - - - groupBox2 - - - Servo - - - 4500 + + 168 Gyro - - True + + groupBox3 - - 54, 13 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 57, 314 - - - 27, 13 - - - 39, 17 - - - 171 - - - 169 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Gservoloc - - - 43, 20 - - - 69, 23 - - - 34 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - NoControl - - - 25 - - - 1 - - - 150, 150 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - label17 - - - BUT_HS4save - - - 13, 13 - - - 136 - - + $this - + + 7 + + NoControl - - 157 - - - 72, 13 - - - 35 - - - 139 - - - $this - - - 149 - - - 132 - - - 1 - - - 2 - - - 57, 262 - - - True - - - True - - - Swash Type - - - SV2_POS - - - 42, 66 - - - 2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Trim - - - 2 - - - NoControl - - - H1_ENABLE - - - False - - - 120 - - - 13, 13 - - - 159 - - - True - - - 12 - - - 0 - - - 260, 365 - - - 15 - - - 239, 95 - - - 180 - - - $this - - - 2 - 483, 174 - - 480, 66 + + 69, 23 - - 654, 397 + + 167 - - False + + Manual - - SV1_POS + + BUT_HS4save - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4485.38897, Culture=neutral, PublicKeyToken=null - - 39, 20 - - - NoControl - - + $this - - $this + + 8 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - 110 - - - Rudder Travel - - - 302, 83 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 532, 284 - - - 236, 66 - - - 448, 288 - - - $this - - - 75, 13 - - - 44, 13 - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - + NoControl 24, 28 - - HS4_TRIM + + 26, 13 - - 1500 + + 120 - - HS3 + + Top - + + label21 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox1 + + + 1 + + + False + + + 18, 173 + + + 43, 20 + + + 119 + + + 1500 + + + COL_MIN + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + False + + + 17, 117 + + + 44, 20 + + + 117 + + + 1500 + + + COL_MID + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + False + + + 18, 45 + + + 43, 20 + + + 115 + + + 1500 + + + COL_MAX + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + False + + NoControl - - -60 + + 11, 89 - - 15, 14 + + 58, 23 - - label24 + + 110 - - 109, 13 + + Zero - - 161 + + BUT_0collective - - 5 - - - Rudder + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4485.38897, Culture=neutral, PublicKeyToken=null groupBox1 - - groupBox5 + + 5 - - 24 + + 297, 95 - - 27 + + 80, 209 - - 13, 13 + + 165 - + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - label44 + + 9 - - 19, 157 + + True - - Trim - - - Max + + NoControl 112, 23 - - 529, 268 + + 27, 13 + + + 135 + + + Max + + + label24 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + False + + + 21, 40 + + + 43, 20 + + + 132 + + + 1500 + + + HS4_MIN + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + False + + + 106, 40 + + + 43, 20 + + + 133 + + + 1500 + + + HS4_MAX + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + True + + + NoControl + + + 27, 23 + + + 24, 13 + + + 134 + + + Min + + + label40 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + + 437, 186 + + + 169, 78 + + + 166 + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + 126, 314 + + + 44, 20 + + + 164 + + + HS3_TRIM + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + 126, 288 + + + 44, 20 + + + 163 + + + HS2_TRIM + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + 126, 262 + + + 44, 20 + + + 162 + + + HS1_TRIM + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + True + + + NoControl + + + 131, 249 + + + 27, 13 + + + 161 + + + Trim + + + label39 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + True + + + NoControl + + + 102, 249 + + + 27, 13 + + + 160 + + + Rev + + + label38 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + True + + + NoControl + + + 54, 249 + + + 44, 13 + + + 159 + + + Position + + + label37 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + True + + + NoControl + + + 17, 249 + + + 35, 13 + + + 158 + + + Servo + + + label36 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + True + + + NoControl + + + 260, 365 + + + 54, 13 + + + 157 + + + Pitch Max + + + label26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + 314, 362 + + + 47, 20 + + + 156 + + + 4500 + + + PIT_MAX + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + True + + + NoControl + + + 260, 341 + + + 48, 13 + + + 155 + + + Roll Max + + + label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + 314, 336 + + + 47, 20 + + + 154 + + + 4500 + + + ROL_MAX + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + True + + + NoControl + + + 480, 66 + + + 75, 13 + + + 153 + + + Rudder Travel + + + label23 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 22 + + + True + + + NoControl + + + 236, 66 + + + 72, 13 + + + 150 + + + Swash Travel + + + label22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 23 + + + True + + + NoControl + + + 27, 317 + + + 13, 13 + + + 149 + + + 3 + + + label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + True + + + NoControl + + + 27, 291 + + + 13, 13 + + + 148 + + + 2 + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + True + + + NoControl + + + 27, 265 + + + 13, 13 + + + 147 + + + 1 + + + label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + 57, 314 + + + 39, 20 + + + 146 + + + 180 + + + SV3_POS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 27 + + + 57, 288 + + + 39, 20 + + + 145 + + + 60 + + + SV2_POS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 28 + + + 57, 262 + + + 39, 20 + + + 144 + + + -60 + + + SV1_POS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 29 + + + True + + + NoControl + + + 105, 317 + + + 15, 14 + + + 143 + + + HS3_REV + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 30 + + + True + + + NoControl + + + 105, 291 + + + 15, 14 + + + 142 + + + HS2_REV + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 31 + + + True + + + NoControl + + + 105, 268 + + + 15, 14 + + + 141 + + + HS1_REV + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 32 + + + True + + + NoControl + + + 42, 66 + + + 109, 13 + + + 140 + + + Swash-Servo position + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 33 17, 17 + + 396, 93 + + + 242, 42 + + + 152 + + + HS4 + + + ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4485.38897, Culture=neutral, PublicKeyToken=null + + + $this + + + 34 + + + 239, 95 + + + 42, 213 + + + 151 + + + HS3 + + + ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4485.38897, Culture=neutral, PublicKeyToken=null + + + $this + + + 35 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 20, 93 + + + 0, 0, 0, 0 + + + 150, 150 + + + 139 + + + Gservoloc + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4485.38897, Culture=neutral, PublicKeyToken=null + + + $this + + + 36 + + + True + + + NoControl + + + 529, 268 + + + 27, 13 + + + 174 + + + Trim + + + label44 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + NoControl + + + 496, 268 + + + 27, 13 + + + 173 + + + Rev + + + label43 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + NoControl + + + 448, 288 + + + 42, 13 + + + 172 + + + Rudder + + + label42 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 532, 284 + + + 44, 20 + + + 171 + + + HS4_TRIM + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + NoControl + + + 499, 287 + + + 15, 14 + + + 170 + + + HS4_REV + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + True + + 6, 13 + + + 654, 397 + + + currentStateBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ConfigTradHeli + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4485.38897, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Msi/wix.pdb b/Tools/ArdupilotMegaPlanner/Msi/wix.pdb index 2fb8713afc..997b2adcda 100644 Binary files a/Tools/ArdupilotMegaPlanner/Msi/wix.pdb and b/Tools/ArdupilotMegaPlanner/Msi/wix.pdb differ diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index b651cb62a3..3109be3ffb 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs +++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Resources; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.1.*")] -[assembly: AssemblyFileVersion("1.1.69")] +[assembly: AssemblyFileVersion("1.1.70")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs index b0e45557e7..af564473f8 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs @@ -1,32 +1,32 @@ -namespace ArdupilotMega -{ - partial class _3DRradio - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() +namespace ArdupilotMega +{ + partial class _3DRradio + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(_3DRradio)); @@ -76,11 +76,9 @@ // resources.ApplyResources(this.Progressbar, "Progressbar"); this.Progressbar.Name = "Progressbar"; - this.toolTip1.SetToolTip(this.Progressbar, resources.GetString("Progressbar.ToolTip")); // // S1 // - resources.ApplyResources(this.S1, "S1"); this.S1.FormattingEnabled = true; this.S1.Items.AddRange(new object[] { resources.GetString("S1.Items"), @@ -92,6 +90,7 @@ resources.GetString("S1.Items6"), resources.GetString("S1.Items7"), resources.GetString("S1.Items8")}); + resources.ApplyResources(this.S1, "S1"); this.S1.Name = "S1"; this.toolTip1.SetToolTip(this.S1, resources.GetString("S1.ToolTip")); // @@ -99,30 +98,25 @@ // resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip")); // // S0 // resources.ApplyResources(this.S0, "S0"); this.S0.Name = "S0"; this.S0.ReadOnly = true; - this.toolTip1.SetToolTip(this.S0, resources.GetString("S0.ToolTip")); // // label2 // resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.toolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip")); // // label3 // resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.toolTip1.SetToolTip(this.label3, resources.GetString("label3.ToolTip")); // // S2 // - resources.ApplyResources(this.S2, "S2"); this.S2.FormattingEnabled = true; this.S2.Items.AddRange(new object[] { resources.GetString("S2.Items"), @@ -135,6 +129,7 @@ resources.GetString("S2.Items7"), resources.GetString("S2.Items8"), resources.GetString("S2.Items9")}); + resources.ApplyResources(this.S2, "S2"); this.S2.Name = "S2"; this.toolTip1.SetToolTip(this.S2, resources.GetString("S2.ToolTip")); // @@ -142,11 +137,9 @@ // resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.toolTip1.SetToolTip(this.label4, resources.GetString("label4.ToolTip")); // // S3 // - resources.ApplyResources(this.S3, "S3"); this.S3.FormattingEnabled = true; this.S3.Items.AddRange(new object[] { resources.GetString("S3.Items"), @@ -179,6 +172,7 @@ resources.GetString("S3.Items27"), resources.GetString("S3.Items28"), resources.GetString("S3.Items29")}); + resources.ApplyResources(this.S3, "S3"); this.S3.Name = "S3"; this.toolTip1.SetToolTip(this.S3, resources.GetString("S3.ToolTip")); // @@ -186,11 +180,9 @@ // resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.toolTip1.SetToolTip(this.label5, resources.GetString("label5.ToolTip")); // // S4 // - resources.ApplyResources(this.S4, "S4"); this.S4.FormattingEnabled = true; this.S4.Items.AddRange(new object[] { resources.GetString("S4.Items"), @@ -214,6 +206,7 @@ resources.GetString("S4.Items18"), resources.GetString("S4.Items19"), resources.GetString("S4.Items20")}); + resources.ApplyResources(this.S4, "S4"); this.S4.Name = "S4"; this.toolTip1.SetToolTip(this.S4, resources.GetString("S4.ToolTip")); // @@ -221,7 +214,6 @@ // resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.toolTip1.SetToolTip(this.label6, resources.GetString("label6.ToolTip")); // // S5 // @@ -233,7 +225,6 @@ // resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.toolTip1.SetToolTip(this.label7, resources.GetString("label7.ToolTip")); // // S6 // @@ -245,7 +236,6 @@ // resources.ApplyResources(this.label8, "label8"); this.label8.Name = "label8"; - this.toolTip1.SetToolTip(this.label8, resources.GetString("label8.ToolTip")); // // S7 // @@ -273,7 +263,6 @@ // // RS4 // - resources.ApplyResources(this.RS4, "RS4"); this.RS4.FormattingEnabled = true; this.RS4.Items.AddRange(new object[] { resources.GetString("RS4.Items"), @@ -297,12 +286,12 @@ resources.GetString("RS4.Items18"), resources.GetString("RS4.Items19"), resources.GetString("RS4.Items20")}); + resources.ApplyResources(this.RS4, "RS4"); this.RS4.Name = "RS4"; this.toolTip1.SetToolTip(this.RS4, resources.GetString("RS4.ToolTip")); // // RS3 // - resources.ApplyResources(this.RS3, "RS3"); this.RS3.FormattingEnabled = true; this.RS3.Items.AddRange(new object[] { resources.GetString("RS3.Items"), @@ -335,12 +324,12 @@ resources.GetString("RS3.Items27"), resources.GetString("RS3.Items28"), resources.GetString("RS3.Items29")}); + resources.ApplyResources(this.RS3, "RS3"); this.RS3.Name = "RS3"; this.toolTip1.SetToolTip(this.RS3, resources.GetString("RS3.ToolTip")); // // RS2 // - resources.ApplyResources(this.RS2, "RS2"); this.RS2.FormattingEnabled = true; this.RS2.Items.AddRange(new object[] { resources.GetString("RS2.Items"), @@ -353,12 +342,12 @@ resources.GetString("RS2.Items7"), resources.GetString("RS2.Items8"), resources.GetString("RS2.Items9")}); + resources.ApplyResources(this.RS2, "RS2"); this.RS2.Name = "RS2"; this.toolTip1.SetToolTip(this.RS2, resources.GetString("RS2.ToolTip")); // // RS1 // - resources.ApplyResources(this.RS1, "RS1"); this.RS1.FormattingEnabled = true; this.RS1.Items.AddRange(new object[] { resources.GetString("RS1.Items"), @@ -370,6 +359,7 @@ resources.GetString("RS1.Items6"), resources.GetString("RS1.Items7"), resources.GetString("RS1.Items8")}); + resources.ApplyResources(this.RS1, "RS1"); this.RS1.Name = "RS1"; this.toolTip1.SetToolTip(this.RS1, resources.GetString("RS1.ToolTip")); // @@ -385,51 +375,43 @@ resources.ApplyResources(this.RS0, "RS0"); this.RS0.Name = "RS0"; this.RS0.ReadOnly = true; - this.toolTip1.SetToolTip(this.RS0, resources.GetString("RS0.ToolTip")); // // label9 // resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; - this.toolTip1.SetToolTip(this.label9, resources.GetString("label9.ToolTip")); // // label10 // resources.ApplyResources(this.label10, "label10"); this.label10.Name = "label10"; - this.toolTip1.SetToolTip(this.label10, resources.GetString("label10.ToolTip")); // // RTI // resources.ApplyResources(this.RTI, "RTI"); this.RTI.Name = "RTI"; this.RTI.ReadOnly = true; - this.toolTip1.SetToolTip(this.RTI, resources.GetString("RTI.ToolTip")); // // ATI // resources.ApplyResources(this.ATI, "ATI"); this.ATI.Name = "ATI"; this.ATI.ReadOnly = true; - this.toolTip1.SetToolTip(this.ATI, resources.GetString("ATI.ToolTip")); // // label11 // resources.ApplyResources(this.label11, "label11"); this.label11.Name = "label11"; - this.toolTip1.SetToolTip(this.label11, resources.GetString("label11.ToolTip")); // // label12 // resources.ApplyResources(this.label12, "label12"); this.label12.Name = "label12"; - this.toolTip1.SetToolTip(this.label12, resources.GetString("label12.ToolTip")); // // BUT_savesettings // resources.ApplyResources(this.BUT_savesettings, "BUT_savesettings"); this.BUT_savesettings.Name = "BUT_savesettings"; - this.toolTip1.SetToolTip(this.BUT_savesettings, resources.GetString("BUT_savesettings.ToolTip")); this.BUT_savesettings.UseVisualStyleBackColor = true; this.BUT_savesettings.Click += new System.EventHandler(this.BUT_savesettings_Click); // @@ -437,7 +419,6 @@ // resources.ApplyResources(this.BUT_getcurrent, "BUT_getcurrent"); this.BUT_getcurrent.Name = "BUT_getcurrent"; - this.toolTip1.SetToolTip(this.BUT_getcurrent, resources.GetString("BUT_getcurrent.ToolTip")); this.BUT_getcurrent.UseVisualStyleBackColor = true; this.BUT_getcurrent.Click += new System.EventHandler(this.BUT_getcurrent_Click); // @@ -446,13 +427,11 @@ resources.ApplyResources(this.lbl_status, "lbl_status"); this.lbl_status.BackColor = System.Drawing.Color.Transparent; this.lbl_status.Name = "lbl_status"; - this.toolTip1.SetToolTip(this.lbl_status, resources.GetString("lbl_status.ToolTip")); // // BUT_upload // resources.ApplyResources(this.BUT_upload, "BUT_upload"); this.BUT_upload.Name = "BUT_upload"; - this.toolTip1.SetToolTip(this.BUT_upload, resources.GetString("BUT_upload.ToolTip")); this.BUT_upload.UseVisualStyleBackColor = true; this.BUT_upload.Click += new System.EventHandler(this.BUT_upload_Click); // @@ -460,7 +439,6 @@ // resources.ApplyResources(this.BUT_syncS2, "BUT_syncS2"); this.BUT_syncS2.Name = "BUT_syncS2"; - this.toolTip1.SetToolTip(this.BUT_syncS2, resources.GetString("BUT_syncS2.ToolTip")); this.BUT_syncS2.UseVisualStyleBackColor = true; this.BUT_syncS2.Click += new System.EventHandler(this.BUT_syncS2_Click); // @@ -468,7 +446,6 @@ // resources.ApplyResources(this.BUT_syncS3, "BUT_syncS3"); this.BUT_syncS3.Name = "BUT_syncS3"; - this.toolTip1.SetToolTip(this.BUT_syncS3, resources.GetString("BUT_syncS3.ToolTip")); this.BUT_syncS3.UseVisualStyleBackColor = true; this.BUT_syncS3.Click += new System.EventHandler(this.BUT_syncS3_Click); // @@ -476,7 +453,6 @@ // resources.ApplyResources(this.BUT_syncS5, "BUT_syncS5"); this.BUT_syncS5.Name = "BUT_syncS5"; - this.toolTip1.SetToolTip(this.BUT_syncS5, resources.GetString("BUT_syncS5.ToolTip")); this.BUT_syncS5.UseVisualStyleBackColor = true; this.BUT_syncS5.Click += new System.EventHandler(this.BUT_syncS5_Click); // @@ -525,53 +501,52 @@ this.Controls.Add(this.BUT_upload); this.MinimumSize = new System.Drawing.Size(334, 482); this.Name = "_3DRradio"; - this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip")); this.ResumeLayout(false); this.PerformLayout(); - } - - #endregion - - private MyButton BUT_upload; - private System.Windows.Forms.ProgressBar Progressbar; - private System.Windows.Forms.Label lbl_status; - private System.Windows.Forms.ComboBox S1; - private System.Windows.Forms.Label label1; - private MyButton BUT_getcurrent; - private System.Windows.Forms.TextBox S0; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.ComboBox S2; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.ComboBox S3; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.ComboBox S4; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox S5; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.CheckBox S6; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.CheckBox S7; - private MyButton BUT_savesettings; - private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.CheckBox RS7; - private System.Windows.Forms.CheckBox RS6; - private System.Windows.Forms.CheckBox RS5; - private System.Windows.Forms.ComboBox RS4; - private System.Windows.Forms.ComboBox RS3; - private System.Windows.Forms.ComboBox RS2; - private System.Windows.Forms.TextBox RS0; - private System.Windows.Forms.ComboBox RS1; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.TextBox RTI; - private System.Windows.Forms.TextBox ATI; - private System.Windows.Forms.TextBox RSSI; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label12; - private MyButton BUT_syncS2; - private MyButton BUT_syncS3; - private MyButton BUT_syncS5; - } + } + + #endregion + + private MyButton BUT_upload; + private System.Windows.Forms.ProgressBar Progressbar; + private System.Windows.Forms.Label lbl_status; + private System.Windows.Forms.ComboBox S1; + private System.Windows.Forms.Label label1; + private MyButton BUT_getcurrent; + private System.Windows.Forms.TextBox S0; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox S2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox S3; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox S4; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.CheckBox S5; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.CheckBox S6; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.CheckBox S7; + private MyButton BUT_savesettings; + private System.Windows.Forms.ToolTip toolTip1; + private System.Windows.Forms.CheckBox RS7; + private System.Windows.Forms.CheckBox RS6; + private System.Windows.Forms.CheckBox RS5; + private System.Windows.Forms.ComboBox RS4; + private System.Windows.Forms.ComboBox RS3; + private System.Windows.Forms.ComboBox RS2; + private System.Windows.Forms.TextBox RS0; + private System.Windows.Forms.ComboBox RS1; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.TextBox RTI; + private System.Windows.Forms.TextBox ATI; + private System.Windows.Forms.TextBox RSSI; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label12; + private MyButton BUT_syncS2; + private MyButton BUT_syncS3; + private MyButton BUT_syncS5; + } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx index 7d2e6647f8..0e0676fca2 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx +++ b/Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx @@ -117,1092 +117,45 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 27 - - - 2 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 0 - - - 23 - - - RS7 - - - $this - - - 11 - - - Mavlink - - - 25 - - - 16 - - - - - - - 27 - - - $this - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom, Left - - 87, 141 - - - 12 - - - 18 - - - 39 - - - 12 - - - 22 - - - 11 - - - S3 - - - 32 - - - 80, 20 - - - 23 - - - TXPOWER is the transmit power in dBm. 20dBm is 100mW. It is useful to set this to lower levels for short range testing. - - - - $this - - - - - - 127, 39 - - - 22 - - - 10 - - - 30 - - - S4 - - - 19 - - - BUT_savesettings - - - 57 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - $this - - - 80, 21 - - - $this - - - 36 - - - 15 - - - 201, 195 - - - BUT_upload - - - 15, 176 - - - 44, 13 - - - 19 - - - 87, 222 - - - 250 - - - 18, 330 - - - RS4 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - $this - - - 20 - - - 22 - - - 15, 257 - - - Version - - - $this - - - 12 - - - > - - - 180, 330 - - - 9 - - - ECC is to enable/disable the golay error correcting code. It defaults to off. If you enable it then you packets take twice as many bytes to send, so you lose half your air bandwidth, but it can correct up to 3 bit errors per 12 bits of data. Use this for long range, usually in combination with a lower air data rate. The golay decode takes 20 microsecond per transmitted byte (40 microseconds per user data byte) which means you will also be a bit CPU constrained at the highest air data rates. So you usually use golay at 128kbps or less. - - - - 13 - - - RS3 - - - 3 - - - Upload Firmware (Local) - - - 11 - - - - - - 15 - - - - - - 21 - - - 80, 21 - - - - - - RS2 - - - 201, 303 - - - - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 80, 21 - - - Local - - - 24 - - - 9 - - - 17 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 87, 25 - - - 8 - - - 57 - - - 80, 21 - - - $this - - - 1 - - - 39, 13 - - - RS1 - - - $this - - - toolTip1 - - - 31 - - - RSSI - - - Save Settings - - - 80, 20 - - - 34 - - - False - - - 6, 13 - - - TXPOWER is the transmit power in dBm. 20dBm is 100mW. It is useful to set this to lower levels for short range testing. - - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 30 - - - - - - S6 - - - 18 - - - 25 - - - 4 - - - 5 - - - 6 - - - 7 - - - lbl_status - - - 4 - - - 87, 51 - - - 10 - - - 20 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12, 402 294, 36 - - 9 - - - RS5 - - - 15, 122 - - - 80, 20 - - - 3 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 38, 13 - - - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 22, 23 - - - label1 - - - $this - - - 28 - - - 80, 21 - - - 6 - - - 201, 141 - - + + 2 - - 25 - - - RTI - - - - Bottom, Left - - - NETID is a 16 bit 'network ID'. This is used to seed the frequency hopping sequence and to identify packets as coming from the right radio. Make sure you use a different NETID from anyone else running the same sort of radio in the area. - - - 108, 9 - - - 201, 115 - - - Bottom, Left - - - 11 - - - RS6 - - - 3 - - - 4 - - - BUT_syncS3 - - - 16 - - - 15 - - - - - - - - - 26 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 2 - - - MAVLINK enables/disables MAVLink packet framing. This tries to align radio packets to MAVLink packet boundaries, which makes a big difference to what happens to the MAVLink stream when you lose a packet. - - - - Net ID - - - 5 - - - 6 - - - 7 - - - 8 - - - 35 - - - 2 - - - 3 - - - 4 - - - 11 - - - $this - - - 15, 32 - - - 9 - - - 10 - - - 30 - - - 19 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 80, 21 - - - S5 - - - 37 - - - 32, 13 - - - 80, 21 - - - label8 - - - 173, 247 - - - - - - label7 - Progressbar - - 13 - - - - - - 9 - - - 9 - - - 201, 25 - - - True - - - - - - label9 - - - 24 - - - 14 - - - 80, 21 - - - 42, 13 - - - 33, 13 - - - 80, 21 - - - $this - - - $this - - - > - - - 14 - - - 24 - - - - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 87, 303 - - - AIR_SPEED is the inter-radio data rate in rounded kbps. So 128 means 128kbps. Max is 192, min is 2. I would not recommend values below 16 as the frequency hopping and tdm sync times get too long. - - - 96 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 15 - - - Baud - - - 20 - - - 7 - - - 16 - - - 26 - - - 28, 13 - - - ECC is to enable/disable the golay error correcting code. It defaults to off. If you enable it then you packets take twice as many bytes to send, so you lose half your air bandwidth, but it can correct up to 3 bit errors per 12 bits of data. Use this for long range, usually in combination with a lower air data rate. The golay decode takes 20 microsecond per transmitted byte (40 microseconds per user data byte) which means you will also be a bit CPU constrained at the highest air data rates. So you usually use golay at 128kbps or less. - - - - 115 - - - 23 - - - $this - - - > - - - True - - - 87, 276 - - - 250 - - - $this - - - 11 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - 38 - - - Serial baud rate in rounded kbps. So 57 means 57600. - - - - 53, 13 - - - 15, 230 - - - 8 - - - 111 - - - label2 - - - 80, 21 - - - BUT_syncS5 - - - OPPRESEND enables/disables "opportunistic resend". When enabled the radio will send a packet twice if the serial input buffer has less than 256 bytes in it. The 2nd send is marked as a resend and discarded by the receiving radio if it got the first packet OK. This makes a big difference to the link quality, especially for uplink commands. - - - - 10 - - - $this - - - - - - 61, 13 - - - True - - - 8 - - - S0 - - - 87, 168 - - - 80, 21 - - - 32 - - - 12, 374 - - - 13 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - 7 - - - 75, 39 - - - 4 - - - Format - - - 2 - - - - - - see the spec for a RSSI to dBm graph. The numbers at the end are: -txe: number of transmit errors (eg. transmit timeouts) -rxe: number of receive errors (crc error, framing error etc) -stx: number of serial transmit overflows -rrx: number of serial receive overflows -ecc: number of 12 bit words successfully corrected by the golay code -which result in a valid packet CRC - - - - 20 - - - 30 - - - S7 - - - - - - True - - - $this - - - BUT_syncS2 - - - 10 - - - 33 - - - $this - - - Op Resend - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - 32, 13 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 201, 276 - - - 27 - - - - - - 6 - - - 8 - - - 26 - - - 20 - - - 24 - - - $this - - - - - - 52, 13 - - - 15 - - - 25 - - - 22, 23 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 80, 21 - - - 4 - - - Serial baud rate in rounded kbps. So 57 means 57600. - - - - True - - - 6 - - - True - - - 80, 20 - - - 5 - - - 14 - - - 15, 149 - - - 12 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - 12 + + System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 37 - - 17 + + 115 - - $this + + 111 - - 64 + + 57 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - 21 - - - 20 - - - 16 - - + 38 - - 18 - - - 14 - - - 8 - - - Tx Power - - - 192 - - - 128 - - - 96 - - - 28 - - - _3DRradio - - - NETID is a 16 bit 'network ID'. This is used to seed the frequency hopping sequence and to identify packets as coming from the right radio. Make sure you use a different NETID from anyone else running the same sort of radio in the area. - - - 4 - - - 2 - - - label12 - - - 8 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.29801, Culture=neutral, PublicKeyToken=null - - - 14 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - ATI - - - 28 - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 44, 13 - - - label10 - - - 29 - - - 19 - - - 22, 23 - - - 28 - - - True - - - $this - - - 13 - - - 23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 128 - - - 16 - - - label11 - 19 @@ -1215,51 +168,151 @@ which result in a valid packet CRC 2 - - 111 + + 1 - - ECC + + 87, 141 - - 38 + + 80, 21 4 - - 0 + + 17, 17 + + + Serial baud rate in rounded kbps. So 57 means 57600. + - - 201, 249 + + S1 - - 18 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 38 + + $this - - 13 + + 35 - - 21 + + True - - 115 + + 15, 149 - - 201, 222 + + 32, 13 - - + + 5 - - 80, 21 + + Baud + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 34 + + + 87, 115 + + + 80, 20 + + + 7 + + + S0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 32 + + + True + + + 15, 122 + + + 39, 13 8 + + Format + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 31 + + + True + + + 15, 176 + + + 53, 13 + + + 10 + + + Air Speed + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 29 + + + 250 + + + 192 + + + 128 + + + 96 + 64 @@ -1269,214 +322,210 @@ which result in a valid packet CRC 16 - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 - - True + + 4 - - 37 + + 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 87, 168 - - MAVLINK enables/disables MAVLink packet framing. This tries to align radio packets to MAVLink packet boundaries, which makes a big difference to what happens to the MAVLink stream when you lose a packet. - - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - 201, 168 - - - 19 - - - Air Speed - - - 192 - - - - - - $this - - - 9 - - - 21 - - - 99, 330 - - - 87, 115 - - - True - - - $this - - - 87, 195 - - - 173, 168 - - - Remote - - - 29 - - - 294, 22 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 36 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + 80, 21 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9 - - 10 - - - 334, 482 - - - $this - - - 15, 311 - - - 19 - - - 29 - - - 40 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 225, 9 - - - 173, 195 - - - - - - 32 - - - 26 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 194, 58 - - - $this - - - S1 - - - 3 - - - 33 - - - 6 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 16 - - - 17 - - - 13 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + AIR_SPEED is the inter-radio data rate in rounded kbps. So 128 means 128kbps. Max is 192, min is 2. I would not recommend values below 16 as the frequency hopping and tdm sync times get too long. S2 - - 5 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + $this - - 87, 249 + + 30 - - + + True - + + 15, 203 + + + 38, 13 + + 12 - - label5 + + Net ID - + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + 27 + 1 - - $this + + 2 - + + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + + 10 + + + 11 + + + 12 + + + 13 + + + 14 + + + 15 + + + 16 + + + 17 + + + 18 + + + 19 + + + 20 + + + 21 + + 22 - + + 23 + + + 24 + + + 25 + + + 26 + + + 27 + + + 28 + + + 29 + + + 30 + + + 87, 195 + + + 80, 21 + + + 11 + + + NETID is a 16 bit 'network ID'. This is used to seed the frequency hopping sequence and to identify packets as coming from the right radio. Make sure you use a different NETID from anyone else running the same sort of radio in the area. + + + S3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + 28 + + + True + + + 15, 230 + + + 52, 13 + + + 14 + + + Tx Power + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + 0 + 1 @@ -1486,140 +535,1016 @@ which result in a valid packet CRC 3 - + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + + 10 + + + 11 + + + 12 + + + 13 + + 14 - - 2 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label3 - - - $this - - - 0 - - - 15, 203 - - - 0 - - - label4 - 15 - - $this + + 16 - - 5 - - - 1 - - - 34 - - - RSSI - - - AIR_SPEED is the inter-radio data rate in rounded kbps. So 128 means 128kbps. Max is 192, min is 2. I would not recommend values below 16 as the frequency hopping and tdm sync times get too long. - - - 4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - 75, 39 - - - 15, 58 - - - 15, 284 - - - $this - - + 17 - - 27 - - - 29 - - - $this - - + 18 - - RS0 - - - 12, 402 - - - True - - - label6 - - - OPPRESEND enables/disables "opportunistic resend". When enabled the radio will send a packet twice if the serial input buffer has less than 256 bytes in it. The 2nd send is marked as a resend and discarded by the receiving radio if it got the first packet OK. This makes a big difference to the link quality, especially for uplink commands. - - - + 19 - - 31 + + 20 - - 17 + + 87, 222 + + + 80, 21 + + + 13 + + + TXPOWER is the transmit power in dBm. 20dBm is 100mW. It is useful to set this to lower levels for short range testing. + + + + S4 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + True + + + 15, 257 + + + 28, 13 16 + + ECC + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 23 + + + 87, 249 + + + 80, 21 + + + 15 + + + ECC is to enable/disable the golay error correcting code. It defaults to off. If you enable it then you packets take twice as many bytes to send, so you lose half your air bandwidth, but it can correct up to 3 bit errors per 12 bits of data. Use this for long range, usually in combination with a lower air data rate. The golay decode takes 20 microsecond per transmitted byte (40 microseconds per user data byte) which means you will also be a bit CPU constrained at the highest air data rates. So you usually use golay at 128kbps or less. + + + + S5 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + True + + + 15, 284 + + + 44, 13 + + + 18 + + + Mavlink + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + 87, 276 + + + 80, 21 + + + 17 + + + MAVLINK enables/disables MAVLink packet framing. This tries to align radio packets to MAVLink packet boundaries, which makes a big difference to what happens to the MAVLink stream when you lose a packet. + + + + S6 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 22 + + + True + + + 15, 311 + + + 61, 13 + + + 20 + + + Op Resend + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + 87, 303 + + + 80, 21 + + + 19 + + + OPPRESEND enables/disables "opportunistic resend". When enabled the radio will send a packet twice if the serial input buffer has less than 256 bytes in it. The 2nd send is marked as a resend and discarded by the receiving radio if it got the first packet OK. This makes a big difference to the link quality, especially for uplink commands. + + + + S7 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + 201, 303 + + + 80, 21 + + + 29 + + + OPPRESEND enables/disables "opportunistic resend". When enabled the radio will send a packet twice if the serial input buffer has less than 256 bytes in it. The 2nd send is marked as a resend and discarded by the receiving radio if it got the first packet OK. This makes a big difference to the link quality, especially for uplink commands. + + + + RS7 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + 201, 276 + + + 80, 21 + + + 28 + + + MAVLINK enables/disables MAVLink packet framing. This tries to align radio packets to MAVLink packet boundaries, which makes a big difference to what happens to the MAVLink stream when you lose a packet. + + + + RS6 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + 201, 249 + + + 80, 21 + + + 27 + + + ECC is to enable/disable the golay error correcting code. It defaults to off. If you enable it then you packets take twice as many bytes to send, so you lose half your air bandwidth, but it can correct up to 3 bit errors per 12 bits of data. Use this for long range, usually in combination with a lower air data rate. The golay decode takes 20 microsecond per transmitted byte (40 microseconds per user data byte) which means you will also be a bit CPU constrained at the highest air data rates. So you usually use golay at 128kbps or less. + + + + RS5 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + 0 + + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + + 10 + + + 11 + + + 12 + + + 13 + + + 14 + + + 15 + + + 16 + + + 17 + + + 18 + + + 19 + + + 20 + + + 201, 222 + + + 80, 21 + + + 26 + + + TXPOWER is the transmit power in dBm. 20dBm is 100mW. It is useful to set this to lower levels for short range testing. + + + + RS4 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + + 10 + + + 11 + + + 12 + + + 13 + + + 14 + + + 15 + + + 16 + + + 17 + + + 18 + + + 19 + + + 20 + + + 21 + + + 22 + + + 23 + + + 24 + + + 25 + + + 26 + + + 27 + + + 28 + + + 29 + + + 30 + + + 201, 195 + + + 80, 21 + + + 25 + + + NETID is a 16 bit 'network ID'. This is used to seed the frequency hopping sequence and to identify packets as coming from the right radio. Make sure you use a different NETID from anyone else running the same sort of radio in the area. + + + RS3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + 250 + + + 192 + + + 128 + + + 96 + + + 64 + + + 32 + + + 16 + + + 8 + + + 4 + + + 2 + + + 201, 168 + + + 80, 21 + + + 24 + + + AIR_SPEED is the inter-radio data rate in rounded kbps. So 128 means 128kbps. Max is 192, min is 2. I would not recommend values below 16 as the frequency hopping and tdm sync times get too long. + + + RS2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + 115 + + + 111 + + + 57 + + + 38 + + + 19 + + + 9 + + + 4 + + + 2 + + + 1 + + + 201, 141 + + + 80, 21 + + + 22 + + + Serial baud rate in rounded kbps. So 57 means 57600. + + + + RS1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + 17 + + 87, 51 + + + True + + + 194, 58 + + + 34 + + + see the spec for a RSSI to dBm graph. The numbers at the end are: +txe: number of transmit errors (eg. transmit timeouts) +rxe: number of receive errors (crc error, framing error etc) +stx: number of serial transmit overflows +rrx: number of serial receive overflows +ecc: number of 12 bit words successfully corrected by the golay code +which result in a valid packet CRC + + + + RSSI + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 201, 115 + + + 80, 20 + + + 23 + + + RS0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + True + + + 108, 9 + + + 33, 13 + + + 30 + + + Local + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + True + + + 225, 9 + + + 44, 13 + + + 31 + + + Remote + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 201, 25 + + + 80, 20 + + + 33 + + + RTI + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + 87, 25 + + + 80, 20 + + + 32 + + + ATI + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + $this + + 7 + + + True + + + 15, 32 + + + 42, 13 + + + 36 + + + Version + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 15, 58 + + + 32, 13 + + + 37 + + + RSSI + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + False + + + 99, 330 + + + 75, 39 + + + 21 + + + Save Settings + + + BUT_savesettings + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + 18 - - BUT_getcurrent + + 18, 330 - - + + 75, 39 + + + 6 Load Settings - - 17, 17 - + + BUT_getcurrent + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 33 + + + Bottom, Left + + + 12, 374 + + + 294, 22 + + + 3 + + + lbl_status + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 36 + + + 180, 330 + + + 127, 39 + + + 0 + + + Upload Firmware (Local) + + + BUT_upload + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 38 + + + 173, 168 + + + 22, 23 + + + 38 + + + > + + + BUT_syncS2 + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + 173, 195 + + + 22, 23 + + + 39 + + + > + + + BUT_syncS3 + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + 173, 247 + + + 22, 23 + + + 40 + + + > + + + BUT_syncS5 + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + True + + 6, 13 + + + 334, 482 + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + _3DRradio + + + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4491.33622, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs b/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs index 0ec56dfc8a..4467c2ac82 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs +++ b/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs @@ -34,7 +34,7 @@ namespace uploader // protocol constants PROG_MULTI_MAX = 64, // maximum number of bytes in a PROG_MULTI command - READ_MULTI_MAX = 255, // largest read that can be requested + READ_MULTI_MAX = 64, // from 255 // largest read that can be requested // device IDs XXX should come with the firmware image... DEVICE_ID_RF50 = 0x4d, @@ -389,6 +389,12 @@ namespace uploader } log ("\n", 5); + while (port.BytesToWrite > 50) + { + int fred = 1; + fred++; + Console.WriteLine("slowdown"); + } port.Write (b, 0, 1); } diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb index 8efe10e936..9d8a0cd5e1 100644 Binary files a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb and b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb differ diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/version.txt b/Tools/ArdupilotMegaPlanner/bin/Release/version.txt index 8e6a681841..7fb755b96f 100644 --- a/Tools/ArdupilotMegaPlanner/bin/Release/version.txt +++ b/Tools/ArdupilotMegaPlanner/bin/Release/version.txt @@ -1 +1 @@ -1.1.4491.14239 \ No newline at end of file +1.1.4492.34709 \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/georefimage.cs b/Tools/ArdupilotMegaPlanner/georefimage.cs index 520ec95282..85248f6a7e 100644 --- a/Tools/ArdupilotMegaPlanner/georefimage.cs +++ b/Tools/ArdupilotMegaPlanner/georefimage.cs @@ -36,16 +36,19 @@ namespace ArdupilotMega InitializeComponent(); } - Hashtable filedatecahce = new Hashtable(); + Hashtable filedatecache = new Hashtable(); Hashtable photocoords = new Hashtable(); + Hashtable timecoordcache = new Hashtable(); + Hashtable imagetotime = new Hashtable(); + DateTime getPhotoTime(string fn) { DateTime dtaken = DateTime.MinValue; - if (filedatecahce.ContainsKey(fn)) + if (filedatecache.ContainsKey(fn)) { - return (DateTime)filedatecahce[fn]; + return (DateTime)filedatecache[fn]; } try @@ -72,7 +75,7 @@ namespace ArdupilotMega dtaken = lcDirectory.GetDate(0x9003); log.InfoFormat("does " + lcDirectory.GetTagName(0x9003) + " " + dtaken); - filedatecahce[fn] = dtaken; + filedatecache[fn] = dtaken; break; } @@ -188,6 +191,8 @@ namespace ArdupilotMega DateTime startTime = DateTime.MinValue; photocoords = new Hashtable(); + timecoordcache = new Hashtable(); + imagetotime = new Hashtable(); //logFile = @"C:\Users\hog\Pictures\farm 1-10-2011\100SSCAM\2011-10-01 11-48 1.log"; @@ -215,15 +220,17 @@ namespace ArdupilotMega int first = 0; int matchs = 0; - foreach (string file in files) + int lastmatchindex = 0; + + foreach (string filename in files) { - if (file.ToLower().EndsWith(".jpg") && !file.ToLower().Contains("_geotag")) + if (filename.ToLower().EndsWith(".jpg") && !filename.ToLower().Contains("_geotag")) { - DateTime dt = getPhotoTime(file); + DateTime photodt = getPhotoTime(filename); if (startTime == DateTime.MinValue) { - startTime = new DateTime(dt.Year, dt.Month, dt.Day, 0, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); + startTime = new DateTime(photodt.Year, photodt.Month, photodt.Day, 0, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); foreach (string[] arr in list) { @@ -239,21 +246,26 @@ namespace ArdupilotMega TXT_outputlog.AppendText("Log min " + localmin + " max " + localmax + "\r\n"); } - TXT_outputlog.AppendText("Photo " + Path.GetFileNameWithoutExtension(file) + " time " + dt + "\r\n"); - Application.DoEvents(); + TXT_outputlog.AppendText("Photo " + Path.GetFileNameWithoutExtension(filename) + " time " + photodt + "\r\n"); + //Application.DoEvents(); + + int a = 0; foreach (string[] arr in list) { + a++; + + if (lastmatchindex > (a)) + continue; //Application.DoEvents(); - DateTime crap = startTime.AddMilliseconds(int.Parse(arr[1])).AddSeconds(offsetseconds); - + DateTime logdt = startTime.AddMilliseconds(int.Parse(arr[1])).AddSeconds(offsetseconds); if (first == 0) { - TXT_outputlog.AppendText("Photo " + Path.GetFileNameWithoutExtension(file) + " " + dt + " vs Log " + crap + "\r\n"); + TXT_outputlog.AppendText("Photo " + Path.GetFileNameWithoutExtension(filename) + " " + photodt + " vs Log " + logdt + "\r\n"); - TXT_outputlog.AppendText("offset should be about " + (dt - crap).TotalSeconds + "\r\n"); + TXT_outputlog.AppendText("offset should be about " + (photodt - logdt).TotalSeconds + "\r\n"); if (dooffset) return; @@ -263,30 +275,39 @@ namespace ArdupilotMega //Console.Write("ph " + dt + " log " + crap + " \r"); - sw4.WriteLine("ph " + file + " " + dt + " log " + crap); - if (dt.ToString("yyyy-MM-ddTHH:mm:ss") == crap.ToString("yyyy-MM-ddTHH:mm:ss")) + timecoordcache[(long)(logdt.AddSeconds(-offsetseconds) - DateTime.MinValue).TotalSeconds] = new double[] { + double.Parse(arr[latpos]), double.Parse(arr[lngpos]), double.Parse(arr[altpos]) + }; + + sw4.WriteLine("ph " + filename + " " + photodt + " log " + logdt); + + if (photodt.ToString("yyyy-MM-ddTHH:mm:ss") == logdt.ToString("yyyy-MM-ddTHH:mm:ss")) { - TXT_outputlog.AppendText("MATCH Photo " + Path.GetFileNameWithoutExtension(file) + " " + dt + "\r\n"); + lastmatchindex = a; + + TXT_outputlog.AppendText("MATCH Photo " + Path.GetFileNameWithoutExtension(filename) + " " + photodt + "\r\n"); matchs++; + + SharpKml.Dom.Timestamp tstamp = new SharpKml.Dom.Timestamp(); - tstamp.When = dt; + tstamp.When = photodt; kml.AddFeature( new Placemark() { Time = tstamp, - Name = Path.GetFileNameWithoutExtension(file), + Name = Path.GetFileNameWithoutExtension(filename), Geometry = new SharpKml.Dom.Point() { Coordinate = new Vector(double.Parse(arr[latpos]), double.Parse(arr[lngpos]), double.Parse(arr[altpos])) }, Description = new Description() { - Text = "
" + Text = "
" }, StyleSelector = new Style() { @@ -295,14 +316,15 @@ namespace ArdupilotMega } ); - photocoords[file] = new double[] { double.Parse(arr[latpos]), double.Parse(arr[lngpos]), double.Parse(arr[altpos]) }; + photocoords[filename] = new double[] { double.Parse(arr[latpos]), double.Parse(arr[lngpos]), double.Parse(arr[altpos]) }; + imagetotime[filename] = (long)(logdt.AddSeconds(-offsetseconds) - DateTime.MinValue).TotalSeconds; - sw2.WriteLine(Path.GetFileNameWithoutExtension(file) + " " + arr[lngpos] + " " + arr[latpos] + " " + arr[altpos]); - sw.WriteLine(Path.GetFileNameWithoutExtension(file) + "\t" + crap.ToString("yyyy:MM:dd HH:mm:ss") + "\t" + arr[lngpos] + "\t" + arr[latpos] + "\t" + arr[altpos]); + sw2.WriteLine(Path.GetFileNameWithoutExtension(filename) + " " + arr[lngpos] + " " + arr[latpos] + " " + arr[altpos]); + sw.WriteLine(Path.GetFileNameWithoutExtension(filename) + "\t" + logdt.ToString("yyyy:MM:dd HH:mm:ss") + "\t" + arr[lngpos] + "\t" + arr[latpos] + "\t" + arr[altpos]); sw.Flush(); sw2.Flush(); - log.InfoFormat(Path.GetFileNameWithoutExtension(file) + " " + arr[lngpos] + " " + arr[latpos] + " " + arr[altpos] + " "); + log.InfoFormat(Path.GetFileNameWithoutExtension(filename) + " " + arr[lngpos] + " " + arr[latpos] + " " + arr[altpos] + " "); break; } //Console.WriteLine(crap); @@ -330,43 +352,23 @@ namespace ArdupilotMega private void InitializeComponent() { this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.BUT_browselog = new ArdupilotMega.MyButton(); - this.BUT_browsedir = new ArdupilotMega.MyButton(); this.TXT_logfile = new System.Windows.Forms.TextBox(); this.TXT_jpgdir = new System.Windows.Forms.TextBox(); this.TXT_offsetseconds = new System.Windows.Forms.TextBox(); - this.BUT_doit = new ArdupilotMega.MyButton(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.TXT_outputlog = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.BUT_estoffset = new ArdupilotMega.MyButton(); this.BUT_Geotagimages = new ArdupilotMega.MyButton(); + this.BUT_estoffset = new ArdupilotMega.MyButton(); + this.BUT_doit = new ArdupilotMega.MyButton(); + this.BUT_browsedir = new ArdupilotMega.MyButton(); + this.BUT_browselog = new ArdupilotMega.MyButton(); this.SuspendLayout(); // // openFileDialog1 // this.openFileDialog1.FileName = "openFileDialog1"; // - // BUT_browselog - // - this.BUT_browselog.Location = new System.Drawing.Point(351, 12); - this.BUT_browselog.Name = "BUT_browselog"; - this.BUT_browselog.Size = new System.Drawing.Size(75, 23); - this.BUT_browselog.TabIndex = 0; - this.BUT_browselog.Text = "Browse Log"; - this.BUT_browselog.UseVisualStyleBackColor = true; - this.BUT_browselog.Click += new System.EventHandler(this.BUT_browselog_Click); - // - // BUT_browsedir - // - this.BUT_browsedir.Location = new System.Drawing.Point(351, 41); - this.BUT_browsedir.Name = "BUT_browsedir"; - this.BUT_browsedir.Size = new System.Drawing.Size(75, 23); - this.BUT_browsedir.TabIndex = 1; - this.BUT_browsedir.Text = "Browse Directory"; - this.BUT_browsedir.UseVisualStyleBackColor = true; - this.BUT_browsedir.Click += new System.EventHandler(this.BUT_browsedir_Click); - // // TXT_logfile // this.TXT_logfile.Location = new System.Drawing.Point(28, 14); @@ -391,16 +393,6 @@ namespace ArdupilotMega this.TXT_offsetseconds.TabIndex = 4; this.TXT_offsetseconds.Text = "-86158"; // - // BUT_doit - // - this.BUT_doit.Location = new System.Drawing.Point(194, 105); - this.BUT_doit.Name = "BUT_doit"; - this.BUT_doit.Size = new System.Drawing.Size(75, 23); - this.BUT_doit.TabIndex = 5; - this.BUT_doit.Text = "Do It"; - this.BUT_doit.UseVisualStyleBackColor = true; - this.BUT_doit.Click += new System.EventHandler(this.BUT_doit_Click); - // // TXT_outputlog // this.TXT_outputlog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -423,6 +415,17 @@ namespace ArdupilotMega this.label1.TabIndex = 7; this.label1.Text = "Seconds offset"; // + // BUT_Geotagimages + // + this.BUT_Geotagimages.Enabled = false; + this.BUT_Geotagimages.Location = new System.Drawing.Point(366, 105); + this.BUT_Geotagimages.Name = "BUT_Geotagimages"; + this.BUT_Geotagimages.Size = new System.Drawing.Size(75, 23); + this.BUT_Geotagimages.TabIndex = 9; + this.BUT_Geotagimages.Text = "GeoTag Images"; + this.BUT_Geotagimages.UseVisualStyleBackColor = true; + this.BUT_Geotagimages.Click += new System.EventHandler(this.BUT_Geotagimages_Click); + // // BUT_estoffset // this.BUT_estoffset.Location = new System.Drawing.Point(286, 67); @@ -433,16 +436,35 @@ namespace ArdupilotMega this.BUT_estoffset.UseVisualStyleBackColor = true; this.BUT_estoffset.Click += new System.EventHandler(this.BUT_estoffset_Click); // - // BUT_Geotagimages + // BUT_doit // - this.BUT_Geotagimages.Enabled = false; - this.BUT_Geotagimages.Location = new System.Drawing.Point(366, 115); - this.BUT_Geotagimages.Name = "BUT_Geotagimages"; - this.BUT_Geotagimages.Size = new System.Drawing.Size(75, 23); - this.BUT_Geotagimages.TabIndex = 9; - this.BUT_Geotagimages.Text = "GeoTag Images"; - this.BUT_Geotagimages.UseVisualStyleBackColor = true; - this.BUT_Geotagimages.Click += new System.EventHandler(this.BUT_Geotagimages_Click); + this.BUT_doit.Location = new System.Drawing.Point(285, 105); + this.BUT_doit.Name = "BUT_doit"; + this.BUT_doit.Size = new System.Drawing.Size(75, 23); + this.BUT_doit.TabIndex = 5; + this.BUT_doit.Text = "Do It"; + this.BUT_doit.UseVisualStyleBackColor = true; + this.BUT_doit.Click += new System.EventHandler(this.BUT_doit_Click); + // + // BUT_browsedir + // + this.BUT_browsedir.Location = new System.Drawing.Point(351, 41); + this.BUT_browsedir.Name = "BUT_browsedir"; + this.BUT_browsedir.Size = new System.Drawing.Size(75, 23); + this.BUT_browsedir.TabIndex = 1; + this.BUT_browsedir.Text = "Browse Directory"; + this.BUT_browsedir.UseVisualStyleBackColor = true; + this.BUT_browsedir.Click += new System.EventHandler(this.BUT_browsedir_Click); + // + // BUT_browselog + // + this.BUT_browselog.Location = new System.Drawing.Point(351, 12); + this.BUT_browselog.Name = "BUT_browselog"; + this.BUT_browselog.Size = new System.Drawing.Size(75, 23); + this.BUT_browselog.TabIndex = 0; + this.BUT_browselog.Text = "Browse Log"; + this.BUT_browselog.UseVisualStyleBackColor = true; + this.BUT_browselog.Click += new System.EventHandler(this.BUT_browselog_Click); // // Georefimage // @@ -609,7 +631,6 @@ namespace ArdupilotMega } } } - } public class Rational