diff --git a/Tools/ArdupilotMegaPlanner/Common.cs b/Tools/ArdupilotMegaPlanner/Common.cs index 16b0c01977..bd302abd24 100644 --- a/Tools/ArdupilotMegaPlanner/Common.cs +++ b/Tools/ArdupilotMegaPlanner/Common.cs @@ -840,7 +840,7 @@ namespace ArdupilotMega form.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); form.TopMost = true; - //form.TopLevel = true; + form.TopLevel = true; form.Text = title; label.Text = promptText; @@ -864,8 +864,8 @@ namespace ArdupilotMega form.ClientSize = new Size(396, 107); form.Controls.AddRange(new Control[] { label, textBox, buttonOk, buttonCancel }); form.ClientSize = new Size(Math.Max(300, label.Right + 10), form.ClientSize.Height); - form.FormBorderStyle = FormBorderStyle.FixedDialog; - form.StartPosition = FormStartPosition.CenterParent; + form.FormBorderStyle = FormBorderStyle.FixedSingle; + form.StartPosition = FormStartPosition.CenterScreen; form.MinimizeBox = false; form.MaximizeBox = false; form.AcceptButton = buttonOk; @@ -875,7 +875,11 @@ namespace ArdupilotMega DialogResult dialogResult = DialogResult.Cancel; - form.ShowDialog(); + Console.WriteLine("Input Box"); + + form.ShowDialog(); + + Console.WriteLine("Input Box 2"); dialogResult = form.DialogResult; diff --git a/Tools/ArdupilotMegaPlanner/Comms/CommsTCPSerial.cs b/Tools/ArdupilotMegaPlanner/Comms/CommsTCPSerial.cs index 31703b3741..30e10bc527 100644 --- a/Tools/ArdupilotMegaPlanner/Comms/CommsTCPSerial.cs +++ b/Tools/ArdupilotMegaPlanner/Comms/CommsTCPSerial.cs @@ -8,6 +8,7 @@ using System.Threading; using System.Net; // dns, ip address using System.Net.Sockets; // tcplistner using log4net; +using System.IO; namespace ArdupilotMega.Comms { @@ -75,7 +76,7 @@ namespace ArdupilotMega.Comms set; } - public void Open() + public void Open() { if (client.Client.Connected) { @@ -83,6 +84,8 @@ namespace ArdupilotMega.Comms return; } + log.Info("TCP Open"); + string dest = Port; string host = "127.0.0.1"; @@ -100,6 +103,7 @@ namespace ArdupilotMega.Comms { throw new Exception("Canceled by request"); } + Port = dest; ArdupilotMega.MainV2.config["TCP_port"] = Port; diff --git a/Tools/ArdupilotMegaPlanner/Controls/CustomMessageBox.cs b/Tools/ArdupilotMegaPlanner/Controls/CustomMessageBox.cs index 90d0e8febd..4d0ced3d69 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/CustomMessageBox.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/CustomMessageBox.cs @@ -101,26 +101,7 @@ namespace System.Windows.Forms ThemeManager.ApplyThemeTo(msgBoxFrm); } catch { } - - Console.WriteLine("CustomMessageBox 1"); - - /* if (System.Windows.Forms.Application.OpenForms.Count > 0) - { - msgBoxFrm.StartPosition = FormStartPosition.Manual; - Form parentForm = System.Windows.Forms.Application.OpenForms[0]; - // center of first form - msgBoxFrm.Location = new Point(parentForm.Location.X + parentForm.Width / 2 - msgBoxFrm.Width / 2, - parentForm.Location.Y + parentForm.Height / 2 - msgBoxFrm.Height / 2); - Console.WriteLine("CustomMessageBox 2a " + parentForm.Name); - DialogResult test = msgBoxFrm.ShowDialog(); - } - else*/ - { - Console.WriteLine("CustomMessageBox 2b"); - DialogResult test = msgBoxFrm.ShowDialog(); - } - - Console.WriteLine("CustomMessageBox 3"); + DialogResult test = msgBoxFrm.ShowDialog(); DialogResult answer = _state; diff --git a/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.designer.cs b/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.designer.cs index b1bd159e62..cf9cbc46bb 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.designer.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.designer.cs @@ -123,7 +123,7 @@ namespace ArdupilotMega.Controls this.Controls.Add(this.btnCancel); this.Controls.Add(this.lblProgressMessage); this.Controls.Add(this.progressBar1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ProgressReporterDialogue"; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs index b5c57f9975..dfd73c5c9d 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs @@ -84,7 +84,7 @@ If you are just setting up 3DR radios, you may continue without connecting."); AddBackstageViewPage(configpanel, "ArduCopter Pids"); AddBackstageViewPage(new ConfigArducopter(), "ArduCopter Config"); - AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence"); + // AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence"); } /****************************** ArduCopter **************************/ else if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2) @@ -99,7 +99,7 @@ If you are just setting up 3DR radios, you may continue without connecting."); AddBackstageViewPage(configpanel, "ArduCopter Pids"); AddBackstageViewPage(new ConfigArducopter(), "ArduCopter Config"); - AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence"); + // AddBackstageViewPage(new ConfigAP_Limits(), "GeoFence"); } /****************************** ArduPlane **************************/ else if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs index e7a1d76e04..1350bf6df0 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs @@ -404,9 +404,28 @@ namespace ArdupilotMega.GCSViews } catch (Exception ex) { lbl_status.Text = "Failed download"; CustomMessageBox.Show("Failed to download new firmware : " + ex.ToString()); return; } + System.Threading.ThreadPool.QueueUserWorkItem(fwtype, temp); + UploadFlash(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"firmware.hex", board); } + void fwtype(object temp) + { + software sw = (software)temp; + try + { + // Create a request using a URL that can receive a post. + WebRequest request = WebRequest.Create("http://vps.oborne.me/" + sw.name); + request.Timeout = 10000; + // Set the Method property of the request to POST. + request.Method = "GET"; + // Get the request stream. + // Get the response. + WebResponse response = request.GetResponse(); + } + catch { } + } + public void UploadFlash(string filename, string board) { byte[] FLASH = new byte[1]; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index 0a479be71e..e36d1e220c 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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pointCameraHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -64,10 +64,10 @@ this.tableMap = new System.Windows.Forms.TableLayoutPanel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.zg1 = new ZedGraph.ZedGraphControl(); - this.lbl_hdop = new ArdupilotMega.Controls.MyLabel(); - this.lbl_sats = new ArdupilotMega.Controls.MyLabel(); 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.panel1 = new System.Windows.Forms.Panel(); this.TXT_lat = new ArdupilotMega.Controls.MyLabel(); @@ -1059,22 +1059,6 @@ this.zg1.ScrollMinY2 = 0D; this.zg1.DoubleClick += new System.EventHandler(this.zg1_DoubleClick); // - // 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")); - 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")); - // // 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")); @@ -1091,6 +1075,22 @@ 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")); + 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.BackColor = System.Drawing.Color.Transparent; @@ -1203,8 +1203,8 @@ // // dataGridViewImageColumn1 // - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle3; + 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; @@ -1212,8 +1212,8 @@ // // dataGridViewImageColumn2 // - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle4; + 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 1e445b2350..cb378419b9 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -1050,9 +1050,15 @@ namespace ArdupilotMega.GCSViews { alt = (100 * MainV2.cs.multiplierdist).ToString("0"); } + + if (MainV2.config.ContainsKey("guided_alt")) + alt = MainV2.config["guided_alt"].ToString(); + if (DialogResult.Cancel == Common.InputBox("Enter Alt", "Enter Guided Mode Alt", ref alt)) return; + MainV2.config["guided_alt"] = alt; + int intalt = (int)(100 * MainV2.cs.multiplierdist); if (!int.TryParse(alt, out intalt)) { diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 3f6042737b..b11e0afb02 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -121,15 +121,6 @@ 290, 17 - - 175, 70 - - - contextMenuStrip1 - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 174, 22 @@ -142,6 +133,15 @@ Point Camera Here + + 175, 70 + + + contextMenuStrip1 + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Fill @@ -167,6 +167,36 @@ 542, 17 + + 176, 22 + + + Record Hud to AVI + + + 176, 22 + + + Stop Record + + + 176, 22 + + + Set MJPEG source + + + 176, 22 + + + Set Aspect Ratio + + + 176, 22 + + + Display Battery Info + 177, 114 @@ -196,7 +226,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -216,6 +246,150 @@ 0 + + True + + + 33, 272 + + + 335, 55 + + + 5 + + + quickView6 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 0 + + + 33, 224 + + + 335, 55 + + + 4 + + + quickView5 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 1 + + + 33, 168 + + + 335, 55 + + + 3 + + + quickView4 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 2 + + + 33, 112 + + + 335, 55 + + + 2 + + + quickView3 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 3 + + + 33, 55 + + + 335, 55 + + + 1 + + + quickView2 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 4 + + + 33, 6 + + + 335, 55 + + + 0 + + + quickView1 + + + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabQuick + + + 5 + + + 4, 22 + + + 3, 3, 3, 3 + + + 407, 116 + + + 4 + + + Quick + tabQuick @@ -228,6 +402,444 @@ 0 + + NoControl + + + 17, 93 + + + 66, 23 + + + 78 + + + Script + + + BUT_script + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 0 + + + NoControl + + + 101, 93 + + + 66, 23 + + + 77 + + + Joystick + + + 445, 17 + + + Setup and enable your joystick + + + BUT_joystick + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 1 + + + NoControl + + + 173, 35 + + + 57, 23 + + + 76 + + + &Manual + + + Change Mode to Manual/Stabalize + + + BUT_quickmanual + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 2 + + + NoControl + + + 173, 64 + + + 57, 23 + + + 75 + + + &RTL + + + Change Mode to RTL + + + BUT_quickrtl + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 3 + + + NoControl + + + 173, 6 + + + 57, 23 + + + 74 + + + &Auto + + + Change mode to Auto + + + BUT_quickauto + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 4 + + + 0 (Home) + + + 4, 35 + + + 91, 21 + + + 72 + + + CMB_setwp + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 5 + + + NoControl + + + 101, 35 + + + 66, 23 + + + 73 + + + Set WP + + + Changes the current target waypoint + + + BUT_setwp + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 6 + + + 4, 64 + + + 91, 21 + + + 70 + + + CMB_modes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 7 + + + NoControl + + + 101, 64 + + + 66, 23 + + + 71 + + + Set Mode + + + Changes to the Mode on the left + + + BUT_setmode + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 8 + + + NoControl + + + 236, 93 + + + 97, 23 + + + 52 + + + Clear Track + + + Clear the recorded path on the map + + + BUT_clear_track + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 9 + + + 4, 6 + + + 91, 21 + + + 59 + + + CMB_action + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 10 + + + NoControl + + + 236, 6 + + + 97, 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.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 11 + + + NoControl + + + 236, 64 + + + 97, 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.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 12 + + + NoControl + + + 236, 35 + + + 97, 23 + + + 63 + + + Restart Mission + + + Restarts the mission from the beginning + + + BUTrestartmission + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 13 + + + NoControl + + + 101, 6 + + + 66, 23 + + + 60 + + + Do Action + + + Preform the action ot the left + + + BUTactiondo + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabActions + + + 14 + + + 4, 22 + + + 407, 116 + + + 2 + + + Actions + tabActions @@ -240,6 +852,144 @@ 1 + + Zoom + + + Microsoft Sans Serif, 9pt + + + 3, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 82 + + + Gvspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4602.32614, 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.4602.32614, 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.4602.32614, 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.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabGauges + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 407, 116 + + + 0 + + + Gauges + tabGauges @@ -252,6 +1002,24 @@ 2 + + True + + + 4, 22 + + + 3, 3, 3, 3 + + + 407, 116 + + + 1 + + + Status + tabStatus @@ -264,6 +1032,207 @@ 3 + + Top, Right + + + 353, 54 + + + 51, 20 + + + 79 + + + x 1.0 + + + lbl_playbackspeed + + + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 0 + + + Top, Right + + + 353, 32 + + + 51, 20 + + + 78 + + + 0.00 % + + + lbl_logpercent + + + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 1 + + + Top, Bottom, Left, Right + + + 178, 40 + + + 169, 45 + + + 77 + + + Playback Speed + + + NUM_playbackspeed + + + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4602.32614, 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.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 3 + + + Top, Left, Right + + + NoControl + + + 178, 3 + + + 226, 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.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 5 + + + NoControl + + + 3, 3 + + + 80, 23 + + + 71 + + + Load Log + + + BUT_loadtelem + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null + + + tabTLogs + + + 6 + + + 4, 22 + + + 407, 116 + + + 3 + + + Telemetry Logs + tabTLogs @@ -430,7 +1399,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -460,7 +1429,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -493,7 +1462,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -526,7 +1495,7 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -698,7 +1667,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -739,11 +1708,29 @@ 0 + + Bottom, Left + + + NoControl + + + 10, 11 + + + 84, 13 + + + 13 + + + 0 + TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null panel1 @@ -751,6 +1738,21 @@ 0 + + Bottom, Left + + + 438, 8 + + + 76, 20 + + + 69 + + + Change Zoom Level + Zoomlevel @@ -763,11 +1765,29 @@ 1 + + Bottom, Left + + + NoControl + + + 401, 11 + + + 34, 13 + + + 70 + + + Zoom + label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null panel1 @@ -775,11 +1795,29 @@ 2 + + Bottom, Left + + + NoControl + + + 100, 11 + + + 84, 13 + + + 14 + + + 0 + TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null panel1 @@ -787,11 +1825,29 @@ 3 + + Bottom, Left + + + NoControl + + + 190, 11 + + + 64, 13 + + + 15 + + + 0 + TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null panel1 @@ -799,6 +1855,30 @@ 4 + + Bottom, Left + + + True + + + NoControl + + + 325, 11 + + + 70, 17 + + + 68 + + + Auto Pan + + + Makes the map autopan based on current location + CHK_autopan @@ -811,6 +1891,30 @@ 5 + + Bottom, Left + + + True + + + NoControl + + + 260, 10 + + + 59, 17 + + + 62 + + + Tuning + + + Show the tunning graph, chowing target attitudes vs actual + CB_tuning @@ -913,1638 +2017,6 @@ 2 - - 176, 22 - - - Record Hud to AVI - - - 176, 22 - - - Stop Record - - - 176, 22 - - - Set MJPEG source - - - 176, 22 - - - Set Aspect Ratio - - - 176, 22 - - - Display Battery Info - - - True - - - quickView6 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 0 - - - quickView5 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 1 - - - quickView4 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 2 - - - quickView3 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 3 - - - quickView2 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 4 - - - quickView1 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 5 - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 4 - - - Quick - - - tabQuick - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - 33, 272 - - - 335, 55 - - - 5 - - - quickView6 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 0 - - - 33, 224 - - - 335, 55 - - - 4 - - - quickView5 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 1 - - - 33, 168 - - - 335, 55 - - - 3 - - - quickView4 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 2 - - - 33, 112 - - - 335, 55 - - - 2 - - - quickView3 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 3 - - - 33, 55 - - - 335, 55 - - - 1 - - - quickView2 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 4 - - - 33, 6 - - - 335, 55 - - - 0 - - - quickView1 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 5 - - - BUT_script - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 0 - - - BUT_joystick - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 1 - - - BUT_quickmanual - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 2 - - - BUT_quickrtl - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 3 - - - BUT_quickauto - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 4 - - - CMB_setwp - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 5 - - - BUT_setwp - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 6 - - - CMB_modes - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 7 - - - BUT_setmode - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 8 - - - BUT_clear_track - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 9 - - - CMB_action - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 10 - - - BUT_Homealt - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 11 - - - BUT_RAWSensor - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 12 - - - BUTrestartmission - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 13 - - - BUTactiondo - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 14 - - - 4, 22 - - - 407, 116 - - - 2 - - - Actions - - - tabActions - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - NoControl - - - 17, 93 - - - 66, 23 - - - 78 - - - Script - - - BUT_script - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 0 - - - 445, 17 - - - NoControl - - - 101, 93 - - - 66, 23 - - - 77 - - - Joystick - - - Setup and enable your joystick - - - BUT_joystick - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 1 - - - NoControl - - - 173, 35 - - - 57, 23 - - - 76 - - - &Manual - - - Change Mode to Manual/Stabalize - - - BUT_quickmanual - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 2 - - - NoControl - - - 173, 64 - - - 57, 23 - - - 75 - - - &RTL - - - Change Mode to RTL - - - BUT_quickrtl - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 3 - - - NoControl - - - 173, 6 - - - 57, 23 - - - 74 - - - &Auto - - - Change mode to Auto - - - BUT_quickauto - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 4 - - - 0 (Home) - - - 4, 35 - - - 91, 21 - - - 72 - - - CMB_setwp - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 5 - - - NoControl - - - 101, 35 - - - 66, 23 - - - 73 - - - Set WP - - - Changes the current target waypoint - - - BUT_setwp - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 6 - - - 4, 64 - - - 91, 21 - - - 70 - - - CMB_modes - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 7 - - - NoControl - - - 101, 64 - - - 66, 23 - - - 71 - - - Set Mode - - - Changes to the Mode on the left - - - BUT_setmode - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 8 - - - NoControl - - - 236, 93 - - - 97, 23 - - - 52 - - - Clear Track - - - Clear the recorded path on the map - - - BUT_clear_track - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 9 - - - 4, 6 - - - 91, 21 - - - 59 - - - CMB_action - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 10 - - - NoControl - - - 236, 6 - - - 97, 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.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 11 - - - NoControl - - - 236, 64 - - - 97, 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.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 12 - - - NoControl - - - 236, 35 - - - 97, 23 - - - 63 - - - Restart Mission - - - Restarts the mission from the beginning - - - BUTrestartmission - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 13 - - - NoControl - - - 101, 6 - - - 66, 23 - - - 60 - - - Do Action - - - Preform the action ot the left - - - BUTactiondo - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 14 - - - Gvspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 0 - - - Gheading - - - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 1 - - - Galt - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 2 - - - Gspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 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.4599.22736, 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.4599.22736, 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.4599.22736, 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.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 3 - - - True - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 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.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 0 - - - lbl_logpercent - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 1 - - - NUM_playbackspeed - - - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 2 - - - BUT_log2kml - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, 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.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 5 - - - BUT_loadtelem - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 6 - - - 4, 22 - - - 407, 116 - - - 3 - - - Telemetry Logs - - - tabTLogs - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 4 - - - Top, Right - - - 353, 54 - - - 51, 20 - - - 79 - - - x 1.0 - - - lbl_playbackspeed - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 0 - - - Top, Right - - - 353, 32 - - - 51, 20 - - - 78 - - - 0.00 % - - - lbl_logpercent - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 1 - - - Top, Bottom, Left, Right - - - 178, 40 - - - 169, 45 - - - 77 - - - Playback Speed - - - NUM_playbackspeed - - - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4599.22736, 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.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 3 - - - Top, Left, Right - - - NoControl - - - 178, 3 - - - 226, 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.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 5 - - - NoControl - - - 3, 3 - - - 80, 23 - - - 71 - - - Load Log - - - BUT_loadtelem - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 6 - - - Bottom, Left - - - NoControl - - - 10, 11 - - - 84, 13 - - - 13 - - - 0 - - - TXT_lat - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 0 - - - Bottom, Left - - - 438, 8 - - - 76, 20 - - - 69 - - - Change Zoom Level - - - Zoomlevel - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 1 - - - Bottom, Left - - - NoControl - - - 401, 11 - - - 34, 13 - - - 70 - - - Zoom - - - label1 - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 2 - - - Bottom, Left - - - NoControl - - - 100, 11 - - - 84, 13 - - - 14 - - - 0 - - - TXT_long - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 3 - - - Bottom, Left - - - NoControl - - - 190, 11 - - - 64, 13 - - - 15 - - - 0 - - - TXT_alt - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 4 - - - Bottom, Left - - - True - - - NoControl - - - 325, 11 - - - 70, 17 - - - 68 - - - Auto Pan - - - Makes the map autopan based on current location - - - CHK_autopan - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 5 - - - Bottom, Left - - - True - - - NoControl - - - 260, 10 - - - 59, 17 - - - 62 - - - Tuning - - - Show the tunning graph, chowing target attitudes vs actual - - - CB_tuning - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 6 - Up @@ -2560,9 +2032,6 @@ 17, 17 - - 445, 17 - NoControl @@ -2579,7 +2048,7 @@ label6 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null $this @@ -2675,6 +2144,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4602.32614, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs index 76344ead38..b388500b80 100644 --- a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs +++ b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs @@ -1871,7 +1871,7 @@ namespace ArdupilotMega while (true) { - if (!(start.AddMilliseconds(500) > DateTime.Now)) + if (!(start.AddMilliseconds(200) > DateTime.Now)) { if (retrys > 0) { diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index 821f5499f4..3f19f1ed97 100644 --- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs +++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs @@ -2,14 +2,14 @@ - + - - + + @@ -31,7 +31,7 @@ - + @@ -113,11 +113,11 @@ - + - + @@ -128,20 +128,20 @@ - + - + - + @@ -155,7 +155,7 @@ - + @@ -167,13 +167,13 @@ - + - + @@ -184,7 +184,7 @@ - + @@ -195,33 +195,33 @@ - + - + - + - + - + - + @@ -230,28 +230,28 @@ - + - + - + - + - + diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 70be2d8b1b..eaf58d225c 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.3")] +[assembly: AssemblyFileVersion("1.2.4")] [assembly: NeutralResourcesLanguageAttribute("")]