diff --git a/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs b/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs
index bccd3695db..f69c713875 100644
--- a/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs
+++ b/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs
@@ -124,7 +124,7 @@ namespace ArdupilotMega.Antenna
byte target = (byte)((((PointAtAngle / range ) * 2) * 127 + 127) * _tiltreverse);
- Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle);
+ //Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle);
var buffer = new byte[] { 0xff, TiltAddress, target };
ComPort.Write(buffer, 0, buffer.Length);
@@ -142,7 +142,11 @@ namespace ArdupilotMega.Antenna
public bool Close()
{
- ComPort.Close();
+ try
+ {
+ ComPort.Close();
+ }
+ catch { }
return true;
}
diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
index 8d80840653..c76303df54 100644
--- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
+++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
@@ -51,7 +51,7 @@
false
false
true
- 1024
+ 512
x86
@@ -68,7 +68,7 @@
true
false
true
- 1024
+ 512
ArdupilotMega.Program
diff --git a/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs b/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs
index 4cc19161ff..4a055197cd 100644
--- a/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs
+++ b/Tools/ArdupilotMegaPlanner/Controls/ProgressReporterDialogue.cs
@@ -42,6 +42,7 @@ namespace ArdupilotMega.Controls
private void RunBackgroundOperation(object o)
{
+ Thread.CurrentThread.Name = "ProgressReporterDialogue Background thread";
try
{
if (this.DoWork != null) this.DoWork(this, doWorkArgs);
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
index a2498585e3..0d98ff5403 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
@@ -275,6 +275,7 @@ namespace ArdupilotMega.GCSViews
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.MAV_DATA_STREAM_POSITION, MainV2.cs.rateposition); // request gps
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.MAV_DATA_STREAM_EXTRA1, MainV2.cs.rateattitude); // request attitude
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.MAV_DATA_STREAM_EXTRA2, MainV2.cs.rateattitude); // request vfr
+ comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.MAV_DATA_STREAM_EXTRA3, MainV2.cs.ratesensors); // request extra stuff - tridge
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.MAV_DATA_STREAM_RAW_SENSORS, MainV2.cs.ratesensors); // request raw sensor
comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.MAV_DATA_STREAM_RC_CHANNELS, MainV2.cs.raterc); // request rc info
}
diff --git a/Tools/ArdupilotMegaPlanner/HUD.cs b/Tools/ArdupilotMegaPlanner/HUD.cs
index df2536e459..4c3795a886 100644
--- a/Tools/ArdupilotMegaPlanner/HUD.cs
+++ b/Tools/ArdupilotMegaPlanner/HUD.cs
@@ -46,6 +46,8 @@ namespace hud
bool started = false;
+ public bool SixteenXNine = false;
+
public HUD()
{
if (this.DesignMode)
@@ -1552,7 +1554,18 @@ namespace hud
{
if (DesignMode || !started)
return;
- this.Height = (int)(this.Width / 1.333f);
+
+
+ if (SixteenXNine)
+ {
+ this.Height = (int)(this.Width / 1.777f);
+ }
+ else
+ {
+ // 4x3
+ this.Height = (int)(this.Width / 1.333f);
+ }
+
base.OnResize(e);
graphicsObjectGDIP = Graphics.FromImage(objBitmap);
diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
index a45540e1e7..798018a819 100644
--- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
+++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.45")]
+[assembly: AssemblyFileVersion("1.1.46")]
[assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb
index 1edad2b768..55b77aa831 100644
Binary files a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb and b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb differ