diff --git a/Tools/ArdupilotMegaPlanner/Controls/MavlinkCheckBox.cs b/Tools/ArdupilotMegaPlanner/Controls/MavlinkCheckBox.cs index 2b2e5622041..5a83e1730d8 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/MavlinkCheckBox.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/MavlinkCheckBox.cs @@ -46,6 +46,7 @@ namespace ArdupilotMega.Controls if (paramlist.ContainsKey(paramname)) { this.Enabled = true; + this.Visible = true; if ((float)paramlist[paramname] == OnValue) { diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs index 2465dfb733d..8c4a8dd4646 100644 --- a/Tools/ArdupilotMegaPlanner/CurrentState.cs +++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs @@ -122,6 +122,7 @@ namespace ArdupilotMega [DisplayText("Turn Radius (dist)")] public float radius { get { if (groundspeed <= 1) return 0; return ((groundspeed * groundspeed)/(float)(9.8f*Math.Tan(roll * deg2rad))); } } + [DisplayText("RX Rssi")] public float rxrssi { get; set; } //radio public float ch1in { get; set; } @@ -231,6 +232,7 @@ namespace ArdupilotMega PointLatLngAlt _trackerloc = new PointLatLngAlt(); internal PointLatLngAlt TrackerLocation { get { if (_trackerloc.Lng != 0) return _trackerloc; return HomeLocation; } set { _trackerloc = value; } } + [DisplayText("Distance to Mav (dist)")] public float DistToMAV { get diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.Designer.cs index 1deb6794649..7ed6e03606c 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.Designer.cs @@ -30,7 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigAP_Limits)); this.LNK_wiki = new System.Windows.Forms.LinkLabel(); - this.LIM_ENABLED = new Controls.MavlinkCheckBox(); + this.LIM_ENABLED = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); @@ -43,7 +43,7 @@ this.LIM_CHANNEL = new System.Windows.Forms.NumericUpDown(); this.myLabel3 = new ArdupilotMega.Controls.MyLabel(); this.LIM_FNC_RAD = new System.Windows.Forms.NumericUpDown(); - this.LIM_FNC_SMPL = new Controls.MavlinkCheckBox(); + this.LIM_FNC_SMPL = new System.Windows.Forms.CheckBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.LIM_GPSLCK_ON = new System.Windows.Forms.CheckBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); @@ -281,7 +281,7 @@ #endregion private System.Windows.Forms.LinkLabel LNK_wiki; - private Controls.MavlinkCheckBox LIM_ENABLED; + private System.Windows.Forms.CheckBox LIM_ENABLED; private System.Windows.Forms.GroupBox groupBox1; private Controls.MyLabel myLabel2; private Controls.MyLabel myLabel1; @@ -294,7 +294,7 @@ private System.Windows.Forms.GroupBox groupBox4; private Controls.MyLabel myLabel3; private System.Windows.Forms.NumericUpDown LIM_FNC_RAD; - private Controls.MavlinkCheckBox LIM_FNC_SMPL; + private System.Windows.Forms.CheckBox LIM_FNC_SMPL; private Controls.MyLabel myLabel4; private System.Windows.Forms.NumericUpDown LIM_CHANNEL; private System.Windows.Forms.CheckBox LIM_REQUIRED; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.cs index 4254c0ac8ba..27d7de5228b 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAP_Limits.cs @@ -98,6 +98,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView else if (ctls[0].GetType() == typeof(NumericUpDown)) { NumericUpDown nud = ((NumericUpDown)ctls[0]); + Console.WriteLine(nud.Name + " " + copy[key]); nud.Value = (decimal)(float)copy[key]; nud.Enabled = true; } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs index 08a98c90411..85e26edf159 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs @@ -37,12 +37,14 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.lbl_Accel_user = new System.Windows.Forms.Label(); + this.BUT_calib_accell = new ArdupilotMega.Controls.MyButton(); + this.lineSeparator2 = new ArdupilotMega.Controls.LineSeparator(); + this.lineSeparator3 = new ArdupilotMega.Controls.LineSeparator(); this.pictureBoxPlus = new ArdupilotMega.Controls.PictureBoxWithPseudoOpacity(); this.pictureBoxX = new ArdupilotMega.Controls.PictureBoxWithPseudoOpacity(); this.BUT_levelac2 = new ArdupilotMega.Controls.MyButton(); - this.label4 = new System.Windows.Forms.Label(); - this.lineSeparator3 = new ArdupilotMega.Controls.LineSeparator(); - this.lineSeparator2 = new ArdupilotMega.Controls.LineSeparator(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxX)).BeginInit(); this.SuspendLayout(); @@ -85,6 +87,47 @@ namespace ArdupilotMega.GCSViews.ConfigurationView resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // lbl_Accel_user + // + resources.ApplyResources(this.lbl_Accel_user, "lbl_Accel_user"); + this.lbl_Accel_user.Name = "lbl_Accel_user"; + // + // BUT_calib_accell + // + resources.ApplyResources(this.BUT_calib_accell, "BUT_calib_accell"); + this.BUT_calib_accell.Name = "BUT_calib_accell"; + this.BUT_calib_accell.UseVisualStyleBackColor = true; + this.BUT_calib_accell.Click += new System.EventHandler(this.BUT_calib_accell_Click); + // + // lineSeparator2 + // + resources.ApplyResources(this.lineSeparator2, "lineSeparator2"); + this.lineSeparator2.MaximumSize = new System.Drawing.Size(2000, 2); + this.lineSeparator2.MinimumSize = new System.Drawing.Size(0, 2); + this.lineSeparator2.Name = "lineSeparator2"; + this.lineSeparator2.Opacity1 = 0.6F; + this.lineSeparator2.Opacity2 = 0.7F; + this.lineSeparator2.Opacity3 = 0.1F; + this.lineSeparator2.PrimaryColor = System.Drawing.Color.Black; + this.lineSeparator2.SecondaryColor = System.Drawing.Color.Gainsboro; + // + // lineSeparator3 + // + resources.ApplyResources(this.lineSeparator3, "lineSeparator3"); + this.lineSeparator3.MaximumSize = new System.Drawing.Size(2000, 2); + this.lineSeparator3.MinimumSize = new System.Drawing.Size(0, 2); + this.lineSeparator3.Name = "lineSeparator3"; + this.lineSeparator3.Opacity1 = 0.6F; + this.lineSeparator3.Opacity2 = 0.7F; + this.lineSeparator3.Opacity3 = 0.1F; + this.lineSeparator3.PrimaryColor = System.Drawing.Color.Black; + this.lineSeparator3.SecondaryColor = System.Drawing.Color.Gainsboro; + // // pictureBoxPlus // this.pictureBoxPlus.Cursor = System.Windows.Forms.Cursors.Hand; @@ -110,39 +153,12 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.BUT_levelac2.UseVisualStyleBackColor = true; this.BUT_levelac2.Click += new System.EventHandler(this.BUT_levelac2_Click); // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // - // lineSeparator3 - // - resources.ApplyResources(this.lineSeparator3, "lineSeparator3"); - this.lineSeparator3.MaximumSize = new System.Drawing.Size(2000, 2); - this.lineSeparator3.MinimumSize = new System.Drawing.Size(0, 2); - this.lineSeparator3.Name = "lineSeparator3"; - this.lineSeparator3.Opacity1 = 0.6F; - this.lineSeparator3.Opacity2 = 0.7F; - this.lineSeparator3.Opacity3 = 0.1F; - this.lineSeparator3.PrimaryColor = System.Drawing.Color.Black; - this.lineSeparator3.SecondaryColor = System.Drawing.Color.Gainsboro; - // - // lineSeparator2 - // - resources.ApplyResources(this.lineSeparator2, "lineSeparator2"); - this.lineSeparator2.MaximumSize = new System.Drawing.Size(2000, 2); - this.lineSeparator2.MinimumSize = new System.Drawing.Size(0, 2); - this.lineSeparator2.Name = "lineSeparator2"; - this.lineSeparator2.Opacity1 = 0.6F; - this.lineSeparator2.Opacity2 = 0.7F; - this.lineSeparator2.Opacity3 = 0.1F; - this.lineSeparator2.PrimaryColor = System.Drawing.Color.Black; - this.lineSeparator2.SecondaryColor = System.Drawing.Color.Gainsboro; - // // ConfigAccelerometerCalibrationQuad // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbl_Accel_user); + this.Controls.Add(this.BUT_calib_accell); this.Controls.Add(this.lineSeparator2); this.Controls.Add(this.lineSeparator3); this.Controls.Add(this.label4); @@ -177,5 +193,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView private System.Windows.Forms.Label label4; private LineSeparator lineSeparator3; private LineSeparator lineSeparator2; + private MyButton BUT_calib_accell; + private System.Windows.Forms.Label lbl_Accel_user; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs index 274b5d04326..af2a193c968 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs @@ -24,7 +24,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView try { Log.Info("Sending level command (mavlink 1.0)"); - MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_CALIBRATION,1,0,0,0,1,0,0); + MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_CALIBRATION,1,0,0,0,0,0,0); BUT_levelac2.Text = "Complete"; } @@ -103,8 +103,9 @@ namespace ArdupilotMega.GCSViews.ConfigurationView public void Deactivate() { - radioButton_Plus.CheckedChanged -= RadioButtonPlusCheckedChanged; + MainV2.giveComport = false; + radioButton_Plus.CheckedChanged -= RadioButtonPlusCheckedChanged; } void RadioButtonPlusCheckedChanged(object sender, EventArgs e) @@ -114,5 +115,63 @@ namespace ArdupilotMega.GCSViews.ConfigurationView else SetPlus(); } + + private void BUT_calib_accell_Click(object sender, EventArgs e) + { + if (MainV2.giveComport == true) + { + MainV2.comPort.BaseStream.WriteLine(""); + return; + } + + try + { + Log.Info("Sending accel command (mavlink 1.0)"); + MainV2.giveComport = true; + MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_CALIBRATION, 0, 0, 0, 0, 1, 0, 0); + //MainV2.giveComport = false; + + System.Threading.ThreadPool.QueueUserWorkItem(readmessage,this); + + BUT_calib_accell.Text = "Click When Done"; + } + catch (Exception ex) + { + MainV2.giveComport = false; + Log.Error("Exception on level", ex); + CustomMessageBox.Show("Failed to level : ac2 2.0.37+ is required"); + } + } + + static void readmessage(object item) + { + ConfigAccelerometerCalibrationQuad local = (ConfigAccelerometerCalibrationQuad)item; + + while (!(MainV2.cs.message.Contains("Calibration successful") || MainV2.cs.message.Contains("Calibration failed"))) + { + System.Threading.Thread.Sleep(10); + // read the message + MainV2.comPort.readPacket(); + // update cs with the message + MainV2.cs.UpdateCurrentSettings(null); + // update user display + local.UpdateUserMessage(); + } + + MainV2.giveComport = false; + + local.Invoke((MethodInvoker)delegate() + { + local.BUT_calib_accell.Text = "Done"; + }); + } + + public void UpdateUserMessage() + { + this.Invoke((MethodInvoker)delegate() + { + lbl_Accel_user.Text = MainV2.cs.message; + }); + } } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx index 2d8586c8829..e2f6e6e051f 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx @@ -145,7 +145,7 @@ $this - 8 + 10 True @@ -172,7 +172,7 @@ $this - 7 + 9 True @@ -205,7 +205,7 @@ $this - 6 + 8 True @@ -238,7 +238,7 @@ $this - 5 + 7 True @@ -268,7 +268,7 @@ $this - 4 + 6 True @@ -298,92 +298,14 @@ $this - 3 - - - NoControl - - - 116, 65 - - - 248, 81 - - - Zoom - - - 17 - - - pictureBoxPlus - - - ArdupilotMega.Controls.PictureBoxWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4581.34461, Culture=neutral, PublicKeyToken=null - - - $this - - - 9 - - - NoControl - - - 116, 164 - - - 248, 85 - - - Zoom - - - 11 - - - pictureBoxX - - - ArdupilotMega.Controls.PictureBoxWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4581.34461, Culture=neutral, PublicKeyToken=null - - - $this - - - 10 - - - NoControl - - - 378, 318 - - - 102, 23 - - - 16 - - - Calibrate Now - - - BUT_levelac2 - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4581.34461, Culture=neutral, PublicKeyToken=null - - - $this - - - 11 + 5 True + + NoControl + 85, 323 @@ -406,27 +328,63 @@ $this - 2 + 4 - - 20, 36 + + NoControl - - 460, 2 + + 20, 371 - - 80 + + 460, 40 - - lineSeparator3 + + 83 - - ArdupilotMega.Controls.LineSeparator, ArdupilotMegaPlanner10, Version=1.1.4581.34461, Culture=neutral, PublicKeyToken=null + + Beta - + + MiddleCenter + + + lbl_Accel_user + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - + + 0 + + + NoControl + + + 201, 345 + + + 102, 23 + + + 82 + + + Calibrate Accel (Beta) + + + BUT_calib_accell + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.29982, Culture=neutral, PublicKeyToken=null + + + $this + + 1 @@ -442,13 +400,115 @@ lineSeparator2 - ArdupilotMega.Controls.LineSeparator, ArdupilotMegaPlanner10, Version=1.1.4581.34461, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.LineSeparator, ArdupilotMegaPlanner10, Version=1.1.4716.29982, Culture=neutral, PublicKeyToken=null $this - 0 + 2 + + + 20, 36 + + + 460, 2 + + + 80 + + + lineSeparator3 + + + ArdupilotMega.Controls.LineSeparator, ArdupilotMegaPlanner10, Version=1.1.4716.29982, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + NoControl + + + 116, 65 + + + 248, 81 + + + Zoom + + + 17 + + + pictureBoxPlus + + + ArdupilotMega.Controls.PictureBoxWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4716.29982, Culture=neutral, PublicKeyToken=null + + + $this + + + 11 + + + NoControl + + + 116, 164 + + + 248, 85 + + + Zoom + + + 11 + + + pictureBoxX + + + ArdupilotMega.Controls.PictureBoxWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4716.29982, Culture=neutral, PublicKeyToken=null + + + $this + + + 12 + + + NoControl + + + 378, 318 + + + 102, 23 + + + 16 + + + Calibrate Now + + + BUT_levelac2 + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.29982, Culture=neutral, PublicKeyToken=null + + + $this + + + 13 True @@ -457,7 +517,7 @@ 6, 13 - 495, 363 + 495, 411 ConfigAccelerometerCalibrationQuad diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs index ad1e19880ee..a7ec8a2b49d 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs @@ -136,7 +136,7 @@ // // CMB_batmonsensortype // - this.CMB_batmonsensortype.DropDownWidth = 150; + this.CMB_batmonsensortype.DropDownWidth = 200; this.CMB_batmonsensortype.FormattingEnabled = true; this.CMB_batmonsensortype.Items.AddRange(new object[] { resources.GetString("CMB_batmonsensortype.Items"), @@ -172,6 +172,7 @@ // // CMB_batmontype // + this.CMB_batmontype.DropDownWidth = 200; this.CMB_batmontype.FormattingEnabled = true; this.CMB_batmontype.Items.AddRange(new object[] { resources.GetString("CMB_batmontype.Items"), @@ -197,6 +198,7 @@ // // CMB_apmversion // + this.CMB_apmversion.DropDownWidth = 200; this.CMB_apmversion.FormattingEnabled = true; this.CMB_apmversion.Items.AddRange(new object[] { resources.GetString("CMB_apmversion.Items"), diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx index 191585aebe5..32114cc7ef8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx @@ -616,7 +616,7 @@ Then subtract 0.3v from that value and enter it in field #1 at left. 3: Battery Volts - 4: Volts & Current + 4: Voltage and Current 160, 41 @@ -676,7 +676,7 @@ Then subtract 0.3v from that value and enter it in field #1 at left. 1: APM2 - 2.5 non 3DR - 2: APM2.5 3DR IV + 2: APM2.5 - 3DR Power Module 160, 95 diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.Designer.cs index 67dfaa6dde4..489653668bc 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.Designer.cs @@ -36,13 +36,14 @@ this.currentStateBindingSource = new System.Windows.Forms.BindingSource(this.components); this.LNK_wiki = new System.Windows.Forms.LinkLabel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.mavlinkCheckBoxthr_fs = new ArdupilotMega.Controls.MavlinkCheckBox(); - this.mavlinkCheckBoxthr_fs_action = new ArdupilotMega.Controls.MavlinkCheckBox(); - this.mavlinkNumericUpDownthr_fs_value = new ArdupilotMega.Controls.MavlinkNumericUpDown(); this.mavlinkCheckBoxlong_fs = new ArdupilotMega.Controls.MavlinkCheckBox(); this.mavlinkCheckBoxgcs_fs = new ArdupilotMega.Controls.MavlinkCheckBox(); this.mavlinkCheckBoxshort_fs = new ArdupilotMega.Controls.MavlinkCheckBox(); + this.mavlinkCheckBoxthr_fs = new ArdupilotMega.Controls.MavlinkCheckBox(); + this.mavlinkNumericUpDownthr_fs_value = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkCheckBoxthr_fs_action = new ArdupilotMega.Controls.MavlinkCheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.PNL_thr_fs_value = new System.Windows.Forms.Panel(); this.label3 = new System.Windows.Forms.Label(); this.lbl_armed = new System.Windows.Forms.Label(); this.lbl_gpslock = new System.Windows.Forms.Label(); @@ -62,9 +63,11 @@ this.horizontalProgressBar3 = new ArdupilotMega.HorizontalProgressBar(); this.horizontalProgressBar2 = new ArdupilotMega.HorizontalProgressBar(); this.horizontalProgressBar1 = new ArdupilotMega.HorizontalProgressBar(); + this.mavlinkCheckBoxfs_batt_enable = new ArdupilotMega.Controls.MavlinkCheckBox(); ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownthr_fs_value)).BeginInit(); this.groupBox1.SuspendLayout(); + this.PNL_thr_fs_value.SuspendLayout(); this.SuspendLayout(); // // label2 @@ -103,38 +106,6 @@ this.toolTip1.InitialDelay = 500; this.toolTip1.ReshowDelay = 100; // - // mavlinkCheckBoxthr_fs - // - resources.ApplyResources(this.mavlinkCheckBoxthr_fs, "mavlinkCheckBoxthr_fs"); - this.mavlinkCheckBoxthr_fs.Name = "mavlinkCheckBoxthr_fs"; - this.mavlinkCheckBoxthr_fs.OffValue = 0F; - this.mavlinkCheckBoxthr_fs.OnValue = 1F; - this.mavlinkCheckBoxthr_fs.param = null; - this.mavlinkCheckBoxthr_fs.ParamName = null; - this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs, resources.GetString("mavlinkCheckBoxthr_fs.ToolTip")); - this.mavlinkCheckBoxthr_fs.UseVisualStyleBackColor = true; - // - // mavlinkCheckBoxthr_fs_action - // - resources.ApplyResources(this.mavlinkCheckBoxthr_fs_action, "mavlinkCheckBoxthr_fs_action"); - this.mavlinkCheckBoxthr_fs_action.Name = "mavlinkCheckBoxthr_fs_action"; - this.mavlinkCheckBoxthr_fs_action.OffValue = 0F; - this.mavlinkCheckBoxthr_fs_action.OnValue = 1F; - this.mavlinkCheckBoxthr_fs_action.param = null; - this.mavlinkCheckBoxthr_fs_action.ParamName = null; - this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs_action, resources.GetString("mavlinkCheckBoxthr_fs_action.ToolTip")); - this.mavlinkCheckBoxthr_fs_action.UseVisualStyleBackColor = true; - // - // mavlinkNumericUpDownthr_fs_value - // - resources.ApplyResources(this.mavlinkNumericUpDownthr_fs_value, "mavlinkNumericUpDownthr_fs_value"); - this.mavlinkNumericUpDownthr_fs_value.Max = 1F; - this.mavlinkNumericUpDownthr_fs_value.Min = 0F; - this.mavlinkNumericUpDownthr_fs_value.Name = "mavlinkNumericUpDownthr_fs_value"; - this.mavlinkNumericUpDownthr_fs_value.param = null; - this.mavlinkNumericUpDownthr_fs_value.ParamName = null; - this.toolTip1.SetToolTip(this.mavlinkNumericUpDownthr_fs_value, resources.GetString("mavlinkNumericUpDownthr_fs_value.ToolTip")); - // // mavlinkCheckBoxlong_fs // resources.ApplyResources(this.mavlinkCheckBoxlong_fs, "mavlinkCheckBoxlong_fs"); @@ -168,19 +139,58 @@ this.toolTip1.SetToolTip(this.mavlinkCheckBoxshort_fs, resources.GetString("mavlinkCheckBoxshort_fs.ToolTip")); this.mavlinkCheckBoxshort_fs.UseVisualStyleBackColor = true; // + // mavlinkCheckBoxthr_fs + // + resources.ApplyResources(this.mavlinkCheckBoxthr_fs, "mavlinkCheckBoxthr_fs"); + this.mavlinkCheckBoxthr_fs.Name = "mavlinkCheckBoxthr_fs"; + this.mavlinkCheckBoxthr_fs.OffValue = 0F; + this.mavlinkCheckBoxthr_fs.OnValue = 1F; + this.mavlinkCheckBoxthr_fs.param = null; + this.mavlinkCheckBoxthr_fs.ParamName = null; + this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs, resources.GetString("mavlinkCheckBoxthr_fs.ToolTip")); + this.mavlinkCheckBoxthr_fs.UseVisualStyleBackColor = true; + // + // mavlinkNumericUpDownthr_fs_value + // + resources.ApplyResources(this.mavlinkNumericUpDownthr_fs_value, "mavlinkNumericUpDownthr_fs_value"); + this.mavlinkNumericUpDownthr_fs_value.Max = 1F; + this.mavlinkNumericUpDownthr_fs_value.Min = 0F; + this.mavlinkNumericUpDownthr_fs_value.Name = "mavlinkNumericUpDownthr_fs_value"; + this.mavlinkNumericUpDownthr_fs_value.param = null; + this.mavlinkNumericUpDownthr_fs_value.ParamName = null; + this.toolTip1.SetToolTip(this.mavlinkNumericUpDownthr_fs_value, resources.GetString("mavlinkNumericUpDownthr_fs_value.ToolTip")); + // + // mavlinkCheckBoxthr_fs_action + // + resources.ApplyResources(this.mavlinkCheckBoxthr_fs_action, "mavlinkCheckBoxthr_fs_action"); + this.mavlinkCheckBoxthr_fs_action.Name = "mavlinkCheckBoxthr_fs_action"; + this.mavlinkCheckBoxthr_fs_action.OffValue = 0F; + this.mavlinkCheckBoxthr_fs_action.OnValue = 1F; + this.mavlinkCheckBoxthr_fs_action.param = null; + this.mavlinkCheckBoxthr_fs_action.ParamName = null; + this.toolTip1.SetToolTip(this.mavlinkCheckBoxthr_fs_action, resources.GetString("mavlinkCheckBoxthr_fs_action.ToolTip")); + this.mavlinkCheckBoxthr_fs_action.UseVisualStyleBackColor = true; + // // groupBox1 // - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs); - this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs_action); - this.groupBox1.Controls.Add(this.mavlinkNumericUpDownthr_fs_value); + this.groupBox1.Controls.Add(this.mavlinkCheckBoxfs_batt_enable); this.groupBox1.Controls.Add(this.mavlinkCheckBoxlong_fs); - this.groupBox1.Controls.Add(this.mavlinkCheckBoxgcs_fs); this.groupBox1.Controls.Add(this.mavlinkCheckBoxshort_fs); + this.groupBox1.Controls.Add(this.mavlinkCheckBoxgcs_fs); + this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs_action); + this.groupBox1.Controls.Add(this.PNL_thr_fs_value); + this.groupBox1.Controls.Add(this.mavlinkCheckBoxthr_fs); resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // + // PNL_thr_fs_value + // + this.PNL_thr_fs_value.Controls.Add(this.mavlinkNumericUpDownthr_fs_value); + this.PNL_thr_fs_value.Controls.Add(this.label3); + resources.ApplyResources(this.PNL_thr_fs_value, "PNL_thr_fs_value"); + this.PNL_thr_fs_value.Name = "PNL_thr_fs_value"; + // // label3 // resources.ApplyResources(this.label3, "label3"); @@ -424,6 +434,16 @@ this.horizontalProgressBar1.Step = 1; this.horizontalProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous; // + // mavlinkCheckBoxfs_batt_enable + // + resources.ApplyResources(this.mavlinkCheckBoxfs_batt_enable, "mavlinkCheckBoxfs_batt_enable"); + this.mavlinkCheckBoxfs_batt_enable.Name = "mavlinkCheckBoxfs_batt_enable"; + this.mavlinkCheckBoxfs_batt_enable.OffValue = 0F; + this.mavlinkCheckBoxfs_batt_enable.OnValue = 1F; + this.mavlinkCheckBoxfs_batt_enable.param = null; + this.mavlinkCheckBoxfs_batt_enable.ParamName = null; + this.mavlinkCheckBoxfs_batt_enable.UseVisualStyleBackColor = true; + // // ConfigFailSafe // resources.ApplyResources(this, "$this"); @@ -456,6 +476,8 @@ ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownthr_fs_value)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.PNL_thr_fs_value.ResumeLayout(false); + this.PNL_thr_fs_value.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -495,5 +517,7 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label lbl_armed; private System.Windows.Forms.Label lbl_gpslock; + private System.Windows.Forms.Panel PNL_thr_fs_value; + private Controls.MavlinkCheckBox mavlinkCheckBoxfs_batt_enable; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.cs index 595b8245fd7..85edd7d8401 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.cs @@ -42,6 +42,10 @@ namespace ArdupilotMega.GCSViews.ConfigurationView public void Activate() { + // arducopter + mavlinkCheckBoxfs_batt_enable.setup(1, 0, "FS_BATT_ENABLE", MainV2.comPort.param); + + // plane mavlinkCheckBoxthr_fs.setup(1, 0, "THR_FAILSAFE", MainV2.comPort.param, mavlinkNumericUpDownthr_fs_value); mavlinkNumericUpDownthr_fs_value.setup(800, 1200, 1, 1, "THR_FS_VALUE", MainV2.comPort.param); mavlinkCheckBoxthr_fs_action.setup(1, 0, "THR_FS_ACTION",MainV2.comPort.param); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.resx index a99c51ab3e8..2fb01b20c8b 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFailSafe.resx @@ -252,9 +252,138 @@ 214, 17 + + True + + + Top + + + False + + + NoControl + + + 3, 110 + + + 199, 17 + + + 146 + + + FailSafe Long (20 sec) + + + Off, no Action, On, RTL + + + False + + + mavlinkCheckBoxlong_fs + + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null + + + groupBox1 + + + 1 + + + True + + + Top + + + False + + + NoControl + + + 3, 76 + + + 199, 17 + + + 144 + + + GCS FailSafe + + + Enable Failsafe on GCS loss of communication + + + False + + + mavlinkCheckBoxgcs_fs + + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null + + + groupBox1 + + + 3 + + + True + + + Top + + + False + + + NoControl + + + 3, 93 + + + 199, 17 + + + 145 + + + FailSafe Short (1 sec) + + + Off, no Action, On, RTL + + + False + + + mavlinkCheckBoxshort_fs + + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null + + + groupBox1 + + + 2 + True + + Top + False @@ -262,10 +391,10 @@ NoControl - 6, 19 + 3, 16 - 103, 17 + 199, 17 141 @@ -276,60 +405,26 @@ Enable Failsafe on low throttle pwm + + False + mavlinkCheckBoxthr_fs - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null groupBox1 - 1 - - - True - - - False - - - NoControl - - - 6, 69 - - - 134, 17 - - - 147 - - - Throttle Failsafe Action - - - Arducopter Auto: Off, no Action, On, RTL -Arducopter Other: if have gps, RTL, Otherwise Land - - - mavlinkCheckBoxthr_fs_action - - - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null - - - groupBox1 - - - 2 + 6 False - 42, 42 + 55, 3 103, 20 @@ -344,121 +439,95 @@ Arducopter Other: if have gps, RTL, Otherwise Land mavlinkNumericUpDownthr_fs_value - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null - groupBox1 + PNL_thr_fs_value - 3 + 0 - + True - + + Top + + False - + NoControl - - 6, 138 + + 3, 59 - - 132, 17 + + 199, 17 - - 146 + + 147 - - FailSafe Long (20 sec) + + Throttle Failsafe Action - - Off, no Action, On, RTL + + Arducopter Auto: Off, no Action, On, RTL +Arducopter Other: if have gps, RTL, Otherwise Land - - mavlinkCheckBoxlong_fs + + False - - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + + mavlinkCheckBoxthr_fs_action - + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null + + groupBox1 - + 4 - + True - + + Top + + False - + NoControl - - 6, 92 + + 3, 127 - - 89, 17 + + 199, 17 - - 144 + + 150 - - GCS FailSafe + + Battery Failsafe - - Enable Failsafe on GCS loss of communication - - - mavlinkCheckBoxgcs_fs - - - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null - - - groupBox1 - - - 5 - - - True - - + False - - NoControl + + mavlinkCheckBoxfs_batt_enable - - 6, 115 + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null - - 127, 17 - - - 145 - - - FailSafe Short (1 sec) - - - Off, no Action, On, RTL - - - mavlinkCheckBoxshort_fs - - - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null - - + groupBox1 - - 6 + + 0 True @@ -467,16 +536,16 @@ Arducopter Other: if have gps, RTL, Otherwise Land NoControl - 6, 48 + 3, 9 - 30, 13 + 46, 13 148 - Pwm + FS Pwm label3 @@ -485,16 +554,40 @@ Arducopter Other: if have gps, RTL, Otherwise Land System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox1 + PNL_thr_fs_value - 0 + 1 + + + Top + + + 3, 33 + + + 199, 26 + + + 149 + + + PNL_thr_fs_value + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 - 495, 209 + 480, 174 - 170, 167 + 205, 257 148 @@ -596,7 +689,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar9 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -620,7 +713,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar10 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -644,7 +737,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar11 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -668,7 +761,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar12 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -692,7 +785,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar13 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -716,7 +809,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar14 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -740,7 +833,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar15 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -764,7 +857,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar16 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -788,7 +881,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar8 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -812,7 +905,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar7 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -836,7 +929,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar6 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -860,7 +953,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar5 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -884,7 +977,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar4 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -908,7 +1001,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar3 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -932,7 +1025,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar2 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this @@ -956,7 +1049,7 @@ Arducopter Other: if have gps, RTL, Otherwise Land horizontalProgressBar1 - ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4708.37166, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar, ArdupilotMegaPlanner10, Version=1.1.4715.14139, Culture=neutral, PublicKeyToken=null $this diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs index 208862fc669..5689e55e7e5 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs @@ -518,7 +518,11 @@ namespace ArdupilotMega.GCSViews.ConfigurationView { if (currentUiCulture.IsChildOf(_languages[i])) { - CMB_language.SelectedIndex = i; + try + { + CMB_language.SelectedIndex = i; + } + catch { } break; } } @@ -565,7 +569,11 @@ namespace ArdupilotMega.GCSViews.ConfigurationView //set hud color state string hudcolor = (string)MainV2.config["hudcolor"]; int index = CMB_osdcolor.Items.IndexOf(hudcolor ?? "White"); - CMB_osdcolor.SelectedIndex = index; + try + { + CMB_osdcolor.SelectedIndex = index; + } + catch { } if (MainV2.config["distunits"] != null) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index 2052ef5dfbc..d001d2a114f 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -8,8 +8,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.contextMenuStripMap = new System.Windows.Forms.ContextMenuStrip(this.components); this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.flyToHereAltToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -1293,8 +1293,8 @@ // // dataGridViewImageColumn1 // - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1; resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1"); this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up; this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; @@ -1302,8 +1302,8 @@ // // dataGridViewImageColumn2 // - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2; resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2"); this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down; this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index da8f7f40ce8..287fc018a0e 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -343,6 +343,19 @@ namespace ArdupilotMega.GCSViews ((QuickView)ctls[0]).DataBindings.Add(new System.Windows.Forms.Binding("number", this.bindingSource1, MainV2.config["quickView" + f].ToString(), true)); } } + else + { + // if no config, update description on predefined + try + { + Control[] ctls = this.Controls.Find("quickView" + f, true); + if (ctls.Length > 0) + { + ((QuickView)ctls[0]).desc = MainV2.cs.GetNameandUnit(((QuickView)ctls[0]).desc); + } + } + catch { } + } } if (MainV2.comPort.param.ContainsKey("BATT_MONITOR") && (float)MainV2.comPort.param["BATT_MONITOR"] != 0) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 16ac76de0cf..a5414c30f12 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -121,15 +121,6 @@ 290, 17 - - 189, 114 - - - contextMenuStripMap - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 188, 22 @@ -160,6 +151,15 @@ Flight Planner + + 189, 114 + + + contextMenuStripMap + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Fill @@ -185,6 +185,36 @@ 542, 17 + + 172, 22 + + + Record Hud to AVI + + + 172, 22 + + + Stop Record + + + 172, 22 + + + Set MJPEG source + + + 172, 22 + + + Set Aspect Ratio + + + 172, 22 + + + User Items + 173, 114 @@ -214,7 +244,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -234,6 +264,174 @@ 0 + + True + + + Top + + + 3, 278 + + + 327, 55 + + + 10 + + + quickView6 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 0 + + + Top + + + 3, 223 + + + 327, 55 + + + 9 + + + quickView5 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 1 + + + Top + + + 3, 168 + + + 327, 55 + + + 8 + + + quickView4 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 2 + + + Top + + + 3, 113 + + + 327, 55 + + + 3 + + + quickView3 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 3 + + + Top + + + 3, 58 + + + 327, 55 + + + 1 + + + quickView2 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 4 + + + Top + + + 3, 3 + + + 327, 55 + + + 1 + + + 445, 17 + + + Double Click me to change + + + quickView1 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 5 + + + 4, 22 + + + 3, 3, 3, 3 + + + 350, 117 + + + 4 + + + Quick + tabQuick @@ -246,6 +444,516 @@ 0 + + 275, 35 + + + 114, 32 + + + 81 + + + modifyandSetSpeed + + + ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 0 + + + 216, 90 + + + 114, 29 + + + 80 + + + modifyandSetAlt + + + ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 1 + + + Microsoft Sans Serif, 8.25pt + + + NoControl + + + 111, 90 + + + 45, 23 + + + 79 + + + Arm/ Disarm + + + Arm the Mav + + + BUT_ARM + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 2 + + + NoControl + + + 4, 91 + + + 46, 23 + + + 78 + + + Script + + + BUT_script + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 3 + + + NoControl + + + 56, 91 + + + 49, 23 + + + 77 + + + Joystick + + + Setup and enable your joystick + + + BUT_joystick + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 4 + + + NoControl + + + 147, 35 + + + 47, 23 + + + 76 + + + &Manual + + + Change Mode to Manual/Stabalize + + + BUT_quickmanual + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 5 + + + NoControl + + + 147, 64 + + + 47, 23 + + + 75 + + + &RTL + + + Change Mode to RTL + + + BUT_quickrtl + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 6 + + + NoControl + + + 147, 6 + + + 47, 23 + + + 74 + + + &Auto + + + Change mode to Auto + + + BUT_quickauto + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 7 + + + 0 (Home) + + + 4, 35 + + + 76, 21 + + + 72 + + + CMB_setwp + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 8 + + + NoControl + + + 86, 35 + + + 55, 23 + + + 73 + + + Set WP + + + Changes the current target waypoint + + + BUT_setwp + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 9 + + + 4, 64 + + + 76, 21 + + + 70 + + + CMB_modes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 10 + + + NoControl + + + 86, 64 + + + 55, 23 + + + 71 + + + Set Mode + + + Changes to the Mode on the left + + + BUT_setmode + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 11 + + + NoControl + + + 162, 90 + + + 47, 23 + + + 52 + + + Clear Track + + + Clear the recorded path on the map + + + BUT_clear_track + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 12 + + + 4, 6 + + + 76, 21 + + + 59 + + + CMB_action + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 13 + + + NoControl + + + 200, 6 + + + 69, 23 + + + 69 + + + Set Home Alt + + + Set the current display alt as 0, ie home alt is shown as 0 + + + BUT_Homealt + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 14 + + + NoControl + + + 200, 64 + + + 69, 23 + + + 68 + + + Raw Sensor View + + + View raw Gyro and Accel values, and Raw Radio ins/outs + + + BUT_RAWSensor + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 15 + + + NoControl + + + 200, 35 + + + 69, 23 + + + 63 + + + Restart Mission + + + Restarts the mission from the beginning + + + BUTrestartmission + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 16 + + + NoControl + + + 86, 6 + + + 55, 23 + + + 60 + + + Do Action + + + Preform the action ot the left + + + BUTactiondo + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 17 + + + 4, 22 + + + 350, 117 + + + 2 + + + Actions + tabActions @@ -258,6 +966,144 @@ 1 + + Zoom + + + Microsoft Sans Serif, 9pt + + + 3, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 82 + + + Gvspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabGauges + + + 0 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 303, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 80 + + + Gheading + + + ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabGauges + + + 1 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 203, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 81 + + + Galt + + + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabGauges + + + 2 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 103, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 79 + + + Double click me to change Max + + + Gspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabGauges + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 350, 117 + + + 0 + + + Gauges + tabGauges @@ -270,6 +1116,24 @@ 2 + + True + + + 4, 22 + + + 3, 3, 3, 3 + + + 350, 117 + + + 1 + + + Status + tabStatus @@ -282,6 +1146,207 @@ 3 + + Top, Right + + + 253, 54 + + + 51, 20 + + + 79 + + + x 1.0 + + + lbl_playbackspeed + + + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 0 + + + Top, Right + + + 253, 32 + + + 51, 20 + + + 78 + + + 0.00 % + + + lbl_logpercent + + + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 1 + + + Top, Left, Right + + + 178, 40 + + + 73, 45 + + + 77 + + + Playback Speed + + + NUM_playbackspeed + + + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 2 + + + NoControl + + + 29, 32 + + + 127, 23 + + + 76 + + + Tlog > Kml or Graph + + + BUT_log2kml + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 3 + + + Top, Left, Right + + + NoControl + + + 178, 3 + + + 110, 45 + + + 75 + + + tracklog + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 4 + + + NoControl + + + 89, 3 + + + 80, 23 + + + 73 + + + Play/Pause + + + BUT_playlog + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 5 + + + NoControl + + + 3, 3 + + + 80, 23 + + + 71 + + + Load Log + + + BUT_loadtelem + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 6 + + + 4, 22 + + + 350, 117 + + + 3 + + + Telemetry Logs + tabTLogs @@ -375,1638 +1440,6 @@ 1 - - splitContainer1 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableMap - - - 0 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableMap - - - 1 - - - Fill - - - 0, 0 - - - 2 - - - 642, 459 - - - 75 - - - tableMap - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainH.Panel2 - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,Absolute,30,Absolute,20" /></TableLayoutSettings> - - - MainH.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainH - - - 1 - - - 1008, 461 - - - 360 - - - 68 - - - MainH - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - 172, 22 - - - Record Hud to AVI - - - 172, 22 - - - Stop Record - - - 172, 22 - - - Set MJPEG source - - - 172, 22 - - - Set Aspect Ratio - - - 172, 22 - - - User Items - - - True - - - quickView6 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 0 - - - quickView5 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 1 - - - quickView4 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 2 - - - quickView3 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 3 - - - quickView2 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 4 - - - quickView1 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 5 - - - 4, 22 - - - 3, 3, 3, 3 - - - 350, 117 - - - 4 - - - Quick - - - tabQuick - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - Top - - - 3, 278 - - - 327, 55 - - - 10 - - - quickView6 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 0 - - - Top - - - 3, 223 - - - 327, 55 - - - 9 - - - quickView5 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 1 - - - Top - - - 3, 168 - - - 327, 55 - - - 8 - - - quickView4 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 2 - - - Top - - - 3, 113 - - - 327, 55 - - - 3 - - - quickView3 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 3 - - - Top - - - 3, 58 - - - 327, 55 - - - 1 - - - quickView2 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 4 - - - 445, 17 - - - Top - - - 3, 3 - - - 327, 55 - - - 1 - - - Double Click me to change - - - quickView1 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 5 - - - modifyandSetSpeed - - - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 0 - - - modifyandSetAlt - - - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 1 - - - BUT_ARM - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 2 - - - BUT_script - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 3 - - - BUT_joystick - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 4 - - - BUT_quickmanual - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 5 - - - BUT_quickrtl - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 6 - - - BUT_quickauto - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 7 - - - CMB_setwp - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 8 - - - BUT_setwp - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 9 - - - CMB_modes - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 10 - - - BUT_setmode - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 11 - - - BUT_clear_track - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 12 - - - CMB_action - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 13 - - - BUT_Homealt - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 14 - - - BUT_RAWSensor - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 15 - - - BUTrestartmission - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 16 - - - BUTactiondo - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 17 - - - 4, 22 - - - 350, 117 - - - 2 - - - Actions - - - tabActions - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - 275, 35 - - - 114, 32 - - - 81 - - - modifyandSetSpeed - - - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 0 - - - 216, 90 - - - 114, 29 - - - 80 - - - modifyandSetAlt - - - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 1 - - - Microsoft Sans Serif, 8.25pt - - - NoControl - - - 111, 90 - - - 45, 23 - - - 79 - - - Arm/ Disarm - - - Arm the Mav - - - BUT_ARM - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 2 - - - NoControl - - - 4, 91 - - - 46, 23 - - - 78 - - - Script - - - BUT_script - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 3 - - - NoControl - - - 56, 91 - - - 49, 23 - - - 77 - - - Joystick - - - Setup and enable your joystick - - - BUT_joystick - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 4 - - - NoControl - - - 147, 35 - - - 47, 23 - - - 76 - - - &Manual - - - Change Mode to Manual/Stabalize - - - BUT_quickmanual - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 5 - - - NoControl - - - 147, 64 - - - 47, 23 - - - 75 - - - &RTL - - - Change Mode to RTL - - - BUT_quickrtl - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 6 - - - NoControl - - - 147, 6 - - - 47, 23 - - - 74 - - - &Auto - - - Change mode to Auto - - - BUT_quickauto - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 7 - - - 0 (Home) - - - 4, 35 - - - 76, 21 - - - 72 - - - CMB_setwp - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 8 - - - NoControl - - - 86, 35 - - - 55, 23 - - - 73 - - - Set WP - - - Changes the current target waypoint - - - BUT_setwp - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 9 - - - 4, 64 - - - 76, 21 - - - 70 - - - CMB_modes - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 10 - - - NoControl - - - 86, 64 - - - 55, 23 - - - 71 - - - Set Mode - - - Changes to the Mode on the left - - - BUT_setmode - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 11 - - - NoControl - - - 162, 90 - - - 47, 23 - - - 52 - - - Clear Track - - - Clear the recorded path on the map - - - BUT_clear_track - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 12 - - - 4, 6 - - - 76, 21 - - - 59 - - - CMB_action - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 13 - - - NoControl - - - 200, 6 - - - 69, 23 - - - 69 - - - Set Home Alt - - - Set the current display alt as 0, ie home alt is shown as 0 - - - BUT_Homealt - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 14 - - - NoControl - - - 200, 64 - - - 69, 23 - - - 68 - - - Raw Sensor View - - - View raw Gyro and Accel values, and Raw Radio ins/outs - - - BUT_RAWSensor - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 15 - - - NoControl - - - 200, 35 - - - 69, 23 - - - 63 - - - Restart Mission - - - Restarts the mission from the beginning - - - BUTrestartmission - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 16 - - - NoControl - - - 86, 6 - - - 55, 23 - - - 60 - - - Do Action - - - Preform the action ot the left - - - BUTactiondo - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 17 - - - Gvspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 0 - - - Gheading - - - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 1 - - - Galt - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 2 - - - Gspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 350, 117 - - - 0 - - - Gauges - - - tabGauges - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 2 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 3, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 82 - - - Gvspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 0 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 303, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 80 - - - Gheading - - - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 1 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 203, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 81 - - - Galt - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 2 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 103, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 79 - - - Double click me to change Max - - - Gspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 3 - - - True - - - 4, 22 - - - 3, 3, 3, 3 - - - 350, 117 - - - 1 - - - Status - - - tabStatus - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 3 - - - lbl_playbackspeed - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 0 - - - lbl_logpercent - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 1 - - - NUM_playbackspeed - - - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 2 - - - BUT_log2kml - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 3 - - - tracklog - - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTLogs - - - 4 - - - BUT_playlog - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 5 - - - BUT_loadtelem - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 6 - - - 4, 22 - - - 350, 117 - - - 3 - - - Telemetry Logs - - - tabTLogs - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 4 - - - Top, Right - - - 253, 54 - - - 51, 20 - - - 79 - - - x 1.0 - - - lbl_playbackspeed - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 0 - - - Top, Right - - - 253, 32 - - - 51, 20 - - - 78 - - - 0.00 % - - - lbl_logpercent - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 1 - - - Top, Left, Right - - - 178, 40 - - - 73, 45 - - - 77 - - - Playback Speed - - - NUM_playbackspeed - - - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 2 - - - NoControl - - - 29, 32 - - - 127, 23 - - - 76 - - - Tlog > Kml or Graph - - - BUT_log2kml - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 3 - - - Top, Left, Right - - - NoControl - - - 178, 3 - - - 110, 45 - - - 75 - - - tracklog - - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTLogs - - - 4 - - - NoControl - - - 89, 3 - - - 80, 23 - - - 73 - - - Play/Pause - - - BUT_playlog - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 5 - - - NoControl - - - 3, 3 - - - 80, 23 - - - 71 - - - Load Log - - - BUT_loadtelem - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 6 - Fill @@ -2222,7 +1655,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -2249,7 +1682,7 @@ TRK_zoom - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -2279,7 +1712,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -2309,7 +1742,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -2342,7 +1775,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -2375,7 +1808,7 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -2416,117 +1849,6 @@ 0 - - TXT_lat - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 0 - - - Zoomlevel - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 1 - - - label1 - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 2 - - - TXT_long - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 3 - - - TXT_alt - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 4 - - - CHK_autopan - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 5 - - - CB_tuning - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 6 - - - Fill - - - 1, 428 - - - 0, 0, 0, 0 - - - 640, 30 - - - 0 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableMap - - - 1 - Bottom, Left @@ -2549,7 +1871,7 @@ TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null panel1 @@ -2606,7 +1928,7 @@ label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null panel1 @@ -2636,7 +1958,7 @@ TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null panel1 @@ -2666,7 +1988,7 @@ TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null panel1 @@ -2746,6 +2068,96 @@ 6 + + Fill + + + 1, 428 + + + 0, 0, 0, 0 + + + 640, 30 + + + 0 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableMap + + + 1 + + + Fill + + + 0, 0 + + + 2 + + + 642, 459 + + + 75 + + + tableMap + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainH.Panel2 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,Absolute,30,Absolute,20" /></TableLayoutSettings> + + + MainH.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainH + + + 1 + + + 1008, 461 + + + 360 + + + 68 + + + MainH + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + Up @@ -2761,9 +2173,6 @@ 17, 17 - - 445, 17 - True @@ -2870,6 +2279,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4714.36626, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4716.12475, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs index 9642c994769..66cad5ffc97 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.cs @@ -63,7 +63,7 @@ namespace ArdupilotMega /// public static bool MONO = false; /// - /// speech engein enable + /// speech engine enable /// public static bool speechEnable = false; /// @@ -75,7 +75,7 @@ namespace ArdupilotMega /// public static Joystick joystick = null; /// - /// track last joystick packet sent. used to track timming + /// track last joystick packet sent. used to control rate /// DateTime lastjoystick = DateTime.Now; /// @@ -91,7 +91,7 @@ namespace ArdupilotMega /// bool serialThread = false; /// - /// used for mini https server for websockets/mjpeg video stream, and network link kmls + /// used for mini http server for websockets/mjpeg video stream, and network link kmls /// private TcpListener listener; /// @@ -2340,7 +2340,7 @@ namespace ArdupilotMega private void MainMenu_MouseLeave(object sender, EventArgs e) { - if (Control.MousePosition.Y < MainMenu.Bottom) + if (_connectionControl.PointToClient(Control.MousePosition).Y < MainMenu.Height) return; this.SuspendLayout(); diff --git a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs index 6b53529092a..29f909b0458 100644 --- a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs +++ b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs @@ -1069,12 +1069,19 @@ namespace ArdupilotMega int timeout = 2000; // imu calib take a little while - if (actionid == MAV_CMD.PREFLIGHT_CALIBRATION) + if (actionid == MAV_CMD.PREFLIGHT_CALIBRATION && p5 == 1) + { + // this is for advanced accel offsets, and blocks execution + return true; + } else if (actionid == MAV_CMD.PREFLIGHT_CALIBRATION) { retrys = 1; timeout = 25000; - } else if (actionid == MAV_CMD.PREFLIGHT_REBOOT_SHUTDOWN) { + } + else if (actionid == MAV_CMD.PREFLIGHT_REBOOT_SHUTDOWN) + { generatePacket(MAVLINK_MSG_ID_COMMAND_LONG, req); + MainV2.giveComport = false; return true; } @@ -2785,7 +2792,7 @@ namespace ArdupilotMega return temp; } - public static bool translateMode(string modein, ref MAVLink.mavlink_set_mode_t mode) + public bool translateMode(string modein, ref MAVLink.mavlink_set_mode_t mode) { //MAVLink09.mavlink_set_mode_t mode = new MAVLink09.mavlink_set_mode_t(); mode.target_system = MainV2.comPort.sysid; diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index a8fba1786a0..bf7f9523986 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.23")] +[assembly: AssemblyFileVersion("1.2.24")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/SerialOutput2.Designer.cs b/Tools/ArdupilotMegaPlanner/SerialOutput2.Designer.cs index 5aa2297ef1c..0fd510ca0f7 100644 --- a/Tools/ArdupilotMegaPlanner/SerialOutput2.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/SerialOutput2.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SerialOutput)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SerialOutput2)); this.CMB_serialport = new System.Windows.Forms.ComboBox(); this.BUT_connect = new ArdupilotMega.Controls.MyButton(); this.CMB_baudrate = new System.Windows.Forms.ComboBox(); @@ -71,7 +71,7 @@ this.CMB_baudrate.Size = new System.Drawing.Size(121, 21); this.CMB_baudrate.TabIndex = 2; // - // SerialOutput + // SerialOutput2 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -80,8 +80,8 @@ this.Controls.Add(this.BUT_connect); this.Controls.Add(this.CMB_serialport); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "SerialOutput"; - this.Text = "SerialOutput"; + this.Name = "SerialOutput2"; + this.Text = "SerialOutput - Microdrone"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SerialOutput_FormClosing); this.ResumeLayout(false);