mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-09 09:28:31 -04:00
APM Planner 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 Fix config panel null bug Add more Ardurover config options Add Exceptions handling to video format selection Add FORMAT_VERSION to param file ignore list Fix NOTE param file line Add APMRover hidden firmware upload (control-R) on firmware screen. fix possible speach engine exception add dataflashlog for apmrover
This commit is contained in:
Michael Oborne
parent
f86f5dc025
commit
4e7fe5ec5c
@ -1140,6 +1140,7 @@
|
||||
<Content Include="ArduCopterConfig.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="ChangeLog.txt" />
|
||||
<Content Include="Driver\Arduino MEGA 2560.inf">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
||||
@ -11,6 +11,6 @@
|
||||
<UpdateUrlHistory />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ReferencePath>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\</ReferencePath>
|
||||
<ReferencePath>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\</ReferencePath>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
12
Tools/ArdupilotMegaPlanner/ChangeLog.txt
Normal file
12
Tools/ArdupilotMegaPlanner/ChangeLog.txt
Normal file
@ -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
|
||||
@ -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)
|
||||
|
||||
@ -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; }
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -237,7 +237,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox3.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="THR_FS_VALUE.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 82</value>
|
||||
@ -550,7 +550,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="ARSPD_RATIO.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 82</value>
|
||||
@ -838,7 +838,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox2.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="LIM_PITCH_MIN.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 59</value>
|
||||
@ -1054,7 +1054,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox15.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="XTRK_ANGLE_CD.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 36</value>
|
||||
@ -1270,7 +1270,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox14.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="ENRGY2THR_IMAX.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 82</value>
|
||||
@ -1582,7 +1582,7 @@
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox11.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="HDNG2RLL_IMAX.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 82</value>
|
||||
@ -1798,13 +1798,13 @@
|
||||
<value>BUT_writePIDS</value>
|
||||
</data>
|
||||
<data name=">>BUT_writePIDS.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_writePIDS.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_writePIDS.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="BUT_rerequestparams.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
@ -1828,12 +1828,276 @@
|
||||
<value>BUT_rerequestparams</value>
|
||||
</data>
|
||||
<data name=">>BUT_rerequestparams.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_rerequestparams.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_rerequestparams.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="ROV_SONAR_TRIG.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 105</value>
|
||||
</data>
|
||||
<data name="ROV_SONAR_TRIG.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>78, 20</value>
|
||||
</data>
|
||||
<data name="ROV_SONAR_TRIG.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name=">>ROV_SONAR_TRIG.Name" xml:space="preserve">
|
||||
<value>ROV_SONAR_TRIG</value>
|
||||
</data>
|
||||
<data name=">>ROV_SONAR_TRIG.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>ROV_SONAR_TRIG.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>ROV_SONAR_TRIG.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>6, 109</value>
|
||||
</data>
|
||||
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>99, 16</value>
|
||||
</data>
|
||||
<data name="label13.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="label13.Text" xml:space="preserve">
|
||||
<value>Sonar Trigger Dist</value>
|
||||
</data>
|
||||
<data name=">>label13.Name" xml:space="preserve">
|
||||
<value>label13</value>
|
||||
</data>
|
||||
<data name=">>label13.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label13.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>label13.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="ROV_GAIN.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 82</value>
|
||||
</data>
|
||||
<data name="ROV_GAIN.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>78, 20</value>
|
||||
</data>
|
||||
<data name="ROV_GAIN.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name=">>ROV_GAIN.Name" xml:space="preserve">
|
||||
<value>ROV_GAIN</value>
|
||||
</data>
|
||||
<data name=">>ROV_GAIN.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>ROV_GAIN.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>ROV_GAIN.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="label9.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>6, 86</value>
|
||||
</data>
|
||||
<data name="label9.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>69, 16</value>
|
||||
</data>
|
||||
<data name="label9.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="label9.Text" xml:space="preserve">
|
||||
<value>Turn Gain</value>
|
||||
</data>
|
||||
<data name=">>label9.Name" xml:space="preserve">
|
||||
<value>label9</value>
|
||||
</data>
|
||||
<data name=">>label9.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label9.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>label9.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="ROV_CL_NAV.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 59</value>
|
||||
</data>
|
||||
<data name="ROV_CL_NAV.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>78, 20</value>
|
||||
</data>
|
||||
<data name="ROV_CL_NAV.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name=">>ROV_CL_NAV.Name" xml:space="preserve">
|
||||
<value>ROV_CL_NAV</value>
|
||||
</data>
|
||||
<data name=">>ROV_CL_NAV.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>ROV_CL_NAV.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>ROV_CL_NAV.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="label10.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="label10.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>6, 63</value>
|
||||
</data>
|
||||
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>99, 16</value>
|
||||
</data>
|
||||
<data name="label10.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>13</value>
|
||||
</data>
|
||||
<data name="label10.Text" xml:space="preserve">
|
||||
<value>Closed Loop Nav</value>
|
||||
</data>
|
||||
<data name=">>label10.Name" xml:space="preserve">
|
||||
<value>label10</value>
|
||||
</data>
|
||||
<data name=">>label10.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label10.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>label10.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="ROV_BOOSTER.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 36</value>
|
||||
</data>
|
||||
<data name="ROV_BOOSTER.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>78, 20</value>
|
||||
</data>
|
||||
<data name="ROV_BOOSTER.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name=">>ROV_BOOSTER.Name" xml:space="preserve">
|
||||
<value>ROV_BOOSTER</value>
|
||||
</data>
|
||||
<data name=">>ROV_BOOSTER.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>ROV_BOOSTER.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>ROV_BOOSTER.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="label11.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>6, 40</value>
|
||||
</data>
|
||||
<data name="label11.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>99, 16</value>
|
||||
</data>
|
||||
<data name="label11.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="label11.Text" xml:space="preserve">
|
||||
<value>Booster</value>
|
||||
</data>
|
||||
<data name=">>label11.Name" xml:space="preserve">
|
||||
<value>label11</value>
|
||||
</data>
|
||||
<data name=">>label11.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label11.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>label11.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="ROV_AWPR_NAV.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>111, 13</value>
|
||||
</data>
|
||||
<data name="ROV_AWPR_NAV.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>78, 20</value>
|
||||
</data>
|
||||
<data name="ROV_AWPR_NAV.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name=">>ROV_AWPR_NAV.Name" xml:space="preserve">
|
||||
<value>ROV_AWPR_NAV</value>
|
||||
</data>
|
||||
<data name=">>ROV_AWPR_NAV.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>ROV_AWPR_NAV.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>ROV_AWPR_NAV.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="label12.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="label12.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>6, 17</value>
|
||||
</data>
|
||||
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>99, 16</value>
|
||||
</data>
|
||||
<data name="label12.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="label12.Text" xml:space="preserve">
|
||||
<value>Auto WP Rad</value>
|
||||
</data>
|
||||
<data name=">>label12.Name" xml:space="preserve">
|
||||
<value>label12</value>
|
||||
</data>
|
||||
<data name=">>label12.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label12.Parent" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>label12.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>213, 3</value>
|
||||
</data>
|
||||
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>195, 135</value>
|
||||
</data>
|
||||
<data name="groupBox4.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>21</value>
|
||||
</data>
|
||||
<data name="groupBox4.Text" xml:space="preserve">
|
||||
<value>Rover</value>
|
||||
</data>
|
||||
<data name=">>groupBox4.Name" xml:space="preserve">
|
||||
<value>groupBox4</value>
|
||||
</data>
|
||||
<data name=">>groupBox4.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>groupBox4.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox4.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
@ -1855,6 +2119,6 @@
|
||||
<value>ConfigArdurover</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4523.24267, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner10, Version=1.1.4561.34371, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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())
|
||||
|
||||
@ -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
|
||||
//
|
||||
|
||||
@ -217,7 +217,7 @@
|
||||
<value>BUT_swash_manual</value>
|
||||
</data>
|
||||
<data name=">>BUT_swash_manual.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_swash_manual.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@ -409,7 +409,7 @@
|
||||
<value>BUT_HS4save</value>
|
||||
</data>
|
||||
<data name=">>BUT_HS4save.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_HS4save.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@ -550,7 +550,7 @@
|
||||
<value>BUT_0collective</value>
|
||||
</data>
|
||||
<data name=">>BUT_0collective.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_0collective.Parent" xml:space="preserve">
|
||||
<value>groupBox1</value>
|
||||
@ -1354,7 +1354,7 @@
|
||||
<value>HS4</value>
|
||||
</data>
|
||||
<data name=">>HS4.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>HS4.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@ -1375,7 +1375,7 @@
|
||||
<value>HS3</value>
|
||||
</data>
|
||||
<data name=">>HS3.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>HS3.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@ -1405,7 +1405,7 @@
|
||||
<value>Gservoloc</value>
|
||||
</data>
|
||||
<data name=">>Gservoloc.Type" xml:space="preserve">
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Gservoloc.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@ -1570,6 +1570,6 @@
|
||||
<value>ConfigTradHeli</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4494.24488, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner10, Version=1.1.4561.36486, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -134,7 +134,7 @@
|
||||
<value>Point Camera Here</value>
|
||||
</data>
|
||||
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>175, 48</value>
|
||||
<value>175, 70</value>
|
||||
</data>
|
||||
<data name=">>contextMenuStrip1.Name" xml:space="preserve">
|
||||
<value>contextMenuStrip1</value>
|
||||
@ -198,7 +198,7 @@
|
||||
<value>Display Battery Info</value>
|
||||
</data>
|
||||
<data name="contextMenuStrip2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>177, 136</value>
|
||||
<value>177, 114</value>
|
||||
</data>
|
||||
<data name=">>contextMenuStrip2.Name" xml:space="preserve">
|
||||
<value>contextMenuStrip2</value>
|
||||
@ -226,7 +226,7 @@
|
||||
<value>hud1</value>
|
||||
</data>
|
||||
<data name=">>hud1.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>hud1.Parent" xml:space="preserve">
|
||||
<value>SubMainLeft.Panel1</value>
|
||||
@ -265,7 +265,7 @@
|
||||
<value>BUT_script</value>
|
||||
</data>
|
||||
<data name=">>BUT_script.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_script.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -298,7 +298,7 @@
|
||||
<value>BUT_joystick</value>
|
||||
</data>
|
||||
<data name=">>BUT_joystick.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_joystick.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -328,7 +328,7 @@
|
||||
<value>BUT_quickmanual</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickmanual.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickmanual.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -358,7 +358,7 @@
|
||||
<value>BUT_quickrtl</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickrtl.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickrtl.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -388,7 +388,7 @@
|
||||
<value>BUT_quickauto</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickauto.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickauto.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -442,7 +442,7 @@
|
||||
<value>BUT_setwp</value>
|
||||
</data>
|
||||
<data name=">>BUT_setwp.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_setwp.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -493,7 +493,7 @@
|
||||
<value>BUT_setmode</value>
|
||||
</data>
|
||||
<data name=">>BUT_setmode.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_setmode.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -523,7 +523,7 @@
|
||||
<value>BUT_clear_track</value>
|
||||
</data>
|
||||
<data name=">>BUT_clear_track.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_clear_track.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -574,7 +574,7 @@
|
||||
<value>BUT_Homealt</value>
|
||||
</data>
|
||||
<data name=">>BUT_Homealt.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_Homealt.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -604,7 +604,7 @@
|
||||
<value>BUT_RAWSensor</value>
|
||||
</data>
|
||||
<data name=">>BUT_RAWSensor.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_RAWSensor.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -634,7 +634,7 @@
|
||||
<value>BUTrestartmission</value>
|
||||
</data>
|
||||
<data name=">>BUTrestartmission.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUTrestartmission.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -664,7 +664,7 @@
|
||||
<value>BUTactiondo</value>
|
||||
</data>
|
||||
<data name=">>BUTactiondo.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUTactiondo.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
@ -718,7 +718,7 @@
|
||||
<value>Gvspeed</value>
|
||||
</data>
|
||||
<data name=">>Gvspeed.Type" xml:space="preserve">
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Gvspeed.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
@ -748,7 +748,7 @@
|
||||
<value>Gheading</value>
|
||||
</data>
|
||||
<data name=">>Gheading.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Gheading.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
@ -778,7 +778,7 @@
|
||||
<value>Galt</value>
|
||||
</data>
|
||||
<data name=">>Galt.Type" xml:space="preserve">
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Galt.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
@ -811,7 +811,7 @@
|
||||
<value>Gspeed</value>
|
||||
</data>
|
||||
<data name=">>Gspeed.Type" xml:space="preserve">
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Gspeed.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
@ -895,7 +895,7 @@
|
||||
<value>lbl_playbackspeed</value>
|
||||
</data>
|
||||
<data name=">>lbl_playbackspeed.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_playbackspeed.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
@ -922,7 +922,7 @@
|
||||
<value>lbl_logpercent</value>
|
||||
</data>
|
||||
<data name=">>lbl_logpercent.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_logpercent.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
@ -949,7 +949,7 @@
|
||||
<value>NUM_playbackspeed</value>
|
||||
</data>
|
||||
<data name=">>NUM_playbackspeed.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>NUM_playbackspeed.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
@ -976,7 +976,7 @@
|
||||
<value>BUT_log2kml</value>
|
||||
</data>
|
||||
<data name=">>BUT_log2kml.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_log2kml.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
@ -1030,7 +1030,7 @@
|
||||
<value>BUT_playlog</value>
|
||||
</data>
|
||||
<data name=">>BUT_playlog.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_playlog.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
@ -1057,7 +1057,7 @@
|
||||
<value>BUT_loadtelem</value>
|
||||
</data>
|
||||
<data name=">>BUT_loadtelem.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_loadtelem.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
@ -1246,7 +1246,7 @@
|
||||
<value>lbl_hdop</value>
|
||||
</data>
|
||||
<data name=">>lbl_hdop.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_hdop.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
@ -1273,13 +1273,13 @@
|
||||
<value>Sats: 0</value>
|
||||
</data>
|
||||
<data name="lbl_sats.ToolTip" xml:space="preserve">
|
||||
<value>Satalite Count</value>
|
||||
<value>Satallite Count</value>
|
||||
</data>
|
||||
<data name=">>lbl_sats.Name" xml:space="preserve">
|
||||
<value>lbl_sats</value>
|
||||
</data>
|
||||
<data name=">>lbl_sats.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_sats.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
@ -1309,7 +1309,7 @@
|
||||
<value>lbl_winddir</value>
|
||||
</data>
|
||||
<data name=">>lbl_winddir.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_winddir.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
@ -1339,7 +1339,7 @@
|
||||
<value>lbl_windvel</value>
|
||||
</data>
|
||||
<data name=">>lbl_windvel.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_windvel.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
@ -1511,7 +1511,7 @@
|
||||
<value>gMapControl1</value>
|
||||
</data>
|
||||
<data name=">>gMapControl1.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>gMapControl1.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
@ -1574,7 +1574,7 @@
|
||||
<value>TXT_lat</value>
|
||||
</data>
|
||||
<data name=">>TXT_lat.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>TXT_lat.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
@ -1631,7 +1631,7 @@
|
||||
<value>label1</value>
|
||||
</data>
|
||||
<data name=">>label1.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>label1.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
@ -1661,7 +1661,7 @@
|
||||
<value>TXT_long</value>
|
||||
</data>
|
||||
<data name=">>TXT_long.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>TXT_long.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
@ -1691,7 +1691,7 @@
|
||||
<value>TXT_alt</value>
|
||||
</data>
|
||||
<data name=">>TXT_alt.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>TXT_alt.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
@ -1892,7 +1892,7 @@
|
||||
<value>label6</value>
|
||||
</data>
|
||||
<data name=">>label6.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>label6.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@ -1988,6 +1988,6 @@
|
||||
<value>FlightData</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4560.33097, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -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,7 +1248,7 @@ namespace ArdupilotMega.GCSViews
|
||||
|
||||
comPort.sendPacket(hilstate);
|
||||
|
||||
// comPort.sendPacket(oldgps);
|
||||
// comPort.sendPacket(oldgps);
|
||||
|
||||
comPort.sendPacket(asp);
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -110,6 +110,11 @@ namespace ArdupilotMega
|
||||
/// </summary>
|
||||
public string georefkml = "";
|
||||
|
||||
/// <summary>
|
||||
/// store the time we first connect
|
||||
/// </summary>
|
||||
DateTime connecttime = DateTime.Now;
|
||||
|
||||
/// <summary>
|
||||
/// enum of firmwares
|
||||
/// </summary>
|
||||
@ -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;
|
||||
|
||||
@ -962,7 +962,7 @@ namespace ArdupilotMega
|
||||
if (actionid == MAV_CMD.PREFLIGHT_CALIBRATION)
|
||||
{
|
||||
retrys = 1;
|
||||
timeout = 6000;
|
||||
timeout = 12000;
|
||||
}
|
||||
|
||||
while (true)
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension">
|
||||
|
||||
|
||||
<Product Id="*" Name="APM Planner" Language="1033" Version="1.1.91" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
<Product Id="*" Name="APM Planner" Language="1033" Version="1.1.92" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
|
||||
<Package Description="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
|
||||
|
||||
|
||||
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
<UpgradeVersion OnlyDetect="yes" Minimum="1.1.91" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
|
||||
<UpgradeVersion OnlyDetect="no" Maximum="1.1.91" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
|
||||
<UpgradeVersion OnlyDetect="yes" Minimum="1.1.92" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
|
||||
<UpgradeVersion OnlyDetect="no" Maximum="1.1.92" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
|
||||
</Upgrade>
|
||||
|
||||
<InstallExecuteSequence>
|
||||
@ -31,7 +31,7 @@
|
||||
<Permission User="Everyone" GenericAll="yes" />
|
||||
</CreateFolder>
|
||||
</Component>
|
||||
<Component Id="_comp1" Guid="98ec92da-9dc3-4e1d-96af-4ec78a1a3522">
|
||||
<Component Id="_comp1" Guid="c5288a34-fa31-4ee3-92f0-52c727960dcb">
|
||||
<File Id="_2" Source="..\bin\release\.gdbinit" />
|
||||
<File Id="_3" Source="..\bin\release\.gitignore" />
|
||||
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
|
||||
@ -102,11 +102,11 @@
|
||||
<File Id="_69" Source="..\bin\release\ZedGraph.dll" />
|
||||
</Component>
|
||||
<Directory Id="aircraft69" Name="aircraft">
|
||||
<Component Id="_comp70" Guid="a4aa4372-a398-4de1-bca9-79ca5f663c3c">
|
||||
<Component Id="_comp70" Guid="1407ca2e-1a81-44eb-bc4e-9195c9db71a5">
|
||||
<File Id="_71" Source="..\bin\release\aircraft\placeholder.txt" />
|
||||
</Component>
|
||||
<Directory Id="arducopter71" Name="arducopter">
|
||||
<Component Id="_comp72" Guid="bea17f59-b5d3-47f2-b17c-28a78b6d2594">
|
||||
<Component Id="_comp72" Guid="d1ee2488-270c-4cc1-a0f6-08367c78b09e">
|
||||
<File Id="_73" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
|
||||
<File Id="_74" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
|
||||
<File Id="_75" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
|
||||
@ -117,20 +117,20 @@
|
||||
<File Id="_80" Source="..\bin\release\aircraft\arducopter\README" />
|
||||
</Component>
|
||||
<Directory Id="data80" Name="data">
|
||||
<Component Id="_comp81" Guid="60d6590a-9235-4eba-9066-d32595612d33">
|
||||
<Component Id="_comp81" Guid="e42d6cbe-7cce-4e33-bb9d-ffe315ce0b93">
|
||||
<File Id="_82" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
|
||||
<File Id="_83" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
|
||||
<File Id="_84" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Engines84" Name="Engines">
|
||||
<Component Id="_comp85" Guid="dd972696-599a-40a7-92ec-17d36a48e7de">
|
||||
<Component Id="_comp85" Guid="910f8c0c-aa7c-4c8a-b927-3993a8e8e3f5">
|
||||
<File Id="_86" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
|
||||
<File Id="_87" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Models87" Name="Models">
|
||||
<Component Id="_comp88" Guid="062c9b49-bc12-4340-a9e7-114d70ea8fb4">
|
||||
<Component Id="_comp88" Guid="6b51d578-b057-4aa2-93ec-a89203ac6f34">
|
||||
<File Id="_89" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
|
||||
<File Id="_90" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
|
||||
<File Id="_91" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
|
||||
@ -144,7 +144,7 @@
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="Rascal97" Name="Rascal">
|
||||
<Component Id="_comp98" Guid="795ee65b-a949-49e7-9017-ebc330b0ed91">
|
||||
<Component Id="_comp98" Guid="c6535718-d88e-4652-8d64-27d754a30fd3">
|
||||
<File Id="_99" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
|
||||
<File Id="_100" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
|
||||
<File Id="_101" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
|
||||
@ -156,13 +156,13 @@
|
||||
<File Id="_107" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
|
||||
</Component>
|
||||
<Directory Id="Engines107" Name="Engines">
|
||||
<Component Id="_comp108" Guid="192bff01-c2c9-4c0c-890b-fe487f651466">
|
||||
<Component Id="_comp108" Guid="7bf37524-009b-4060-9189-77d4115e0c13">
|
||||
<File Id="_109" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
|
||||
<File Id="_110" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Models110" Name="Models">
|
||||
<Component Id="_comp111" Guid="bffe6e9a-dd59-4588-a452-46933f8e0815">
|
||||
<Component Id="_comp111" Guid="1cd03e13-5eca-48ee-b382-b65b5804852a">
|
||||
<File Id="_112" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
|
||||
<File Id="_113" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
|
||||
<File Id="_114" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
|
||||
@ -173,7 +173,7 @@
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Systems118" Name="Systems">
|
||||
<Component Id="_comp119" Guid="874ace9f-74ed-4316-8415-af2d80ae627f">
|
||||
<Component Id="_comp119" Guid="762a9e17-db9b-450f-ab4e-38a57b39b9d6">
|
||||
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
|
||||
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
|
||||
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
|
||||
@ -184,33 +184,33 @@
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="Driver124" Name="Driver">
|
||||
<Component Id="_comp125" Guid="c4e836a1-1e6f-4046-a3ca-d7f24d192184">
|
||||
<Component Id="_comp125" Guid="6f12a3be-958b-499f-852c-ae40e75604ce">
|
||||
<File Id="_126" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="es_ES126" Name="es-ES">
|
||||
<Component Id="_comp127" Guid="8730378e-dd40-4480-887f-1b8c6a12a0b2">
|
||||
<Component Id="_comp127" Guid="0788bdad-9d40-42cd-aa75-6e3b571961ef">
|
||||
<File Id="_128" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="fr128" Name="fr">
|
||||
<Component Id="_comp129" Guid="f20e1e3a-d1d7-4e51-9c1e-a69ac1641d8a">
|
||||
<Component Id="_comp129" Guid="ffd2f6eb-458f-4fa6-b70b-c4d86bc4768f">
|
||||
<File Id="_130" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="it_IT130" Name="it-IT">
|
||||
<Component Id="_comp131" Guid="c513424b-3bd5-4a81-8f8d-303b6b66d884">
|
||||
<Component Id="_comp131" Guid="a6cf3ce7-b5af-4d23-bba2-9ad2bd3a7ad4">
|
||||
<File Id="_132" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="jsbsim132" Name="jsbsim">
|
||||
<Component Id="_comp133" Guid="5e37eccd-128d-40e7-bed1-83ddb29d2531">
|
||||
<Component Id="_comp133" Guid="2759b623-0a72-41aa-9988-33e98be80b76">
|
||||
<File Id="_134" Source="..\bin\release\jsbsim\fgout.xml" />
|
||||
<File Id="_135" Source="..\bin\release\jsbsim\rascal_test.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="m3u135" Name="m3u">
|
||||
<Component Id="_comp136" Guid="0ec122ee-7829-48d0-93d6-99aa0ad6a636">
|
||||
<Component Id="_comp136" Guid="2b82d1da-0794-45d9-ad4c-101d8876d4bb">
|
||||
<File Id="_137" Source="..\bin\release\m3u\both.m3u" />
|
||||
<File Id="_138" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
|
||||
<File Id="_139" Source="..\bin\release\m3u\hud.m3u" />
|
||||
@ -219,28 +219,28 @@
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="pl141" Name="pl">
|
||||
<Component Id="_comp142" Guid="c11c90fe-5b10-4c29-b36e-a5f34860b78b">
|
||||
<Component Id="_comp142" Guid="b8deb376-d000-4b1f-a20e-619c2122a084">
|
||||
<File Id="_143" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Resources143" Name="Resources">
|
||||
<Component Id="_comp144" Guid="9deb956f-cdd6-4f22-9491-08629ff939a8">
|
||||
<Component Id="_comp144" Guid="df3a70ae-a508-4ea7-b96b-c9eab52dc152">
|
||||
<File Id="_145" Source="..\bin\release\Resources\MAVCmd.txt" />
|
||||
<File Id="_146" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="ru_RU146" Name="ru-RU">
|
||||
<Component Id="_comp147" Guid="4ec316f3-3453-4d0e-90c6-f9e8a38f870d">
|
||||
<Component Id="_comp147" Guid="aed3fa93-2191-42a4-9bd6-df0ea166c9bb">
|
||||
<File Id="_148" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="zh_Hans148" Name="zh-Hans">
|
||||
<Component Id="_comp149" Guid="7657c0fa-f361-4450-8e3f-cb6a16d2713f">
|
||||
<Component Id="_comp149" Guid="56d74fe2-41f0-453c-a4b5-fec2025d5f2b">
|
||||
<File Id="_150" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="zh_TW150" Name="zh-TW">
|
||||
<Component Id="_comp151" Guid="48ef16c7-2d2e-477a-bdc9-9938d9172375">
|
||||
<Component Id="_comp151" Guid="ef35d50e-a6c9-466b-9fe3-687a3338a1af">
|
||||
<File Id="_152" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
@ -263,7 +263,9 @@
|
||||
|
||||
<DirectoryRef Id="ApplicationProgramsFolder">
|
||||
<Component Id="ApplicationShortcut" Guid="{8BC628BA-08A0-43d6-88C8-D4C007AC4607}">
|
||||
<Shortcut Id="ApplicationStartMenuShortcut" Name="APM Planner" Description="Ardupilot Mega Planner" Target="[APMPlanner]ArdupilotMegaPlanner.exe" WorkingDirectory="APMPlanner" />
|
||||
<Shortcut Id="ApplicationStartMenuShortcut" Name="APM Planner Mav 0.9" Description="Ardupilot Mega Planner" Target="[APMPlanner]ArdupilotMegaPlanner.exe" WorkingDirectory="APMPlanner" />
|
||||
|
||||
<Shortcut Id="ApplicationStartMenuShortcut10" Name="APM Planner Mav 1.0" Description="Ardupilot Mega Planner" Target="[APMPlanner]ArdupilotMegaPlanner10.exe" WorkingDirectory="APMPlanner" />
|
||||
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
|
||||
|
||||
<Shortcut Id="UninstallProduct" Name="Uninstall APM Planner" Description="Uninstalls My Application" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
|
||||
|
||||
@ -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("")]
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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"
|
||||
};
|
||||
|
||||
|
||||
@ -104,7 +104,11 @@ namespace ArdupilotMega.Utilities
|
||||
}
|
||||
else
|
||||
{
|
||||
_speechwindows.SpeakAsyncCancelAll();
|
||||
try
|
||||
{
|
||||
_speechwindows.SpeakAsyncCancelAll();
|
||||
}
|
||||
catch { } // System.PlatformNotSupportedException:
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -227,7 +227,9 @@ namespace wix
|
||||
|
||||
<DirectoryRef Id=""ApplicationProgramsFolder"">
|
||||
<Component Id=""ApplicationShortcut"" Guid=""{8BC628BA-08A0-43d6-88C8-D4C007AC4607}"">
|
||||
<Shortcut Id=""ApplicationStartMenuShortcut"" Name=""APM Planner"" Description=""Ardupilot Mega Planner"" Target=""[APMPlanner]ArdupilotMegaPlanner.exe"" WorkingDirectory=""APMPlanner"" />
|
||||
<Shortcut Id=""ApplicationStartMenuShortcut"" Name=""APM Planner Mav 0.9"" Description=""Ardupilot Mega Planner"" Target=""[APMPlanner]ArdupilotMegaPlanner.exe"" WorkingDirectory=""APMPlanner"" />
|
||||
|
||||
<Shortcut Id=""ApplicationStartMenuShortcut10"" Name=""APM Planner Mav 1.0"" Description=""Ardupilot Mega Planner"" Target=""[APMPlanner]ArdupilotMegaPlanner10.exe"" WorkingDirectory=""APMPlanner"" />
|
||||
<RemoveFolder Id=""ApplicationProgramsFolder"" On=""uninstall"" />
|
||||
|
||||
<Shortcut Id=""UninstallProduct"" Name=""Uninstall APM Planner"" Description=""Uninstalls My Application"" Target=""[System64Folder]msiexec.exe"" Arguments=""/x [ProductCode]"" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user