mirror of https://github.com/ArduPilot/ardupilot
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:
parent
19667310b6
commit
8a5108ab96
|
@ -97,7 +97,7 @@
|
|||
<PropertyGroup />
|
||||
<PropertyGroup />
|
||||
<PropertyGroup>
|
||||
<RunPostBuildEvent>Always</RunPostBuildEvent>
|
||||
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>apm2.ico</ApplicationIcon>
|
||||
|
@ -145,7 +145,7 @@
|
|||
<Reference Include="Microsoft.DirectX.DirectInput, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<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 Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
|
@ -160,6 +160,7 @@
|
|||
<HintPath>..\..\..\..\..\Desktop\DIYDrones&avr\myquad\sharpkml\SharpKml\bin\Release\SharpKml.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.configuration" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Data.SQLite">
|
||||
<HintPath>..\..\..\..\..\Desktop\DIYDrones&avr\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\x86\System.Data.SQLite.DLL</HintPath>
|
||||
|
@ -571,8 +572,7 @@
|
|||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>rem macos.bat</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
|
|
|
@ -124,7 +124,7 @@ namespace ArdupilotMega
|
|||
|
||||
//message
|
||||
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
|
||||
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:
|
||||
|
|
|
@ -10,8 +10,6 @@ using System.Drawing.Imaging;
|
|||
|
||||
using System.Threading;
|
||||
|
||||
|
||||
|
||||
using System.Drawing.Drawing2D;
|
||||
|
||||
using OpenTK;
|
||||
|
@ -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,6 +168,8 @@ System.ComponentModel.Category("Values")]
|
|||
if (this.DesignMode)
|
||||
return;
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
|
@ -195,7 +197,7 @@ System.ComponentModel.Category("Values")]
|
|||
GL.Enable(EnableCap.Blend);
|
||||
|
||||
}
|
||||
catch (Exception ex) { Console.WriteLine("HUD opengl onload "+ex.ToString()); }
|
||||
catch (Exception ex) { Console.WriteLine("HUD opengl onload " + ex.ToString()); }
|
||||
|
||||
try
|
||||
{
|
||||
|
@ -218,8 +220,7 @@ System.ComponentModel.Category("Values")]
|
|||
|
||||
}
|
||||
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 +" ");
|
||||
}
|
||||
|
||||
//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);
|
||||
|
||||
if (opengl) {
|
||||
this.SwapBuffers();
|
||||
|
||||
//Console.Write(" e " + (DateTime.Now - starttime).TotalMilliseconds);
|
||||
}
|
||||
|
||||
count++;
|
||||
|
||||
|
@ -279,21 +271,23 @@ System.ComponentModel.Category("Values")]
|
|||
}
|
||||
|
||||
void Clear(Color 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);
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
GL.LineWidth(penn.Width);
|
||||
GL.Color4(penn.Color);
|
||||
|
||||
|
@ -309,24 +303,23 @@ System.ComponentModel.Category("Values")]
|
|||
GL.Vertex2(x, y);
|
||||
}
|
||||
GL.End();
|
||||
|
||||
//GL.Disable(EnableCap.Blend);
|
||||
|
||||
//GL.Enable(EnableCap.Texture2D);
|
||||
}
|
||||
else
|
||||
{
|
||||
graphicsObjectGDIP.DrawArc(penn, rect, start, degrees);
|
||||
}
|
||||
}
|
||||
|
||||
public void DrawEllipse(Pen penn, Rectangle rect)
|
||||
{
|
||||
//GL.Disable(EnableCap.Texture2D);
|
||||
|
||||
//GL.Enable(EnableCap.Blend);
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
GL.LineWidth(penn.Width);
|
||||
GL.Color4(penn.Color);
|
||||
|
||||
GL.Begin(BeginMode.LineLoop);
|
||||
float x, y;
|
||||
for (float i = 0; i < 360; i+=1)
|
||||
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;
|
||||
|
@ -335,13 +328,12 @@ System.ComponentModel.Category("Values")]
|
|||
GL.Vertex2(x, y);
|
||||
}
|
||||
GL.End();
|
||||
|
||||
//GL.Disable(EnableCap.Blend);
|
||||
|
||||
//GL.Enable(EnableCap.Texture2D);
|
||||
}
|
||||
|
||||
//graphicsObject.DrawImage(_bgimage, 0, 0, this.Width, this.Height);
|
||||
else
|
||||
{
|
||||
graphicsObjectGDIP.DrawEllipse(penn, rect);
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -427,27 +417,45 @@ System.ComponentModel.Category("Values")]
|
|||
}
|
||||
|
||||
public void ResetTransform()
|
||||
{
|
||||
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)
|
||||
{
|
||||
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);
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
GL.Begin(BeginMode.TriangleFan);
|
||||
GL.Color4(((SolidBrush)brushh).Color);
|
||||
foreach (Point pnt in list)
|
||||
|
@ -456,18 +464,17 @@ System.ComponentModel.Category("Values")]
|
|||
}
|
||||
GL.Vertex2(list[list.Length - 1].X, list[list.Length - 1].Y);
|
||||
GL.End();
|
||||
|
||||
//GL.Disable(EnableCap.Blend);
|
||||
|
||||
//GL.Enable(EnableCap.Texture2D);
|
||||
}
|
||||
else
|
||||
{
|
||||
graphicsObjectGDIP.FillPolygon(brushh, list);
|
||||
}
|
||||
}
|
||||
|
||||
public void FillPolygon(Brush brushh, PointF[] list)
|
||||
{
|
||||
//GL.Disable(EnableCap.Texture2D);
|
||||
|
||||
//GL.Enable(EnableCap.Blend);
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
GL.Begin(BeginMode.Quads);
|
||||
GL.Color4(((SolidBrush)brushh).Color);
|
||||
foreach (PointF pnt in list)
|
||||
|
@ -476,41 +483,37 @@ System.ComponentModel.Category("Values")]
|
|||
}
|
||||
GL.Vertex2(list[0].X, list[0].Y);
|
||||
GL.End();
|
||||
|
||||
//GL.Disable(EnableCap.Blend);
|
||||
|
||||
//GL.Enable(EnableCap.Texture2D);
|
||||
}
|
||||
|
||||
//graphicsObject.DrawPolygon(redPen, pointlist);
|
||||
else
|
||||
{
|
||||
graphicsObjectGDIP.FillPolygon(brushh, list);
|
||||
}
|
||||
}
|
||||
|
||||
public void DrawPolygon(Pen penn, Point[] list)
|
||||
{
|
||||
//GL.Disable(EnableCap.Texture2D);
|
||||
|
||||
//GL.Enable(EnableCap.Blend);
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
GL.LineWidth(penn.Width);
|
||||
GL.Color4(penn.Color);
|
||||
|
||||
GL.Begin(BeginMode.LineLoop);
|
||||
foreach (Point pnt in list)
|
||||
{
|
||||
GL.Vertex2(pnt.X,pnt.Y);
|
||||
GL.Vertex2(pnt.X, pnt.Y);
|
||||
}
|
||||
GL.End();
|
||||
|
||||
//GL.Disable(EnableCap.Blend);
|
||||
|
||||
//GL.Enable(EnableCap.Texture2D);
|
||||
}
|
||||
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,17 +522,19 @@ 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);
|
||||
}
|
||||
else
|
||||
{
|
||||
graphicsObjectGDIP.DrawPolygon(penn, list);
|
||||
}
|
||||
}
|
||||
|
||||
//graphicsObject.FillRectangle(linearBrush, bg);
|
||||
|
||||
public void FillRectangle(Brush brushh, RectangleF rectf)
|
||||
{
|
||||
if (opengl)
|
||||
{
|
||||
float x1 = rectf.X;
|
||||
float y1 = rectf.Y;
|
||||
|
@ -537,10 +542,6 @@ System.ComponentModel.Category("Values")]
|
|||
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))
|
||||
|
@ -550,7 +551,7 @@ System.ComponentModel.Category("Values")]
|
|||
}
|
||||
else
|
||||
{
|
||||
GL.Color4(((SolidBrush)brushh).Color.R/255f,((SolidBrush)brushh).Color.G/255f,((SolidBrush)brushh).Color.B/255f,((SolidBrush)brushh).Color.A/255f);
|
||||
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);
|
||||
|
@ -569,13 +570,12 @@ System.ComponentModel.Category("Values")]
|
|||
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);
|
||||
else
|
||||
{
|
||||
graphicsObjectGDIP.FillRectangle(brushh, rectf);
|
||||
}
|
||||
}
|
||||
|
||||
public void DrawRectangle(Pen penn, RectangleF rect)
|
||||
{
|
||||
|
@ -584,31 +584,30 @@ 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);
|
||||
|
||||
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.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);
|
||||
}
|
||||
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)
|
||||
{
|
||||
//GL.Disable(EnableCap.Texture2D);
|
||||
|
||||
//GL.Enable(EnableCap.Blend);
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
GL.Color4(penn.Color);
|
||||
GL.LineWidth(penn.Width);
|
||||
|
||||
|
@ -616,18 +615,17 @@ System.ComponentModel.Category("Values")]
|
|||
GL.Vertex2(x1, y1);
|
||||
GL.Vertex2(x2, y2);
|
||||
GL.End();
|
||||
|
||||
//GL.Disable(EnableCap.Blend);
|
||||
|
||||
//GL.Enable(EnableCap.Texture2D);
|
||||
}
|
||||
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)
|
||||
{
|
||||
|
@ -1203,8 +1204,11 @@ System.ComponentModel.Category("Values")]
|
|||
lock (streamlock)
|
||||
{
|
||||
if (streamjpgenable || streamjpg == null) // init image and only update when needed
|
||||
{
|
||||
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,19 +1449,22 @@ System.ComponentModel.Category("Values")]
|
|||
|
||||
try
|
||||
{
|
||||
|
||||
if (opengl)
|
||||
{
|
||||
foreach (int texid in charbitmaptexid)
|
||||
{
|
||||
if (texid != 0)
|
||||
GL.DeleteTexture(texid);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
GC.Collect();
|
||||
|
||||
try
|
||||
{
|
||||
if (opengl)
|
||||
{
|
||||
GL.MatrixMode(MatrixMode.Projection);
|
||||
GL.LoadIdentity();
|
||||
|
@ -1437,6 +1474,7 @@ System.ComponentModel.Category("Values")]
|
|||
|
||||
GL.Viewport(0, 0, Width, Height);
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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("")]
|
||||
|
|
|
@ -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;
|
||||
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -2,5 +2,8 @@
|
|||
<configuration>
|
||||
<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>
|
||||
|
|
|
@ -2,5 +2,8 @@
|
|||
<configuration>
|
||||
<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>
|
||||
|
|
Loading…
Reference in New Issue