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

APM Planner 1.0.71 

hud now does opengl and gdi+
add note about modes and ac 2.0.43
This commit is contained in:
Michael Oborne 2011-09-18 18:07:18 +08:00
parent b2d8fc9dc5
commit d742bf77e3
9 changed files with 1815 additions and 2535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -97,7 +97,7 @@
<PropertyGroup /> <PropertyGroup />
<PropertyGroup /> <PropertyGroup />
<PropertyGroup> <PropertyGroup>
<RunPostBuildEvent>Always</RunPostBuildEvent> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>apm2.ico</ApplicationIcon> <ApplicationIcon>apm2.ico</ApplicationIcon>
@ -145,7 +145,7 @@
<Reference Include="Microsoft.DirectX.DirectInput, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"> <Reference Include="Microsoft.DirectX.DirectInput, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Windows\Microsoft.NET\DirectX for Managed Code\1.0.2902.0\Microsoft.DirectX.DirectInput.dll</HintPath> <HintPath>..\..\..\..\..\..\..\Windows\Microsoft.NET\DirectX for Managed Code\1.0.2902.0\Microsoft.DirectX.DirectInput.dll</HintPath>
<Private>False</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL"> <Reference Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
@ -160,6 +160,7 @@
<HintPath>..\..\..\..\..\Desktop\DIYDrones&amp;avr\myquad\sharpkml\SharpKml\bin\Release\SharpKml.dll</HintPath> <HintPath>..\..\..\..\..\Desktop\DIYDrones&amp;avr\myquad\sharpkml\SharpKml\bin\Release\SharpKml.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.SQLite"> <Reference Include="System.Data.SQLite">
<HintPath>..\..\..\..\..\Desktop\DIYDrones&amp;avr\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\x86\System.Data.SQLite.DLL</HintPath> <HintPath>..\..\..\..\..\Desktop\DIYDrones&amp;avr\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\x86\System.Data.SQLite.DLL</HintPath>
@ -571,8 +572,7 @@
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent> <PostBuildEvent>rem macos.bat</PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PreBuildEvent> <PreBuildEvent>

18
Tools/ArdupilotMegaPlanner/CurrentState.cs
View File

@ -124,7 +124,7 @@ namespace ArdupilotMega
//message //message
public List<string> messages { get; set; } public List<string> 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 //battery
public float battery_voltage { get { return _battery_voltage; } set { _battery_voltage = value / 1000; } } public float battery_voltage { get { return _battery_voltage; } set { _battery_voltage = value / 1000; } }
@ -278,28 +278,28 @@ namespace ArdupilotMega
break; break;
} }
break; break;
case (byte)100: case (byte)(100 + Common.ac2modes.STABILIZE):
mode = "Stabilize"; mode = "Stabilize";
break; break;
case (byte)101: case (byte)(100 + Common.ac2modes.ACRO):
mode = "Acro"; mode = "Acro";
break; break;
case (byte)102: case (byte)(100 + Common.ac2modes.ALT_HOLD):
mode = "Alt Hold"; mode = "Alt Hold";
break; break;
case (byte)103: case (byte)(100 + Common.ac2modes.AUTO):
mode = "Auto"; mode = "Auto";
break; break;
case (byte)104: case (byte)(100 + Common.ac2modes.GUIDED):
mode = "Guided"; mode = "Guided";
break; break;
case (byte)105: case (byte)(100 + Common.ac2modes.LOITER):
mode = "Loiter"; mode = "Loiter";
break; break;
case (byte)106: case (byte)(100 + Common.ac2modes.RTL):
mode = "RTL"; mode = "RTL";
break; break;
case (byte)107: case (byte)(100 + Common.ac2modes.CIRCLE):
mode = "Circle"; mode = "Circle";
break; break;
case (byte)ArdupilotMega.MAVLink.MAV_MODE.MAV_MODE_MANUAL: case (byte)ArdupilotMega.MAVLink.MAV_MODE.MAV_MODE_MANUAL:

558
Tools/ArdupilotMegaPlanner/HUD.cs
View File

@ -10,8 +10,6 @@ using System.Drawing.Imaging;
using System.Threading; using System.Threading;
using System.Drawing.Drawing2D; using System.Drawing.Drawing2D;
using OpenTK; using OpenTK;
@ -20,10 +18,11 @@ using OpenTK.Graphics;
// Control written by Michael Oborne 2011 // Control written by Michael Oborne 2011
// dual opengl and GDI+
namespace hud namespace hud
{ {
public class HUD : GLControl// : Graphics public class HUD : GLControl
{ {
object paintlock = new object(); object paintlock = new object();
object streamlock = new object(); object streamlock = new object();
@ -40,7 +39,7 @@ namespace hud
public int huddrawtime = 0; public int huddrawtime = 0;
public bool opengl = true; public bool opengl { get { return base.UseOpenGL; } set { base.UseOpenGL = value; } }
public HUD() public HUD()
{ {
@ -48,9 +47,8 @@ namespace hud
return; return;
InitializeComponent(); InitializeComponent();
//graphicsObject = this;
//graphicsObject = Graphics.FromImage(objBitmap); graphicsObject = this;
} }
private void InitializeComponent() private void InitializeComponent()
@ -152,6 +150,8 @@ System.ComponentModel.Category("Values")]
Bitmap objBitmap = new Bitmap(1024, 1024); Bitmap objBitmap = new Bitmap(1024, 1024);
int count = 0; int count = 0;
DateTime countdate = DateTime.Now; DateTime countdate = DateTime.Now;
HUD graphicsObject;
Graphics graphicsObjectGDIP;
DateTime starttime = DateTime.MinValue; DateTime starttime = DateTime.MinValue;
@ -168,58 +168,59 @@ System.ComponentModel.Category("Values")]
if (this.DesignMode) if (this.DesignMode)
return; return;
try if (opengl)
{ {
try
{
GraphicsMode test = this.GraphicsMode; GraphicsMode test = this.GraphicsMode;
Console.WriteLine(test.ToString()); Console.WriteLine(test.ToString());
Console.WriteLine("Vendor: " + GL.GetString(StringName.Vendor)); Console.WriteLine("Vendor: " + GL.GetString(StringName.Vendor));
Console.WriteLine("Version: " + GL.GetString(StringName.Version)); Console.WriteLine("Version: " + GL.GetString(StringName.Version));
Console.WriteLine("Device: " + GL.GetString(StringName.Renderer)); Console.WriteLine("Device: " + GL.GetString(StringName.Renderer));
//Console.WriteLine("Extensions: " + GL.GetString(StringName.Extensions)); //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.MatrixMode(MatrixMode.Projection);
GL.LoadIdentity(); GL.LoadIdentity();
GL.Ortho(0, Width, Height, 0, -1, 1); GL.Ortho(0, Width, Height, 0, -1, 1);
GL.MatrixMode(MatrixMode.Modelview); GL.MatrixMode(MatrixMode.Modelview);
GL.LoadIdentity(); GL.LoadIdentity();
GL.PushAttrib(AttribMask.DepthBufferBit); GL.PushAttrib(AttribMask.DepthBufferBit);
GL.Disable(EnableCap.DepthTest); GL.Disable(EnableCap.DepthTest);
//GL.Enable(EnableCap.Texture2D); //GL.Enable(EnableCap.Texture2D);
GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha); GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
GL.Enable(EnableCap.Blend); 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) protected override void OnPaint(PaintEventArgs e)
@ -233,37 +234,28 @@ System.ComponentModel.Category("Values")]
return; return;
} }
if ((DateTime.Now - starttime).TotalMilliseconds < 75 && (_bgimage == null)) if ((DateTime.Now - starttime).TotalMilliseconds < 30 && (_bgimage == null))
{ {
//Console.WriteLine("ms "+(DateTime.Now - starttime).TotalMilliseconds); //Console.WriteLine("ms "+(DateTime.Now - starttime).TotalMilliseconds);
//e.Graphics.DrawImageUnscaled(objBitmap, 0, 0); //e.Graphics.DrawImageUnscaled(objBitmap, 0, 0);
//return; return;
} }
starttime = DateTime.Now; 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); doPaint(e);
//Console.Write(" d " + (DateTime.Now - starttime).TotalMilliseconds); if (opengl) {
this.SwapBuffers();
this.SwapBuffers(); }
//Console.Write(" e " + (DateTime.Now - starttime).TotalMilliseconds);
count++; count++;
@ -280,69 +272,69 @@ System.ComponentModel.Category("Values")]
void Clear(Color color) 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 rad2deg = (float)(180 / Math.PI);
const float deg2rad = (float)(1.0 / rad2deg); 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) public void DrawArc(Pen penn,RectangleF rect, float start,float degrees)
{ {
//GL.Disable(EnableCap.Texture2D); if (opengl)
//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++)
{ {
x = (float)Math.Sin(i * deg2rad) * rect.Width / 2; GL.LineWidth(penn.Width);
y = (float)Math.Cos(i * deg2rad) * rect.Height / 2; GL.Color4(penn.Color);
x = x + rect.X + rect.Width / 2;
y = y + rect.Y + rect.Height / 2; GL.Begin(BeginMode.LineStrip);
GL.Vertex2(x, y); 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);
} }
GL.End();
//GL.Disable(EnableCap.Blend);
//GL.Enable(EnableCap.Texture2D);
} }
public void DrawEllipse(Pen penn, Rectangle rect) public void DrawEllipse(Pen penn, Rectangle rect)
{ {
//GL.Disable(EnableCap.Texture2D); if (opengl)
//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)
{ {
x = (float)Math.Sin(i * deg2rad) * rect.Width / 2; GL.LineWidth(penn.Width);
y = (float)Math.Cos(i * deg2rad) * rect.Height / 2; GL.Color4(penn.Color);
x = x + rect.X + rect.Width / 2;
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; 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; int texture;
Bitmap bitmap = new Bitmap(512,512); Bitmap bitmap = new Bitmap(512,512);
@ -393,8 +385,6 @@ System.ComponentModel.Category("Values")]
GL.End(); GL.End();
//GL.Disable(EnableCap.Blend);
GL.Disable(EnableCap.Texture2D); GL.Disable(EnableCap.Texture2D);
} }
@ -428,89 +418,102 @@ System.ComponentModel.Category("Values")]
public void ResetTransform() public void ResetTransform()
{ {
GL.LoadIdentity(); if (opengl)
{
GL.LoadIdentity();
}
else
{
graphicsObjectGDIP.ResetTransform();
}
} }
public void RotateTransform(float angle) 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) 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) public void FillPolygon(Brush brushh, Point[] list)
{ {
if (opengl)
//GL.Disable(EnableCap.Texture2D);
//GL.Enable(EnableCap.Blend);
GL.Begin(BeginMode.TriangleFan);
GL.Color4(((SolidBrush)brushh).Color);
foreach (Point pnt in list)
{ {
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) public void FillPolygon(Brush brushh, PointF[] list)
{ {
//GL.Disable(EnableCap.Texture2D); if (opengl)
//GL.Enable(EnableCap.Blend);
GL.Begin(BeginMode.Quads);
GL.Color4(((SolidBrush)brushh).Color);
foreach (PointF pnt in list)
{ {
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) public void DrawPolygon(Pen penn, Point[] list)
{ {
//GL.Disable(EnableCap.Texture2D); if (opengl)
//GL.Enable(EnableCap.Blend);
GL.LineWidth(penn.Width);
GL.Color4(penn.Color);
GL.Begin(BeginMode.LineLoop);
foreach (Point pnt in list)
{ {
GL.Vertex2(pnt.X,pnt.Y); GL.LineWidth(penn.Width);
GL.Color4(penn.Color);
GL.Begin(BeginMode.LineLoop);
foreach (Point pnt in list)
{
GL.Vertex2(pnt.X, pnt.Y);
}
GL.End();
}
else
{
graphicsObjectGDIP.DrawPolygon(penn, list);
} }
GL.End();
//GL.Disable(EnableCap.Blend);
//GL.Enable(EnableCap.Texture2D);
} }
public void DrawPolygon(Pen penn, PointF[] list) public void DrawPolygon(Pen penn, PointF[] list)
{ {
//GL.Disable(EnableCap.Texture2D); if (opengl)
{
//GL.Enable(EnableCap.Blend);
GL.LineWidth(penn.Width); GL.LineWidth(penn.Width);
GL.Color4(penn.Color); GL.Color4(penn.Color);
@ -519,64 +522,61 @@ System.ComponentModel.Category("Values")]
{ {
GL.Vertex2(pnt.X, pnt.Y); GL.Vertex2(pnt.X, pnt.Y);
} }
//GL.Vertex2(list[0].X, list[0].Y);
GL.End(); GL.End();
}
//GL.Disable(EnableCap.Blend); else
{
//GL.Enable(EnableCap.Texture2D); graphicsObjectGDIP.DrawPolygon(penn, list);
}
} }
//graphicsObject.FillRectangle(linearBrush, bg);
public void FillRectangle(Brush brushh, RectangleF rectf) public void FillRectangle(Brush brushh, RectangleF rectf)
{ {
float x1 = rectf.X; if (opengl)
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))
{ {
LinearGradientBrush temp = (LinearGradientBrush)brushh; float x1 = rectf.X;
GL.Color4(temp.LinearColors[0]); 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 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) public void DrawRectangle(Pen penn, RectangleF rect)
{ {
DrawRectangle(penn, rect.X, rect.Y, rect.Width, rect.Height); 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) public void DrawRectangle(Pen penn, double x1, double y1, double width, double height)
{ {
//GL.Disable(EnableCap.Texture2D);
//GL.Enable(EnableCap.Blend); if (opengl)
{
GL.LineWidth(penn.Width);
GL.Color4(penn.Color);
GL.LineWidth(penn.Width); GL.Begin(BeginMode.LineLoop);
GL.Color4(penn.Color); GL.Vertex2(x1, y1);
GL.Vertex2(x1 + width, y1);
GL.Begin(BeginMode.LineLoop); GL.Vertex2(x1 + width, y1 + height);
GL.Vertex2(x1, y1); GL.Vertex2(x1, y1 + height);
GL.Vertex2(x1+width, y1); GL.End();
GL.Vertex2(x1+width, y1+height); }
GL.Vertex2(x1, y1+height); else
GL.End(); {
graphicsObjectGDIP.DrawRectangle(penn, (float)x1, (float)y1, (float)width, (float)height);
//GL.Disable(EnableCap.Blend); }
//GL.Enable(EnableCap.Texture2D);
} }
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); if (opengl)
{
GL.Color4(penn.Color);
GL.LineWidth(penn.Width);
GL.Color4(penn.Color); GL.Begin(BeginMode.Lines);
GL.LineWidth(penn.Width); GL.Vertex2(x1, y1);
GL.Vertex2(x2, y2);
GL.Begin(BeginMode.Lines); GL.End();
GL.Vertex2(x1, y1); }
GL.Vertex2(x2, y2); else
GL.End(); {
graphicsObjectGDIP.DrawLine(penn, (float)x1, (float)y1, (float)x2, (float)y2);
//GL.Disable(EnableCap.Blend); }
//GL.Enable(EnableCap.Texture2D);
} }
void doPaint(object e) void doPaint(PaintEventArgs e)
{ {
HUD graphicsObject = this; graphicsObjectGDIP = Graphics.FromImage(objBitmap);
//Graphics graphicsObject = ((PaintEventArgs)e).Graphics; graphicsObjectGDIP.SmoothingMode = SmoothingMode.AntiAlias;
//graphicsObject.SmoothingMode = SmoothingMode.AntiAlias;
try try
{ {
@ -1187,7 +1185,10 @@ System.ComponentModel.Category("Values")]
drawstring(graphicsObject, gps, font, fontsize + 2, whiteBrush, this.Width - 10 * fontsize, this.Height - 30 - fontoffset); 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) if (DesignMode)
{ {
@ -1204,7 +1205,10 @@ System.ComponentModel.Category("Values")]
{ {
if (streamjpgenable || streamjpg == null) // init image and only update when needed if (streamjpgenable || streamjpg == null) // init image and only update when needed
{ {
objBitmap = GrabScreenshot(); if (opengl)
{
objBitmap = GrabScreenshot();
}
streamjpg = new MemoryStream(); streamjpg = new MemoryStream();
objBitmap.Save(streamjpg, ici, eps); objBitmap.Save(streamjpg, ici, eps);
//objBitmap.Save(streamjpg,ImageFormat.Bmp); //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) 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 == "") if (text == null || text == "")
return; return;
/* /*
@ -1404,6 +1414,30 @@ System.ComponentModel.Category("Values")]
//pth.Dispose(); //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) protected override void OnResize(EventArgs e)
{ {
if (DesignMode) if (DesignMode)
@ -1415,13 +1449,14 @@ System.ComponentModel.Category("Values")]
try try
{ {
if (opengl)
foreach (int texid in charbitmaptexid)
{ {
if (texid != 0) foreach (int texid in charbitmaptexid)
GL.DeleteTexture(texid); {
if (texid != 0)
GL.DeleteTexture(texid);
}
} }
} }
catch { } catch { }
@ -1429,13 +1464,16 @@ System.ComponentModel.Category("Values")]
try try
{ {
GL.MatrixMode(MatrixMode.Projection); if (opengl)
GL.LoadIdentity(); {
GL.Ortho(0, Width, Height, 0, -1, 1); GL.MatrixMode(MatrixMode.Projection);
GL.MatrixMode(MatrixMode.Modelview); GL.LoadIdentity();
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 { } catch { }

20
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -161,6 +161,8 @@ namespace ArdupilotMega
} }
catch (Exception e) { MessageBox.Show("A Major error has occured : " + e.ToString()); this.Close(); } 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(); GCSViews.FlightData.myhud.Refresh();
GCSViews.FlightData.myhud.Refresh(); GCSViews.FlightData.myhud.Refresh();
@ -168,8 +170,11 @@ namespace ArdupilotMega
if (GCSViews.FlightData.myhud.huddrawtime > 1000) if (GCSViews.FlightData.myhud.huddrawtime > 1000)
{ {
MessageBox.Show("The HUD draw time is above 1 seconds. Please update your graphics card driver."); 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(); changeunits();
try try
@ -726,6 +731,8 @@ namespace ArdupilotMega
{ {
try 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); XmlTextWriter xmlwriter = new XmlTextWriter(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"config.xml", Encoding.ASCII);
xmlwriter.Formatting = Formatting.Indented; xmlwriter.Formatting = Formatting.Indented;
@ -733,14 +740,16 @@ namespace ArdupilotMega
xmlwriter.WriteStartElement("Config"); xmlwriter.WriteStartElement("Config");
//xmlwriter.WriteElementString("APMlocation", defineslocation);
xmlwriter.WriteElementString("comport", comportname); xmlwriter.WriteElementString("comport", comportname);
xmlwriter.WriteElementString("baudrate", CMB_baudrate.Text); xmlwriter.WriteElementString("baudrate", CMB_baudrate.Text);
xmlwriter.WriteElementString("APMFirmware", APMFirmware.ToString()); 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) foreach (string key in config.Keys)
{ {
try try
@ -748,6 +757,8 @@ namespace ArdupilotMega
if (key == "") if (key == "")
continue; continue;
xmlwriter.WriteElementString(key, config[key].ToString()); xmlwriter.WriteElementString(key, config[key].ToString());
appconfig.AppSettings.Settings.Add(key, config[key].ToString());
} }
catch { } catch { }
} }
@ -756,6 +767,8 @@ namespace ArdupilotMega
xmlwriter.WriteEndDocument(); xmlwriter.WriteEndDocument();
xmlwriter.Close(); xmlwriter.Close();
appconfig.Save();
} }
catch (Exception ex) { MessageBox.Show(ex.ToString()); } catch (Exception ex) { MessageBox.Show(ex.ToString()); }
} }
@ -945,11 +958,12 @@ namespace ArdupilotMega
if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds >= 1) if ((DateTime.Now - comPort.lastvalidpacket).TotalSeconds >= 1)
{ {
GCSViews.FlightData.myhud.Invalidate();
if (linkqualitytime.Second != DateTime.Now.Second) if (linkqualitytime.Second != DateTime.Now.Second)
{ {
MainV2.cs.linkqualitygcs = (ushort)(MainV2.cs.linkqualitygcs * 0.8f); MainV2.cs.linkqualitygcs = (ushort)(MainV2.cs.linkqualitygcs * 0.8f);
linkqualitytime = DateTime.Now; linkqualitytime = DateTime.Now;
GCSViews.FlightData.myhud.Invalidate();
} }
} }

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

@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.70")] [assembly: AssemblyFileVersion("1.0.71")]
[assembly: NeutralResourcesLanguageAttribute("")] [assembly: NeutralResourcesLanguageAttribute("")]

430
Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs generated
View File

@ -32,12 +32,30 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setup)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setup));
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabReset = new System.Windows.Forms.TabPage(); this.tabReset = new System.Windows.Forms.TabPage();
this.BUT_reset = new ArdupilotMega.MyButton();
this.tabRadioIn = new System.Windows.Forms.TabPage(); this.tabRadioIn = new System.Windows.Forms.TabPage();
this.CHK_revch3 = new System.Windows.Forms.CheckBox(); this.CHK_revch3 = new System.Windows.Forms.CheckBox();
this.CHK_revch4 = new System.Windows.Forms.CheckBox(); this.CHK_revch4 = new System.Windows.Forms.CheckBox();
this.CHK_revch2 = new System.Windows.Forms.CheckBox(); this.CHK_revch2 = new System.Windows.Forms.CheckBox();
this.CHK_revch1 = 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.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.label14 = new System.Windows.Forms.Label();
this.LBL_flightmodepwm = new System.Windows.Forms.Label(); this.LBL_flightmodepwm = new System.Windows.Forms.Label();
this.label13 = 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.CMB_fmode2 = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.CMB_fmode1 = new System.Windows.Forms.ComboBox(); this.CMB_fmode1 = new System.Windows.Forms.ComboBox();
this.BUT_SaveModes = new ArdupilotMega.MyButton();
this.tabHardware = new System.Windows.Forms.TabPage(); this.tabHardware = new System.Windows.Forms.TabPage();
this.linkLabelmagdec = new System.Windows.Forms.LinkLabel(); this.linkLabelmagdec = new System.Windows.Forms.LinkLabel();
this.label106 = new System.Windows.Forms.Label(); this.label106 = new System.Windows.Forms.Label();
@ -82,6 +101,7 @@
this.label15 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label();
this.pictureBoxQuadX = new System.Windows.Forms.PictureBox(); this.pictureBoxQuadX = new System.Windows.Forms.PictureBox();
this.pictureBoxQuad = 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.tabHeli = new System.Windows.Forms.TabPage();
this.label27 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label();
this.GYR_GAIN_ = new System.Windows.Forms.TextBox(); this.GYR_GAIN_ = new System.Windows.Forms.TextBox();
@ -106,20 +126,6 @@
this.HS2_REV = new System.Windows.Forms.CheckBox(); this.HS2_REV = new System.Windows.Forms.CheckBox();
this.HS1_REV = new System.Windows.Forms.CheckBox(); this.HS1_REV = new System.Windows.Forms.CheckBox();
this.label17 = new System.Windows.Forms.Label(); 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_saveheliconfig = new ArdupilotMega.MyButton();
this.BUT_0collective = new ArdupilotMega.MyButton(); this.BUT_0collective = new ArdupilotMega.MyButton();
this.HS4 = new ArdupilotMega.VerticalProgressBar2(); this.HS4 = new ArdupilotMega.VerticalProgressBar2();
@ -129,15 +135,11 @@
this.HS2_TRIM = new ArdupilotMega.MyTrackBar(); this.HS2_TRIM = new ArdupilotMega.MyTrackBar();
this.HS1_TRIM = new ArdupilotMega.MyTrackBar(); this.HS1_TRIM = new ArdupilotMega.MyTrackBar();
this.Gservoloc = new AGaugeApp.AGauge(); this.Gservoloc = new AGaugeApp.AGauge();
this.CB_simple1 = new System.Windows.Forms.CheckBox(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
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.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabReset.SuspendLayout(); this.tabReset.SuspendLayout();
this.tabRadioIn.SuspendLayout(); this.tabRadioIn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit();
this.tabModes.SuspendLayout(); this.tabModes.SuspendLayout();
this.tabHardware.SuspendLayout(); this.tabHardware.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@ -148,7 +150,6 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit();
this.tabHeli.SuspendLayout(); this.tabHeli.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS4_TRIM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HS4_TRIM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).BeginInit();
@ -175,6 +176,14 @@
this.tabReset.Name = "tabReset"; this.tabReset.Name = "tabReset";
this.tabReset.UseVisualStyleBackColor = true; 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 // tabRadioIn
// //
this.tabRadioIn.Controls.Add(this.CHK_revch3); this.tabRadioIn.Controls.Add(this.CHK_revch3);
@ -222,8 +231,140 @@
this.CHK_revch1.UseVisualStyleBackColor = true; this.CHK_revch1.UseVisualStyleBackColor = true;
this.CHK_revch1.CheckedChanged += new System.EventHandler(this.CHK_revch1_CheckedChanged); 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 // tabModes
// //
this.tabModes.Controls.Add(this.label29);
this.tabModes.Controls.Add(this.CB_simple6); this.tabModes.Controls.Add(this.CB_simple6);
this.tabModes.Controls.Add(this.CB_simple5); this.tabModes.Controls.Add(this.CB_simple5);
this.tabModes.Controls.Add(this.CB_simple4); this.tabModes.Controls.Add(this.CB_simple4);
@ -257,6 +398,47 @@
this.tabModes.Name = "tabModes"; this.tabModes.Name = "tabModes";
this.tabModes.UseVisualStyleBackColor = true; 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 // label14
// //
resources.ApplyResources(this.label14, "label14"); resources.ApplyResources(this.label14, "label14");
@ -392,6 +574,13 @@
resources.ApplyResources(this.CMB_fmode1, "CMB_fmode1"); resources.ApplyResources(this.CMB_fmode1, "CMB_fmode1");
this.CMB_fmode1.Name = "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 // tabHardware
// //
this.tabHardware.BackColor = System.Drawing.Color.DarkRed; this.tabHardware.BackColor = System.Drawing.Color.DarkRed;
@ -569,6 +758,13 @@
this.pictureBoxQuad.TabStop = false; this.pictureBoxQuad.TabStop = false;
this.pictureBoxQuad.Click += new System.EventHandler(this.pictureBoxQuad_Click); 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 // tabHeli
// //
this.tabHeli.Controls.Add(this.label27); this.tabHeli.Controls.Add(this.label27);
@ -738,159 +934,6 @@
resources.ApplyResources(this.label17, "label17"); resources.ApplyResources(this.label17, "label17");
this.label17.Name = "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 // BUT_saveheliconfig
// //
resources.ApplyResources(this.BUT_saveheliconfig, "BUT_saveheliconfig"); resources.ApplyResources(this.BUT_saveheliconfig, "BUT_saveheliconfig");
@ -1126,42 +1169,6 @@
this.Gservoloc.Value2 = 180F; this.Gservoloc.Value2 = 180F;
this.Gservoloc.Value3 = 0F; 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 // Setup
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
@ -1174,6 +1181,7 @@
this.tabReset.ResumeLayout(false); this.tabReset.ResumeLayout(false);
this.tabRadioIn.ResumeLayout(false); this.tabRadioIn.ResumeLayout(false);
this.tabRadioIn.PerformLayout(); this.tabRadioIn.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).EndInit();
this.tabModes.ResumeLayout(false); this.tabModes.ResumeLayout(false);
this.tabModes.PerformLayout(); this.tabModes.PerformLayout();
this.tabHardware.ResumeLayout(false); this.tabHardware.ResumeLayout(false);
@ -1188,7 +1196,6 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).EndInit();
this.tabHeli.ResumeLayout(false); this.tabHeli.ResumeLayout(false);
this.tabHeli.PerformLayout(); this.tabHeli.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS4_TRIM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HS4_TRIM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HS2_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_simple3;
private System.Windows.Forms.CheckBox CB_simple2; private System.Windows.Forms.CheckBox CB_simple2;
private System.Windows.Forms.CheckBox CB_simple1; private System.Windows.Forms.CheckBox CB_simple1;
private System.Windows.Forms.Label label29;
} }
} }

3300
Tools/ArdupilotMegaPlanner/Setup/Setup.resx
View File

File diff suppressed because it is too large Load Diff

5
Tools/ArdupilotMegaPlanner/app.config
View File

@ -2,5 +2,8 @@
<configuration> <configuration>
<configSections> <configSections>
</configSections> </configSections>
<startup><supportedRuntime version="v2.0.50727"/></startup> <startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
<supportedRuntime version="v4.0"/>
</startup>
</configuration> </configuration>

5
Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.exe.config
View File

@ -2,5 +2,8 @@
<configuration> <configuration>
<configSections> <configSections>
</configSections> </configSections>
<startup><supportedRuntime version="v2.0.50727"/></startup> <startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
<supportedRuntime version="v4.0"/>
</startup>
</configuration> </configuration>