diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj index 4f05e626a4..41212902c1 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj @@ -1140,6 +1140,7 @@ Always + Always diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user index c06c0e6d56..496c214467 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user @@ -11,6 +11,6 @@ - C:\Users\hog\Desktop\DIYDrones\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\;C:\Users\hog\Desktop\DIYDrones\myquad\sharpkml\SharpKml\bin\Release\;C:\Users\hog\Desktop\DIYDrones\myquad\MetaDataExtractorCSharp240d\bin\Release\;C:\Users\hog\Documents\Visual Studio 2010\Projects\ArdupilotMega\ArdupilotMega\Lib\;C:\Users\meee\Desktop\ArduPilotMegaPlanner\ + C:\Users\hog\Desktop\DIYDrones\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\;C:\Users\hog\Desktop\DIYDrones\myquad\sharpkml\SharpKml\bin\Release\;C:\Users\hog\Desktop\DIYDrones\myquad\MetaDataExtractorCSharp240d\bin\Release\;C:\Users\hog\Documents\Visual Studio 2010\Projects\ArdupilotMega\ArdupilotMega\Lib\ \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/ChangeLog.txt b/Tools/ArdupilotMegaPlanner/ChangeLog.txt new file mode 100644 index 0000000000..d33b4ffca8 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/ChangeLog.txt @@ -0,0 +1,12 @@ + +##### 1.1.94 + +Fix Issue 668 - typo +Fix issue 666 - now defaults to mav 1.0 planner +Fix Issue 665 - mavlink 1.0 is now default +Fix Issue 663 - increase timeout from 6 seconds to 12 seconds +Fix Issue 662 - now reads sat count for mav 1.0 +Partial Issue 654 - added current to status, hud still wip +Fix Issue 648 - add validation to value +Fix Issue 638 - add delay +Fix Issue 636 - check for version.txt in app directory \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs b/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs index 90357f8798..6056922e75 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs @@ -35,7 +35,7 @@ namespace ArdupilotMega.Controls // process hashdefines and update display foreach (string value in MainV2.comPort.param.Keys) { - if (value == null) // older ap vesion have a null param + if (value == null || value == "") // older ap version have a null param continue; Control[] text = this.Controls.Find(value, true); foreach (Control ctl in text) diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs index b246d26199..880a2a1a0d 100644 --- a/Tools/ArdupilotMegaPlanner/CurrentState.cs +++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs @@ -158,6 +158,8 @@ namespace ArdupilotMega private float _battery_voltage; public float battery_remaining { get { return _battery_remaining; } set { _battery_remaining = value / 100; if (_battery_remaining < 0 || _battery_remaining > 1) _battery_remaining = 0; } } private float _battery_remaining; + public float current { get { return _current; } set { _current = value / 100; } } + private float _current; // pressure public float press_abs { get; set; } @@ -450,7 +452,7 @@ namespace ArdupilotMega var hb = bytearray.ByteArrayToStructure(6); armed = (hb.base_mode & (byte)MAVLink.MAV_MODE_FLAG.SAFETY_ARMED) == (byte)MAVLink.MAV_MODE_FLAG.SAFETY_ARMED ? 4 : 3; - + string oldmode = mode; mode = "Unknown"; @@ -545,6 +547,7 @@ namespace ArdupilotMega battery_voltage = sysstatus.voltage_battery; battery_remaining = sysstatus.battery_remaining; + current = sysstatus.current_battery; packetdropremote = sysstatus.drop_rate_comm; @@ -733,6 +736,8 @@ namespace ArdupilotMega gpshdop = gps.eph; + satcount = gps.satellites_visible; + groundspeed = gps.vel * 1.0e-2f; groundcourse = gps.cog * 1.0e-2f; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs index 1c6752f03a..271fce64f2 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.Designer.cs @@ -81,6 +81,17 @@ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.BUT_writePIDS = new ArdupilotMega.Controls.MyButton(); this.BUT_rerequestparams = new ArdupilotMega.Controls.MyButton(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.ROV_GAIN = new System.Windows.Forms.NumericUpDown(); + this.label9 = new System.Windows.Forms.Label(); + this.ROV_CL_NAV = new System.Windows.Forms.NumericUpDown(); + this.label10 = new System.Windows.Forms.Label(); + this.ROV_BOOSTER = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); + this.ROV_AWPR_NAV = new System.Windows.Forms.NumericUpDown(); + this.label12 = new System.Windows.Forms.Label(); + this.ROV_SONAR_TRIG = new System.Windows.Forms.NumericUpDown(); + this.label13 = new System.Windows.Forms.Label(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.THR_FS_VALUE)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.THR_MAX)).BeginInit(); @@ -108,6 +119,12 @@ ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_D)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_I)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_P)).BeginInit(); + this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_GAIN)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_CL_NAV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_BOOSTER)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_AWPR_NAV)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_SONAR_TRIG)).BeginInit(); this.SuspendLayout(); // // groupBox3 @@ -412,10 +429,77 @@ this.BUT_rerequestparams.UseVisualStyleBackColor = true; this.BUT_rerequestparams.Click += new System.EventHandler(this.BUT_rerequestparams_Click); // + // groupBox4 + // + this.groupBox4.Controls.Add(this.ROV_SONAR_TRIG); + this.groupBox4.Controls.Add(this.label13); + this.groupBox4.Controls.Add(this.ROV_GAIN); + this.groupBox4.Controls.Add(this.label9); + this.groupBox4.Controls.Add(this.ROV_CL_NAV); + this.groupBox4.Controls.Add(this.label10); + this.groupBox4.Controls.Add(this.ROV_BOOSTER); + this.groupBox4.Controls.Add(this.label11); + this.groupBox4.Controls.Add(this.ROV_AWPR_NAV); + this.groupBox4.Controls.Add(this.label12); + resources.ApplyResources(this.groupBox4, "groupBox4"); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.TabStop = false; + // + // ROV_GAIN + // + resources.ApplyResources(this.ROV_GAIN, "ROV_GAIN"); + this.ROV_GAIN.Name = "ROV_GAIN"; + // + // label9 + // + resources.ApplyResources(this.label9, "label9"); + this.label9.Name = "label9"; + // + // ROV_CL_NAV + // + resources.ApplyResources(this.ROV_CL_NAV, "ROV_CL_NAV"); + this.ROV_CL_NAV.Name = "ROV_CL_NAV"; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // + // ROV_BOOSTER + // + resources.ApplyResources(this.ROV_BOOSTER, "ROV_BOOSTER"); + this.ROV_BOOSTER.Name = "ROV_BOOSTER"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // + // ROV_AWPR_NAV + // + resources.ApplyResources(this.ROV_AWPR_NAV, "ROV_AWPR_NAV"); + this.ROV_AWPR_NAV.Name = "ROV_AWPR_NAV"; + // + // label12 + // + resources.ApplyResources(this.label12, "label12"); + this.label12.Name = "label12"; + // + // ROV_SONAR_TRIG + // + resources.ApplyResources(this.ROV_SONAR_TRIG, "ROV_SONAR_TRIG"); + this.ROV_SONAR_TRIG.Name = "ROV_SONAR_TRIG"; + // + // label13 + // + resources.ApplyResources(this.label13, "label13"); + this.label13.Name = "label13"; + // // ConfigArdurover // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.groupBox4); this.Controls.Add(this.BUT_rerequestparams); this.Controls.Add(this.BUT_writePIDS); this.Controls.Add(this.groupBox3); @@ -453,6 +537,12 @@ ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_D)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_I)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HDNG2RLL_P)).EndInit(); + this.groupBox4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.ROV_GAIN)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_CL_NAV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_BOOSTER)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_AWPR_NAV)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ROV_SONAR_TRIG)).EndInit(); this.ResumeLayout(false); } @@ -510,5 +600,16 @@ private System.Windows.Forms.ToolTip toolTip1; private Controls.MyButton BUT_writePIDS; private Controls.MyButton BUT_rerequestparams; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.NumericUpDown ROV_SONAR_TRIG; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.NumericUpDown ROV_GAIN; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.NumericUpDown ROV_CL_NAV; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.NumericUpDown ROV_BOOSTER; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.NumericUpDown ROV_AWPR_NAV; + private System.Windows.Forms.Label label12; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx index a42e29cbf7..813d1b26c2 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArdurover.resx @@ -237,7 +237,7 @@ $this - 2 + 3 111, 82 @@ -550,7 +550,7 @@ $this - 3 + 4 111, 82 @@ -838,7 +838,7 @@ $this - 4 + 5 111, 59 @@ -1054,7 +1054,7 @@ $this - 5 + 6 111, 36 @@ -1270,7 +1270,7 @@ $this - 6 + 7 111, 82 @@ -1582,7 +1582,7 @@ $this - 7 + 8 111, 82 @@ -1798,13 +1798,13 @@ BUT_writePIDS - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null $this - 1 + 2 NoControl @@ -1828,12 +1828,276 @@ BUT_rerequestparams - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null $this + 1 + + + 111, 105 + + + 78, 20 + + + 16 + + + ROV_SONAR_TRIG + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 0 + + + NoControl + + + 6, 109 + + + 99, 16 + + + 17 + + + Sonar Trigger Dist + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 1 + + + 111, 82 + + + 78, 20 + + + 11 + + + ROV_GAIN + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 2 + + + NoControl + + + 6, 86 + + + 69, 16 + + + 12 + + + Turn Gain + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 3 + + + 111, 59 + + + 78, 20 + + + 9 + + + ROV_CL_NAV + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 4 + + + NoControl + + + 6, 63 + + + 99, 16 + + + 13 + + + Closed Loop Nav + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 5 + + + 111, 36 + + + 78, 20 + + + 7 + + + ROV_BOOSTER + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 6 + + + NoControl + + + 6, 40 + + + 99, 16 + + + 14 + + + Booster + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 7 + + + 111, 13 + + + 78, 20 + + + 5 + + + ROV_AWPR_NAV + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 8 + + + NoControl + + + 6, 17 + + + 99, 16 + + + 15 + + + Auto WP Rad + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 9 + + + 213, 3 + + + 195, 135 + + + 21 + + + Rover + + + groupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -1855,6 +2119,6 @@ ConfigArdurover - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs index 83ac0f7e7e..7f764f6ef8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs @@ -154,7 +154,11 @@ namespace ArdupilotMega.GCSViews.ConfigurationView if (MainV2.getConfig("video_options") != "" && CMB_videosources.Text != "") { - CMB_videoresolutions.SelectedIndex = int.Parse(MainV2.getConfig("video_options")); + try + { + CMB_videoresolutions.SelectedIndex = int.Parse(MainV2.getConfig("video_options")); + } + catch { } // ignore bad entries } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs index bdcc18764c..048822927e 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs @@ -52,7 +52,10 @@ namespace ArdupilotMega.GCSViews.ConfigurationView string line = sr.ReadLine(); if (line.Contains("NOTE:")) + { CustomMessageBox.Show(line, "Saved Note"); + continue; + } if (line.StartsWith("#")) continue; @@ -92,6 +95,8 @@ namespace ArdupilotMega.GCSViews.ConfigurationView continue; if (name == "LOG_LASTFILE") continue; + if (name == "FORMAT_VERSION") + continue; param[name] = value; } @@ -141,6 +146,8 @@ namespace ArdupilotMega.GCSViews.ConfigurationView continue; if (name == "LOG_LASTFILE") continue; + if (name == "FORMAT_VERSION") + continue; if (row.Cells[0].Value.ToString() == name) { if (row.Cells[1].Value.ToString() != value.ToString()) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs index 7a4c662264..1b8df59419 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.Designer.cs @@ -179,6 +179,7 @@ // resources.ApplyResources(this.H_COL_MIN, "H_COL_MIN"); this.H_COL_MIN.Name = "H_COL_MIN"; + this.H_COL_MIN.Validating += new System.ComponentModel.CancelEventHandler(this.PWM_Validating); // // groupBox1 // diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx index 56cc3b35a7..e9031e5c21 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigTradHeli.resx @@ -217,7 +217,7 @@ BUT_swash_manual - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null $this @@ -409,7 +409,7 @@ BUT_HS4save - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null $this @@ -550,7 +550,7 @@ BUT_0collective - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null groupBox1 @@ -1354,7 +1354,7 @@ HS4 - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null + ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null $this @@ -1375,7 +1375,7 @@ HS3 - ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null + ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null $this @@ -1405,7 +1405,7 @@ Gservoloc - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null $this @@ -1570,6 +1570,6 @@ ConfigTradHeli - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs index 98cf22d451..180d40729b 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs @@ -28,6 +28,13 @@ namespace ArdupilotMega.GCSViews } return true; } + + if (keyData == (Keys.Control | Keys.R)) + { + findfirmware("AR2"); + return true; + } + return base.ProcessCmdKey(ref msg, keyData); } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index 7c2feefa58..47b03bd69a 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -1103,14 +1103,18 @@ namespace ArdupilotMega.GCSViews private void tracklog_Scroll(object sender, EventArgs e) { - BUT_clear_track_Click(sender, e); + try + { + BUT_clear_track_Click(sender, e); - MainV2.comPort.lastlogread = DateTime.MinValue; + MainV2.comPort.lastlogread = DateTime.MinValue; - if (MainV2.comPort.logplaybackfile != null) - MainV2.comPort.logplaybackfile.BaseStream.Position = (long)(MainV2.comPort.logplaybackfile.BaseStream.Length * (tracklog.Value / 100.0)); + if (MainV2.comPort.logplaybackfile != null) + MainV2.comPort.logplaybackfile.BaseStream.Position = (long)(MainV2.comPort.logplaybackfile.BaseStream.Length * (tracklog.Value / 100.0)); - updateLogPlayPosition(); + updateLogPlayPosition(); + } + catch { } // ignore any invalid } bool loaded = false; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index ad0c1f9f1f..757bc14f20 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -134,7 +134,7 @@ Point Camera Here - 175, 48 + 175, 70 contextMenuStrip1 @@ -198,7 +198,7 @@ Display Battery Info - 177, 136 + 177, 114 contextMenuStrip2 @@ -226,7 +226,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -265,7 +265,7 @@ BUT_script - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -298,7 +298,7 @@ BUT_joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -328,7 +328,7 @@ BUT_quickmanual - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -358,7 +358,7 @@ BUT_quickrtl - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -388,7 +388,7 @@ BUT_quickauto - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -442,7 +442,7 @@ BUT_setwp - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -493,7 +493,7 @@ BUT_setmode - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -523,7 +523,7 @@ BUT_clear_track - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -574,7 +574,7 @@ BUT_Homealt - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -604,7 +604,7 @@ BUT_RAWSensor - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -634,7 +634,7 @@ BUTrestartmission - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -664,7 +664,7 @@ BUTactiondo - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabActions @@ -718,7 +718,7 @@ Gvspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabGauges @@ -748,7 +748,7 @@ Gheading - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabGauges @@ -778,7 +778,7 @@ Galt - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabGauges @@ -811,7 +811,7 @@ Gspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabGauges @@ -895,7 +895,7 @@ lbl_playbackspeed - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabTLogs @@ -922,7 +922,7 @@ lbl_logpercent - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabTLogs @@ -949,7 +949,7 @@ NUM_playbackspeed - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabTLogs @@ -976,7 +976,7 @@ BUT_log2kml - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1030,7 +1030,7 @@ BUT_playlog - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1057,7 +1057,7 @@ BUT_loadtelem - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1246,7 +1246,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1273,13 +1273,13 @@ Sats: 0 - Satalite Count + Satallite Count lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1309,7 +1309,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1339,7 +1339,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1511,7 +1511,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1574,7 +1574,7 @@ TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null panel1 @@ -1631,7 +1631,7 @@ label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null panel1 @@ -1661,7 +1661,7 @@ TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null panel1 @@ -1691,7 +1691,7 @@ TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null panel1 @@ -1892,7 +1892,7 @@ label6 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null $this @@ -1988,6 +1988,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs index 4b6f3ccd96..b15b86e722 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs @@ -789,7 +789,7 @@ namespace ArdupilotMega.GCSViews float rdiff = (float)((att.roll - oldatt.roll) / timediff.TotalSeconds); float ydiff = (float)((att.yaw - oldatt.yaw) / timediff.TotalSeconds); -// Console.WriteLine("{0:0.00000} {1:0.00000} {2:0.00000} \t {3:0.00000} {4:0.00000} {5:0.00000}", pdiff, rdiff, ydiff, DATA[17][0], DATA[17][1], DATA[17][2]); + // Console.WriteLine("{0:0.00000} {1:0.00000} {2:0.00000} \t {3:0.00000} {4:0.00000} {5:0.00000}", pdiff, rdiff, ydiff, DATA[17][0], DATA[17][1], DATA[17][2]); oldatt = att; @@ -838,7 +838,7 @@ namespace ArdupilotMega.GCSViews #if MAVLINK10 gps.alt = (int)(DATA[20][2] * ft2m * 1000); gps.fix_type = 3; - if (xplane9) + if (xplane9) { gps.cog = (ushort)((float)DATA[19][2]); } @@ -1179,16 +1179,16 @@ namespace ArdupilotMega.GCSViews sitlout.heading = gps.cog; #endif - sitlout.v_north = DATA[21][4]; + sitlout.v_north = DATA[21][4]; sitlout.v_east = DATA[21][5]; - // correct accel + // correct accel sitlout.ax = -ans.Item2; // pitch sitlout.ay = -ans.Item1; // roll sitlout.az = ans.Item3; // yaw sitlout.phidot = -0.5;// att.pitchspeed; -// sitlout.thetadot = att.rollspeed; + // sitlout.thetadot = att.rollspeed; //sitlout.psidot = att.yawspeed; sitlout.phi = att.roll * rad2deg; @@ -1201,7 +1201,7 @@ namespace ArdupilotMega.GCSViews byte[] sendme = StructureToByteArray(sitlout); - SITLSEND.Send(sendme,sendme.Length); + SITLSEND.Send(sendme, sendme.Length); return; } @@ -1248,10 +1248,10 @@ namespace ArdupilotMega.GCSViews comPort.sendPacket(hilstate); -// comPort.sendPacket(oldgps); + // comPort.sendPacket(oldgps); comPort.sendPacket(asp); - + #else if (chkSensor.Checked == false) // attitude @@ -1268,11 +1268,11 @@ namespace ArdupilotMega.GCSViews #endif - MAVLink.mavlink_raw_pressure_t pres = new MAVLink.mavlink_raw_pressure_t(); - double calc = (101325 * Math.Pow(1 - 2.25577 * Math.Pow(10, -5) * gps.alt, 5.25588)); // updated from valid gps - pres.press_diff1 = (short)(int)(calc - 101325); // 0 alt is 0 pa + MAVLink.mavlink_raw_pressure_t pres = new MAVLink.mavlink_raw_pressure_t(); + double calc = (101325 * Math.Pow(1 - 2.25577 * Math.Pow(10, -5) * gps.alt, 5.25588)); // updated from valid gps + pres.press_diff1 = (short)(int)(calc - 101325); // 0 alt is 0 pa - comPort.sendPacket(pres); + comPort.sendPacket(pres); #if !MAVLINK10 comPort.sendPacket(asp); } @@ -2025,7 +2025,11 @@ namespace ArdupilotMega.GCSViews System.Diagnostics.Process P = new System.Diagnostics.Process(); P.StartInfo.FileName = ofd.FileName; P.StartInfo.Arguments = extra + @" --geometry=400x300 --aircraft=arducopter --native-fdm=socket,out,50,127.0.0.1,49005,udp --generic=socket,in,50,127.0.0.1,49000,udp,quadhil --fdm=external --roll=0 --pitch=0 --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz111111=30 --timeofday=noon --shading-flat --fog-disable --disable-specular-highlight --disable-skyblend --disable-random-objects --disable-panel --disable-horizon-effect --disable-clouds --disable-anti-alias-hud "; - P.Start(); + try + { + P.Start(); + } + catch { CustomMessageBox.Show("Failed to start FlightGear"); } } } @@ -2076,7 +2080,11 @@ namespace ArdupilotMega.GCSViews System.Diagnostics.Process P = new System.Diagnostics.Process(); P.StartInfo.FileName = ofd.FileName; P.StartInfo.Arguments = extra + @" --geometry=400x300 --native-fdm=socket,out,50,127.0.0.1,49005,udp --generic=socket,in,50,127.0.0.1,49000,udp,MAVLink --roll=0 --pitch=0 --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --timeofday=noon --shading-flat --fog-disable --disable-specular-highlight --disable-skyblend --disable-random-objects --disable-panel --disable-horizon-effect --disable-clouds --disable-anti-alias-hud "; - P.Start(); + try + { + P.Start(); + } + catch { CustomMessageBox.Show("Failed to start FlightGear"); } } } @@ -2106,7 +2114,12 @@ namespace ArdupilotMega.GCSViews System.Diagnostics.Process P = new System.Diagnostics.Process(); P.StartInfo.FileName = ofd.FileName; P.StartInfo.Arguments = ""; - P.Start(); + try + { + P.Start(); + } + catch { CustomMessageBox.Show("Failed to start XPlanes"); } + } } @@ -2173,6 +2186,5 @@ namespace ArdupilotMega.GCSViews CHKgraphthrottle.Visible = false; } } - } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs index f411f4b4a5..36698ddfff 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.cs @@ -110,6 +110,11 @@ namespace ArdupilotMega /// public string georefkml = ""; + /// + /// store the time we first connect + /// + DateTime connecttime = DateTime.Now; + /// /// enum of firmwares /// @@ -685,6 +690,9 @@ namespace ArdupilotMega } catch { CustomMessageBox.Show("Failed to create log - wont log this session"); } // soft fail + // reset connect time + connecttime = DateTime.Now; + // do the connect comPort.Open(true); @@ -1193,8 +1201,8 @@ namespace ArdupilotMega heatbeatSend = DateTime.Now; } - // data loss warning - if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds > 10) + // data loss warning - ignore first 30 seconds of connect + if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds > 10 && (DateTime.Now - connecttime).TotalSeconds > 30) { if (speechEnable && speechEngine != null) { @@ -1690,12 +1698,12 @@ namespace ArdupilotMega if (MONO) { process.StartInfo.FileName = "mono"; - process.StartInfo.Arguments = " \"" + exePath + Path.DirectorySeparatorChar + "Updater.exe\""; + process.StartInfo.Arguments = " \"" + exePath + Path.DirectorySeparatorChar + "Updater.exe\"" + "\"" + Application.ExecutablePath + "\""; } else { process.StartInfo.FileName = exePath + Path.DirectorySeparatorChar + "Updater.exe"; - process.StartInfo.Arguments = ""; + process.StartInfo.Arguments = Application.ExecutablePath; } try @@ -1747,9 +1755,11 @@ namespace ArdupilotMega private static void CheckForUpdate() { var baseurl = ConfigurationManager.AppSettings["UpdateLocation"]; - string path = Path.GetFileName(Application.ExecutablePath); + string path = Path.GetDirectoryName(Application.ExecutablePath); - path = "version.txt"; + path = path + Path.DirectorySeparatorChar + "version.txt"; + + log.Debug(path); // Create a request using a URL that can receive a post. string requestUriString = baseurl + path; diff --git a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs index 218bb6dfa1..7c5da2b060 100644 --- a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs +++ b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs @@ -962,7 +962,7 @@ namespace ArdupilotMega if (actionid == MAV_CMD.PREFLIGHT_CALIBRATION) { retrys = 1; - timeout = 6000; + timeout = 12000; } while (true) diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index 5b1e02ff74..3be08dd8eb 100644 --- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs +++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs @@ -2,14 +2,14 @@ - + - - + + @@ -31,7 +31,7 @@ - + @@ -102,11 +102,11 @@ - + - + @@ -117,20 +117,20 @@ - + - + - + @@ -144,7 +144,7 @@ - + @@ -156,13 +156,13 @@ - + - + @@ -173,7 +173,7 @@ - + @@ -184,33 +184,33 @@ - + - + - + - + - + - + @@ -219,28 +219,28 @@ - + - + - + - + - + @@ -263,7 +263,9 @@ - + + + diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 932178790d..8d9571fcc7 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs +++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Resources; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.1.*")] -[assembly: AssemblyFileVersion("1.1.93")] +[assembly: AssemblyFileVersion("1.1.94")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Updater/Program.cs b/Tools/ArdupilotMegaPlanner/Updater/Program.cs index b509a1bf25..0ddf306be4 100644 --- a/Tools/ArdupilotMegaPlanner/Updater/Program.cs +++ b/Tools/ArdupilotMegaPlanner/Updater/Program.cs @@ -45,11 +45,11 @@ namespace Updater if (MAC) { P.StartInfo.FileName = "mono"; - P.StartInfo.Arguments = " \"" + Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + "ArdupilotMegaPlanner.exe\""; + P.StartInfo.Arguments = " \"" + Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + "ArdupilotMegaPlanner10.exe\""; } else { - P.StartInfo.FileName = Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + "ArdupilotMegaPlanner.exe"; + P.StartInfo.FileName = Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + "ArdupilotMegaPlanner10.exe"; P.StartInfo.Arguments = ""; } Console.WriteLine("Start " + P.StartInfo.FileName + " with " + P.StartInfo.Arguments); diff --git a/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs b/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs index 87fc18b050..65187ac4e1 100644 --- a/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs +++ b/Tools/ArdupilotMegaPlanner/Utilities/CaptureMJPEG.cs @@ -34,7 +34,7 @@ namespace ArdupilotMega.Utilities asyncthread = new Thread(new ThreadStart(getUrl)) { IsBackground = true, - Priority = ThreadPriority.Normal, + Priority = ThreadPriority.BelowNormal, Name = "mjpg stream reader" }; diff --git a/Tools/ArdupilotMegaPlanner/Utilities/Speech.cs b/Tools/ArdupilotMegaPlanner/Utilities/Speech.cs index df5c149d1f..faf8d51890 100644 --- a/Tools/ArdupilotMegaPlanner/Utilities/Speech.cs +++ b/Tools/ArdupilotMegaPlanner/Utilities/Speech.cs @@ -104,7 +104,11 @@ namespace ArdupilotMega.Utilities } else { - _speechwindows.SpeakAsyncCancelAll(); + try + { + _speechwindows.SpeakAsyncCancelAll(); + } + catch { } // System.PlatformNotSupportedException: } } } diff --git a/Tools/ArdupilotMegaPlanner/wix/Program.cs b/Tools/ArdupilotMegaPlanner/wix/Program.cs index 6f6ebc754a..01dc62ac80 100644 --- a/Tools/ArdupilotMegaPlanner/wix/Program.cs +++ b/Tools/ArdupilotMegaPlanner/wix/Program.cs @@ -227,7 +227,9 @@ namespace wix - + + +