diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
index b75096d41e..02429fd7d4 100644
--- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
+++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
@@ -97,7 +97,7 @@
- Always
+ OnBuildSuccess
apm2.ico
@@ -145,7 +145,7 @@
False
..\..\..\..\..\..\..\Windows\Microsoft.NET\DirectX for Managed Code\1.0.2902.0\Microsoft.DirectX.DirectInput.dll
- False
+ True
False
@@ -160,6 +160,7 @@
..\..\..\..\..\Desktop\DIYDrones&avr\myquad\sharpkml\SharpKml\bin\Release\SharpKml.dll
+
..\..\..\..\..\Desktop\DIYDrones&avr\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\x86\System.Data.SQLite.DLL
@@ -571,8 +572,7 @@
-
-
+ rem macos.bat
diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs
index 1584a56b18..303e0b969f 100644
--- a/Tools/ArdupilotMegaPlanner/CurrentState.cs
+++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs
@@ -124,7 +124,7 @@ namespace ArdupilotMega
//message
public List messages { get; set; }
- public string message { get { return messages[messages.Count - 1]; } set { } }
+ public string message { get { if (messages.Count == 0) return ""; return messages[messages.Count - 1]; } set { } }
//battery
public float battery_voltage { get { return _battery_voltage; } set { _battery_voltage = value / 1000; } }
@@ -278,28 +278,28 @@ namespace ArdupilotMega
break;
}
break;
- case (byte)100:
+ case (byte)(100 + Common.ac2modes.STABILIZE):
mode = "Stabilize";
break;
- case (byte)101:
+ case (byte)(100 + Common.ac2modes.ACRO):
mode = "Acro";
break;
- case (byte)102:
+ case (byte)(100 + Common.ac2modes.ALT_HOLD):
mode = "Alt Hold";
break;
- case (byte)103:
+ case (byte)(100 + Common.ac2modes.AUTO):
mode = "Auto";
break;
- case (byte)104:
+ case (byte)(100 + Common.ac2modes.GUIDED):
mode = "Guided";
break;
- case (byte)105:
+ case (byte)(100 + Common.ac2modes.LOITER):
mode = "Loiter";
break;
- case (byte)106:
+ case (byte)(100 + Common.ac2modes.RTL):
mode = "RTL";
break;
- case (byte)107:
+ case (byte)(100 + Common.ac2modes.CIRCLE):
mode = "Circle";
break;
case (byte)ArdupilotMega.MAVLink.MAV_MODE.MAV_MODE_MANUAL:
diff --git a/Tools/ArdupilotMegaPlanner/HUD.cs b/Tools/ArdupilotMegaPlanner/HUD.cs
index a8746a1e1b..416d131619 100644
--- a/Tools/ArdupilotMegaPlanner/HUD.cs
+++ b/Tools/ArdupilotMegaPlanner/HUD.cs
@@ -9,8 +9,6 @@ using System.IO;
using System.Drawing.Imaging;
using System.Threading;
-
-
using System.Drawing.Drawing2D;
@@ -20,10 +18,11 @@ using OpenTK.Graphics;
// Control written by Michael Oborne 2011
+// dual opengl and GDI+
namespace hud
{
- public class HUD : GLControl// : Graphics
+ public class HUD : GLControl
{
object paintlock = new object();
object streamlock = new object();
@@ -40,7 +39,7 @@ namespace hud
public int huddrawtime = 0;
- public bool opengl = true;
+ public bool opengl { get { return base.UseOpenGL; } set { base.UseOpenGL = value; } }
public HUD()
{
@@ -48,9 +47,8 @@ namespace hud
return;
InitializeComponent();
- //graphicsObject = this;
- //graphicsObject = Graphics.FromImage(objBitmap);
+ graphicsObject = this;
}
private void InitializeComponent()
@@ -152,6 +150,8 @@ System.ComponentModel.Category("Values")]
Bitmap objBitmap = new Bitmap(1024, 1024);
int count = 0;
DateTime countdate = DateTime.Now;
+ HUD graphicsObject;
+ Graphics graphicsObjectGDIP;
DateTime starttime = DateTime.MinValue;
@@ -168,58 +168,59 @@ System.ComponentModel.Category("Values")]
if (this.DesignMode)
return;
- try
+ if (opengl)
{
+ try
+ {
- GraphicsMode test = this.GraphicsMode;
- Console.WriteLine(test.ToString());
- Console.WriteLine("Vendor: " + GL.GetString(StringName.Vendor));
- Console.WriteLine("Version: " + GL.GetString(StringName.Version));
- Console.WriteLine("Device: " + GL.GetString(StringName.Renderer));
- //Console.WriteLine("Extensions: " + GL.GetString(StringName.Extensions));
+ GraphicsMode test = this.GraphicsMode;
+ Console.WriteLine(test.ToString());
+ Console.WriteLine("Vendor: " + GL.GetString(StringName.Vendor));
+ Console.WriteLine("Version: " + GL.GetString(StringName.Version));
+ Console.WriteLine("Device: " + GL.GetString(StringName.Renderer));
+ //Console.WriteLine("Extensions: " + GL.GetString(StringName.Extensions));
- int[] viewPort = new int[4];
+ int[] viewPort = new int[4];
- GL.GetInteger(GetPName.Viewport, viewPort);
+ GL.GetInteger(GetPName.Viewport, viewPort);
- GL.MatrixMode(MatrixMode.Projection);
- GL.LoadIdentity();
- GL.Ortho(0, Width, Height, 0, -1, 1);
- GL.MatrixMode(MatrixMode.Modelview);
- GL.LoadIdentity();
+ GL.MatrixMode(MatrixMode.Projection);
+ GL.LoadIdentity();
+ GL.Ortho(0, Width, Height, 0, -1, 1);
+ GL.MatrixMode(MatrixMode.Modelview);
+ GL.LoadIdentity();
- GL.PushAttrib(AttribMask.DepthBufferBit);
- GL.Disable(EnableCap.DepthTest);
- //GL.Enable(EnableCap.Texture2D);
- GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
- GL.Enable(EnableCap.Blend);
+ GL.PushAttrib(AttribMask.DepthBufferBit);
+ GL.Disable(EnableCap.DepthTest);
+ //GL.Enable(EnableCap.Texture2D);
+ GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
+ GL.Enable(EnableCap.Blend);
+ }
+ catch (Exception ex) { Console.WriteLine("HUD opengl onload " + ex.ToString()); }
+
+ try
+ {
+ GL.Hint(HintTarget.PerspectiveCorrectionHint, HintMode.Nicest);
+
+ GL.Hint(HintTarget.LineSmoothHint, HintMode.Nicest);
+ GL.Hint(HintTarget.PolygonSmoothHint, HintMode.Nicest);
+ GL.Hint(HintTarget.PointSmoothHint, HintMode.Nicest);
+
+ GL.Hint(HintTarget.TextureCompressionHint, HintMode.Nicest);
+ }
+ catch { }
+
+ try
+ {
+
+ GL.Enable(EnableCap.LineSmooth);
+ GL.Enable(EnableCap.PointSmooth);
+ GL.Enable(EnableCap.PolygonSmooth);
+
+ }
+ catch { }
}
- catch (Exception ex) { Console.WriteLine("HUD opengl onload "+ex.ToString()); }
-
- try
- {
- GL.Hint(HintTarget.PerspectiveCorrectionHint, HintMode.Nicest);
-
- GL.Hint(HintTarget.LineSmoothHint, HintMode.Nicest);
- GL.Hint(HintTarget.PolygonSmoothHint, HintMode.Nicest);
- GL.Hint(HintTarget.PointSmoothHint, HintMode.Nicest);
-
- GL.Hint(HintTarget.TextureCompressionHint, HintMode.Nicest);
- }
- catch { }
-
- try
- {
-
- GL.Enable(EnableCap.LineSmooth);
- GL.Enable(EnableCap.PointSmooth);
- GL.Enable(EnableCap.PolygonSmooth);
-
- }
- catch { }
-
- //GL.Viewport(0, 0, Width, Height);
}
protected override void OnPaint(PaintEventArgs e)
@@ -233,37 +234,28 @@ System.ComponentModel.Category("Values")]
return;
}
- if ((DateTime.Now - starttime).TotalMilliseconds < 75 && (_bgimage == null))
+ if ((DateTime.Now - starttime).TotalMilliseconds < 30 && (_bgimage == null))
{
//Console.WriteLine("ms "+(DateTime.Now - starttime).TotalMilliseconds);
//e.Graphics.DrawImageUnscaled(objBitmap, 0, 0);
- //return;
+ return;
}
starttime = DateTime.Now;
- if (Console.CursorLeft > 0)
+ if (opengl)
{
- //Console.WriteLine(" "+ Console.CursorLeft +" ");
+ MakeCurrent();
+
+ GL.Clear(ClearBufferMask.ColorBufferBit);
+
}
- //Console.Write("HUD a "+(DateTime.Now - starttime).TotalMilliseconds);
-
- MakeCurrent();
-
- //Console.Write(" b " + (DateTime.Now - starttime).TotalMilliseconds);
-
- GL.Clear(ClearBufferMask.ColorBufferBit);
-
- //Console.Write(" c " + (DateTime.Now - starttime).TotalMilliseconds);
-
doPaint(e);
- //Console.Write(" d " + (DateTime.Now - starttime).TotalMilliseconds);
-
- this.SwapBuffers();
-
- //Console.Write(" e " + (DateTime.Now - starttime).TotalMilliseconds);
+ if (opengl) {
+ this.SwapBuffers();
+ }
count++;
@@ -280,69 +272,69 @@ System.ComponentModel.Category("Values")]
void Clear(Color color)
{
- GL.ClearColor(color);
+ if (opengl)
+ {
+ GL.ClearColor(color);
+ } else
+ {
+ graphicsObjectGDIP.Clear(color);
+ }
}
const float rad2deg = (float)(180 / Math.PI);
const float deg2rad = (float)(1.0 / rad2deg);
- //graphicsObject.DrawArc(whitePen, arcrect, 180 + 45, 90);
-
public void DrawArc(Pen penn,RectangleF rect, float start,float degrees)
{
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
-
- GL.LineWidth(penn.Width);
- GL.Color4(penn.Color);
-
- GL.Begin(BeginMode.LineStrip);
- start -= 90;
- float x = 0, y = 0;
- for (int i = (int)start; i <= start + degrees; i++)
+ if (opengl)
{
- x = (float)Math.Sin(i * deg2rad) * rect.Width / 2;
- y = (float)Math.Cos(i * deg2rad) * rect.Height / 2;
- x = x + rect.X + rect.Width / 2;
- y = y + rect.Y + rect.Height / 2;
- GL.Vertex2(x, y);
- }
- GL.End();
+ GL.LineWidth(penn.Width);
+ GL.Color4(penn.Color);
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
+ GL.Begin(BeginMode.LineStrip);
+ start -= 90;
+ float x = 0, y = 0;
+ for (int i = (int)start; i <= start + degrees; i++)
+ {
+ x = (float)Math.Sin(i * deg2rad) * rect.Width / 2;
+ y = (float)Math.Cos(i * deg2rad) * rect.Height / 2;
+ x = x + rect.X + rect.Width / 2;
+ y = y + rect.Y + rect.Height / 2;
+ GL.Vertex2(x, y);
+ }
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.DrawArc(penn, rect, start, degrees);
+ }
}
public void DrawEllipse(Pen penn, Rectangle rect)
{
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
-
- GL.LineWidth(penn.Width);
- GL.Color4(penn.Color);
-
- GL.Begin(BeginMode.LineLoop);
- float x, y;
- for (float i = 0; i < 360; i+=1)
+ if (opengl)
{
- x = (float)Math.Sin(i * deg2rad) * rect.Width / 2;
- y = (float)Math.Cos(i * deg2rad) * rect.Height / 2;
- x = x + rect.X + rect.Width / 2;
+ GL.LineWidth(penn.Width);
+ GL.Color4(penn.Color);
+
+ GL.Begin(BeginMode.LineLoop);
+ float x, y;
+ for (float i = 0; i < 360; i += 1)
+ {
+ x = (float)Math.Sin(i * deg2rad) * rect.Width / 2;
+ y = (float)Math.Cos(i * deg2rad) * rect.Height / 2;
+ x = x + rect.X + rect.Width / 2;
y = y + rect.Y + rect.Height / 2;
- GL.Vertex2(x, y);
+ GL.Vertex2(x, y);
+ }
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.DrawEllipse(penn, rect);
}
- GL.End();
-
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
}
- //graphicsObject.DrawImage(_bgimage, 0, 0, this.Width, this.Height);
-
int texture;
Bitmap bitmap = new Bitmap(512,512);
@@ -393,8 +385,6 @@ System.ComponentModel.Category("Values")]
GL.End();
-
- //GL.Disable(EnableCap.Blend);
GL.Disable(EnableCap.Texture2D);
}
@@ -428,89 +418,102 @@ System.ComponentModel.Category("Values")]
public void ResetTransform()
{
- GL.LoadIdentity();
+ if (opengl)
+ {
+ GL.LoadIdentity();
+ }
+ else
+ {
+ graphicsObjectGDIP.ResetTransform();
+ }
}
public void RotateTransform(float angle)
{
- GL.Rotate(angle,0,0,1);
+ if (opengl)
+ {
+ GL.Rotate(angle, 0, 0, 1);
+ }
+ else
+ {
+ graphicsObjectGDIP.RotateTransform(angle);
+ }
}
public void TranslateTransform(float x, float y)
{
- GL.Translate(x, y, 0f);
+ if (opengl)
+ {
+ GL.Translate(x, y, 0f);
+ }
+ else
+ {
+ graphicsObjectGDIP.TranslateTransform(x, y);
+ }
}
public void FillPolygon(Brush brushh, Point[] list)
{
-
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
-
- GL.Begin(BeginMode.TriangleFan);
- GL.Color4(((SolidBrush)brushh).Color);
- foreach (Point pnt in list)
+ if (opengl)
{
- GL.Vertex2(pnt.X, pnt.Y);
+ GL.Begin(BeginMode.TriangleFan);
+ GL.Color4(((SolidBrush)brushh).Color);
+ foreach (Point pnt in list)
+ {
+ GL.Vertex2(pnt.X, pnt.Y);
+ }
+ GL.Vertex2(list[list.Length - 1].X, list[list.Length - 1].Y);
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.FillPolygon(brushh, list);
}
- GL.Vertex2(list[list.Length - 1].X, list[list.Length - 1].Y);
- GL.End();
-
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
}
public void FillPolygon(Brush brushh, PointF[] list)
{
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
-
- GL.Begin(BeginMode.Quads);
- GL.Color4(((SolidBrush)brushh).Color);
- foreach (PointF pnt in list)
+ if (opengl)
{
- GL.Vertex2(pnt.X, pnt.Y);
+ GL.Begin(BeginMode.Quads);
+ GL.Color4(((SolidBrush)brushh).Color);
+ foreach (PointF pnt in list)
+ {
+ GL.Vertex2(pnt.X, pnt.Y);
+ }
+ GL.Vertex2(list[0].X, list[0].Y);
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.FillPolygon(brushh, list);
}
- GL.Vertex2(list[0].X, list[0].Y);
- GL.End();
-
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
}
- //graphicsObject.DrawPolygon(redPen, pointlist);
-
public void DrawPolygon(Pen penn, Point[] list)
{
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
-
- GL.LineWidth(penn.Width);
- GL.Color4(penn.Color);
-
- GL.Begin(BeginMode.LineLoop);
- foreach (Point pnt in list)
+ if (opengl)
{
- GL.Vertex2(pnt.X,pnt.Y);
- }
- GL.End();
+ GL.LineWidth(penn.Width);
+ GL.Color4(penn.Color);
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
+ GL.Begin(BeginMode.LineLoop);
+ foreach (Point pnt in list)
+ {
+ GL.Vertex2(pnt.X, pnt.Y);
+ }
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.DrawPolygon(penn, list);
+ }
}
public void DrawPolygon(Pen penn, PointF[] list)
- {
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
-
+ {
+ if (opengl)
+ {
GL.LineWidth(penn.Width);
GL.Color4(penn.Color);
@@ -519,64 +522,61 @@ System.ComponentModel.Category("Values")]
{
GL.Vertex2(pnt.X, pnt.Y);
}
- //GL.Vertex2(list[0].X, list[0].Y);
- GL.End();
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.DrawPolygon(penn, list);
+ }
}
- //graphicsObject.FillRectangle(linearBrush, bg);
public void FillRectangle(Brush brushh, RectangleF rectf)
{
- float x1 = rectf.X;
- float y1 = rectf.Y;
-
- float width = rectf.Width;
- float height = rectf.Height;
-
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
-
- GL.Begin(BeginMode.Quads);
-
- if (((Type)brushh.GetType()) == typeof(LinearGradientBrush))
+ if (opengl)
{
- LinearGradientBrush temp = (LinearGradientBrush)brushh;
- GL.Color4(temp.LinearColors[0]);
+ float x1 = rectf.X;
+ float y1 = rectf.Y;
+
+ float width = rectf.Width;
+ float height = rectf.Height;
+
+ GL.Begin(BeginMode.Quads);
+
+ if (((Type)brushh.GetType()) == typeof(LinearGradientBrush))
+ {
+ LinearGradientBrush temp = (LinearGradientBrush)brushh;
+ GL.Color4(temp.LinearColors[0]);
+ }
+ else
+ {
+ GL.Color4(((SolidBrush)brushh).Color.R / 255f, ((SolidBrush)brushh).Color.G / 255f, ((SolidBrush)brushh).Color.B / 255f, ((SolidBrush)brushh).Color.A / 255f);
+ }
+
+ GL.Vertex2(x1, y1);
+ GL.Vertex2(x1 + width, y1);
+
+ if (((Type)brushh.GetType()) == typeof(LinearGradientBrush))
+ {
+ LinearGradientBrush temp = (LinearGradientBrush)brushh;
+ GL.Color4(temp.LinearColors[1]);
+ }
+ else
+ {
+ GL.Color4(((SolidBrush)brushh).Color.R / 255f, ((SolidBrush)brushh).Color.G / 255f, ((SolidBrush)brushh).Color.B / 255f, ((SolidBrush)brushh).Color.A / 255f);
+ }
+
+ GL.Vertex2(x1 + width, y1 + height);
+ GL.Vertex2(x1, y1 + height);
+ GL.End();
}
else
{
- GL.Color4(((SolidBrush)brushh).Color.R/255f,((SolidBrush)brushh).Color.G/255f,((SolidBrush)brushh).Color.B/255f,((SolidBrush)brushh).Color.A/255f);
+ graphicsObjectGDIP.FillRectangle(brushh, rectf);
}
-
- GL.Vertex2(x1, y1);
- GL.Vertex2(x1 + width, y1);
-
- if (((Type)brushh.GetType()) == typeof(LinearGradientBrush))
- {
- LinearGradientBrush temp = (LinearGradientBrush)brushh;
- GL.Color4(temp.LinearColors[1]);
- }
- else
- {
- GL.Color4(((SolidBrush)brushh).Color.R / 255f, ((SolidBrush)brushh).Color.G / 255f, ((SolidBrush)brushh).Color.B / 255f, ((SolidBrush)brushh).Color.A / 255f);
- }
-
- GL.Vertex2(x1 + width, y1 + height);
- GL.Vertex2(x1, y1 + height);
- GL.End();
-
- //GL.Disable(EnableCap.Blend);
- //GL.Disable(EnableCap.ColorArray);
- //GL.Enable(EnableCap.Texture2D);
}
- //graphicsObject.DrawRectangle(transPen, bg.X,bg.Y,bg.Width,bg.Height);
-
public void DrawRectangle(Pen penn, RectangleF rect)
{
DrawRectangle(penn, rect.X, rect.Y, rect.Width, rect.Height);
@@ -584,50 +584,48 @@ System.ComponentModel.Category("Values")]
public void DrawRectangle(Pen penn, double x1, double y1, double width, double height)
{
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
- GL.LineWidth(penn.Width);
- GL.Color4(penn.Color);
+ if (opengl)
+ {
+ GL.LineWidth(penn.Width);
+ GL.Color4(penn.Color);
- GL.Begin(BeginMode.LineLoop);
- GL.Vertex2(x1, y1);
- GL.Vertex2(x1+width, y1);
- GL.Vertex2(x1+width, y1+height);
- GL.Vertex2(x1, y1+height);
- GL.End();
-
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
+ GL.Begin(BeginMode.LineLoop);
+ GL.Vertex2(x1, y1);
+ GL.Vertex2(x1 + width, y1);
+ GL.Vertex2(x1 + width, y1 + height);
+ GL.Vertex2(x1, y1 + height);
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.DrawRectangle(penn, (float)x1, (float)y1, (float)width, (float)height);
+ }
}
- public void DrawLine(Pen penn, double x1, double y1, double x2, double y2)
+ public void DrawLine(Pen penn, double x1, double y1, double x2, double y2)
{
- //GL.Disable(EnableCap.Texture2D);
-
- //GL.Enable(EnableCap.Blend);
- GL.Color4(penn.Color);
- GL.LineWidth(penn.Width);
+ if (opengl)
+ {
+ GL.Color4(penn.Color);
+ GL.LineWidth(penn.Width);
- GL.Begin(BeginMode.Lines);
- GL.Vertex2(x1, y1);
- GL.Vertex2(x2, y2);
- GL.End();
-
- //GL.Disable(EnableCap.Blend);
-
- //GL.Enable(EnableCap.Texture2D);
+ GL.Begin(BeginMode.Lines);
+ GL.Vertex2(x1, y1);
+ GL.Vertex2(x2, y2);
+ GL.End();
+ }
+ else
+ {
+ graphicsObjectGDIP.DrawLine(penn, (float)x1, (float)y1, (float)x2, (float)y2);
+ }
}
- void doPaint(object e)
+ void doPaint(PaintEventArgs e)
{
- HUD graphicsObject = this;
- //Graphics graphicsObject = ((PaintEventArgs)e).Graphics;
- //graphicsObject.SmoothingMode = SmoothingMode.AntiAlias;
-
+ graphicsObjectGDIP = Graphics.FromImage(objBitmap);
+ graphicsObjectGDIP.SmoothingMode = SmoothingMode.AntiAlias;
try
{
@@ -1187,7 +1185,10 @@ System.ComponentModel.Category("Values")]
drawstring(graphicsObject, gps, font, fontsize + 2, whiteBrush, this.Width - 10 * fontsize, this.Height - 30 - fontoffset);
- //e.Graphics.DrawImageUnscaled(objBitmap, 0, 0);
+ if (!opengl)
+ {
+ e.Graphics.DrawImageUnscaled(objBitmap, 0, 0);
+ }
if (DesignMode)
{
@@ -1204,7 +1205,10 @@ System.ComponentModel.Category("Values")]
{
if (streamjpgenable || streamjpg == null) // init image and only update when needed
{
- objBitmap = GrabScreenshot();
+ if (opengl)
+ {
+ objBitmap = GrabScreenshot();
+ }
streamjpg = new MemoryStream();
objBitmap.Save(streamjpg, ici, eps);
//objBitmap.Save(streamjpg,ImageFormat.Bmp);
@@ -1267,6 +1271,12 @@ System.ComponentModel.Category("Values")]
void drawstring(HUD e, string text, Font font, float fontsize, Brush brush, float x, float y)
{
+ if (!opengl)
+ {
+ drawstring(graphicsObjectGDIP, text, font, fontsize, brush, x, y);
+ return;
+ }
+
if (text == null || text == "")
return;
/*
@@ -1404,6 +1414,30 @@ System.ComponentModel.Category("Values")]
//pth.Dispose();
}
+ protected override void OnHandleCreated(EventArgs e)
+ {
+ try
+ {
+ if (opengl)
+ {
+ base.OnHandleCreated(e);
+ }
+ }
+ catch (Exception ex) { Console.WriteLine(ex.ToString()); opengl = false; } // macs fail here
+ }
+
+ protected override void OnHandleDestroyed(EventArgs e)
+ {
+ try
+ {
+ if (opengl)
+ {
+ base.OnHandleDestroyed(e);
+ }
+ }
+ catch (Exception ex) { Console.WriteLine(ex.ToString()); opengl = false; }
+ }
+
protected override void OnResize(EventArgs e)
{
if (DesignMode)
@@ -1415,13 +1449,14 @@ System.ComponentModel.Category("Values")]
try
{
-
- foreach (int texid in charbitmaptexid)
+ if (opengl)
{
- if (texid != 0)
- GL.DeleteTexture(texid);
+ foreach (int texid in charbitmaptexid)
+ {
+ if (texid != 0)
+ GL.DeleteTexture(texid);
+ }
}
-
}
catch { }
@@ -1429,13 +1464,16 @@ System.ComponentModel.Category("Values")]
try
{
- GL.MatrixMode(MatrixMode.Projection);
- GL.LoadIdentity();
- GL.Ortho(0, Width, Height, 0, -1, 1);
- GL.MatrixMode(MatrixMode.Modelview);
- GL.LoadIdentity();
+ if (opengl)
+ {
+ GL.MatrixMode(MatrixMode.Projection);
+ GL.LoadIdentity();
+ GL.Ortho(0, Width, Height, 0, -1, 1);
+ GL.MatrixMode(MatrixMode.Modelview);
+ GL.LoadIdentity();
- GL.Viewport(0, 0, Width, Height);
+ GL.Viewport(0, 0, Width, Height);
+ }
}
catch { }
diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs
index 00e90ad6e8..022ce5b1d9 100644
--- a/Tools/ArdupilotMegaPlanner/MainV2.cs
+++ b/Tools/ArdupilotMegaPlanner/MainV2.cs
@@ -161,6 +161,8 @@ namespace ArdupilotMega
}
catch (Exception e) { MessageBox.Show("A Major error has occured : " + e.ToString()); this.Close(); }
+ Console.WriteLine("check hud");
+
GCSViews.FlightData.myhud.Refresh();
GCSViews.FlightData.myhud.Refresh();
GCSViews.FlightData.myhud.Refresh();
@@ -168,8 +170,11 @@ namespace ArdupilotMega
if (GCSViews.FlightData.myhud.huddrawtime > 1000)
{
MessageBox.Show("The HUD draw time is above 1 seconds. Please update your graphics card driver.");
+ GCSViews.FlightData.myhud.opengl = false;
}
+ Console.WriteLine("check hud done");
+
changeunits();
try
@@ -726,6 +731,8 @@ namespace ArdupilotMega
{
try
{
+ System.Configuration.Configuration appconfig = System.Configuration.ConfigurationManager.OpenExeConfiguration(System.Configuration.ConfigurationUserLevel.None);
+
XmlTextWriter xmlwriter = new XmlTextWriter(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"config.xml", Encoding.ASCII);
xmlwriter.Formatting = Formatting.Indented;
@@ -733,14 +740,16 @@ namespace ArdupilotMega
xmlwriter.WriteStartElement("Config");
- //xmlwriter.WriteElementString("APMlocation", defineslocation);
-
xmlwriter.WriteElementString("comport", comportname);
xmlwriter.WriteElementString("baudrate", CMB_baudrate.Text);
xmlwriter.WriteElementString("APMFirmware", APMFirmware.ToString());
+ appconfig.AppSettings.Settings.Add("comport", comportname);
+ appconfig.AppSettings.Settings.Add("baudrate", CMB_baudrate.Text);
+ appconfig.AppSettings.Settings.Add("APMFirmware", APMFirmware.ToString());
+
foreach (string key in config.Keys)
{
try
@@ -748,6 +757,8 @@ namespace ArdupilotMega
if (key == "")
continue;
xmlwriter.WriteElementString(key, config[key].ToString());
+
+ appconfig.AppSettings.Settings.Add(key, config[key].ToString());
}
catch { }
}
@@ -756,6 +767,8 @@ namespace ArdupilotMega
xmlwriter.WriteEndDocument();
xmlwriter.Close();
+
+ appconfig.Save();
}
catch (Exception ex) { MessageBox.Show(ex.ToString()); }
}
@@ -945,11 +958,12 @@ namespace ArdupilotMega
if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds >= 1)
{
- GCSViews.FlightData.myhud.Invalidate();
if (linkqualitytime.Second != DateTime.Now.Second)
{
MainV2.cs.linkqualitygcs = (ushort)(MainV2.cs.linkqualitygcs * 0.8f);
linkqualitytime = DateTime.Now;
+
+ GCSViews.FlightData.myhud.Invalidate();
}
}
diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
index 622fe43525..652a00b471 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.0.70")]
+[assembly: AssemblyFileVersion("1.0.71")]
[assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs
index 243c6d9816..4bf673fa62 100644
--- a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs
+++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs
@@ -32,12 +32,30 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setup));
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabReset = new System.Windows.Forms.TabPage();
+ this.BUT_reset = new ArdupilotMega.MyButton();
this.tabRadioIn = new System.Windows.Forms.TabPage();
this.CHK_revch3 = new System.Windows.Forms.CheckBox();
this.CHK_revch4 = new System.Windows.Forms.CheckBox();
this.CHK_revch2 = new System.Windows.Forms.CheckBox();
this.CHK_revch1 = new System.Windows.Forms.CheckBox();
+ this.BUT_Calibrateradio = new ArdupilotMega.MyButton();
+ this.BAR8 = new ArdupilotMega.HorizontalProgressBar2();
+ this.currentStateBindingSource = new System.Windows.Forms.BindingSource(this.components);
+ this.BAR7 = new ArdupilotMega.HorizontalProgressBar2();
+ this.BAR6 = new ArdupilotMega.HorizontalProgressBar2();
+ this.BAR5 = new ArdupilotMega.HorizontalProgressBar2();
+ this.BARpitch = new ArdupilotMega.VerticalProgressBar2();
+ this.BARthrottle = new ArdupilotMega.VerticalProgressBar2();
+ this.BARyaw = new ArdupilotMega.HorizontalProgressBar2();
+ this.BARroll = new ArdupilotMega.HorizontalProgressBar2();
this.tabModes = new System.Windows.Forms.TabPage();
+ this.label29 = new System.Windows.Forms.Label();
+ this.CB_simple6 = new System.Windows.Forms.CheckBox();
+ this.CB_simple5 = new System.Windows.Forms.CheckBox();
+ this.CB_simple4 = new System.Windows.Forms.CheckBox();
+ this.CB_simple3 = new System.Windows.Forms.CheckBox();
+ this.CB_simple2 = new System.Windows.Forms.CheckBox();
+ this.CB_simple1 = new System.Windows.Forms.CheckBox();
this.label14 = new System.Windows.Forms.Label();
this.LBL_flightmodepwm = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
@@ -60,6 +78,7 @@
this.CMB_fmode2 = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.CMB_fmode1 = new System.Windows.Forms.ComboBox();
+ this.BUT_SaveModes = new ArdupilotMega.MyButton();
this.tabHardware = new System.Windows.Forms.TabPage();
this.linkLabelmagdec = new System.Windows.Forms.LinkLabel();
this.label106 = new System.Windows.Forms.Label();
@@ -82,6 +101,7 @@
this.label15 = new System.Windows.Forms.Label();
this.pictureBoxQuadX = new System.Windows.Forms.PictureBox();
this.pictureBoxQuad = new System.Windows.Forms.PictureBox();
+ this.BUT_levelac2 = new ArdupilotMega.MyButton();
this.tabHeli = new System.Windows.Forms.TabPage();
this.label27 = new System.Windows.Forms.Label();
this.GYR_GAIN_ = new System.Windows.Forms.TextBox();
@@ -106,20 +126,6 @@
this.HS2_REV = new System.Windows.Forms.CheckBox();
this.HS1_REV = new System.Windows.Forms.CheckBox();
this.label17 = new System.Windows.Forms.Label();
- this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.BUT_reset = new ArdupilotMega.MyButton();
- this.BUT_Calibrateradio = new ArdupilotMega.MyButton();
- this.BAR8 = new ArdupilotMega.HorizontalProgressBar2();
- this.currentStateBindingSource = new System.Windows.Forms.BindingSource(this.components);
- this.BAR7 = new ArdupilotMega.HorizontalProgressBar2();
- this.BAR6 = new ArdupilotMega.HorizontalProgressBar2();
- this.BAR5 = new ArdupilotMega.HorizontalProgressBar2();
- this.BARpitch = new ArdupilotMega.VerticalProgressBar2();
- this.BARthrottle = new ArdupilotMega.VerticalProgressBar2();
- this.BARyaw = new ArdupilotMega.HorizontalProgressBar2();
- this.BARroll = new ArdupilotMega.HorizontalProgressBar2();
- this.BUT_SaveModes = new ArdupilotMega.MyButton();
- this.BUT_levelac2 = new ArdupilotMega.MyButton();
this.BUT_saveheliconfig = new ArdupilotMega.MyButton();
this.BUT_0collective = new ArdupilotMega.MyButton();
this.HS4 = new ArdupilotMega.VerticalProgressBar2();
@@ -129,15 +135,11 @@
this.HS2_TRIM = new ArdupilotMega.MyTrackBar();
this.HS1_TRIM = new ArdupilotMega.MyTrackBar();
this.Gservoloc = new AGaugeApp.AGauge();
- this.CB_simple1 = new System.Windows.Forms.CheckBox();
- this.CB_simple2 = new System.Windows.Forms.CheckBox();
- this.CB_simple3 = new System.Windows.Forms.CheckBox();
- this.CB_simple4 = new System.Windows.Forms.CheckBox();
- this.CB_simple5 = new System.Windows.Forms.CheckBox();
- this.CB_simple6 = new System.Windows.Forms.CheckBox();
+ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.tabControl1.SuspendLayout();
this.tabReset.SuspendLayout();
this.tabRadioIn.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit();
this.tabModes.SuspendLayout();
this.tabHardware.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -148,7 +150,6 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit();
this.tabHeli.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS4_TRIM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).BeginInit();
@@ -175,6 +176,14 @@
this.tabReset.Name = "tabReset";
this.tabReset.UseVisualStyleBackColor = true;
//
+ // BUT_reset
+ //
+ resources.ApplyResources(this.BUT_reset, "BUT_reset");
+ this.BUT_reset.Name = "BUT_reset";
+ this.BUT_reset.Tag = "";
+ this.BUT_reset.UseVisualStyleBackColor = true;
+ this.BUT_reset.Click += new System.EventHandler(this.BUT_reset_Click);
+ //
// tabRadioIn
//
this.tabRadioIn.Controls.Add(this.CHK_revch3);
@@ -222,8 +231,140 @@
this.CHK_revch1.UseVisualStyleBackColor = true;
this.CHK_revch1.CheckedChanged += new System.EventHandler(this.CHK_revch1_CheckedChanged);
//
+ // BUT_Calibrateradio
+ //
+ resources.ApplyResources(this.BUT_Calibrateradio, "BUT_Calibrateradio");
+ this.BUT_Calibrateradio.Name = "BUT_Calibrateradio";
+ this.BUT_Calibrateradio.UseVisualStyleBackColor = true;
+ this.BUT_Calibrateradio.Click += new System.EventHandler(this.BUT_Calibrateradio_Click);
+ //
+ // BAR8
+ //
+ this.BAR8.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
+ this.BAR8.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BAR8.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch8in", true));
+ this.BAR8.Label = "Radio 8";
+ resources.ApplyResources(this.BAR8, "BAR8");
+ this.BAR8.Maximum = 2200;
+ this.BAR8.maxline = 0;
+ this.BAR8.Minimum = 800;
+ this.BAR8.minline = 0;
+ this.BAR8.Name = "BAR8";
+ this.BAR8.Value = 1500;
+ this.BAR8.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+ //
+ // currentStateBindingSource
+ //
+ this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState);
+ //
+ // BAR7
+ //
+ this.BAR7.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
+ this.BAR7.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BAR7.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch7in", true));
+ this.BAR7.Label = "Radio 7";
+ resources.ApplyResources(this.BAR7, "BAR7");
+ this.BAR7.Maximum = 2200;
+ this.BAR7.maxline = 0;
+ this.BAR7.Minimum = 800;
+ this.BAR7.minline = 0;
+ this.BAR7.Name = "BAR7";
+ this.BAR7.Value = 1500;
+ this.BAR7.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+ //
+ // BAR6
+ //
+ this.BAR6.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
+ this.BAR6.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BAR6.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch6in", true));
+ this.BAR6.Label = "Radio 6";
+ resources.ApplyResources(this.BAR6, "BAR6");
+ this.BAR6.Maximum = 2200;
+ this.BAR6.maxline = 0;
+ this.BAR6.Minimum = 800;
+ this.BAR6.minline = 0;
+ this.BAR6.Name = "BAR6";
+ this.BAR6.Value = 1500;
+ this.BAR6.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+ //
+ // BAR5
+ //
+ this.BAR5.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
+ this.BAR5.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BAR5.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch5in", true));
+ this.BAR5.Label = "Radio 5";
+ resources.ApplyResources(this.BAR5, "BAR5");
+ this.BAR5.Maximum = 2200;
+ this.BAR5.maxline = 0;
+ this.BAR5.Minimum = 800;
+ this.BAR5.minline = 0;
+ this.BAR5.Name = "BAR5";
+ this.BAR5.Value = 1500;
+ this.BAR5.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+ //
+ // BARpitch
+ //
+ this.BARpitch.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
+ this.BARpitch.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BARpitch.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch2in", true));
+ this.BARpitch.Label = "Pitch";
+ resources.ApplyResources(this.BARpitch, "BARpitch");
+ this.BARpitch.Maximum = 2200;
+ this.BARpitch.maxline = 0;
+ this.BARpitch.Minimum = 800;
+ this.BARpitch.minline = 0;
+ this.BARpitch.Name = "BARpitch";
+ this.BARpitch.Value = 1500;
+ this.BARpitch.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+ //
+ // BARthrottle
+ //
+ this.BARthrottle.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69)))));
+ this.BARthrottle.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BARthrottle.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch3in", true));
+ this.BARthrottle.Label = "Throttle";
+ resources.ApplyResources(this.BARthrottle, "BARthrottle");
+ this.BARthrottle.Maximum = 2200;
+ this.BARthrottle.maxline = 0;
+ this.BARthrottle.Minimum = 800;
+ this.BARthrottle.minline = 0;
+ this.BARthrottle.Name = "BARthrottle";
+ this.BARthrottle.Value = 1000;
+ this.BARthrottle.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(148)))), ((int)(((byte)(193)))), ((int)(((byte)(31)))));
+ //
+ // BARyaw
+ //
+ this.BARyaw.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
+ this.BARyaw.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BARyaw.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch4in", true));
+ this.BARyaw.Label = "Yaw";
+ resources.ApplyResources(this.BARyaw, "BARyaw");
+ this.BARyaw.Maximum = 2200;
+ this.BARyaw.maxline = 0;
+ this.BARyaw.Minimum = 800;
+ this.BARyaw.minline = 0;
+ this.BARyaw.Name = "BARyaw";
+ this.BARyaw.Value = 1500;
+ this.BARyaw.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+ //
+ // BARroll
+ //
+ this.BARroll.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
+ this.BARroll.BorderColor = System.Drawing.SystemColors.ActiveBorder;
+ this.BARroll.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch1in", true));
+ this.BARroll.Label = "Roll";
+ resources.ApplyResources(this.BARroll, "BARroll");
+ this.BARroll.Maximum = 2200;
+ this.BARroll.maxline = 0;
+ this.BARroll.Minimum = 800;
+ this.BARroll.minline = 0;
+ this.BARroll.Name = "BARroll";
+ this.BARroll.Value = 1500;
+ this.BARroll.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+ //
// tabModes
//
+ this.tabModes.Controls.Add(this.label29);
this.tabModes.Controls.Add(this.CB_simple6);
this.tabModes.Controls.Add(this.CB_simple5);
this.tabModes.Controls.Add(this.CB_simple4);
@@ -257,6 +398,47 @@
this.tabModes.Name = "tabModes";
this.tabModes.UseVisualStyleBackColor = true;
//
+ // label29
+ //
+ resources.ApplyResources(this.label29, "label29");
+ this.label29.Name = "label29";
+ //
+ // CB_simple6
+ //
+ resources.ApplyResources(this.CB_simple6, "CB_simple6");
+ this.CB_simple6.Name = "CB_simple6";
+ this.CB_simple6.UseVisualStyleBackColor = true;
+ //
+ // CB_simple5
+ //
+ resources.ApplyResources(this.CB_simple5, "CB_simple5");
+ this.CB_simple5.Name = "CB_simple5";
+ this.CB_simple5.UseVisualStyleBackColor = true;
+ //
+ // CB_simple4
+ //
+ resources.ApplyResources(this.CB_simple4, "CB_simple4");
+ this.CB_simple4.Name = "CB_simple4";
+ this.CB_simple4.UseVisualStyleBackColor = true;
+ //
+ // CB_simple3
+ //
+ resources.ApplyResources(this.CB_simple3, "CB_simple3");
+ this.CB_simple3.Name = "CB_simple3";
+ this.CB_simple3.UseVisualStyleBackColor = true;
+ //
+ // CB_simple2
+ //
+ resources.ApplyResources(this.CB_simple2, "CB_simple2");
+ this.CB_simple2.Name = "CB_simple2";
+ this.CB_simple2.UseVisualStyleBackColor = true;
+ //
+ // CB_simple1
+ //
+ resources.ApplyResources(this.CB_simple1, "CB_simple1");
+ this.CB_simple1.Name = "CB_simple1";
+ this.CB_simple1.UseVisualStyleBackColor = true;
+ //
// label14
//
resources.ApplyResources(this.label14, "label14");
@@ -392,6 +574,13 @@
resources.ApplyResources(this.CMB_fmode1, "CMB_fmode1");
this.CMB_fmode1.Name = "CMB_fmode1";
//
+ // BUT_SaveModes
+ //
+ resources.ApplyResources(this.BUT_SaveModes, "BUT_SaveModes");
+ this.BUT_SaveModes.Name = "BUT_SaveModes";
+ this.BUT_SaveModes.UseVisualStyleBackColor = true;
+ this.BUT_SaveModes.Click += new System.EventHandler(this.BUT_SaveModes_Click);
+ //
// tabHardware
//
this.tabHardware.BackColor = System.Drawing.Color.DarkRed;
@@ -569,6 +758,13 @@
this.pictureBoxQuad.TabStop = false;
this.pictureBoxQuad.Click += new System.EventHandler(this.pictureBoxQuad_Click);
//
+ // BUT_levelac2
+ //
+ resources.ApplyResources(this.BUT_levelac2, "BUT_levelac2");
+ this.BUT_levelac2.Name = "BUT_levelac2";
+ this.BUT_levelac2.UseVisualStyleBackColor = true;
+ this.BUT_levelac2.Click += new System.EventHandler(this.BUT_levelac2_Click);
+ //
// tabHeli
//
this.tabHeli.Controls.Add(this.label27);
@@ -738,159 +934,6 @@
resources.ApplyResources(this.label17, "label17");
this.label17.Name = "label17";
//
- // BUT_reset
- //
- resources.ApplyResources(this.BUT_reset, "BUT_reset");
- this.BUT_reset.Name = "BUT_reset";
- this.BUT_reset.Tag = "";
- this.BUT_reset.UseVisualStyleBackColor = true;
- this.BUT_reset.Click += new System.EventHandler(this.BUT_reset_Click);
- //
- // BUT_Calibrateradio
- //
- resources.ApplyResources(this.BUT_Calibrateradio, "BUT_Calibrateradio");
- this.BUT_Calibrateradio.Name = "BUT_Calibrateradio";
- this.BUT_Calibrateradio.UseVisualStyleBackColor = true;
- this.BUT_Calibrateradio.Click += new System.EventHandler(this.BUT_Calibrateradio_Click);
- //
- // BAR8
- //
- this.BAR8.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
- this.BAR8.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BAR8.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch8in", true));
- this.BAR8.Label = "Radio 8";
- resources.ApplyResources(this.BAR8, "BAR8");
- this.BAR8.Maximum = 2200;
- this.BAR8.maxline = 0;
- this.BAR8.Minimum = 800;
- this.BAR8.minline = 0;
- this.BAR8.Name = "BAR8";
- this.BAR8.Value = 1500;
- this.BAR8.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
- //
- // currentStateBindingSource
- //
- this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState);
- //
- // BAR7
- //
- this.BAR7.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
- this.BAR7.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BAR7.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch7in", true));
- this.BAR7.Label = "Radio 7";
- resources.ApplyResources(this.BAR7, "BAR7");
- this.BAR7.Maximum = 2200;
- this.BAR7.maxline = 0;
- this.BAR7.Minimum = 800;
- this.BAR7.minline = 0;
- this.BAR7.Name = "BAR7";
- this.BAR7.Value = 1500;
- this.BAR7.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
- //
- // BAR6
- //
- this.BAR6.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
- this.BAR6.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BAR6.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch6in", true));
- this.BAR6.Label = "Radio 6";
- resources.ApplyResources(this.BAR6, "BAR6");
- this.BAR6.Maximum = 2200;
- this.BAR6.maxline = 0;
- this.BAR6.Minimum = 800;
- this.BAR6.minline = 0;
- this.BAR6.Name = "BAR6";
- this.BAR6.Value = 1500;
- this.BAR6.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
- //
- // BAR5
- //
- this.BAR5.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
- this.BAR5.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BAR5.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch5in", true));
- this.BAR5.Label = "Radio 5";
- resources.ApplyResources(this.BAR5, "BAR5");
- this.BAR5.Maximum = 2200;
- this.BAR5.maxline = 0;
- this.BAR5.Minimum = 800;
- this.BAR5.minline = 0;
- this.BAR5.Name = "BAR5";
- this.BAR5.Value = 1500;
- this.BAR5.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
- //
- // BARpitch
- //
- this.BARpitch.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
- this.BARpitch.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BARpitch.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch2in", true));
- this.BARpitch.Label = "Pitch";
- resources.ApplyResources(this.BARpitch, "BARpitch");
- this.BARpitch.Maximum = 2200;
- this.BARpitch.maxline = 0;
- this.BARpitch.Minimum = 800;
- this.BARpitch.minline = 0;
- this.BARpitch.Name = "BARpitch";
- this.BARpitch.Value = 1500;
- this.BARpitch.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
- //
- // BARthrottle
- //
- this.BARthrottle.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69)))));
- this.BARthrottle.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BARthrottle.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch3in", true));
- this.BARthrottle.Label = "Throttle";
- resources.ApplyResources(this.BARthrottle, "BARthrottle");
- this.BARthrottle.Maximum = 2200;
- this.BARthrottle.maxline = 0;
- this.BARthrottle.Minimum = 800;
- this.BARthrottle.minline = 0;
- this.BARthrottle.Name = "BARthrottle";
- this.BARthrottle.Value = 1000;
- this.BARthrottle.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(148)))), ((int)(((byte)(193)))), ((int)(((byte)(31)))));
- //
- // BARyaw
- //
- this.BARyaw.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
- this.BARyaw.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BARyaw.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch4in", true));
- this.BARyaw.Label = "Yaw";
- resources.ApplyResources(this.BARyaw, "BARyaw");
- this.BARyaw.Maximum = 2200;
- this.BARyaw.maxline = 0;
- this.BARyaw.Minimum = 800;
- this.BARyaw.minline = 0;
- this.BARyaw.Name = "BARyaw";
- this.BARyaw.Value = 1500;
- this.BARyaw.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
- //
- // BARroll
- //
- this.BARroll.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255)))));
- this.BARroll.BorderColor = System.Drawing.SystemColors.ActiveBorder;
- this.BARroll.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.currentStateBindingSource, "ch1in", true));
- this.BARroll.Label = "Roll";
- resources.ApplyResources(this.BARroll, "BARroll");
- this.BARroll.Maximum = 2200;
- this.BARroll.maxline = 0;
- this.BARroll.Minimum = 800;
- this.BARroll.minline = 0;
- this.BARroll.Name = "BARroll";
- this.BARroll.Value = 1500;
- this.BARroll.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
- //
- // BUT_SaveModes
- //
- resources.ApplyResources(this.BUT_SaveModes, "BUT_SaveModes");
- this.BUT_SaveModes.Name = "BUT_SaveModes";
- this.BUT_SaveModes.UseVisualStyleBackColor = true;
- this.BUT_SaveModes.Click += new System.EventHandler(this.BUT_SaveModes_Click);
- //
- // BUT_levelac2
- //
- resources.ApplyResources(this.BUT_levelac2, "BUT_levelac2");
- this.BUT_levelac2.Name = "BUT_levelac2";
- this.BUT_levelac2.UseVisualStyleBackColor = true;
- this.BUT_levelac2.Click += new System.EventHandler(this.BUT_levelac2_Click);
- //
// BUT_saveheliconfig
//
resources.ApplyResources(this.BUT_saveheliconfig, "BUT_saveheliconfig");
@@ -1126,42 +1169,6 @@
this.Gservoloc.Value2 = 180F;
this.Gservoloc.Value3 = 0F;
//
- // CB_simple1
- //
- resources.ApplyResources(this.CB_simple1, "CB_simple1");
- this.CB_simple1.Name = "CB_simple1";
- this.CB_simple1.UseVisualStyleBackColor = true;
- //
- // CB_simple2
- //
- resources.ApplyResources(this.CB_simple2, "CB_simple2");
- this.CB_simple2.Name = "CB_simple2";
- this.CB_simple2.UseVisualStyleBackColor = true;
- //
- // CB_simple3
- //
- resources.ApplyResources(this.CB_simple3, "CB_simple3");
- this.CB_simple3.Name = "CB_simple3";
- this.CB_simple3.UseVisualStyleBackColor = true;
- //
- // CB_simple4
- //
- resources.ApplyResources(this.CB_simple4, "CB_simple4");
- this.CB_simple4.Name = "CB_simple4";
- this.CB_simple4.UseVisualStyleBackColor = true;
- //
- // CB_simple5
- //
- resources.ApplyResources(this.CB_simple5, "CB_simple5");
- this.CB_simple5.Name = "CB_simple5";
- this.CB_simple5.UseVisualStyleBackColor = true;
- //
- // CB_simple6
- //
- resources.ApplyResources(this.CB_simple6, "CB_simple6");
- this.CB_simple6.Name = "CB_simple6";
- this.CB_simple6.UseVisualStyleBackColor = true;
- //
// Setup
//
resources.ApplyResources(this, "$this");
@@ -1174,6 +1181,7 @@
this.tabReset.ResumeLayout(false);
this.tabRadioIn.ResumeLayout(false);
this.tabRadioIn.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).EndInit();
this.tabModes.ResumeLayout(false);
this.tabModes.PerformLayout();
this.tabHardware.ResumeLayout(false);
@@ -1188,7 +1196,6 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).EndInit();
this.tabHeli.ResumeLayout(false);
this.tabHeli.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS4_TRIM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).EndInit();
@@ -1304,6 +1311,7 @@
private System.Windows.Forms.CheckBox CB_simple3;
private System.Windows.Forms.CheckBox CB_simple2;
private System.Windows.Forms.CheckBox CB_simple1;
+ private System.Windows.Forms.Label label29;
}
}
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx
index fdcafe6fac..2c2973ce03 100644
--- a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx
+++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx
@@ -117,6 +117,24 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ NoControl
+
+
+
+ 214, 161
+
+
+ 195, 23
+
+
+
+ 0
+
+
+ Reset APM Hardware to Default
+
BUT_reset
@@ -129,14 +147,12 @@
0
-
4, 22
666, 393
-
4
@@ -155,1777 +171,6 @@
0
-
- CHK_revch3
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabRadioIn
-
-
- 0
-
-
- CHK_revch4
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabRadioIn
-
-
- 1
-
-
- CHK_revch2
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabRadioIn
-
-
- 2
-
-
- CHK_revch1
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabRadioIn
-
-
- 3
-
-
- BUT_Calibrateradio
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 4
-
-
- BAR8
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 5
-
-
- BAR7
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 6
-
-
- BAR6
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 7
-
-
- BAR5
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 8
-
-
- BARpitch
-
-
- ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 9
-
-
- BARthrottle
-
-
- ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 10
-
-
- BARyaw
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 11
-
-
- BARroll
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 12
-
-
- 4, 22
-
-
-
- 3, 3, 3, 3
-
-
- 666, 393
-
-
- 0
-
-
- Radio Input
-
-
- tabRadioIn
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 1
-
-
- True
-
-
- NoControl
-
-
- 372, 235
-
-
- 87, 17
-
-
- 119
-
-
- Simple Mode
-
-
- CB_simple6
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 0
-
-
- True
-
-
- NoControl
-
-
- 373, 208
-
-
- 87, 17
-
-
- 118
-
-
- Simple Mode
-
-
- CB_simple5
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 1
-
-
- True
-
-
- NoControl
-
-
- 372, 181
-
-
- 87, 17
-
-
- 117
-
-
- Simple Mode
-
-
- CB_simple4
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 2
-
-
- True
-
-
- NoControl
-
-
- 373, 154
-
-
- 87, 17
-
-
- 116
-
-
- Simple Mode
-
-
- CB_simple3
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 3
-
-
- True
-
-
- NoControl
-
-
- 372, 127
-
-
- 87, 17
-
-
- 115
-
-
- Simple Mode
-
-
- CB_simple2
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 4
-
-
- True
-
-
- 373, 101
-
-
- 87, 17
-
-
- 114
-
-
- Simple Mode
-
-
- CB_simple1
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 5
-
-
- True
-
-
- NoControl
-
-
- 242, 67
-
-
- 74, 13
-
-
- 113
-
-
- Current PWM:
-
-
- label14
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 6
-
-
- True
-
-
- NoControl
-
-
- 322, 67
-
-
- 13, 13
-
-
- 112
-
-
- 0
-
-
- LBL_flightmodepwm
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 7
-
-
- True
-
-
- NoControl
-
-
- 242, 50
-
-
- 74, 13
-
-
- 111
-
-
- Current Mode:
-
-
- label13
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 8
-
-
- True
-
-
- NoControl
-
-
- 322, 50
-
-
- 42, 13
-
-
- 110
-
-
- Manual
-
-
- lbl_currentmode
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 9
-
-
- True
-
-
- NoControl
-
-
- 483, 101
-
-
- 76, 13
-
-
- 109
-
-
- PWM 0 - 1230
-
-
- False
-
-
- label12
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 10
-
-
- True
-
-
- NoControl
-
-
- 483, 236
-
-
- 70, 13
-
-
- 108
-
-
- PWM 1750 +
-
-
- False
-
-
- label11
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 11
-
-
- True
-
-
- NoControl
-
-
- 483, 209
-
-
- 94, 13
-
-
- 107
-
-
- PWM 1621 - 1749
-
-
- False
-
-
- label10
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 12
-
-
- True
-
-
- NoControl
-
-
- 483, 182
-
-
- 94, 13
-
-
- 106
-
-
- PWM 1491 - 1620
-
-
- False
-
-
- label9
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 13
-
-
- True
-
-
- NoControl
-
-
- 483, 155
-
-
- 94, 13
-
-
- 105
-
-
- PWM 1361 - 1490
-
-
- False
-
-
- label8
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 14
-
-
- True
-
-
- NoControl
-
-
- 483, 128
-
-
- 94, 13
-
-
- 104
-
-
- PWM 1231 - 1360
-
-
- False
-
-
- label7
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 15
-
-
- True
-
-
- NoControl
-
-
- 168, 236
-
-
- 71, 13
-
-
- 11
-
-
- Flight Mode 6
-
-
- label6
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 16
-
-
- 245, 233
-
-
- 121, 21
-
-
- 10
-
-
- CMB_fmode6
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 17
-
-
- True
-
-
- NoControl
-
-
- 168, 209
-
-
- 71, 13
-
-
- 9
-
-
- Flight Mode 5
-
-
- label5
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 18
-
-
- 245, 206
-
-
- 121, 21
-
-
- 8
-
-
- CMB_fmode5
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 19
-
-
- True
-
-
- NoControl
-
-
- 168, 182
-
-
- 71, 13
-
-
- 7
-
-
- Flight Mode 4
-
-
- label4
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 20
-
-
- 245, 179
-
-
- 121, 21
-
-
- 6
-
-
- CMB_fmode4
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 21
-
-
- True
-
-
- NoControl
-
-
- 168, 155
-
-
- 71, 13
-
-
- 5
-
-
- Flight Mode 3
-
-
- label3
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 22
-
-
- 245, 152
-
-
- 121, 21
-
-
- 4
-
-
- CMB_fmode3
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 23
-
-
- True
-
-
- NoControl
-
-
- 168, 128
-
-
- 71, 13
-
-
- 3
-
-
- Flight Mode 2
-
-
- label2
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 24
-
-
- 245, 125
-
-
- 121, 21
-
-
- 2
-
-
- CMB_fmode2
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 25
-
-
- True
-
-
- NoControl
-
-
- 168, 101
-
-
- 71, 13
-
-
- 1
-
-
- Flight Mode 1
-
-
- label1
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 26
-
-
- 245, 98
-
-
- 121, 21
-
-
- 0
-
-
- CMB_fmode1
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabModes
-
-
- 27
-
-
- NoControl
-
-
- 245, 260
-
-
- 121, 23
-
-
- 103
-
-
- Save Modes
-
-
- BUT_SaveModes
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabModes
-
-
- 28
-
-
- 4, 22
-
-
- 666, 393
-
-
- 3
-
-
- Modes
-
-
- tabModes
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 2
-
-
- linkLabelmagdec
-
-
- System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 0
-
-
- label106
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 1
-
-
- label105
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 2
-
-
- TXT_battcapacity
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 3
-
-
- CMB_batmontype
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 4
-
-
- label100
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 5
-
-
- TXT_declination
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 6
-
-
- CHK_enableairspeed
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 7
-
-
- CHK_enablesonar
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 8
-
-
- CHK_enablebattmon
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 9
-
-
- CHK_enablecompass
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 10
-
-
- pictureBox4
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 11
-
-
- pictureBox3
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 12
-
-
- pictureBox2
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 13
-
-
- pictureBox1
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHardware
-
-
- 14
-
-
- 4, 22
-
-
- 3, 3, 3, 3
-
-
- 666, 393
-
-
- 1
-
-
- Hardware
-
-
- tabHardware
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 3
-
-
- label28
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabArducopter
-
-
- 0
-
-
- label16
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabArducopter
-
-
- 1
-
-
- label15
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabArducopter
-
-
- 2
-
-
- pictureBoxQuadX
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabArducopter
-
-
- 3
-
-
- pictureBoxQuad
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabArducopter
-
-
- 4
-
-
- BUT_levelac2
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabArducopter
-
-
- 5
-
-
- 4, 22
-
-
- 666, 393
-
-
- 2
-
-
- ArduCopter2
-
-
- tabArducopter
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 4
-
-
- label27
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 0
-
-
- GYR_GAIN_
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 1
-
-
- GYR_ENABLE_
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 2
-
-
- label26
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 3
-
-
- PIT_MAX_
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 4
-
-
- label25
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 5
-
-
- ROL_MAX_
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 6
-
-
- label24
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 7
-
-
- COL_MID_
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 8
-
-
- label23
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 9
-
-
- label22
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 10
-
-
- label21
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 11
-
-
- HS4_REV
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 12
-
-
- label20
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 13
-
-
- label19
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 14
-
-
- label18
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 15
-
-
- SV3_POS_
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 16
-
-
- SV2_POS_
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 17
-
-
- SV1_POS_
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 18
-
-
- HS3_REV
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 19
-
-
- HS2_REV
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 20
-
-
- HS1_REV
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 21
-
-
- label17
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabHeli
-
-
- 22
-
-
- BUT_saveheliconfig
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 23
-
-
- BUT_0collective
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 24
-
-
- HS4
-
-
- ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 25
-
-
- HS3
-
-
- ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 26
-
-
- HS4_TRIM
-
-
- ArdupilotMega.MyTrackBar, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 27
-
-
- HS3_TRIM
-
-
- ArdupilotMega.MyTrackBar, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 28
-
-
- HS2_TRIM
-
-
- ArdupilotMega.MyTrackBar, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 29
-
-
- HS1_TRIM
-
-
- ArdupilotMega.MyTrackBar, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 30
-
-
- Gservoloc
-
-
- AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabHeli
-
-
- 31
-
-
- 4, 22
-
-
- 666, 393
-
-
- 5
-
-
- AC2 Heli - BETA
-
-
- tabHeli
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 5
-
-
- Fill
-
-
- 0, 0
-
-
- 674, 419
-
-
- 93
-
-
- tabControl1
-
-
- System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 0
-
True
@@ -2046,6 +291,1110 @@
3
+
+ NoControl
+
+
+ 482, 340
+
+
+ 134, 23
+
+
+ 102
+
+
+ Calibrate Radio
+
+
+ BUT_Calibrateradio
+
+
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 4
+
+
+ 17, 17
+
+
+ 446, 240
+
+
+ 170, 25
+
+
+ 101
+
+
+ BAR8
+
+
+ ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 5
+
+
+ 446, 185
+
+
+ 170, 25
+
+
+ 100
+
+
+ BAR7
+
+
+ ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 6
+
+
+ 446, 130
+
+
+ 170, 25
+
+
+ 99
+
+
+ BAR6
+
+
+ ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 7
+
+
+ 446, 75
+
+
+ 170, 25
+
+
+ 98
+
+
+ BAR5
+
+
+ ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 8
+
+
+ 143, 61
+
+
+ 47, 211
+
+
+ 96
+
+
+ BARpitch
+
+
+ ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 9
+
+
+ 359, 61
+
+
+ 47, 211
+
+
+ 95
+
+
+ BARthrottle
+
+
+ ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 10
+
+
+ 21, 304
+
+
+ 288, 23
+
+
+ 94
+
+
+ BARyaw
+
+
+ ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 11
+
+
+ 21, 6
+
+
+ 288, 23
+
+
+ 93
+
+
+ BARroll
+
+
+ ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabRadioIn
+
+
+ 12
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 666, 393
+
+
+ 0
+
+
+ Radio Input
+
+
+ tabRadioIn
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 1
+
+
+ True
+
+
+ 90, 310
+
+
+ 487, 13
+
+
+ 120
+
+
+ NOTE: Please use the CLI to set modes For AC 2.0.42 or bellow as the mode numbers have changed.
+
+
+ label29
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 0
+
+
+ True
+
+
+ NoControl
+
+
+ 372, 235
+
+
+ 87, 17
+
+
+ 119
+
+
+ Simple Mode
+
+
+ CB_simple6
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 1
+
+
+ True
+
+
+ NoControl
+
+
+ 373, 208
+
+
+ 87, 17
+
+
+ 118
+
+
+ Simple Mode
+
+
+ CB_simple5
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 2
+
+
+ True
+
+
+ NoControl
+
+
+ 372, 181
+
+
+ 87, 17
+
+
+ 117
+
+
+ Simple Mode
+
+
+ CB_simple4
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 3
+
+
+ True
+
+
+ NoControl
+
+
+ 373, 154
+
+
+ 87, 17
+
+
+ 116
+
+
+ Simple Mode
+
+
+ CB_simple3
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 4
+
+
+ True
+
+
+ NoControl
+
+
+ 372, 127
+
+
+ 87, 17
+
+
+ 115
+
+
+ Simple Mode
+
+
+ CB_simple2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 5
+
+
+ True
+
+
+ 373, 101
+
+
+ 87, 17
+
+
+ 114
+
+
+ Simple Mode
+
+
+ CB_simple1
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 6
+
+
+ True
+
+
+ NoControl
+
+
+ 242, 67
+
+
+ 74, 13
+
+
+ 113
+
+
+ Current PWM:
+
+
+ label14
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 7
+
+
+ True
+
+
+ NoControl
+
+
+ 322, 67
+
+
+ 13, 13
+
+
+ 112
+
+
+ 0
+
+
+ LBL_flightmodepwm
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 8
+
+
+ True
+
+
+ NoControl
+
+
+ 242, 50
+
+
+ 74, 13
+
+
+ 111
+
+
+ Current Mode:
+
+
+ label13
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 9
+
+
+ True
+
+
+ NoControl
+
+
+ 322, 50
+
+
+ 42, 13
+
+
+ 110
+
+
+ Manual
+
+
+ lbl_currentmode
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 10
+
+
+ True
+
+
+ NoControl
+
+
+ 483, 101
+
+
+ 76, 13
+
+
+ 109
+
+
+ PWM 0 - 1230
+
+
+ False
+
+
+ label12
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 11
+
+
+ True
+
+
+ NoControl
+
+
+ 483, 236
+
+
+ 70, 13
+
+
+ 108
+
+
+ PWM 1750 +
+
+
+ False
+
+
+ label11
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 12
+
+
+ True
+
+
+ NoControl
+
+
+ 483, 209
+
+
+ 94, 13
+
+
+ 107
+
+
+ PWM 1621 - 1749
+
+
+ False
+
+
+ label10
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 13
+
+
+ True
+
+
+ NoControl
+
+
+ 483, 182
+
+
+ 94, 13
+
+
+ 106
+
+
+ PWM 1491 - 1620
+
+
+ False
+
+
+ label9
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 14
+
+
+ True
+
+
+ NoControl
+
+
+ 483, 155
+
+
+ 94, 13
+
+
+ 105
+
+
+ PWM 1361 - 1490
+
+
+ False
+
+
+ label8
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 15
+
+
+ True
+
+
+ NoControl
+
+
+ 483, 128
+
+
+ 94, 13
+
+
+ 104
+
+
+ PWM 1231 - 1360
+
+
+ False
+
+
+ label7
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 16
+
+
+ True
+
+
+ NoControl
+
+
+ 168, 236
+
+
+ 71, 13
+
+
+ 11
+
+
+ Flight Mode 6
+
+
+ label6
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 17
+
+
+ 245, 233
+
+
+ 121, 21
+
+
+ 10
+
+
+ CMB_fmode6
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 18
+
+
+ True
+
+
+ NoControl
+
+
+ 168, 209
+
+
+ 71, 13
+
+
+ 9
+
+
+ Flight Mode 5
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 19
+
+
+ 245, 206
+
+
+ 121, 21
+
+
+ 8
+
+
+ CMB_fmode5
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 20
+
+
+ True
+
+
+ NoControl
+
+
+ 168, 182
+
+
+ 71, 13
+
+
+ 7
+
+
+ Flight Mode 4
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 21
+
+
+ 245, 179
+
+
+ 121, 21
+
+
+ 6
+
+
+ CMB_fmode4
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 22
+
+
+ True
+
+
+ NoControl
+
+
+ 168, 155
+
+
+ 71, 13
+
+
+ 5
+
+
+ Flight Mode 3
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 23
+
+
+ 245, 152
+
+
+ 121, 21
+
+
+ 4
+
+
+ CMB_fmode3
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 24
+
+
+ True
+
+
+ NoControl
+
+
+ 168, 128
+
+
+ 71, 13
+
+
+ 3
+
+
+ Flight Mode 2
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 25
+
+
+ 245, 125
+
+
+ 121, 21
+
+
+ 2
+
+
+ CMB_fmode2
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 26
+
+
+ True
+
+
+ NoControl
+
+
+ 168, 101
+
+
+ 71, 13
+
+
+ 1
+
+
+ Flight Mode 1
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 27
+
+
+ 245, 98
+
+
+ 121, 21
+
+
+ 0
+
+
+ CMB_fmode1
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabModes
+
+
+ 28
+
+
+ NoControl
+
+
+ 245, 260
+
+
+ 121, 23
+
+
+ 103
+
+
+ Save Modes
+
+
+ BUT_SaveModes
+
+
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabModes
+
+
+ 29
+
+
+ 4, 22
+
+
+ 666, 393
+
+
+ 3
+
+
+ Modes
+
+
+ tabModes
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 2
+
True
@@ -2214,9 +1563,6 @@
5
-
- 214, 17
-
383, 57
@@ -2226,6 +1572,9 @@
20
+
+ 214, 17
+
Magnetic Declination (-20.0 to 20.0) eg 2° 3' W is -2.3
@@ -2463,6 +1812,33 @@
14
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 666, 393
+
+
+ 1
+
+
+ Hardware
+
+
+ tabHardware
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 3
+
True
@@ -2608,6 +1984,57 @@ will work with hexa's etc
4
+
+ NoControl
+
+
+ 274, 67
+
+
+ 75, 23
+
+
+ 8
+
+
+ Level
+
+
+ BUT_levelac2
+
+
+ ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
+
+
+ tabArducopter
+
+
+ 5
+
+
+ 4, 22
+
+
+ 666, 393
+
+
+ 2
+
+
+ ArduCopter2
+
+
+ tabArducopter
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 4
+
True
@@ -3262,264 +2689,6 @@ will work with hexa's etc
22
-
- 214, 17
-
-
- NoControl
-
-
- 214, 161
-
-
- 195, 23
-
-
- 0
-
-
- Reset APM Hardware to Default
-
-
- BUT_reset
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabReset
-
-
- 0
-
-
- NoControl
-
-
- 482, 340
-
-
- 134, 23
-
-
- 102
-
-
- Calibrate Radio
-
-
- BUT_Calibrateradio
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 4
-
-
- 17, 17
-
-
- 446, 240
-
-
- 170, 25
-
-
- 101
-
-
- BAR8
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 5
-
-
- 17, 17
-
-
- 446, 185
-
-
- 170, 25
-
-
- 100
-
-
- BAR7
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 6
-
-
- 446, 130
-
-
- 170, 25
-
-
- 99
-
-
- BAR6
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 7
-
-
- 446, 75
-
-
- 170, 25
-
-
- 98
-
-
- BAR5
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 8
-
-
- 143, 61
-
-
- 47, 211
-
-
- 96
-
-
- BARpitch
-
-
- ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 9
-
-
- 359, 61
-
-
- 47, 211
-
-
- 95
-
-
- BARthrottle
-
-
- ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 10
-
-
- 21, 304
-
-
- 288, 23
-
-
- 94
-
-
- BARyaw
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 11
-
-
- 21, 6
-
-
- 288, 23
-
-
- 93
-
-
- BARroll
-
-
- ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabRadioIn
-
-
- 12
-
-
- NoControl
-
-
- 274, 67
-
-
- 75, 23
-
-
- 8
-
-
- Level
-
-
- BUT_levelac2
-
-
- ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c
-
-
- tabArducopter
-
-
- 5
-
NoControl
@@ -3742,6 +2911,54 @@ will work with hexa's etc
31
+
+ 4, 22
+
+
+ 666, 393
+
+
+ 5
+
+
+ AC2 Heli - BETA
+
+
+ tabHeli
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 5
+
+
+ Fill
+
+
+ 0, 0
+
+
+ 674, 419
+
+
+ 93
+
+
+ tabControl1
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 0
+
True
@@ -3751,24 +2968,21 @@ will work with hexa's etc
674, 419
-
- NoControl
-
APMSetup
-
- toolTip1
-
-
- System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
currentStateBindingSource
System.Windows.Forms.BindingSource, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ toolTip1
+
+
+ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
Setup
diff --git a/Tools/ArdupilotMegaPlanner/app.config b/Tools/ArdupilotMegaPlanner/app.config
index 4064e56e9d..59a00b4486 100644
--- a/Tools/ArdupilotMegaPlanner/app.config
+++ b/Tools/ArdupilotMegaPlanner/app.config
@@ -2,5 +2,8 @@
-
+
+
+
+
diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config
index 4064e56e9d..59a00b4486 100644
--- a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config
+++ b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config
@@ -2,5 +2,8 @@
-
+
+
+
+