diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj index c60c66b4a6..72c896177c 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj @@ -79,7 +79,7 @@ ArdupilotMega.Program - 92959F7BF337E6755031B3721140373D9674958B + 02470CFADCC96F21D82436EFEE4A079F3AA2292B ArdupilotMega_TemporaryKey.pfx @@ -88,7 +88,7 @@ true - false + true false @@ -1193,6 +1193,7 @@ + Always diff --git a/Tools/ArdupilotMegaPlanner/Controls/HUD.cs b/Tools/ArdupilotMegaPlanner/Controls/HUD.cs index fc1494ae16..3312fe53e1 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/HUD.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/HUD.cs @@ -1256,7 +1256,7 @@ namespace ArdupilotMega.Controls { //Console.WriteLine(a + " " + scrollbg.Left + " " + (scrollbg.Top - space * (a - start)) + " " + (scrollbg.Left + 20) + " " + (scrollbg.Top - space * (a - start))); graphicsObject.DrawLine(whitePen, scrollbg.Left, scrollbg.Top - space * (a - start), scrollbg.Left + 10, scrollbg.Top - space * (a - start)); - drawstring(graphicsObject, a.ToString().PadLeft(5), font, fontsize, whiteBrush, scrollbg.Left + 7 + (int)(0 * fontoffset), scrollbg.Top - space * (a - start) - 6 - fontoffset); + drawstring(graphicsObject, a.ToString().PadLeft(5), font, fontsize, whiteBrush, scrollbg.Left + 0 + (int)(0 * fontoffset), scrollbg.Top - space * (a - start) - 6 - fontoffset); } } diff --git a/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs b/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs index fc7aa6e667..bc3a2c199f 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs @@ -21,6 +21,7 @@ namespace ArdupilotMega.Controls private Exception workerException; public ProgressWorkerEventArgs doWorkArgs; + internal object locker = new object(); internal int _progress = -1; internal string _status = ""; @@ -213,8 +214,11 @@ namespace ArdupilotMega.Controls if (doWorkArgs.CancelRequested && !doWorkArgs.CancelAcknowledged) return; - _progress = progress; - _status = status; + lock (locker) + { + _progress = progress; + _status = status; + } } @@ -234,10 +238,12 @@ namespace ArdupilotMega.Controls /// private void timer1_Tick(object sender, EventArgs e) { - // this value is being currupted - not thread safe - int pgv = _progress; - - lblProgressMessage.Text = _status; + int pgv = -1; + lock (locker) + { + pgv = _progress; + lblProgressMessage.Text = _status; + } if (pgv == -1) { this.progressBar1.Style = ProgressBarStyle.Marquee; @@ -248,7 +254,7 @@ namespace ArdupilotMega.Controls try { this.progressBar1.Value = pgv; - } + } // Exception System.ArgumentOutOfRangeException: Value of '-12959800' is not valid for 'Value'. 'Value' should be between 'minimum' and 'maximum'. catch { } // clean fail. and ignore, chances are we will hit this again in the next 100 ms } } diff --git a/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs b/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs index 17dd200929..4d7d89fd0e 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/QuickView.cs @@ -36,5 +36,23 @@ namespace ArdupilotMega.Controls this.OnDoubleClick(e); } + public override void Refresh() + { + if (this.Visible) + base.Refresh(); + } + + protected override void OnInvalidated(InvalidateEventArgs e) + { + if (this.Visible) + base.OnInvalidated(e); + } + + protected override void OnPaint(PaintEventArgs e) + { + if (this.Visible) + base.OnPaint(e); + } + } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs index 845429c89e..746f6a1907 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs @@ -84,6 +84,12 @@ namespace ArdupilotMega.GCSViews.ConfigurationView public void Activate() { + if (!MainV2.comPort.param.ContainsKey("FRAME")) + { + this.Enabled = false; + return; + } + if ((float)MainV2.comPort.param["FRAME"] == 0) { this.radioButton_Plus.Checked = true; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFriendlyParams.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFriendlyParams.cs index aa9518f602..3f61ed158d 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFriendlyParams.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFriendlyParams.cs @@ -214,6 +214,34 @@ namespace ArdupilotMega.GCSViews.ConfigurationView // If this is a range string rangeRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Range); string incrementRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Increment); + + // modify for scaling + float test = 1; + MAVLink.modifyParamForDisplay(true, x.Key, ref test); + + if (test != 1) + { + if (units.ToLower() == "centi-degrees") + { + units = "Degrees"; + incrementRaw = "0.1"; + string[] rangeParts = rangeRaw.Split(new[] { ' ' }); + if (rangeParts.Count() == 2) + { + float lowerRange; + float.TryParse(rangeParts[0], out lowerRange); + float upperRange; + float.TryParse(rangeParts[1], out upperRange); + + rangeRaw = (lowerRange / 100) + " " + (upperRange / 100); + } + } + else + { + units += " / " + (int)(1 / test); + } + } + if (!String.IsNullOrEmpty(rangeRaw) && !String.IsNullOrEmpty(incrementRaw)) { float increment, intValue; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.cs index 08a2285590..ee3138eab9 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.cs @@ -100,9 +100,13 @@ namespace ArdupilotMega.GCSViews.ConfigurationView } } - updatePitch(); - updateRoll(); - updateYaw(); + try + { + updatePitch(); + updateRoll(); + updateYaw(); + } + catch (Exception ex) { CustomMessageBox.Show("Failed to set Param\n" + ex.ToString()); this.Enabled = false; return; } } void ensureDisabled(ComboBox cmb, int number) @@ -130,6 +134,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView } else { + MainV2.comPort.setParam("MNT_STAB_PITCH", 0); ensureDisabled(mavlinkComboBoxTilt,7); } @@ -150,6 +155,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView } else { + MainV2.comPort.setParam("MNT_STAB_ROLL", 0); ensureDisabled(mavlinkComboBoxRoll,8); } @@ -170,6 +176,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView } else { + MainV2.comPort.setParam("MNT_STAB_YAW", 0); ensureDisabled(mavlinkComboBoxPan,6); } @@ -242,9 +249,13 @@ namespace ArdupilotMega.GCSViews.ConfigurationView if (MainV2.comPort.param.ContainsKey("MNT_MODE")) MainV2.comPort.setParam("MNT_MODE",3); - updatePitch(); - updateRoll(); - updateYaw(); + try + { + updatePitch(); + updateRoll(); + updateYaw(); + } + catch (Exception ex) { CustomMessageBox.Show("Failed to set Param\n"+ex.ToString()); return; } } } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index 0e21fb4717..0a479be71e 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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(); @@ -1040,10 +1040,10 @@ // // splitContainer1.Panel2 // - this.splitContainer1.Panel2.Controls.Add(this.lbl_hdop); - this.splitContainer1.Panel2.Controls.Add(this.lbl_sats); this.splitContainer1.Panel2.Controls.Add(this.lbl_winddir); this.splitContainer1.Panel2.Controls.Add(this.lbl_windvel); + this.splitContainer1.Panel2.Controls.Add(this.lbl_hdop); + this.splitContainer1.Panel2.Controls.Add(this.lbl_sats); this.splitContainer1.Panel2.Controls.Add(this.gMapControl1); // // zg1 @@ -1203,8 +1203,8 @@ // // dataGridViewImageColumn1 // - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle3; 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 // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle4; 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 034e311dd9..1e445b2350 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -469,6 +469,7 @@ namespace ArdupilotMega.GCSViews { if (MainV2.config["CHK_maprotation"] != null && MainV2.config["CHK_maprotation"].ToString() == "True") { + // dont holdinvalidation here setMapBearing(); } @@ -516,12 +517,14 @@ namespace ArdupilotMega.GCSViews //route.Stroke.Width = 5; //route.Tag = "track"; - updateClearRoutes(); + //updateClearRoutes(); + + gMapControl1.UpdateRouteLocalPosition(route); if (waypoints.AddSeconds(10) < DateTime.Now) { //Console.WriteLine("Doing FD WP's"); - updateMissionRoute(); + updateMissionRouteMarkers(); if (MainV2.comPort.logreadmode && MainV2.comPort.logplaybackfile != null) { @@ -608,7 +611,7 @@ namespace ArdupilotMega.GCSViews private void setMapBearing() { - this.BeginInvoke((System.Windows.Forms.MethodInvoker)delegate() + this.Invoke((System.Windows.Forms.MethodInvoker)delegate() { gMapControl1.Bearing = (int)MainV2.cs.yaw; }); @@ -627,7 +630,7 @@ namespace ArdupilotMega.GCSViews } // to prevent cross thread calls while in a draw and exception - private void updateMissionRoute() + private void updateMissionRouteMarkers() { // not async this.Invoke((System.Windows.Forms.MethodInvoker)delegate() @@ -656,6 +659,9 @@ namespace ArdupilotMega.GCSViews } else { + if (BUT_playlog.Text == "Play") + return; + this.BeginInvoke((System.Windows.Forms.MethodInvoker)delegate() { try @@ -735,7 +741,7 @@ namespace ArdupilotMega.GCSViews mBorders.InnerMarker = m; try { - mBorders.wprad = (int)float.Parse(ArdupilotMega.MainV2.config["TXT_WPRad"].ToString()); + mBorders.wprad = (int)(float.Parse(ArdupilotMega.MainV2.config["TXT_WPRad"].ToString()) / MainV2.cs.multiplierdist); } catch { } mBorders.MainMap = gMapControl1; @@ -1511,7 +1517,7 @@ namespace ArdupilotMega.GCSViews lbl2.Location = new Point(lbl1.Right + 5, y); lbl2.Size = new System.Drawing.Size(50, 13); //if (lbl2.Name == "") - lbl2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, field.Name, true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "")); + lbl2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bindingSource1, field.Name, false, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0")); lbl2.Name = field.Name + "value"; lbl2.Visible = true; //lbl2.Text = fieldValue.ToString(); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 49e8121f30..3f6042737b 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -121,6 +121,15 @@ 290, 17 + + 175, 70 + + + contextMenuStrip1 + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 174, 22 @@ -133,15 +142,6 @@ Point Camera Here - - 175, 70 - - - contextMenuStrip1 - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Fill @@ -167,36 +167,6 @@ 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 @@ -226,7 +196,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -246,150 +216,6 @@ 0 - - True - - - 33, 272 - - - 335, 55 - - - 5 - - - quickView6 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 0 - - - 33, 224 - - - 335, 55 - - - 4 - - - quickView5 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 1 - - - 33, 168 - - - 335, 55 - - - 3 - - - quickView4 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 2 - - - 33, 112 - - - 335, 55 - - - 2 - - - quickView3 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 3 - - - 33, 55 - - - 335, 55 - - - 1 - - - quickView2 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 4 - - - 33, 6 - - - 335, 55 - - - 0 - - - quickView1 - - - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabQuick - - - 5 - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 4 - - - Quick - tabQuick @@ -402,444 +228,6 @@ 0 - - NoControl - - - 17, 93 - - - 66, 23 - - - 78 - - - Script - - - BUT_script - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabActions - - - 14 - - - 4, 22 - - - 407, 116 - - - 2 - - - Actions - tabActions @@ -852,144 +240,6 @@ 1 - - Zoom - - - Microsoft Sans Serif, 9pt - - - 3, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 82 - - - Gvspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabGauges - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 0 - - - Gauges - tabGauges @@ -1002,24 +252,6 @@ 2 - - True - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 1 - - - Status - tabStatus @@ -1032,207 +264,6 @@ 3 - - Top, Right - - - 353, 54 - - - 51, 20 - - - 79 - - - x 1.0 - - - lbl_playbackspeed - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 0 - - - Top, Right - - - 353, 32 - - - 51, 20 - - - 78 - - - 0.00 % - - - lbl_logpercent - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, 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.4587.33706, 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.4587.33706, 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.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 5 - - - NoControl - - - 3, 3 - - - 80, 23 - - - 71 - - - Load Log - - - BUT_loadtelem - - - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - tabTLogs - - - 6 - - - 4, 22 - - - 407, 116 - - - 3 - - - Telemetry Logs - tabTLogs @@ -1377,6 +408,66 @@ 0 + + NoControl + + + 4, 3 + + + 46, 12 + + + 68 + + + Dir: 0 + + + Estimated Wind Direction + + + lbl_winddir + + + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + + + splitContainer1.Panel2 + + + 0 + + + NoControl + + + 4, 23 + + + 48, 12 + + + 69 + + + Vel: 0 + + + Estimated Wind Velocity + + + lbl_windvel + + + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null + + + splitContainer1.Panel2 + + + 1 + Bottom, Left @@ -1402,13 +493,13 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 - 0 + 2 Bottom, Left @@ -1435,72 +526,12 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 - 1 - - - NoControl - - - 4, 3 - - - 46, 12 - - - 68 - - - Dir: 0 - - - Estimated Wind Direction - - - lbl_winddir - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - - 2 - - - NoControl - - - 4, 23 - - - 48, 12 - - - 69 - - - Vel: 0 - - - Estimated Wind Velocity - - - lbl_windvel - - - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - 3 @@ -1667,7 +698,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1708,29 +739,11 @@ 0 - - Bottom, Left - - - NoControl - - - 10, 11 - - - 84, 13 - - - 13 - - - 0 - TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null panel1 @@ -1738,21 +751,6 @@ 0 - - Bottom, Left - - - 438, 8 - - - 76, 20 - - - 69 - - - Change Zoom Level - Zoomlevel @@ -1765,29 +763,11 @@ 1 - - Bottom, Left - - - NoControl - - - 401, 11 - - - 34, 13 - - - 70 - - - Zoom - label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null panel1 @@ -1795,29 +775,11 @@ 2 - - Bottom, Left - - - NoControl - - - 100, 11 - - - 84, 13 - - - 14 - - - 0 - TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null panel1 @@ -1825,29 +787,11 @@ 3 - - Bottom, Left - - - NoControl - - - 190, 11 - - - 64, 13 - - - 15 - - - 0 - TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null panel1 @@ -1855,30 +799,6 @@ 4 - - Bottom, Left - - - True - - - NoControl - - - 325, 11 - - - 70, 17 - - - 68 - - - Auto Pan - - - Makes the map autopan based on current location - CHK_autopan @@ -1891,30 +811,6 @@ 5 - - Bottom, Left - - - True - - - NoControl - - - 260, 10 - - - 59, 17 - - - 62 - - - Tuning - - - Show the tunning graph, chowing target attitudes vs actual - CB_tuning @@ -2017,6 +913,1638 @@ 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 @@ -2032,6 +2560,9 @@ 17, 17 + + 445, 17 + NoControl @@ -2048,7 +2579,7 @@ label6 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null $this @@ -2144,6 +2675,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4587.33706, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4599.22736, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs index 42389a0a30..5be8d2afbc 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs @@ -904,7 +904,7 @@ namespace ArdupilotMega.GCSViews GMapMarkerRect mBorders = new GMapMarkerRect(point); { mBorders.InnerMarker = m; - mBorders.wprad = (int)float.Parse(TXT_WPRad.Text); + mBorders.wprad = (int)(float.Parse(TXT_WPRad.Text) / MainV2.cs.multiplierdist); mBorders.MainMap = MainMap; if (color.HasValue) { @@ -1068,12 +1068,12 @@ namespace ArdupilotMega.GCSViews else if (command == (byte)MAVLink.MAV_CMD.LOITER_TIME || command == (byte)MAVLink.MAV_CMD.LOITER_TURNS || command == (byte)MAVLink.MAV_CMD.LOITER_UNLIM) { pointlist.Add(new PointLatLngAlt(double.Parse(cell3), double.Parse(cell4), (int)double.Parse(cell2) + homealt, (a + 1).ToString()){ color = Color.LightBlue }); - addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2) , Color.LightBlue); + addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2), Color.LightBlue); } else { pointlist.Add(new PointLatLngAlt(double.Parse(cell3), double.Parse(cell4), (int)double.Parse(cell2) + homealt, (a + 1).ToString())); - addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2) ,null); + addpolygonmarker((a + 1).ToString(), double.Parse(cell4), double.Parse(cell3), (int)double.Parse(cell2), null); } avglong += double.Parse(Commands.Rows[a].Cells[Lon.Index].Value.ToString()); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.resx index bd885a8bf8..fc5402ed54 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.resx @@ -136,7 +136,8 @@ 0 - + *NOTE* CLI Works over USB only + TXT_terminal @@ -166,7 +167,7 @@ BUTsetupshow - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null $this @@ -190,7 +191,7 @@ BUTradiosetup - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null $this @@ -214,7 +215,7 @@ BUTtests - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null $this @@ -238,7 +239,7 @@ Logs - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null $this @@ -262,7 +263,7 @@ BUT_logbrowse - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null $this @@ -283,6 +284,6 @@ Terminal - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4579.17884, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4598.41454, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/MagCalib.cs b/Tools/ArdupilotMegaPlanner/MagCalib.cs index 199bcb4975..ecbfd980e4 100644 --- a/Tools/ArdupilotMegaPlanner/MagCalib.cs +++ b/Tools/ArdupilotMegaPlanner/MagCalib.cs @@ -42,7 +42,8 @@ namespace ArdupilotMega { double[] ans = getOffsets(openFileDialog1.FileName, throttleThreshold); - SaveOffsets(ans); + if (ans.Length != 1) + SaveOffsets(ans); } catch (Exception ex) { log.Debug(ex.ToString()); } } @@ -82,7 +83,12 @@ namespace ArdupilotMega log.Info("Start log: " + DateTime.Now); MAVLink mine = new MAVLink(); - mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + try + { + mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + } + catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return new double[] {0}; } + mine.logreadmode = true; mine.packets.Initialize(); // clear diff --git a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs index c5950b4de8..76344ead38 100644 --- a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs +++ b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs @@ -512,7 +512,7 @@ namespace ArdupilotMega Array.Reverse(datearray); logfile.Write(datearray, 0, datearray.Length); logfile.Write(packet, 0, i); - logfile.Flush(); + // logfile.Flush(); } } diff --git a/Tools/ArdupilotMegaPlanner/MavlinkLog.cs b/Tools/ArdupilotMegaPlanner/MavlinkLog.cs index 4cb741ee82..1df89ba445 100644 --- a/Tools/ArdupilotMegaPlanner/MavlinkLog.cs +++ b/Tools/ArdupilotMegaPlanner/MavlinkLog.cs @@ -553,7 +553,12 @@ namespace ArdupilotMega { MAVLink mine = new MAVLink(); - mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + try + { + mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + } + catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return; } + mine.logreadmode = true; mine.packets.Initialize(); // clear @@ -664,7 +669,11 @@ namespace ArdupilotMega { MAVLink MavlinkInterface = new MAVLink(); - MavlinkInterface.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + try + { + MavlinkInterface.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + } + catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return options; } MavlinkInterface.logreadmode = true; MavlinkInterface.packets.Initialize(); // clear @@ -1199,7 +1208,11 @@ namespace ArdupilotMega { MAVLink mine = new MAVLink(); - mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + try + { + mine.logplaybackfile = new BinaryReader(File.Open(logfile, FileMode.Open, FileAccess.Read, FileShare.Read)); + } + catch (Exception ex) { log.Debug(ex.ToString()); CustomMessageBox.Show("Log Can not be opened. Are you still connected?"); return; } mine.logreadmode = true; mine.packets.Initialize(); // clear diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index 54f729d0af..821f5499f4 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/Program.cs b/Tools/ArdupilotMegaPlanner/Program.cs index 0dc8fcdce1..b47e55dc90 100644 --- a/Tools/ArdupilotMegaPlanner/Program.cs +++ b/Tools/ArdupilotMegaPlanner/Program.cs @@ -99,6 +99,9 @@ namespace ArdupilotMega log.Debug(ex.ToString()); + if (ex.Message == "Requested registry access is not allowed.") { + return; + } if (ex.Message == "The port is closed.") { CustomMessageBox.Show("Serial connection has been lost"); return; diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 12847138b8..70be2d8b1b 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.2")] +[assembly: AssemblyFileVersion("1.2.3")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs b/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs index 65187ac4e1..c2e6d88950 100644 --- a/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs +++ b/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs @@ -132,6 +132,12 @@ namespace ArdupilotMega.Utilities running = false; } + static void getUrlRTSP() + { + + + } + static Dictionary getHeader(StreamReader stream) { Dictionary answer = new Dictionary(); diff --git a/Tools/ArdupilotMegaPlanner/paramcompare.cs b/Tools/ArdupilotMegaPlanner/paramcompare.cs index 6671d1dce6..4d12e0371b 100644 --- a/Tools/ArdupilotMegaPlanner/paramcompare.cs +++ b/Tools/ArdupilotMegaPlanner/paramcompare.cs @@ -63,7 +63,7 @@ namespace ArdupilotMega { foreach (DataGridViewRow dgvr in dgv.Rows) { - if (dgvr.Cells[0].Value.ToString() == row.Cells[Command.Index].Value.ToString()) + if (dgvr.Cells[0].Value.ToString().Trim() == row.Cells[Command.Index].Value.ToString().Trim()) { dgvr.Cells[1].Value = row.Cells[newvalue.Index].Value.ToString(); break;