diff --git a/Tools/ArdupilotMegaPlanner/ArduCopterConfig.xml b/Tools/ArdupilotMegaPlanner/ArduCopterConfig.xml index fda38f6780..100893c154 100644 --- a/Tools/ArdupilotMegaPlanner/ArduCopterConfig.xml +++ b/Tools/ArdupilotMegaPlanner/ArduCopterConfig.xml @@ -16,7 +16,7 @@ Large: P = 0.090 RATE_PIT_P 0.001 5 - 0.001 + 0.0001 I @@ -24,7 +24,7 @@ Large: P = 0.090 RATE_PIT_I 0 5 - 0.001 + 0.0001 D @@ -32,7 +32,7 @@ Large: P = 0.090 RATE_PIT_D 0 5 - 0.001 + 0.0001 IMAX @@ -58,14 +58,14 @@ When the sticks are fully deflected: STAB_D 0 5 - 0.001 + 0.0001 Dynamic STAB_D_S 0 1 - 0.001 + 0.0001 @@ -82,7 +82,7 @@ Too high = slow wobbles STB_PIT_P 0.001 5 - 0.001 + 0.0001 I @@ -90,7 +90,7 @@ Too high = slow wobbles STB_PIT_I 0 5 - 0.001 + 0.0001 IMAX @@ -98,7 +98,7 @@ Too high = slow wobbles STB_PIT_IMAX 0 50 - 0.001 + 0.0001 @@ -111,21 +111,21 @@ Too high = slow wobbles RATE_YAW_P 0.001 5 - 0.001 + 0.0001 I RATE_YAW_I 0 5 - 0.001 + 0.0001 D RATE_YAW_D 0 5 - 0.001 + 0.0001 IMAX @@ -148,14 +148,14 @@ Too high = slow wobbles STB_YAW_P 0.001 10 - 0.001 + 0.0001 I STB_YAW_I 0 5 - 0.001 + 0.0001 IMAX @@ -180,7 +180,7 @@ How much angle is applied to make the copter accelerate to the desired speed. LOITER_LON_P 0.001 5 - 0.001 + 0.0001 I @@ -188,7 +188,7 @@ How much angle is applied to make the copter accelerate to the desired speed. LOITER_LON_I 0 5 - 0.001 + 0.0001 D @@ -196,7 +196,7 @@ How much angle is applied to make the copter accelerate to the desired speed. LOITER_LON_D 0 5 - 0.001 + 0.0001 IMAX @@ -220,7 +220,7 @@ A distance error of 100cm * P of .25 = 25 cm/s HLD_LON_P 0.001 5 - 0.001 + 0.0001 @@ -238,7 +238,7 @@ A distance error of 100cm * P of .25 = 25 cm/s NAV_LON_P 0.001 5 - 0.001 + 0.0001 I @@ -246,7 +246,7 @@ A distance error of 100cm * P of .25 = 25 cm/s NAV_LON_I 0 5 - 0.001 + 0.0001 D @@ -254,7 +254,7 @@ A distance error of 100cm * P of .25 = 25 cm/s NAV_LON_D 0 5 - 0.001 + 0.0001 IMAX @@ -294,14 +294,14 @@ A distance error of 100cm * P of .25 = 25 cm/s THR_ALT_P 0.001 5 - 0.001 + 0.0001 I THR_ALT_I 0 5 - 0.001 + 0.0001 IMAX @@ -323,21 +323,21 @@ A distance error of 100cm * P of .25 = 25 cm/s THR_RATE_P 0.001 5 - 0.001 + 0.0001 I THR_RATE_I 0 5 - 0.001 + 0.0001 D THR_RATE_D 0 5 - 0.001 + 0.0001 IMAX diff --git a/Tools/ArdupilotMegaPlanner/ChangeLog.txt b/Tools/ArdupilotMegaPlanner/ChangeLog.txt index 2d671710e9..47be8c94b3 100644 --- a/Tools/ArdupilotMegaPlanner/ChangeLog.txt +++ b/Tools/ArdupilotMegaPlanner/ChangeLog.txt @@ -1,4 +1,13 @@ -* Mission Planner 1.2.26 +* Mission Planner 1.2.27 +add extra decimal place on arducopter config screens +update ch6_list +fix quickview double click error +fix terminal/logview comport problem +add AC thr accel pids +modify driver (line ending issue) and resign +fix config view doubleclick popout + +* Mission Planner 1.2.26 move mavlink structure/currentstate around for future mods update old firmware git hashs mod some error descriptions diff --git a/Tools/ArdupilotMegaPlanner/Common.cs b/Tools/ArdupilotMegaPlanner/Common.cs index 49f7a41af1..ad7f3db7fb 100644 --- a/Tools/ArdupilotMegaPlanner/Common.cs +++ b/Tools/ArdupilotMegaPlanner/Common.cs @@ -561,46 +561,41 @@ namespace ArdupilotMega { // CH_6 Tuning // ----------- - CH6_NONE = 0, - // Attitude - CH6_STABILIZE_KP = 1, - CH6_STABILIZE_KI = 2, - CH6_YAW_KP = 3, - // Rate - CH6_RATE_KP = 4, - CH6_RATE_KI = 5, - CH6_RATE_KD = 21, - CH6_YAW_RATE_KP = 6, - // Altitude rate controller - CH6_THROTTLE_KP = 7, - // Extras - CH6_TOP_BOTTOM_RATIO = 8, - CH6_RELAY = 9, - CH6_TRAVERSE_SPEED = 10, - - CH6_NAV_P = 11, - CH6_LOITER_P = 12, - CH6_HELI_EXTERNAL_GYRO = 13, - - // altitude controller - CH6_THR_HOLD_KP = 14, - CH6_Z_GAIN = 15, - //CH6_DAMP = 16, - - // optical flow controller - CH6_OPTFLOW_KP = 17, - CH6_OPTFLOW_KI = 18, - CH6_OPTFLOW_KD = 19, - - CH6_NAV_I = 20, - CH6_LOITER_RATE_P = 22, - CH6_LOITER_RATE_D = 23, - CH6_YAW_KI = 24, - CH6_ACRO_KP = 25, - CH6_YAW_RATE_KD = 26, - CH6_LOITER_KI = 27, - CH6_LOITER_RATE_KI = 28, - CH6_STABILIZE_KD = 29 + CH6_0NONE = 0, // no tuning performed + CH6_STABILIZE_KP = 1, // stabilize roll/pitch angle controller's P term + CH6_STABILIZE_KI = 2, // stabilize roll/pitch angle controller's I term + CH6_STABILIZE_KD = 29, // stabilize roll/pitch angle controller's D term + CH6_YAW_KP = 3, // stabilize yaw heading controller's P term + CH6_YAW_KI = 24, // stabilize yaw heading controller's P term + CH6_ACRO_KP = 25, // acro controller's P term. converts pilot input to a desired roll, pitch or yaw rate + CH6_RATE_KP = 4, // body frame roll/pitch rate controller's P term + CH6_RATE_KI = 5, // body frame roll/pitch rate controller's I term + CH6_RATE_KD = 21, // body frame roll/pitch rate controller's D term + CH6_YAW_RATE_KP = 6, // body frame yaw rate controller's P term + CH6_YAW_RATE_KD = 26, // body frame yaw rate controller's D term + CH6_THR_HOLD_KP = 14, // altitude hold controller's P term (alt error to desired rate) + CH6_THROTTLE_KP = 7, // throttle rate controller's P term (desired rate to acceleration or motor output) + CH6_THROTTLE_KI = 33, // throttle rate controller's I term (desired rate to acceleration or motor output) + CH6_THR_ACCEL_KP = 34, // accel based throttle controller's P term + CH6_THR_ACCEL_KI = 35, // accel based throttle controller's I term + CH6_THR_ACCEL_KD = 36, // accel based throttle controller's D term + CH6_TOP_BOTTOM_RATIO = 8, // upper/lower motor ratio (not used) + CH6_RELAY = 9, // switch relay on if ch6 high, off if low + CH6_TRAVERSE_SPEED = 10, // maximum speed to next way point (0 to 10m/s) + CH6_NAV_KP = 11, // navigation rate controller's P term (speed error to tilt angle) + CH6_NAV_KI = 20, // navigation rate controller's I term (speed error to tilt angle) + CH6_LOITER_KP = 12, // loiter distance controller's P term (position error to speed) + CH6_LOITER_KI = 27, // loiter distance controller's I term (position error to speed) + CH6_HELI_EXTERNAL_GYRO = 13, // TradHeli specific external tail gyro gain + CH6_OPTFLOW_KP = 17, // optical flow loiter controller's P term (position error to tilt angle) + CH6_OPTFLOW_KI = 18, // optical flow loiter controller's I term (position error to tilt angle) + CH6_OPTFLOW_KD = 19, // optical flow loiter controller's D term (position error to tilt angle) + CH6_LOITER_RATE_KP = 22, // loiter rate controller's P term (speed error to tilt angle) + CH6_LOITER_RATE_KI = 28, // loiter rate controller's I term (speed error to tilt angle) + CH6_LOITER_RATE_KD = 23, // loiter rate controller's D term (speed error to tilt angle) + CH6_AHRS_YAW_KP = 30, // ahrs's compass effect on yaw angle (0 = very low, 1 = very high) + CH6_AHRS_KP = 31, // accelerometer effect on roll/pitch angle (0=low) + CH6_INAV_TC = 32 // inertial navigation baro/accel and gps/accel time } public static void linearRegression() diff --git a/Tools/ArdupilotMegaPlanner/Comms/CommsSerialPort.cs b/Tools/ArdupilotMegaPlanner/Comms/CommsSerialPort.cs index 737d4d2cf3..9f12cce496 100644 --- a/Tools/ArdupilotMegaPlanner/Comms/CommsSerialPort.cs +++ b/Tools/ArdupilotMegaPlanner/Comms/CommsSerialPort.cs @@ -49,23 +49,33 @@ namespace ArdupilotMega.Comms public void toggleDTR() { - bool open = this.IsOpen; + bool open = this.IsOpen; + Console.WriteLine("toggleDTR " + this.IsOpen); + try + { + if (!open) + this.Open(); + } + catch { } - if (!open) - this.Open(); - base.DtrEnable = false; - base.RtsEnable = false; + base.DtrEnable = false; + base.RtsEnable = false; - System.Threading.Thread.Sleep(50); + System.Threading.Thread.Sleep(50); - base.DtrEnable = true; - base.RtsEnable = true; + base.DtrEnable = true; + base.RtsEnable = true; - System.Threading.Thread.Sleep(50); + System.Threading.Thread.Sleep(50); - if (!open) - this.Close(); + try + { + if (!open) + this.Close(); + } + catch { } + Console.WriteLine("toggleDTR done " + this.IsOpen); } public new static string[] GetPortNames() diff --git a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs index 50eac1d4ce..684011af4a 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs @@ -226,6 +226,9 @@ namespace ArdupilotMega.Controls.BackstageView private void DrawMenu(BackstageViewPage CurrentPage) { + if (_activePage == CurrentPage) + return; + pnlMenu.Visible = false; pnlMenu.SuspendLayout(); diff --git a/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs b/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs index c50129d717..eea78b8c2a 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs @@ -216,7 +216,7 @@ namespace ArdupilotMega.Controls nud.Maximum = (decimal)rangemax; nud.Minimum = (decimal)rangemin; nud.Increment = (decimal)step; - nud.DecimalPlaces = (int)(step.ToString().Length - step.ToString(new System.Globalization.CultureInfo("en-US")).IndexOf('.') - 1); + nud.DecimalPlaces = (int)(step.ToString().Length - step.ToString(new System.Globalization.CultureInfo("en-US")).IndexOf('.') -1); nud.Name = paramname[0]; this.Controls.Add(nud); diff --git a/Tools/ArdupilotMegaPlanner/Controls/RangeControl.Designer.cs b/Tools/ArdupilotMegaPlanner/Controls/RangeControl.Designer.cs index 790d83b71f..d0216c99a1 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/RangeControl.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/RangeControl.Designer.cs @@ -90,7 +90,7 @@ // this.numericUpDown1.Location = new System.Drawing.Point(3, 3); this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(47, 20); + this.numericUpDown1.Size = new System.Drawing.Size(57, 20); this.numericUpDown1.TabIndex = 4; // // myLabel1 diff --git a/Tools/ArdupilotMegaPlanner/Driver/arduino.cat b/Tools/ArdupilotMegaPlanner/Driver/arduino.cat index a7e6ad65cf..0f2ad511ed 100644 Binary files a/Tools/ArdupilotMegaPlanner/Driver/arduino.cat and b/Tools/ArdupilotMegaPlanner/Driver/arduino.cat differ diff --git a/Tools/ArdupilotMegaPlanner/Driver/arduino.inf b/Tools/ArdupilotMegaPlanner/Driver/arduino.inf index b05aafe280..da1a6e147a 100644 --- a/Tools/ArdupilotMegaPlanner/Driver/arduino.inf +++ b/Tools/ArdupilotMegaPlanner/Driver/arduino.inf @@ -8,7 +8,7 @@ Signature="$Windows NT$" Class=Ports ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} Provider=%MFGNAME% -DriverVer=01/01/2012,1.0.0.0 +DriverVer=01/01/2012,1.0.0.1 CatalogFile=arduino.cat [Manufacturer] diff --git a/Tools/ArdupilotMegaPlanner/Driver/px4fmu.cat b/Tools/ArdupilotMegaPlanner/Driver/px4fmu.cat index 48489a0e30..4e7a3edc27 100644 Binary files a/Tools/ArdupilotMegaPlanner/Driver/px4fmu.cat and b/Tools/ArdupilotMegaPlanner/Driver/px4fmu.cat differ diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs index 6d4714bbea..41795301e3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs @@ -137,6 +137,16 @@ this.myLabel3 = new ArdupilotMega.Controls.MyLabel(); this.myLabel2 = new ArdupilotMega.Controls.MyLabel(); this.myLabel1 = new ArdupilotMega.Controls.MyLabel(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.THR_ACCEL_D = new System.Windows.Forms.NumericUpDown(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.THR_ACCEL_IMAX = new System.Windows.Forms.NumericUpDown(); + this.THR_ACCEL_I = new System.Windows.Forms.NumericUpDown(); + this.label7 = new System.Windows.Forms.Label(); + this.THR_ACCEL_P = new System.Windows.Forms.NumericUpDown(); + this.label8 = new System.Windows.Forms.Label(); + this.MVCHK_thr_Acc_enable = new ArdupilotMega.Controls.MavlinkCheckBox(); ((System.ComponentModel.ISupportInitialize)(this.TUNE_LOW)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.TUNE_HIGH)).BeginInit(); this.groupBox5.SuspendLayout(); @@ -193,6 +203,11 @@ ((System.ComponentModel.ISupportInitialize)(this.LOITER_LAT_IMAX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.LOITER_LAT_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.LOITER_LAT_P)).BeginInit(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_D)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_IMAX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_I)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_P)).BeginInit(); this.SuspendLayout(); // // TUNE_LOW @@ -303,6 +318,7 @@ resources.ApplyResources(this.groupBox4, "groupBox4"); this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; + this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter); // // NAV_LAT_D // @@ -361,6 +377,7 @@ resources.ApplyResources(this.groupBox6, "groupBox6"); this.groupBox6.Name = "groupBox6"; this.groupBox6.TabStop = false; + this.groupBox6.Enter += new System.EventHandler(this.groupBox6_Enter); // // XTRK_GAIN_SC // @@ -383,6 +400,7 @@ resources.ApplyResources(this.groupBox7, "groupBox7"); this.groupBox7.Name = "groupBox7"; this.groupBox7.TabStop = false; + this.groupBox7.Enter += new System.EventHandler(this.groupBox7_Enter); // // THR_ALT_IMAX // @@ -425,6 +443,7 @@ resources.ApplyResources(this.groupBox19, "groupBox19"); this.groupBox19.Name = "groupBox19"; this.groupBox19.TabStop = false; + this.groupBox19.Enter += new System.EventHandler(this.groupBox19_Enter); // // HLD_LAT_IMAX // @@ -467,6 +486,7 @@ resources.ApplyResources(this.groupBox20, "groupBox20"); this.groupBox20.Name = "groupBox20"; this.groupBox20.TabStop = false; + this.groupBox20.Enter += new System.EventHandler(this.groupBox20_Enter); // // STB_YAW_IMAX // @@ -511,6 +531,7 @@ resources.ApplyResources(this.groupBox21, "groupBox21"); this.groupBox21.Name = "groupBox21"; this.groupBox21.TabStop = false; + this.groupBox21.Enter += new System.EventHandler(this.groupBox21_Enter); // // STAB_D // @@ -607,6 +628,7 @@ resources.ApplyResources(this.groupBox23, "groupBox23"); this.groupBox23.Name = "groupBox23"; this.groupBox23.TabStop = false; + this.groupBox23.Enter += new System.EventHandler(this.groupBox23_Enter); // // RATE_YAW_D // @@ -661,6 +683,7 @@ resources.ApplyResources(this.groupBox24, "groupBox24"); this.groupBox24.Name = "groupBox24"; this.groupBox24.TabStop = false; + this.groupBox24.Enter += new System.EventHandler(this.groupBox24_Enter); // // RATE_PIT_D // @@ -775,6 +798,7 @@ resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); // // LOITER_LAT_D // @@ -848,10 +872,81 @@ this.myLabel1.Name = "myLabel1"; this.myLabel1.resize = false; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.THR_ACCEL_D); + this.groupBox2.Controls.Add(this.label5); + this.groupBox2.Controls.Add(this.label6); + this.groupBox2.Controls.Add(this.THR_ACCEL_IMAX); + this.groupBox2.Controls.Add(this.THR_ACCEL_I); + this.groupBox2.Controls.Add(this.label7); + this.groupBox2.Controls.Add(this.THR_ACCEL_P); + this.groupBox2.Controls.Add(this.label8); + resources.ApplyResources(this.groupBox2, "groupBox2"); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.TabStop = false; + // + // THR_ACCEL_D + // + resources.ApplyResources(this.THR_ACCEL_D, "THR_ACCEL_D"); + this.THR_ACCEL_D.Name = "THR_ACCEL_D"; + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // THR_ACCEL_IMAX + // + resources.ApplyResources(this.THR_ACCEL_IMAX, "THR_ACCEL_IMAX"); + this.THR_ACCEL_IMAX.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.THR_ACCEL_IMAX.Name = "THR_ACCEL_IMAX"; + // + // THR_ACCEL_I + // + resources.ApplyResources(this.THR_ACCEL_I, "THR_ACCEL_I"); + this.THR_ACCEL_I.Name = "THR_ACCEL_I"; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.Name = "label7"; + // + // THR_ACCEL_P + // + resources.ApplyResources(this.THR_ACCEL_P, "THR_ACCEL_P"); + this.THR_ACCEL_P.Name = "THR_ACCEL_P"; + // + // label8 + // + resources.ApplyResources(this.label8, "label8"); + this.label8.Name = "label8"; + // + // MVCHK_thr_Acc_enable + // + resources.ApplyResources(this.MVCHK_thr_Acc_enable, "MVCHK_thr_Acc_enable"); + this.MVCHK_thr_Acc_enable.Name = "MVCHK_thr_Acc_enable"; + this.MVCHK_thr_Acc_enable.OffValue = 0F; + this.MVCHK_thr_Acc_enable.OnValue = 1F; + this.MVCHK_thr_Acc_enable.param = null; + this.MVCHK_thr_Acc_enable.ParamName = null; + this.MVCHK_thr_Acc_enable.UseVisualStyleBackColor = true; + // // ConfigArducopter // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.MVCHK_thr_Acc_enable); + this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.BUT_rerequestparams); this.Controls.Add(this.BUT_writePIDS); @@ -931,6 +1026,11 @@ ((System.ComponentModel.ISupportInitialize)(this.LOITER_LAT_IMAX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LOITER_LAT_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LOITER_LAT_P)).EndInit(); + this.groupBox2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_D)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_IMAX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_I)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.THR_ACCEL_P)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1045,5 +1145,15 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.NumericUpDown LOITER_LAT_P; private System.Windows.Forms.Label label4; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.NumericUpDown THR_ACCEL_D; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.NumericUpDown THR_ACCEL_IMAX; + private System.Windows.Forms.NumericUpDown THR_ACCEL_I; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.NumericUpDown THR_ACCEL_P; + private System.Windows.Forms.Label label8; + private Controls.MavlinkCheckBox MVCHK_thr_Acc_enable; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs index d03dc7878b..b8121f55c8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs @@ -74,6 +74,8 @@ namespace ArdupilotMega.GCSViews.ConfigurationView // prefill all fields processToScreen(); + MVCHK_thr_Acc_enable.setup(1, 0, "THR_ACC_ENABLE", MainV2.comPort.MAV.param, groupBox2); + startup = false; } @@ -188,12 +190,12 @@ namespace ArdupilotMega.GCSViews.ConfigurationView thisctl.Maximum = 9000; thisctl.Minimum = -9000; thisctl.Value = (decimal)numbervalue; - thisctl.Increment = (decimal)0.001; + thisctl.Increment = (decimal)0.0001; if (thisctl.Name.EndsWith("_P") || thisctl.Name.EndsWith("_I") || thisctl.Name.EndsWith("_D") || thisctl.Name.EndsWith("_LOW") || thisctl.Name.EndsWith("_HIGH") || thisctl.Value == 0 - || thisctl.Value.ToString("0.###", new System.Globalization.CultureInfo("en-US")).Contains(".")) + || thisctl.Value.ToString("0.####", new System.Globalization.CultureInfo("en-US")).Contains(".")) { - thisctl.DecimalPlaces = 3; + thisctl.DecimalPlaces = 4; } else { @@ -424,6 +426,51 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.Activate(); } + + private void groupBox1_Enter(object sender, EventArgs e) + { + + } + + private void groupBox4_Enter(object sender, EventArgs e) + { + + } + + private void groupBox6_Enter(object sender, EventArgs e) + { + + } + + private void groupBox7_Enter(object sender, EventArgs e) + { + + } + + private void groupBox19_Enter(object sender, EventArgs e) + { + + } + + private void groupBox20_Enter(object sender, EventArgs e) + { + + } + + private void groupBox21_Enter(object sender, EventArgs e) + { + + } + + private void groupBox23_Enter(object sender, EventArgs e) + { + + } + + private void groupBox24_Enter(object sender, EventArgs e) + { + + } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx index 873f222bba..ff3fd3f3a3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.resx @@ -119,7 +119,7 @@ - 399, 324 + 394, 308 51, 20 @@ -138,10 +138,10 @@ $this - 4 + 6 - 489, 324 + 484, 308 46, 20 @@ -159,10 +159,10 @@ $this - 5 + 7 - 423, 296 + 418, 280 112, 21 @@ -180,10 +180,10 @@ $this - 7 + 9 - 423, 348 + 418, 332 112, 21 @@ -201,7 +201,127 @@ $this - 9 + 11 + + + THR_RATE_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 0 + + + label29 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 1 + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 2 + + + THR_RATE_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 3 + + + THR_RATE_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 4 + + + label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 5 + + + THR_RATE_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 6 + + + label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 7 + + + 7, 231 + + + 170, 110 + + + 35 + + + Throttle Rate + + + groupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 80, 60 @@ -396,30 +516,6 @@ 7 - - 12, 247 - - - 170, 110 - - - 35 - - - Throttle Rate - - - groupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 10 - True @@ -427,7 +523,7 @@ NoControl - 12, 112 + 7, 102 154, 17 @@ -448,16 +544,7 @@ $this - 11 - - - 80, 60 - - - 78, 20 - - - 18 + 13 NAV_LAT_D @@ -471,21 +558,6 @@ 0 - - NoControl - - - 6, 63 - - - 10, 13 - - - 19 - - - D - label27 @@ -498,15 +570,6 @@ 1 - - 80, 107 - - - 78, 20 - - - 16 - WP_SPEED_MAX @@ -519,21 +582,6 @@ 2 - - NoControl - - - 6, 110 - - - 54, 13 - - - 17 - - - m/s - label9 @@ -546,15 +594,6 @@ 3 - - 80, 84 - - - 78, 20 - - - 11 - NAV_LAT_IMAX @@ -567,21 +606,6 @@ 4 - - NoControl - - - 6, 87 - - - 65, 13 - - - 12 - - - IMAX - label13 @@ -594,15 +618,6 @@ 5 - - 80, 37 - - - 78, 20 - - - 7 - NAV_LAT_I @@ -615,21 +630,6 @@ 6 - - NoControl - - - 6, 40 - - - 10, 13 - - - 14 - - - I - label15 @@ -642,11 +642,251 @@ 7 - - 80, 13 + + NAV_LAT_P - - 78, 20 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 8 + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 9 + + + 532, 231 + + + 170, 131 + + + 24 + + + Nav WP + + + groupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + 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 @@ -690,29 +930,53 @@ 9 - - 541, 247 + + XTRK_GAIN_SC - - 170, 131 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 24 + + groupBox6 - - Nav WP + + 0 - - groupBox4 + + label18 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + 1 + + + 359, 231 + + + 170, 43 + + + 25 + + + Crosstrack Correction + + + groupBox6 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 12 + + 15 80, 13 @@ -720,71 +984,143 @@ 78, 20 - - 5 + + 5 + + + XTRK_GAIN_SC + + + 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 + + + THR_ALT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 0 + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 1 - - XTRK_GAIN_SC + + THR_ALT_I - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox6 + + groupBox7 - - 0 + + 2 - - NoControl + + label21 - - 6, 16 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 38, 13 + + groupBox7 - - 15 + + 3 - - Gain + + THR_ALT_P - - label18 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox7 + + + 4 + + + label22 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox6 + + groupBox7 - - 1 + + 5 - - 364, 247 + + 183, 231 - - 170, 43 + + 170, 110 - - 25 + + 26 - - Crosstrack Correction + + Altitude Hold - - groupBox6 + + groupBox7 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 13 + + 16 80, 63 @@ -930,29 +1266,101 @@ 5 - - 188, 247 + + HLD_LAT_IMAX - - 170, 110 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 26 + + groupBox19 - - Altitude Hold + + 0 - - groupBox7 + + label28 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 1 + + + HLD_LAT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 2 + + + label30 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 3 + + + HLD_LAT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 4 + + + label31 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox19 + + + 5 + + + 532, 5 + + + 170, 95 + + + 27 + + + Loiter Speed + + + groupBox19 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 14 + + 17 80, 61 @@ -1065,62 +1473,134 @@ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox19 + + 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 + + + STB_YAW_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 0 + + + label32 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 1 + + + STB_YAW_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox20 + + + 2 + + + label34 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + groupBox20 - - NoControl + + 3 - - 6, 16 + + STB_YAW_P - - 14, 13 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15 + + groupBox20 - - P + + 4 - - label31 + + label35 - + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox19 + + groupBox20 - + 5 - - 537, 13 + + 359, 5 - + 170, 95 - - 27 + + 28 - - Loiter Speed + + Stabilize Yaw - - groupBox19 + + groupBox20 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 15 + + 18 80, 63 @@ -1266,29 +1746,125 @@ 5 - - 364, 13 + + STAB_D - - 170, 95 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 28 + + groupBox21 - - Stabilize Yaw + + 0 - - groupBox20 + + lblSTAB_D - + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 1 + + + STB_PIT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 2 + + + label36 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 3 + + + STB_PIT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 4 + + + label41 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 5 + + + STB_PIT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 6 + + + label42 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 7 + + + 183, 5 + + + 170, 114 + + + 29 + + + Stabilize Pitch + + + groupBox21 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 16 + + 19 80, 88 @@ -1473,38 +2049,110 @@ label42 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox21 + + + 7 + + + STB_RLL_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 0 + + + label43 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 1 + + + STB_RLL_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 2 + + + label45 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 3 + + + STB_RLL_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox22 + + + 4 + + + label46 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox21 + + groupBox22 - - 7 + + 5 - - 188, 13 + + 7, 5 - - 170, 114 + + 170, 95 - - 29 + + 30 - - Stabilize Pitch + + Stabilize Roll - - groupBox21 + + groupBox22 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 17 + + 20 80, 63 @@ -1650,29 +2298,125 @@ 5 - - 12, 13 + + RATE_YAW_D - - 170, 95 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 30 + + groupBox23 - - Stabilize Roll + + 0 - - groupBox22 + + label10 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 1 + + + RATE_YAW_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 2 + + + label47 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 3 + + + RATE_YAW_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 4 + + + label77 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 5 + + + RATE_YAW_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 6 + + + label82 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 7 + + + 359, 123 + + + 170, 108 + + + 31 + + + Rate Yaw + + + groupBox23 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 18 + + 21 80, 60 @@ -1851,44 +2595,140 @@ 7 - - P + + P + + + label82 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox23 + + + 7 + + + RATE_PIT_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 0 + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 1 + + + RATE_PIT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 2 + + + label84 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 3 + + + RATE_PIT_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 4 + + + label86 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 5 + + + RATE_PIT_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox24 + + + 6 - - label82 + + label87 - + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox23 + + groupBox24 - + 7 - - 364, 133 + + 183, 123 - + 170, 108 - - 31 + + 32 - - Rate Yaw + + Rate Pitch - - groupBox23 + + groupBox24 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 19 + + 22 80, 60 @@ -2082,29 +2922,125 @@ 7 - - 188, 133 + + RATE_RLL_D - + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 0 + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 1 + + + RATE_RLL_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 2 + + + label88 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 3 + + + RATE_RLL_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 4 + + + label90 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 5 + + + RATE_RLL_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 6 + + + label91 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox25 + + + 7 + + + 7, 123 + + 170, 108 - - 32 + + 33 - - Rate Pitch + + Rate Roll - - groupBox24 + + groupBox25 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 20 + + 23 80, 60 @@ -2247,84 +3183,180 @@ groupBox25 - - 5 + + 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 + + + 17, 17 + + + LOITER_LAT_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + LOITER_LAT_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 - - 80, 13 + + LOITER_LAT_I - - 78, 20 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + groupBox1 - - RATE_RLL_P + + 4 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label3 - - groupBox25 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + groupBox1 - - NoControl + + 5 - - 6, 16 + + LOITER_LAT_P - - 14, 13 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7 + + groupBox1 - - P + + 6 - - label91 + + label4 - + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox25 + + groupBox1 - + 7 - - 12, 133 + + 532, 123 - + 170, 108 - - 33 + + 32 - - Rate Roll + + Rate Loiter - - groupBox25 + + groupBox1 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 21 + + 2 - - 17, 17 - 80, 60 @@ -2517,35 +3549,11 @@ 7 - - 537, 133 - - - 170, 108 - - - 32 - - - Rate Loiter - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - NoControl - 364, 383 + 364, 397 0, 15, 0, 0 @@ -2563,19 +3571,19 @@ BUT_rerequestparams - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4724.22562, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4730.12876, Culture=neutral, PublicKeyToken=null $this - 1 + 3 NoControl - 255, 383 + 255, 397 103, 19 @@ -2590,16 +3598,16 @@ BUT_writePIDS - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4724.22562, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4730.12876, Culture=neutral, PublicKeyToken=null $this - 2 + 4 - 364, 321 + 359, 305 29, 23 @@ -2614,16 +3622,16 @@ myLabel3 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4724.22562, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4730.12876, Culture=neutral, PublicKeyToken=null $this - 3 + 5 - 364, 296 + 359, 280 53, 23 @@ -2638,16 +3646,16 @@ myLabel2 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4724.22562, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4730.12876, Culture=neutral, PublicKeyToken=null $this - 6 + 8 - 364, 348 + 359, 332 53, 23 @@ -2662,17 +3670,266 @@ myLabel1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4724.22562, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4730.12876, Culture=neutral, PublicKeyToken=null $this - 8 + 10 + + + 80, 66 + + + 78, 20 + + + 14 + + + THR_ACCEL_D + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + NoControl + + + 6, 69 + + + 10, 13 + + + 15 + + + D + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + NoControl + + + 6, 92 + + + 65, 13 + + + 16 + + + IMAX + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + 80, 89 + + + 78, 20 + + + 11 + + + THR_ACCEL_IMAX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + + 80, 43 + + + 78, 20 + + + 7 + + + THR_ACCEL_I + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 4 + + + NoControl + + + 6, 46 + + + 10, 13 + + + 14 + + + I + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 5 + + + 80, 19 + + + 78, 20 + + + 5 + + + THR_ACCEL_P + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 6 + + + NoControl + + + 6, 22 + + + 14, 13 + + + 15 + + + P + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 7 + + + 7, 352 + + + 170, 115 + + + 36 + + + Throttle Accel + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + False + + + 103, 347 + + + 59, 17 + + + 75 + + + Enable + + + MVCHK_thr_Acc_enable + + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4730.12876, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 True + + 61 + 6, 13 @@ -2680,7 +3937,7 @@ True - 728, 411 + 708, 468 toolTip1 diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index 8b458c00dc..f4a8156e04 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -70,12 +70,12 @@ this.tableMap = new System.Windows.Forms.TableLayoutPanel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.zg1 = new ZedGraph.ZedGraphControl(); - this.gMapControl1 = new ArdupilotMega.Controls.myGMAP(); - this.TRK_zoom = new ArdupilotMega.Controls.MyTrackBar(); this.lbl_winddir = new ArdupilotMega.Controls.MyLabel(); this.lbl_windvel = new ArdupilotMega.Controls.MyLabel(); this.lbl_hdop = new ArdupilotMega.Controls.MyLabel(); this.lbl_sats = new ArdupilotMega.Controls.MyLabel(); + this.gMapControl1 = new ArdupilotMega.Controls.myGMAP(); + this.TRK_zoom = new ArdupilotMega.Controls.MyTrackBar(); this.panel1 = new System.Windows.Forms.Panel(); this.TXT_lat = new ArdupilotMega.Controls.MyLabel(); this.Zoomlevel = new System.Windows.Forms.NumericUpDown(); @@ -1136,6 +1136,38 @@ this.zg1.ScrollMinY2 = 0D; this.zg1.DoubleClick += new System.EventHandler(this.zg1_DoubleClick); // + // lbl_winddir + // + this.lbl_winddir.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "wind_dir", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Dir: 0")); + resources.ApplyResources(this.lbl_winddir, "lbl_winddir"); + this.lbl_winddir.Name = "lbl_winddir"; + this.lbl_winddir.resize = true; + this.toolTip1.SetToolTip(this.lbl_winddir, resources.GetString("lbl_winddir.ToolTip")); + // + // lbl_windvel + // + this.lbl_windvel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "wind_vel", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Vel: 0")); + resources.ApplyResources(this.lbl_windvel, "lbl_windvel"); + this.lbl_windvel.Name = "lbl_windvel"; + this.lbl_windvel.resize = true; + this.toolTip1.SetToolTip(this.lbl_windvel, resources.GetString("lbl_windvel.ToolTip")); + // + // lbl_hdop + // + resources.ApplyResources(this.lbl_hdop, "lbl_hdop"); + this.lbl_hdop.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "gpshdop", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "hdop: 0.0")); + this.lbl_hdop.Name = "lbl_hdop"; + this.lbl_hdop.resize = true; + this.toolTip1.SetToolTip(this.lbl_hdop, resources.GetString("lbl_hdop.ToolTip")); + // + // lbl_sats + // + resources.ApplyResources(this.lbl_sats, "lbl_sats"); + this.lbl_sats.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "satcount", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Sats: 0")); + this.lbl_sats.Name = "lbl_sats"; + this.lbl_sats.resize = true; + this.toolTip1.SetToolTip(this.lbl_sats, resources.GetString("lbl_sats.ToolTip")); + // // gMapControl1 // this.gMapControl1.Bearing = 0F; @@ -1174,38 +1206,6 @@ this.TRK_zoom.Value = 10D; this.TRK_zoom.Scroll += new System.EventHandler(this.TRK_zoom_Scroll); // - // lbl_winddir - // - this.lbl_winddir.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "wind_dir", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Dir: 0")); - resources.ApplyResources(this.lbl_winddir, "lbl_winddir"); - this.lbl_winddir.Name = "lbl_winddir"; - this.lbl_winddir.resize = true; - this.toolTip1.SetToolTip(this.lbl_winddir, resources.GetString("lbl_winddir.ToolTip")); - // - // lbl_windvel - // - this.lbl_windvel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "wind_vel", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Vel: 0")); - resources.ApplyResources(this.lbl_windvel, "lbl_windvel"); - this.lbl_windvel.Name = "lbl_windvel"; - this.lbl_windvel.resize = true; - this.toolTip1.SetToolTip(this.lbl_windvel, resources.GetString("lbl_windvel.ToolTip")); - // - // lbl_hdop - // - resources.ApplyResources(this.lbl_hdop, "lbl_hdop"); - this.lbl_hdop.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "gpshdop", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "hdop: 0.0")); - this.lbl_hdop.Name = "lbl_hdop"; - this.lbl_hdop.resize = true; - this.toolTip1.SetToolTip(this.lbl_hdop, resources.GetString("lbl_hdop.ToolTip")); - // - // lbl_sats - // - resources.ApplyResources(this.lbl_sats, "lbl_sats"); - this.lbl_sats.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, "satcount", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "Sats: 0")); - this.lbl_sats.Name = "lbl_sats"; - this.lbl_sats.resize = true; - this.toolTip1.SetToolTip(this.lbl_sats, resources.GetString("lbl_sats.ToolTip")); - // // panel1 // this.panel1.Controls.Add(this.TXT_lat); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index 3a8c17d3e7..ce61c08854 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -2326,7 +2326,8 @@ print 'Roll complete' CheckBox chk_box = new CheckBox(); - if (((QuickView)sender).Tag.ToString() == field.Name) + // dont change to ToString() = null exception + if (((QuickView)sender).Tag == field.Name) chk_box.Checked = true; chk_box.Text = field.Name; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 73d54c83a9..f7ca9e22e4 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -244,7 +244,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -283,7 +283,7 @@ quickView6 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabQuick @@ -307,7 +307,7 @@ quickView5 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabQuick @@ -331,7 +331,7 @@ quickView4 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabQuick @@ -355,7 +355,7 @@ quickView3 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabQuick @@ -379,7 +379,7 @@ quickView2 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabQuick @@ -409,7 +409,7 @@ quickView1 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabQuick @@ -457,7 +457,7 @@ modifyandSetSpeed - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -478,7 +478,7 @@ modifyandSetAlt - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -511,7 +511,7 @@ BUT_ARM - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -538,7 +538,7 @@ BUT_script - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -568,7 +568,7 @@ BUT_joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -598,7 +598,7 @@ BUT_quickmanual - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -628,7 +628,7 @@ BUT_quickrtl - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -658,7 +658,7 @@ BUT_quickauto - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -712,7 +712,7 @@ BUT_setwp - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -763,7 +763,7 @@ BUT_setmode - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -793,7 +793,7 @@ BUT_clear_track - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -844,7 +844,7 @@ BUT_Homealt - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -874,7 +874,7 @@ BUT_RAWSensor - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -904,7 +904,7 @@ BUTrestartmission - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -934,7 +934,7 @@ BUTactiondo - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabActions @@ -988,7 +988,7 @@ Gvspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabGauges @@ -1018,7 +1018,7 @@ Gheading - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabGauges @@ -1048,7 +1048,7 @@ Galt - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabGauges @@ -1081,7 +1081,7 @@ Gspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabGauges @@ -1165,7 +1165,7 @@ lbl_playbackspeed - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1192,7 +1192,7 @@ lbl_logpercent - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1219,7 +1219,7 @@ NUM_playbackspeed - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1246,7 +1246,7 @@ BUT_log2kml - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1300,7 +1300,7 @@ BUT_playlog - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1327,7 +1327,7 @@ BUT_loadtelem - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1513,7 +1513,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1543,7 +1543,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1576,7 +1576,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1609,7 +1609,7 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1781,7 +1781,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1808,7 +1808,7 @@ TRK_zoom - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1871,7 +1871,7 @@ TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null panel1 @@ -1928,7 +1928,7 @@ label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null panel1 @@ -1958,7 +1958,7 @@ TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null panel1 @@ -1988,7 +1988,7 @@ TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null panel1 @@ -2279,6 +2279,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4723.32619, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4725.11331, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs index 083fac9a24..5edb15afa3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs @@ -217,7 +217,7 @@ namespace ArdupilotMega.GCSViews { DateTime start = DateTime.Now; - while ((DateTime.Now - start).TotalMilliseconds < time) + while ((DateTime.Now - start).TotalMilliseconds < time && !inlogview) { try { @@ -234,7 +234,7 @@ namespace ArdupilotMega.GCSViews { DateTime start = DateTime.Now; - while ((DateTime.Now - start).TotalMilliseconds < time) + while ((DateTime.Now - start).TotalMilliseconds < time && !inlogview) { try { @@ -273,20 +273,25 @@ namespace ArdupilotMega.GCSViews threadrun = true; // 10 sec - waitandsleep(10000); + if (!inlogview) + waitandsleep(10000); // 100 ms - readandsleep(100); + if (!inlogview) + readandsleep(100); try { - comPort.Write("\n\n\n"); + if (!inlogview) + comPort.Write("\n\n\n"); // 1 secs - readandsleep(1000); + if (!inlogview) + readandsleep(1000); - comPort.Write("\r\r\r?\r"); + if (!inlogview) + comPort.Write("\r\r\r?\r"); } - catch { threadrun = false; return; } + catch { threadrun = false; return; } while (threadrun) { diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index 11009f7b2e..fee6b72459 100644 --- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs +++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs @@ -2,14 +2,14 @@ - + - - + + @@ -31,7 +31,7 @@ - + @@ -106,11 +106,11 @@ - + - + @@ -121,20 +121,20 @@ - + - + - + @@ -148,7 +148,7 @@ - + @@ -160,13 +160,13 @@ - + - + @@ -177,7 +177,7 @@ - + @@ -188,12 +188,12 @@ - + - + @@ -202,31 +202,31 @@ - + - + - + - + - + @@ -235,31 +235,31 @@ - + - + - + - + - + diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 431897b673..91099119ae 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.2.26")] +[assembly: AssemblyFileVersion("1.2.27")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/wix/wix.csproj b/Tools/ArdupilotMegaPlanner/wix/wix.csproj index 42fbee7ca3..05bc437035 100644 --- a/Tools/ArdupilotMegaPlanner/wix/wix.csproj +++ b/Tools/ArdupilotMegaPlanner/wix/wix.csproj @@ -81,7 +81,9 @@ - + + Designer + SettingsSingleFileGenerator Settings.Designer.cs