Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

APM Planner 1.1.97 

add toy Mode
fix some mono issues
fix opengl hud issue
change config font size
modify mylabel for mono
modify default telem rates
add extra sonar option
remove 0 home alt check
fix terminal hang issue
remove application idle call, causes 100% cpu on mono
update gimbal icons
modify graph line thinkness
This commit is contained in:
Michael Oborne 2012-07-12 22:06:22 +08:00
parent 9dfb3c4db9
commit 0fe874eec6
27 changed files with 238 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx
View File

@ -1588,7 +1588,7 @@
</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>3DRRadio Config 0.8</value>
<value>3DRRadio Config 0.9</value>
</data>
<data name="&gt;&gt;settingsToolStripMenuItem.Name" xml:space="preserve">
<value>settingsToolStripMenuItem</value>

4
Tools/ArdupilotMegaPlanner/Common.cs
View File

@ -535,8 +535,8 @@ namespace ArdupilotMega
[DisplayText("Land")]
LAND = 9, // AUTO control
OF_LOITER = 10,
[Private(true)]
APPROACH = 11
[DisplayText("Toy")]
TOY = 11
}
public enum ac2ch7modes

15
Tools/ArdupilotMegaPlanner/Controls/AGauge.cs
View File

@ -1471,6 +1471,18 @@ System.ComponentModel.Description("Enables or disables the range selected by Nee
}
#endregion
/// <summary>
/// this is to fix a mono off screen drawing issue
/// </summary>
/// <returns></returns>
public bool ThisReallyVisible()
{
if (Parent != null)
return this.Bounds.IntersectsWith(Parent.ClientRectangle);
return true;
}
#region base member overrides
protected override void OnPaintBackground(PaintEventArgs pevent)
{
@ -1483,6 +1495,9 @@ System.ComponentModel.Description("Enables or disables the range selected by Nee
return;
}
if (!ThisReallyVisible())
return;
float scale = 1;
// scale it

4
Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageViewButton.cs
View File

@ -92,7 +92,7 @@ namespace ArdupilotMega.Controls.BackstageView
new Point(Width, midheight - arSize)
};
g.DrawString(Text, new Font(FontFamily.GenericSansSerif, 10), new SolidBrush(SelectedTextColor), 20, 6);
g.DrawString(Text, new Font(FontFamily.GenericSansSerif, 10, FontStyle.Bold), new SolidBrush(SelectedTextColor), 10, 6);
g.FillPolygon(arrowBrush, arrowPoints);
@ -116,7 +116,7 @@ namespace ArdupilotMega.Controls.BackstageView
g.DrawLine(butPen, 0, Height - 1, Width, Height - 1);
}
g.DrawString(Text, new Font(FontFamily.GenericSansSerif, 10), new SolidBrush(this.UnSelectedTextColor), 20, 6);
g.DrawString(Text, new Font(FontFamily.GenericSansSerif, 10,FontStyle.Bold), new SolidBrush(this.UnSelectedTextColor), 5, 6);
}
}

1
Tools/ArdupilotMegaPlanner/Controls/ConnectionControl.Designer.cs generated
View File

@ -91,6 +91,7 @@
this.Controls.Add(this.cmb_Baud);
this.Name = "ConnectionControl";
this.Size = new System.Drawing.Size(230, 76);
this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ConnectionControl_MouseClick);
this.ResumeLayout(false);
this.PerformLayout();

12
Tools/ArdupilotMegaPlanner/Controls/ConnectionControl.cs
View File

@ -37,5 +37,17 @@ namespace ArdupilotMega.Controls
cmb_Baud.Enabled = !isConnected;
cmb_Connection.Enabled = !isConnected;
}
private void ConnectionControl_MouseClick(object sender, MouseEventArgs e)
{
if (e.X > cmb_ConnectionType.Location.X &&
e.Y > cmb_ConnectionType.Location.Y &&
e.X < cmb_ConnectionType.Right &&
e.Y < cmb_ConnectionType.Bottom)
{
cmb_ConnectionType.Visible = true;
}
}
}
}

12
Tools/ArdupilotMegaPlanner/Controls/HUD.cs
View File

@ -194,7 +194,7 @@ namespace ArdupilotMega.Controls
{
OpenTK.Graphics.GraphicsMode test = this.GraphicsMode;
log.Info(test.ToString());
// log.Info(test.ToString());
log.Info("Vendor: " + GL.GetString(StringName.Vendor));
log.Info("Version: " + GL.GetString(StringName.Version));
log.Info("Device: " + GL.GetString(StringName.Renderer));
@ -217,7 +217,7 @@ namespace ArdupilotMega.Controls
GL.Enable(EnableCap.Blend);
}
catch (Exception ex) { log.Info("HUD opengl onload " + ex.ToString()); }
catch (Exception ex) { log.Error("HUD opengl onload 1 ", ex); }
try
{
@ -229,7 +229,7 @@ namespace ArdupilotMega.Controls
GL.Hint(HintTarget.TextureCompressionHint, HintMode.Nicest);
}
catch { }
catch (Exception ex) { log.Error("HUD opengl onload 2 ", ex); }
try
{
@ -239,7 +239,7 @@ namespace ArdupilotMega.Controls
GL.Enable(EnableCap.PolygonSmooth);
}
catch { }
catch (Exception ex) { log.Error("HUD opengl onload 3 ", ex); }
}
started = true;
@ -252,6 +252,8 @@ namespace ArdupilotMega.Controls
{
//GL.Enable(EnableCap.AlphaTest)
if (!started)
return;
@ -310,7 +312,7 @@ namespace ArdupilotMega.Controls
if (DateTime.Now.Second != countdate.Second)
{
countdate = DateTime.Now;
// Console.WriteLine("HUD " + count + " hz drawtime " + (huddrawtime / count) + " gl " + opengl);
Console.WriteLine("HUD " + count + " hz drawtime " + (huddrawtime / count) + " gl " + opengl);
if ((huddrawtime / count) > 1000)
opengl = false;

16
Tools/ArdupilotMegaPlanner/Controls/MyLabel.cs
View File

@ -49,10 +49,24 @@ namespace ArdupilotMega.Controls
this.Width = textSize.Width;
}
this.Invalidate();
if (this.Visible && ThisReallyVisible())
this.Invalidate();
}
}
/// <summary>
/// this is to fix a mono off screen drawing issue
/// </summary>
/// <returns></returns>
public bool ThisReallyVisible()
{
if (Parent != null)
return this.Bounds.IntersectsWith(Parent.ClientRectangle);
return true;
}
SolidBrush s = new SolidBrush(Color.White);
SolidBrush b = new SolidBrush(Color.Black);

9
Tools/ArdupilotMegaPlanner/CurrentState.cs
View File

@ -328,9 +328,9 @@ namespace ArdupilotMega
messages = new List<string>();
rateattitude = 10;
rateposition = 3;
ratestatus = 3;
ratesensors = 3;
raterc = 3;
ratestatus = 2;
ratesensors = 2;
raterc = 2;
datetime = DateTime.MinValue;
}
@ -494,6 +494,9 @@ namespace ArdupilotMega
case (byte)(Common.apmmodes.CIRCLE):
mode = "Circle";
break;
case 16:
mode = "Initialising";
break;
default:
mode = "Unknown";
break;

4
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraStab.Designer.cs generated
View File

@ -81,7 +81,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
//
this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
this.pictureBox1.BackgroundImage = global::ArdupilotMega.Properties.Resources.cameraGimalPitch1;
this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pictureBox1.Location = new System.Drawing.Point(33, 52);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(203, 112);
@ -261,7 +261,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
// pictureBox2
//
this.pictureBox2.BackgroundImage = global::ArdupilotMega.Properties.Resources.cameraGimalRoll1;
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pictureBox2.Location = new System.Drawing.Point(33, 207);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(203, 112);

4
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFriendlyParams.cs
View File

@ -190,6 +190,10 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
try
{
Utilities.ParameterMetaDataParser.GetParameterInformation();
_parameterMetaDataRepository.Reload();
SortParamList();
}
catch (Exception exp) { log.Error(exp); } // just to cleanup any errors
}

3
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.Designer.cs generated
View File

@ -69,7 +69,8 @@
this.CMB_sonartype.Items.AddRange(new object[] {
resources.GetString("CMB_sonartype.Items"),
resources.GetString("CMB_sonartype.Items1"),
resources.GetString("CMB_sonartype.Items2")});
resources.GetString("CMB_sonartype.Items2"),
resources.GetString("CMB_sonartype.Items3")});
resources.ApplyResources(this.CMB_sonartype, "CMB_sonartype");
this.CMB_sonartype.Name = "CMB_sonartype";
this.CMB_sonartype.SelectedIndexChanged += new System.EventHandler(this.CMB_sonartype_SelectedIndexChanged);

9
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigHardwareOptions.resx
View File

@ -139,7 +139,7 @@
<value>BUT_MagCalibrationLive</value>
</data>
<data name="&gt;&gt;BUT_MagCalibrationLive.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4517.33956, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.35069, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_MagCalibrationLive.Parent" xml:space="preserve">
<value>$this</value>
@ -183,6 +183,9 @@
<data name="CMB_sonartype.Items2" xml:space="preserve">
<value>XL-EZL0</value>
</data>
<data name="CMB_sonartype.Items3" xml:space="preserve">
<value>HRLV</value>
</data>
<data name="CMB_sonartype.Location" type="System.Drawing.Point, System.Drawing">
<value>243, 122</value>
</data>
@ -538,7 +541,7 @@
<value>BUT_MagCalibrationLog</value>
</data>
<data name="&gt;&gt;BUT_MagCalibrationLog.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4517.33956, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.35069, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_MagCalibrationLog.Parent" xml:space="preserve">
<value>$this</value>
@ -589,6 +592,6 @@
<value>ConfigHardwareOptions</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4517.33956, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner10, Version=1.1.4576.35069, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

5
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs
View File

@ -46,12 +46,13 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
AddBackstageViewPage(new ConfigFlightModes(), "Flight Modes");
AddBackstageViewPage(new ConfigHardwareOptions(), "Hardware Options");
AddBackstageViewPage(new ConfigBatteryMonitoring(), "Battery Monitor");
AddBackstageViewPage(new ConfigCameraStab(), "Camera Gimbal");
/******************************HELI **************************/
if (MainV2.comPort.param["H_GYR_ENABLE"] != null) // heli
{
AddBackstageViewPage(new ConfigCameraStab(), "Camera Gimbal");
AddBackstageViewPage(new ConfigAccelerometerCalibrationQuad(), "ArduCopter Level");
AddBackstageViewPage(new ConfigTradHeli(), "Heli Setup");
@ -65,6 +66,8 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
/****************************** ArduCopter **************************/
else if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2)
{
AddBackstageViewPage(new ConfigCameraStab(), "Camera Gimbal");
AddBackstageViewPage(new ConfigAccelerometerCalibrationQuad(), "ArduCopter Level");
var configpanel = new Controls.ConfigPanel();

2
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
View File

@ -837,7 +837,7 @@ namespace ArdupilotMega.GCSViews
{
((Button)sender).Enabled = false;
#if MAVLINK10
comPort.doCommand((MAVLink.MAV_CMD)Enum.Parse(typeof(MAVLink.MAV_CMD), CMB_action.Text),0,0,0,0,0,0,0);
comPort.doCommand((MAVLink.MAV_CMD)Enum.Parse(typeof(MAVLink.MAV_CMD), CMB_action.Text),1,0,0,0,0,0,0);
#else
comPort.doAction((MAVLink.MAV_ACTION)Enum.Parse(typeof(MAVLink.MAV_ACTION), "MAV_ACTION_" + CMB_action.Text));
#endif

68
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
View File

@ -226,7 +226,7 @@
<value>hud1</value>
</data>
<data name="&gt;&gt;hud1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;hud1.Parent" xml:space="preserve">
<value>SubMainLeft.Panel1</value>
@ -265,7 +265,7 @@
<value>BUT_script</value>
</data>
<data name="&gt;&gt;BUT_script.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_script.Parent" xml:space="preserve">
<value>tabActions</value>
@ -298,7 +298,7 @@
<value>BUT_joystick</value>
</data>
<data name="&gt;&gt;BUT_joystick.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_joystick.Parent" xml:space="preserve">
<value>tabActions</value>
@ -328,7 +328,7 @@
<value>BUT_quickmanual</value>
</data>
<data name="&gt;&gt;BUT_quickmanual.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickmanual.Parent" xml:space="preserve">
<value>tabActions</value>
@ -358,7 +358,7 @@
<value>BUT_quickrtl</value>
</data>
<data name="&gt;&gt;BUT_quickrtl.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickrtl.Parent" xml:space="preserve">
<value>tabActions</value>
@ -388,7 +388,7 @@
<value>BUT_quickauto</value>
</data>
<data name="&gt;&gt;BUT_quickauto.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickauto.Parent" xml:space="preserve">
<value>tabActions</value>
@ -442,7 +442,7 @@
<value>BUT_setwp</value>
</data>
<data name="&gt;&gt;BUT_setwp.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_setwp.Parent" xml:space="preserve">
<value>tabActions</value>
@ -493,7 +493,7 @@
<value>BUT_setmode</value>
</data>
<data name="&gt;&gt;BUT_setmode.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_setmode.Parent" xml:space="preserve">
<value>tabActions</value>
@ -523,7 +523,7 @@
<value>BUT_clear_track</value>
</data>
<data name="&gt;&gt;BUT_clear_track.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_clear_track.Parent" xml:space="preserve">
<value>tabActions</value>
@ -574,7 +574,7 @@
<value>BUT_Homealt</value>
</data>
<data name="&gt;&gt;BUT_Homealt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_Homealt.Parent" xml:space="preserve">
<value>tabActions</value>
@ -604,7 +604,7 @@
<value>BUT_RAWSensor</value>
</data>
<data name="&gt;&gt;BUT_RAWSensor.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_RAWSensor.Parent" xml:space="preserve">
<value>tabActions</value>
@ -634,7 +634,7 @@
<value>BUTrestartmission</value>
</data>
<data name="&gt;&gt;BUTrestartmission.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTrestartmission.Parent" xml:space="preserve">
<value>tabActions</value>
@ -664,7 +664,7 @@
<value>BUTactiondo</value>
</data>
<data name="&gt;&gt;BUTactiondo.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTactiondo.Parent" xml:space="preserve">
<value>tabActions</value>
@ -718,7 +718,7 @@
<value>Gvspeed</value>
</data>
<data name="&gt;&gt;Gvspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gvspeed.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -748,7 +748,7 @@
<value>Gheading</value>
</data>
<data name="&gt;&gt;Gheading.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gheading.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -778,7 +778,7 @@
<value>Galt</value>
</data>
<data name="&gt;&gt;Galt.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Galt.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -811,7 +811,7 @@
<value>Gspeed</value>
</data>
<data name="&gt;&gt;Gspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gspeed.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -895,7 +895,7 @@
<value>lbl_playbackspeed</value>
</data>
<data name="&gt;&gt;lbl_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -922,7 +922,7 @@
<value>lbl_logpercent</value>
</data>
<data name="&gt;&gt;lbl_logpercent.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_logpercent.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -949,7 +949,7 @@
<value>NUM_playbackspeed</value>
</data>
<data name="&gt;&gt;NUM_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;NUM_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -976,7 +976,7 @@
<value>BUT_log2kml</value>
</data>
<data name="&gt;&gt;BUT_log2kml.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_log2kml.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1030,7 +1030,7 @@
<value>BUT_playlog</value>
</data>
<data name="&gt;&gt;BUT_playlog.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_playlog.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1057,7 +1057,7 @@
<value>BUT_loadtelem</value>
</data>
<data name="&gt;&gt;BUT_loadtelem.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_loadtelem.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1246,7 +1246,7 @@
<value>lbl_hdop</value>
</data>
<data name="&gt;&gt;lbl_hdop.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_hdop.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1279,7 +1279,7 @@
<value>lbl_sats</value>
</data>
<data name="&gt;&gt;lbl_sats.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_sats.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1309,7 +1309,7 @@
<value>lbl_winddir</value>
</data>
<data name="&gt;&gt;lbl_winddir.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_winddir.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1339,7 +1339,7 @@
<value>lbl_windvel</value>
</data>
<data name="&gt;&gt;lbl_windvel.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_windvel.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1511,7 +1511,7 @@
<value>gMapControl1</value>
</data>
<data name="&gt;&gt;gMapControl1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;gMapControl1.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1574,7 +1574,7 @@
<value>TXT_lat</value>
</data>
<data name="&gt;&gt;TXT_lat.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_lat.Parent" xml:space="preserve">
<value>panel1</value>
@ -1631,7 +1631,7 @@
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>panel1</value>
@ -1661,7 +1661,7 @@
<value>TXT_long</value>
</data>
<data name="&gt;&gt;TXT_long.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_long.Parent" xml:space="preserve">
<value>panel1</value>
@ -1691,7 +1691,7 @@
<value>TXT_alt</value>
</data>
<data name="&gt;&gt;TXT_alt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_alt.Parent" xml:space="preserve">
<value>panel1</value>
@ -1892,7 +1892,7 @@
<value>label6</value>
</data>
<data name="&gt;&gt;label6.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;label6.Parent" xml:space="preserve">
<value>$this</value>
@ -1988,6 +1988,6 @@
<value>FlightData</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4561.37648, Culture=neutral, PublicKeyToken=null</value>
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4576.33626, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

6
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs
View File

@ -285,7 +285,7 @@ namespace ArdupilotMega.GCSViews
float result;
bool pass = float.TryParse(TXT_homealt.Text, out result);
if (result == 0 || pass == false)
if (pass == false)
{
CustomMessageBox.Show("You must have a home altitude");
return;
@ -306,8 +306,10 @@ namespace ArdupilotMega.GCSViews
ans = (int)ans;
if (alt != 0) // use passed in value;
cell.Value = alt.ToString();
if (ans == 0)
if (ans == 0) // default
cell.Value = 50;
if (ans == 0 && MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2)
cell.Value = 15;
// online verify height
if (isonline && CHK_geheight.Checked)
{

54
Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs
View File

@ -36,6 +36,10 @@ namespace ArdupilotMega.GCSViews
{
if (!comPort.IsOpen)
return;
// if btr > 0 then this shouldnt happen
comPort.ReadTimeout = 300;
try
{
lock (thisLock)
@ -43,6 +47,7 @@ namespace ArdupilotMega.GCSViews
System.Threading.Thread.Sleep(20);
byte[] buffer = new byte[256];
int a = 0;
while (comPort.BytesToRead > 0)
{
byte indata = (byte)comPort.ReadByte();
@ -60,12 +65,12 @@ namespace ArdupilotMega.GCSViews
addText(ASCIIEncoding.ASCII.GetString(buffer,0,a+1));
}
}
catch (Exception) { if (!threadrun) return; TXT_terminal.AppendText("Error reading com port\r\n"); }
catch (Exception ex) { Console.WriteLine(ex.ToString()); if (!threadrun) return; TXT_terminal.AppendText("Error reading com port\r\n"); }
}
void addText(string data)
{
this.Invoke((System.Windows.Forms.MethodInvoker)delegate()
this.BeginInvoke((System.Windows.Forms.MethodInvoker)delegate()
{
TXT_terminal.SelectionStart = TXT_terminal.Text.Length;
@ -86,6 +91,7 @@ namespace ArdupilotMega.GCSViews
}
inputStartPos = TXT_terminal.SelectionStart;
});
}
private void TXT_terminal_Click(object sender, EventArgs e)
@ -178,9 +184,12 @@ namespace ArdupilotMega.GCSViews
}
// do not change this \r is correct - no \n
if (cmd == "+++")
{
comPort.Write(Encoding.ASCII.GetBytes(cmd), 0, cmd.Length);
else {
comPort.Write(Encoding.ASCII.GetBytes(cmd + "\r"), 0, cmd.Length + 1);
}
else
{
comPort.Write(Encoding.ASCII.GetBytes(cmd + "\r"), 0, cmd.Length + 1);
}
}
catch { CustomMessageBox.Show("Error writing to com port"); }
@ -198,6 +207,23 @@ namespace ArdupilotMega.GCSViews
e.Handled = true;*/
}
private void readandsleep(int time)
{
DateTime start = DateTime.Now;
while ((DateTime.Now - start).TotalMilliseconds < time)
{
try
{
if (comPort.BytesToRead > 0)
{
comPort_DataReceived((object)null, (SerialDataReceivedEventArgs)null);
}
}
catch { threadrun = false; return; }
}
}
private void Terminal_Load(object sender, EventArgs e)
{
try
@ -219,28 +245,18 @@ namespace ArdupilotMega.GCSViews
{
threadrun = true;
DateTime start = DateTime.Now;
while ((DateTime.Now - start).TotalMilliseconds < 2000)
{
try
{
if (comPort.BytesToRead > 0)
{
comPort_DataReceived((object)null, (SerialDataReceivedEventArgs)null);
}
}
catch { threadrun = false; return; }
}
// 2 secs
readandsleep(2000);
try
{
comPort.Write("\n\n\n");
System.Threading.Thread.Sleep(500);
// 1 secs
readandsleep(1000);
comPort.Write("\r\r\r?\r");
}
catch { return; }
catch { threadrun = false; return; }
while (threadrun)
{

19
Tools/ArdupilotMegaPlanner/Log.cs
View File

@ -62,6 +62,23 @@ namespace ArdupilotMega
InitializeComponent();
}
private void readandsleep(int time)
{
DateTime start = DateTime.Now;
while ((DateTime.Now - start).TotalMilliseconds < time)
{
try
{
if (comPort.BytesToRead > 0)
{
comPort_DataReceived((object)null, (SerialDataReceivedEventArgs)null);
}
}
catch { threadrun = false; return; }
}
}
private void Log_Load(object sender, EventArgs e)
{
status = serialstatus.Connecting;
@ -87,7 +104,7 @@ namespace ArdupilotMega
threadrun = true;
System.Threading.Thread.Sleep(2000);
readandsleep(2500);
try
{

10
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -975,6 +975,12 @@ namespace ArdupilotMega
{
try
{
if (MONO)
{
log.Error("Mono: closing joystick thread");
break;
}
if (!MONO)
{
//joystick stuff
@ -1152,8 +1158,6 @@ namespace ArdupilotMega
GCSViews.FlightData.myhud.Invalidate();
}
GC.Collect();
}
if (speechEnable && speechEngine != null && (MainV2.comPort.logreadmode || comPort.BaseStream.IsOpen))
@ -1210,7 +1214,9 @@ namespace ArdupilotMega
//Console.WriteLine(DateTime.Now.Millisecond + " " + comPort.BaseStream.BytesToRead);
while (comPort.BaseStream.BytesToRead > minbytes && giveComport == false)
{
comPort.readPacket();
}
}
catch (Exception e)
{

6
Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs
View File

@ -343,6 +343,8 @@ namespace ArdupilotMega
mavlinkversion = hb.mavlink_version;
aptype = (MAV_TYPE)hb.type;
setAPType();
sysid = buffer[3];
compid = buffer[4];
recvpacketcount = buffer[2];
@ -960,7 +962,7 @@ namespace ArdupilotMega
if (actionid == MAV_CMD.PREFLIGHT_CALIBRATION)
{
retrys = 1;
timeout = 12000;
timeout = 25000;
}
while (true)
@ -2115,7 +2117,7 @@ namespace ArdupilotMega
log.InfoFormat("MAVLINK: S wait time out btr {0} len {1}", BaseStream.BytesToRead, length);
throw new Exception("Timeout");
}
System.Threading.Thread.Sleep(1);
// System.Threading.Thread.Sleep(1);
}
if (BaseStream.IsOpen)
{

48
Tools/ArdupilotMegaPlanner/Msi/installer.wxs
View File

@ -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.95" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<Product Id="*" Name="APM Planner" Language="1033" Version="1.1.96" 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.95" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.1.95" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
<UpgradeVersion OnlyDetect="yes" Minimum="1.1.96" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.1.96" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
</Upgrade>
<InstallExecuteSequence>
@ -31,7 +31,7 @@
<Permission User="Everyone" GenericAll="yes" />
</CreateFolder>
</Component>
<Component Id="_comp1" Guid="5aaf1928-e09d-4e37-9469-e5052d863bfd">
<Component Id="_comp1" Guid="51ed87ff-f399-4df1-8100-a78e628d8282">
<File Id="_2" Source="..\bin\release\.gdbinit" />
<File Id="_3" Source="..\bin\release\.gitignore" />
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
@ -106,11 +106,11 @@
<File Id="_73" Source="..\bin\release\ZedGraph.dll" />
</Component>
<Directory Id="aircraft73" Name="aircraft">
<Component Id="_comp74" Guid="b2dcad0d-c45f-42ab-b166-5e491f3c0e35">
<Component Id="_comp74" Guid="f5d0de83-48c7-4a71-92f0-9a9d57d3e82d">
<File Id="_75" Source="..\bin\release\aircraft\placeholder.txt" />
</Component>
<Directory Id="arducopter75" Name="arducopter">
<Component Id="_comp76" Guid="c4f10ce4-1c94-485c-b631-da697a862b03">
<Component Id="_comp76" Guid="88fb41e6-9ad8-4926-931b-6afff7359ea2">
<File Id="_77" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_78" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_79" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
@ -121,20 +121,20 @@
<File Id="_84" Source="..\bin\release\aircraft\arducopter\README" />
</Component>
<Directory Id="data84" Name="data">
<Component Id="_comp85" Guid="7eab9b6d-4d9a-47b6-9cf0-f8b17de70070">
<Component Id="_comp85" Guid="1c9503b2-9317-427a-846a-29aca07ade36">
<File Id="_86" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_87" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_88" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
</Component>
</Directory>
<Directory Id="Engines88" Name="Engines">
<Component Id="_comp89" Guid="8ae25de9-82ff-4650-b014-423a9af8076b">
<Component Id="_comp89" Guid="f680284d-ee46-485f-94c7-72ef64948c39">
<File Id="_90" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_91" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
</Component>
</Directory>
<Directory Id="Models91" Name="Models">
<Component Id="_comp92" Guid="d5c63e2f-83cc-4851-ad0e-2eeeebffb00a">
<Component Id="_comp92" Guid="b0ca7457-c3d2-43e0-84e9-9d2ad89d5cc4">
<File Id="_93" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
@ -148,7 +148,7 @@
</Directory>
</Directory>
<Directory Id="Rascal101" Name="Rascal">
<Component Id="_comp102" Guid="db7915a5-5407-4a3f-8e46-e30e159805be">
<Component Id="_comp102" Guid="02d6a7bb-90ba-46f0-9bb1-1ec9707e093a">
<File Id="_103" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_104" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
@ -160,13 +160,13 @@
<File Id="_111" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
</Component>
<Directory Id="Engines111" Name="Engines">
<Component Id="_comp112" Guid="6a231d14-d3df-40e0-93b3-376270583846">
<Component Id="_comp112" Guid="01e9c632-0210-4930-aae2-ad0c9ee0ffc8">
<File Id="_113" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_114" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
</Component>
</Directory>
<Directory Id="Models114" Name="Models">
<Component Id="_comp115" Guid="48a86b1f-21bc-4308-9cdc-4d64a5a729a7">
<Component Id="_comp115" Guid="e9a6a7a2-2ac4-4b3a-b340-38cc65c37690">
<File Id="_116" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_117" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
@ -177,7 +177,7 @@
</Component>
</Directory>
<Directory Id="Systems122" Name="Systems">
<Component Id="_comp123" Guid="51d9759f-a50b-42ef-8913-c99b99651073">
<Component Id="_comp123" Guid="2a07d8e4-c5e5-4705-8d25-392f0733abf2">
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_125" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
@ -188,33 +188,33 @@
</Directory>
</Directory>
<Directory Id="Driver128" Name="Driver">
<Component Id="_comp129" Guid="ad08c36b-87ba-4414-ac24-e0166cc08942">
<Component Id="_comp129" Guid="f7f15503-7115-4ac1-8aa3-3625f9917a93">
<File Id="_130" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
</Component>
</Directory>
<Directory Id="es_ES130" Name="es-ES">
<Component Id="_comp131" Guid="cad1f0d4-8279-43ba-9b80-55d78fe045d1">
<Component Id="_comp131" Guid="2e240851-0995-4ee4-bfb9-573824fe5515">
<File Id="_132" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="fr132" Name="fr">
<Component Id="_comp133" Guid="b24333f5-6691-4bd9-886c-87f3745e6044">
<Component Id="_comp133" Guid="67ef3f83-9966-432f-acf8-b16cd9293755">
<File Id="_134" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="it_IT134" Name="it-IT">
<Component Id="_comp135" Guid="5a85fb3f-e836-4e26-a7de-1362badc0fa3">
<Component Id="_comp135" Guid="7ca12d12-75c4-4414-9368-cd293216deb0">
<File Id="_136" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="jsbsim136" Name="jsbsim">
<Component Id="_comp137" Guid="181669f4-2d71-4d7e-adc4-48bdd6c35f88">
<Component Id="_comp137" Guid="218978da-c605-4f1f-9de9-c3137361d0df">
<File Id="_138" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_139" Source="..\bin\release\jsbsim\rascal_test.xml" />
</Component>
</Directory>
<Directory Id="m3u139" Name="m3u">
<Component Id="_comp140" Guid="ac316674-97e5-4c0b-a294-ee3ffbadb06b">
<Component Id="_comp140" Guid="010c372d-c85f-4bfe-9d05-fca36998955b">
<File Id="_141" Source="..\bin\release\m3u\both.m3u" />
<File Id="_142" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_143" Source="..\bin\release\m3u\hud.m3u" />
@ -223,28 +223,28 @@
</Component>
</Directory>
<Directory Id="pl145" Name="pl">
<Component Id="_comp146" Guid="8245cbbf-d2d5-44fa-ad79-d368569f0b71">
<Component Id="_comp146" Guid="1169ee9c-7e77-4f36-aeef-478b12bee34e">
<File Id="_147" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="Resources147" Name="Resources">
<Component Id="_comp148" Guid="dd8ecf56-34d7-4023-85bd-3e2c5a89fd3c">
<Component Id="_comp148" Guid="11fda02b-b51a-4b9a-93ed-7ef78d1c5201">
<File Id="_149" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_150" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
</Component>
</Directory>
<Directory Id="ru_RU150" Name="ru-RU">
<Component Id="_comp151" Guid="23156b45-b72e-4c25-802e-6b8417eac33a">
<Component Id="_comp151" Guid="222ed999-6709-4131-bc3b-3c064a9c3560">
<File Id="_152" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_Hans152" Name="zh-Hans">
<Component Id="_comp153" Guid="e23f73d4-5f7a-4727-aff1-a88675a3448a">
<Component Id="_comp153" Guid="9a4c0831-bc61-4569-9d74-1be94832b702">
<File Id="_154" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_TW154" Name="zh-TW">
<Component Id="_comp155" Guid="ddbd2375-9e66-4126-8346-310bbf8db53f">
<Component Id="_comp155" Guid="812f4883-fed1-4733-9993-ef4877e992d6">
<File Id="_156" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>

9
Tools/ArdupilotMegaPlanner/Program.cs
View File

@ -29,7 +29,7 @@ namespace ArdupilotMega
Application.ThreadException += Application_ThreadException;
Application.Idle += Application_Idle;
// Application.Idle += Application_Idle;
int wt = 0, ct = 0;
ThreadPool.GetMaxThreads(out wt, out ct);
@ -96,7 +96,8 @@ namespace ArdupilotMega
static void Application_Idle(object sender, EventArgs e)
{
// Console.Write("Idle\r");
System.Threading.Thread.Sleep(10);
Console.Write("Idle\r");
}
static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
@ -125,8 +126,8 @@ namespace ArdupilotMega
}
if (e.Exception.GetType() == typeof(FileNotFoundException) || e.Exception.GetType() == typeof(BadImageFormatException)) // i get alot of error from people who click the exe from inside a zip file.
{
CustomMessageBox.Show("You are missing some DLL's. Please extract the zip file somewhere. OR Use the update feature from the menu");
return;
CustomMessageBox.Show("You are missing some DLL's. Please extract the zip file somewhere. OR Use the update feature from the menu " + e.Exception.ToString() );
// return;
}
DialogResult dr = CustomMessageBox.Show("An error has occurred\n"+ex.ToString() + "\n\nReport this Error???", "Send Error", MessageBoxButtons.YesNo);
if (DialogResult.Yes == dr)

2
Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
View File

@ -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.96")]
[assembly: AssemblyFileVersion("1.1.97")]
[assembly: NeutralResourcesLanguageAttribute("")]

19
Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataRepository.cs
View File

@ -16,14 +16,19 @@ namespace ArdupilotMega.Utilities
/// </summary>
public ParameterMetaDataRepository()
{
string paramMetaDataXMLFileName = String.Format("{0}\\{1}", Application.StartupPath, ConfigurationManager.AppSettings["ParameterMetaDataXMLFileName"]);
try
{
if (File.Exists(paramMetaDataXMLFileName))
_parameterMetaDataXML = XDocument.Load(paramMetaDataXMLFileName);
Reload();
}
}
catch { } // Exception System.Xml.XmlException: Root element is missing.
public void Reload()
{
string paramMetaDataXMLFileName = String.Format("{0}\\{1}", Application.StartupPath, ConfigurationManager.AppSettings["ParameterMetaDataXMLFileName"]);
try
{
if (File.Exists(paramMetaDataXMLFileName))
_parameterMetaDataXML = XDocument.Load(paramMetaDataXMLFileName);
}
catch { } // Exception System.Xml.XmlException: Root element is missing.
}
/// <summary>

2
Tools/ArdupilotMegaPlanner/Utilities/ThemeManager.cs
View File

@ -117,7 +117,7 @@ namespace ArdupilotMega.Utilities
zg1.GraphPane.Fill = new ZedGraph.Fill(Color.FromArgb(0x37, 0x37, 0x38));
foreach (ZedGraph.LineItem li in zg1.GraphPane.CurveList)
li.Line.Width = 4;
li.Line.Width = 2;
zg1.GraphPane.Title.FontSpec.FontColor = TextColor;

24
Tools/ArdupilotMegaPlanner/temp.Designer.cs generated
View File

@ -31,6 +31,7 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.BUT_paramgen = new ArdupilotMega.Controls.MyButton();
this.BUT_magcalib = new ArdupilotMega.Controls.MyButton();
this.BUT_ant_track = new ArdupilotMega.Controls.MyButton();
this.BUT_follow_me = new ArdupilotMega.Controls.MyButton();
@ -48,7 +49,6 @@
this.BUT_flashdl = new ArdupilotMega.Controls.MyButton();
this.BUT_wipeeeprom = new ArdupilotMega.Controls.MyButton();
this.button1 = new ArdupilotMega.Controls.MyButton();
this.BUT_paramgen = new ArdupilotMega.Controls.MyButton();
this.SuspendLayout();
//
// label1
@ -78,6 +78,16 @@
this.label3.TabIndex = 13;
this.label3.Text = "1280 - can do full copy\'s 2560- full read, write flash only";
//
// BUT_paramgen
//
this.BUT_paramgen.Location = new System.Drawing.Point(206, 118);
this.BUT_paramgen.Name = "BUT_paramgen";
this.BUT_paramgen.Size = new System.Drawing.Size(75, 23);
this.BUT_paramgen.TabIndex = 20;
this.BUT_paramgen.Text = "Param gen";
this.BUT_paramgen.UseVisualStyleBackColor = true;
this.BUT_paramgen.Click += new System.EventHandler(this.BUT_paramgen_Click);
//
// BUT_magcalib
//
this.BUT_magcalib.Location = new System.Drawing.Point(119, 164);
@ -245,21 +255,11 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// BUT_paramgen
//
this.BUT_paramgen.Location = new System.Drawing.Point(206, 118);
this.BUT_paramgen.Name = "BUT_paramgen";
this.BUT_paramgen.Size = new System.Drawing.Size(75, 23);
this.BUT_paramgen.TabIndex = 20;
this.BUT_paramgen.Text = "Param gen";
this.BUT_paramgen.UseVisualStyleBackColor = true;
this.BUT_paramgen.Click += new System.EventHandler(this.BUT_paramgen_Click);
//
// temp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(731, 281);
this.ClientSize = new System.Drawing.Size(696, 288);
this.Controls.Add(this.BUT_paramgen);
this.Controls.Add(this.BUT_magcalib);
this.Controls.Add(this.BUT_ant_track);