Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 10:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

APM Planner 1.1.76

Browse Source 
Modify Hud center
add 3dr snr's and snr based distance estimate
display current frame type
fix disapearing window
add base xml level to param xml (xml standard)
add georef kml refrence
this includes adams new dynamic params
This commit is contained in:
Michael Oborne 2012-04-30 18:48:52 +08:00
parent 650e9467d7
commit fda96ae3a6
32 changed files with 3167 additions and 2993 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -170,8 +170,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>Lib\netDxf.dll</HintPath>
</Reference>
<Reference Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Lib\OpenTK.dll</HintPath>
</Reference>
<Reference Include="OpenTK.Compatibility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\Desktop\DIYDrones\opentk\trunk\Binaries\OpenTK\Debug\OpenTK.Compatibility.dll</HintPath>
</Reference>
<Reference Include="OpenTK.GLControl, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -227,6 +232,9 @@
<Compile Include="Attributes\PrivateAttribute.cs" />
<Compile Include="CodeGen.cs" />
<Compile Include="Controls\IDynamicParameterControl.cs" />
<Compile Include="Controls\OpenGLtest.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigFriendlyParams.cs">
<SubType>UserControl</SubType>
</Compile>
@ -591,6 +599,9 @@
<EmbeddedResource Include="Controls\ProgressReporterDialogue.resx">
<DependentUpon>ProgressReporterDialogue.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\OpenGLtest.resx">
<DependentUpon>OpenGLtest.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigAccelerometerCalibrationQuad.es-ES.resx">
<DependentUpon>ConfigAccelerometerCalibrationQuad.cs</DependentUpon>
</EmbeddedResource>
@ -684,9 +695,6 @@
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigPlanner.resx">
<DependentUpon>ConfigPlanner.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigPlanner.zh-Hans.resx">
<DependentUpon>ConfigPlanner.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigRadioInput.es-ES.resx">
<DependentUpon>ConfigRadioInput.cs</DependentUpon>
</EmbeddedResource>
@ -1105,9 +1113,7 @@
<None Include="AeroSimRCAPMHil.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="app.config" />
<None Include="arducopter-xplane.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

2
Tools/ArdupilotMegaPlanner/Common.cs
View File

@ -447,7 +447,7 @@ namespace ArdupilotMega
// altitude controller
CH6_THR_HOLD_KP = 14,
CH6_Z_GAIN = 15,
CH6_DAMP = 16,
//CH6_DAMP = 16,
// optical flow controller
CH6_OPTFLOW_KP = 17,

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

@ -14,7 +14,7 @@ using System.Drawing.Drawing2D;
using log4net;
using OpenTK;
using OpenTK.Graphics.OpenGL;
using OpenTK.Graphics;
//using OpenTK.Graphics;
// Control written by Michael Oborne 2011
@ -192,7 +192,7 @@ namespace ArdupilotMega.Controls
try
{
GraphicsMode test = this.GraphicsMode;
OpenTK.Graphics.GraphicsMode test = this.GraphicsMode;
log.Info(test.ToString());
log.Info("Vendor: " + GL.GetString(StringName.Vendor));
log.Info("Version: " + GL.GetString(StringName.Version));
@ -875,12 +875,18 @@ namespace ArdupilotMega.Controls
//draw centre / current att
Rectangle centercircle = new Rectangle(halfwidth - 10, halfheight - 10, 20, 20);
Rectangle centercircle = new Rectangle(halfwidth - halfwidth / 2, halfheight - halfwidth / 2, halfwidth, halfwidth);
graphicsObject.DrawEllipse(redPen, centercircle);
graphicsObject.DrawLine(redPen, centercircle.Left - 10, halfheight, centercircle.Left, halfheight);
graphicsObject.DrawLine(redPen, centercircle.Right, halfheight, centercircle.Right + 10, halfheight);
graphicsObject.DrawLine(redPen, centercircle.Left + centercircle.Width / 2, centercircle.Top, centercircle.Left + centercircle.Width / 2, centercircle.Top - 10);
//graphicsObject.DrawEllipse(redPen, centercircle);
Pen redtemp = new Pen(Color.FromArgb(200, redPen.Color.R, redPen.Color.G, redPen.Color.B));
redtemp.Width = 4.0f;
// left
graphicsObject.DrawLine(redtemp, centercircle.Left - halfwidth / 5, halfheight, centercircle.Left, halfheight);
// right
graphicsObject.DrawLine(redtemp, centercircle.Right, halfheight, centercircle.Right + halfwidth / 5, halfheight);
// center point
graphicsObject.DrawLine(redtemp, halfwidth-1, halfheight, centercircle.Right - halfwidth / 3, halfheight + halfheight / 10);
graphicsObject.DrawLine(redtemp, halfwidth+1, halfheight, centercircle.Left + halfwidth / 3, halfheight + halfheight / 10);
// draw roll ind
@ -1347,8 +1353,8 @@ namespace ArdupilotMega.Controls
// Returns a System.Drawing.Bitmap with the contents of the current framebuffer
public new Bitmap GrabScreenshot()
{
if (GraphicsContext.CurrentContext == null)
throw new GraphicsContextMissingException();
if (OpenTK.Graphics.GraphicsContext.CurrentContext == null)
throw new OpenTK.Graphics.GraphicsContextMissingException();
Bitmap bmp = new Bitmap(this.ClientSize.Width, this.ClientSize.Height);
System.Drawing.Imaging.BitmapData data =

228
Tools/ArdupilotMegaPlanner/Controls/OpenGLtest.cs Normal file
View File

@ -0,0 +1,228 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenTK;
using OpenTK.Graphics.OpenGL;
using System.Drawing.Imaging;
using System.Drawing;
namespace ArdupilotMega.Controls
{
public class OpenGLtest : GLControl
{
int fixme;
Bitmap _terrain = new Bitmap(640,480);
public OpenGLtest()
{
InitializeComponent();
try
{
_terrain = new Bitmap(@"C:\Users\hog\Pictures\Denmark\[Group 1]-P1020169_P1020174-6 images.jpg");
}
catch { }
_terrain = new Bitmap(_terrain, 512, 512);
GL.GenTextures(1, out texture);
GL.BindTexture(TextureTarget.Texture2D, texture);
BitmapData data = _terrain.LockBits(new System.Drawing.Rectangle(0, 0, _terrain.Width, _terrain.Height),
ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
//Console.WriteLine("w {0} h {1}",data.Width, data.Height);
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, data.Width, data.Height, 0,
OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0);
_terrain.UnlockBits(data);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
}
const float rad2deg = (float)(180 / Math.PI);
const float deg2rad = (float)(1.0 / rad2deg);
int[,] getElevationData(double lat, double lng, double direction)
{
int[,] answer = new int[400,400];
double step = 0.00083333333333333;
for (int y = 0; y < answer.GetLength(0) - 1; y++)
{
Console.WriteLine(y);
for (int x = 0; x < answer.GetLength(1) - 1; x++)
{
double mlat = lat + step * (float)y + Math.Sin(direction * deg2rad) * step * (float)y;
double mlng = lng + step * (float)x + Math.Cos(direction * deg2rad) * step * (float)x;
// Console.WriteLine(mlat + " "+mlng);
int alt = srtm.getAltitude(mlat, mlng, 20);
answer[x,y] = alt;
}
}
return answer;
}
int texture = 0;
private System.ComponentModel.IContainer components;
public Vector3 Normal(Vector3 a, Vector3 b, Vector3 c)
{
var dir = Vector3.Cross(b - a, c - a);
var norm = Vector3.Normalize(dir);
return norm;
}
float _angle = 0;
double cameraX, cameraY, cameraZ; // camera coordinates
double lookX, lookY, lookZ; // camera look-at coordinates
protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
{
if (this.DesignMode)
return;
_angle+=1;
try
{
base.OnPaint(e);
}
catch { return; }
float scale = 1.0f;
float radians = (float)(Math.PI*(_angle-90.0f)/180.0f);
int mouseY = (int)(900 * scale);
// calculate the camera's position
cameraX = lookX + Math.Sin(radians)*mouseY; // multiplying by mouseY makes the
cameraZ = lookZ + Math.Cos(radians)*mouseY; // camera get closer/farther away with mouseY
cameraY = lookY + mouseY / 2.0f;
// calculate the camera look-at coordinates as the center of the terrain map
lookX = (_terrain.Width * scale) / 2.0f;
lookY = 0 * scale;
lookZ = (_terrain.Height * scale) / 2.0f;
MakeCurrent();
GL.ClearColor(Color.Green);
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
GL.LoadIdentity();
OpenTK.Graphics.Glu.LookAt(cameraX, cameraY, cameraZ, lookX, lookY, lookZ, 0.0, 1.0, 0.0);
GL.Enable(EnableCap.Texture2D);
GL.BindTexture(TextureTarget.Texture2D, texture);
double mlat = -34.73306;
double mlng = 117.8864897;
double step = 0.00083333333333333;
int increment =50;
for (int z = 0; z < _terrain.Height - 1; z += increment)
{
//Makes OpenGL draw a triangle at every three consecutive vertices
GL.Begin(BeginMode.TriangleStrip);
for (int x = 0; x < _terrain.Width - 1; x += increment)
{
// Console.WriteLine(mlat + step * z +" "+ mlng + step * x);
int heightl = srtm.getAltitude(mlat + step * z, mlng + step * x, 20);
//GL.Color3(_terrain.GetPixel(x, z));
GL.TexCoord2((x / (float)_terrain.Width), (z / (float)_terrain.Height));
GL.Vertex3(x * scale, heightl, z * scale); // _terrain.GetPixel(x, z).R
try
{
heightl = srtm.getAltitude(mlat + step * (z + increment), mlng + step * (x), 20);
//GL.Color3(_terrain.GetPixel(x, z + increment));
GL.TexCoord2((x / (float)_terrain.Width), ((z + increment) / (float)_terrain.Height));
GL.Vertex3(x * scale, heightl, z + increment * scale);
}
catch { break; }
}
GL.End();
}
GL.Enable(EnableCap.Blend);
GL.DepthMask(false);
GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.One);
GL.DepthMask(true);
GL.Disable(EnableCap.Blend);
GL.Flush();
this.SwapBuffers();
// this.Invalidate();
}
private void InitializeComponent()
{
this.SuspendLayout();
//
// OpenGLtest
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.Name = "OpenGLtest";
this.Load += new System.EventHandler(this.test_Load);
this.Resize += new System.EventHandler(this.test_Resize);
this.ResumeLayout(false);
}
private void test_Load(object sender, EventArgs e)
{
GL.Enable(EnableCap.DepthTest);
// GL.Enable(EnableCap.Light0);
// GL.Enable(EnableCap.Lighting);
GL.Enable(EnableCap.ColorMaterial);
GL.Enable(EnableCap.Normalize);
//GL.Enable(EnableCap.LineSmooth);
//GL.Enable(EnableCap.PointSmooth);
//GL.Enable(EnableCap.PolygonSmooth);
GL.ShadeModel(ShadingModel.Smooth);
GL.Enable(EnableCap.CullFace);
GL.Enable(EnableCap.Texture2D);
}
private void test_Resize(object sender, EventArgs e)
{
GL.Viewport(0, 0, this.Width, this.Height);
GL.MatrixMode(MatrixMode.Projection);
GL.LoadIdentity();
if (Height == 0)
Height = 1;
OpenTK.Graphics.Glu.Perspective(54.0f, this.Width / this.Height, 1.0f, 5000.0f);
GL.MatrixMode(MatrixMode.Modelview);
GL.LoadIdentity();
}
}
}

120
Tools/ArdupilotMegaPlanner/Controls/OpenGLtest.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

30
Tools/ArdupilotMegaPlanner/CurrentState.cs
View File

@ -262,6 +262,36 @@ namespace ArdupilotMega
public float remnoise { get; set; }
public ushort rxerrors { get; set; }
public ushort fixedp { get; set; }
private float _localsnrdb = 0;
private float _remotesnrdb = 0;
private DateTime lastrssi = DateTime.Now;
private DateTime lastremrssi = DateTime.Now;
public float localsnrdb { get { if (lastrssi.AddSeconds(1) > DateTime.Now) { return _localsnrdb; } lastrssi = DateTime.Now; _localsnrdb = ((rssi - noise) / 1.9f) * 0.5f + _localsnrdb * 0.5f; return _localsnrdb; } }
public float remotesnrdb { get { if (lastremrssi.AddSeconds(1) > DateTime.Now) { return _remotesnrdb; } lastremrssi = DateTime.Now; _remotesnrdb = ((remrssi - remnoise) / 1.9f) * 0.5f + _remotesnrdb * 0.5f; return _remotesnrdb; } }
public float DistRSSIRemain {
get
{
float work = 0;
if (localsnrdb > remotesnrdb)
{
// remote
// minus fade margin
work = remotesnrdb - 5;
}
else
{
// local
// minus fade margin
work = localsnrdb - 5;
}
{
work = DistToMAV * (float)Math.Pow(2.0, work / 6.0);
}
return work;
}
}
// stats
public ushort packetdropremote { get; set; }

16
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs generated
View File

@ -38,6 +38,8 @@
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pictureBox3 = new System.Windows.Forms.PictureBox();
this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
this.lbl_frame = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@ -117,10 +119,22 @@
this.pictureBox4.TabStop = false;
this.pictureBox4.Click += new System.EventHandler(this.pictureBoxQuad_Click);
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// lbl_frame
//
resources.ApplyResources(this.lbl_frame, "lbl_frame");
this.lbl_frame.Name = "lbl_frame";
//
// ConfigAccelerometerCalibrationQuad
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lbl_frame);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox3);
this.Controls.Add(this.pictureBox4);
this.Controls.Add(this.pictureBox1);
@ -154,5 +168,7 @@
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.PictureBox pictureBox3;
private System.Windows.Forms.PictureBox pictureBox4;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label lbl_frame;
}
}

9
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.cs
View File

@ -24,6 +24,8 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
{
MainV2.comPort.setParam("FRAME", 1f);
CustomMessageBox.Show("Set to x");
lbl_frame.Text = "X";
}
catch { CustomMessageBox.Show("Set frame failed"); }
}
@ -53,6 +55,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
{
MainV2.comPort.setParam("FRAME", 0f);
CustomMessageBox.Show("Set to +");
lbl_frame.Text = "+";
}
catch { CustomMessageBox.Show("Set frame failed"); }
}
@ -76,6 +79,12 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
return;
}
}
try
{
lbl_frame.Text = ((float)MainV2.comPort.param["FRAME"] == 0) ? "+" : "X";
}
catch { lbl_frame.Text = "Invalid Frame"; }
}
}
}

80
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx
View File

@ -148,7 +148,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label28.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="label15.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -178,7 +178,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="pictureBoxQuadX.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -205,7 +205,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxQuadX.ZOrder" xml:space="preserve">
<value>6</value>
<value>8</value>
</data>
<data name="pictureBoxQuad.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -232,7 +232,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxQuad.ZOrder" xml:space="preserve">
<value>7</value>
<value>9</value>
</data>
<data name="BUT_levelac2.Location" type="System.Drawing.Point, System.Drawing">
<value>269, 38</value>
@ -250,13 +250,13 @@
<value>BUT_levelac2</value>
</data>
<data name="&gt;&gt;BUT_levelac2.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4496.35237, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4503.13960, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_levelac2.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;BUT_levelac2.ZOrder" xml:space="preserve">
<value>8</value>
<value>10</value>
</data>
<data name="pictureBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -283,7 +283,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="pictureBox2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -310,7 +310,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBox2.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="pictureBox3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -337,7 +337,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBox3.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<data name="pictureBox4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -364,8 +364,68 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBox4.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>262, 74</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>57, 13</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Currently : </value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lbl_frame.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lbl_frame.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lbl_frame.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 74</value>
</data>
<data name="lbl_frame.Size" type="System.Drawing.Size, System.Drawing">
<value>13, 13</value>
</data>
<data name="lbl_frame.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
</data>
<data name="lbl_frame.Text" xml:space="preserve">
<value>+</value>
</data>
<data name="&gt;&gt;lbl_frame.Name" xml:space="preserve">
<value>lbl_frame</value>
</data>
<data name="&gt;&gt;lbl_frame.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lbl_frame.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lbl_frame.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -379,6 +439,6 @@
<value>ConfigAccelerometerCalibrationQuad</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4496.35237, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4503.13960, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

165
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs generated
View File

@ -1,32 +1,32 @@
namespace ArdupilotMega.GCSViews.ConfigurationView
{
partial class ConfigPlanner
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
namespace ArdupilotMega.GCSViews.ConfigurationView
{
partial class ConfigPlanner
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigPlanner));
this.label33 = new System.Windows.Forms.Label();
@ -360,6 +360,7 @@
this.CMB_language.FormattingEnabled = true;
resources.ApplyResources(this.CMB_language, "CMB_language");
this.CMB_language.Name = "CMB_language";
this.CMB_language.SelectedIndexChanged += new System.EventHandler(this.CMB_language_SelectedIndexChanged);
//
// label93
//
@ -485,56 +486,56 @@
((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Label label33;
private System.Windows.Forms.ComboBox CMB_ratesensors;
private System.Windows.Forms.Label label26;
private System.Windows.Forms.ComboBox CMB_videoresolutions;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.CheckBox CHK_GDIPlus;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.CheckBox CHK_loadwponconnect;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.NumericUpDown NUM_tracklength;
private System.Windows.Forms.CheckBox CHK_speechaltwarning;
private System.Windows.Forms.Label label108;
private System.Windows.Forms.CheckBox CHK_resetapmonconnect;
private System.Windows.Forms.CheckBox CHK_mavdebug;
private System.Windows.Forms.Label label107;
private System.Windows.Forms.ComboBox CMB_raterc;
private System.Windows.Forms.Label label104;
private System.Windows.Forms.Label label103;
private System.Windows.Forms.Label label102;
private System.Windows.Forms.Label label101;
private System.Windows.Forms.ComboBox CMB_ratestatus;
private System.Windows.Forms.ComboBox CMB_rateposition;
private System.Windows.Forms.ComboBox CMB_rateattitude;
private System.Windows.Forms.Label label99;
private System.Windows.Forms.Label label98;
private System.Windows.Forms.Label label97;
private System.Windows.Forms.ComboBox CMB_speedunits;
private System.Windows.Forms.ComboBox CMB_distunits;
private System.Windows.Forms.Label label96;
private System.Windows.Forms.Label label95;
private System.Windows.Forms.CheckBox CHK_speechbattery;
private System.Windows.Forms.CheckBox CHK_speechcustom;
private System.Windows.Forms.CheckBox CHK_speechmode;
private System.Windows.Forms.CheckBox CHK_speechwaypoint;
private System.Windows.Forms.Label label94;
private System.Windows.Forms.ComboBox CMB_osdcolor;
private System.Windows.Forms.ComboBox CMB_language;
private System.Windows.Forms.Label label93;
private System.Windows.Forms.CheckBox CHK_enablespeech;
private System.Windows.Forms.CheckBox CHK_hudshow;
private System.Windows.Forms.Label label92;
private System.Windows.Forms.ComboBox CMB_videosources;
private ArdupilotMega.Controls.MyButton BUT_Joystick;
private ArdupilotMega.Controls.MyButton BUT_videostop;
private ArdupilotMega.Controls.MyButton BUT_videostart;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox CHK_maprotation;
}
}
}
#endregion
private System.Windows.Forms.Label label33;
private System.Windows.Forms.ComboBox CMB_ratesensors;
private System.Windows.Forms.Label label26;
private System.Windows.Forms.ComboBox CMB_videoresolutions;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.CheckBox CHK_GDIPlus;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.CheckBox CHK_loadwponconnect;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.NumericUpDown NUM_tracklength;
private System.Windows.Forms.CheckBox CHK_speechaltwarning;
private System.Windows.Forms.Label label108;
private System.Windows.Forms.CheckBox CHK_resetapmonconnect;
private System.Windows.Forms.CheckBox CHK_mavdebug;
private System.Windows.Forms.Label label107;
private System.Windows.Forms.ComboBox CMB_raterc;
private System.Windows.Forms.Label label104;
private System.Windows.Forms.Label label103;
private System.Windows.Forms.Label label102;
private System.Windows.Forms.Label label101;
private System.Windows.Forms.ComboBox CMB_ratestatus;
private System.Windows.Forms.ComboBox CMB_rateposition;
private System.Windows.Forms.ComboBox CMB_rateattitude;
private System.Windows.Forms.Label label99;
private System.Windows.Forms.Label label98;
private System.Windows.Forms.Label label97;
private System.Windows.Forms.ComboBox CMB_speedunits;
private System.Windows.Forms.ComboBox CMB_distunits;
private System.Windows.Forms.Label label96;
private System.Windows.Forms.Label label95;
private System.Windows.Forms.CheckBox CHK_speechbattery;
private System.Windows.Forms.CheckBox CHK_speechcustom;
private System.Windows.Forms.CheckBox CHK_speechmode;
private System.Windows.Forms.CheckBox CHK_speechwaypoint;
private System.Windows.Forms.Label label94;
private System.Windows.Forms.ComboBox CMB_osdcolor;
private System.Windows.Forms.ComboBox CMB_language;
private System.Windows.Forms.Label label93;
private System.Windows.Forms.CheckBox CHK_enablespeech;
private System.Windows.Forms.CheckBox CHK_hudshow;
private System.Windows.Forms.Label label92;
private System.Windows.Forms.ComboBox CMB_videosources;
private ArdupilotMega.Controls.MyButton BUT_Joystick;
private ArdupilotMega.Controls.MyButton BUT_videostop;
private ArdupilotMega.Controls.MyButton BUT_videostart;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox CHK_maprotation;
}
}

12
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx
View File

@ -643,7 +643,7 @@
<value>NoControl</value>
</data>
<data name="label101.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 246</value>
<value>12, 246</value>
</data>
<data name="label101.Size" type="System.Drawing.Size, System.Drawing">
<value>84, 13</value>
@ -778,7 +778,7 @@
<value>57</value>
</data>
<data name="label99.Text" xml:space="preserve">
<value>NOTE: The Configuration Tab will NOT display these units, as those are raw values.
<value>NOTE: The Configuration Tab will NOT display these units, as those are raw values.
</value>
</data>
<data name="&gt;&gt;label99.Name" xml:space="preserve">
@ -1268,7 +1268,7 @@
<value>BUT_Joystick</value>
</data>
<data name="&gt;&gt;BUT_Joystick.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4501.27331, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_Joystick.Parent" xml:space="preserve">
<value>$this</value>
@ -1295,7 +1295,7 @@
<value>BUT_videostop</value>
</data>
<data name="&gt;&gt;BUT_videostop.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4501.27331, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_videostop.Parent" xml:space="preserve">
<value>$this</value>
@ -1322,7 +1322,7 @@
<value>BUT_videostart</value>
</data>
<data name="&gt;&gt;BUT_videostart.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4501.27331, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_videostart.Parent" xml:space="preserve">
<value>$this</value>
@ -1397,6 +1397,6 @@
<value>ConfigPlanner</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4501.27331, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

7
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.Designer.cs generated
View File

@ -28,7 +28,6 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setup));
this.backstageView = new ArdupilotMega.Controls.BackstageView.BackstageView();
this.SuspendLayout();
//
@ -38,17 +37,15 @@
this.backstageView.Dock = System.Windows.Forms.DockStyle.Fill;
this.backstageView.Location = new System.Drawing.Point(0, 0);
this.backstageView.Name = "backstageView";
this.backstageView.Size = new System.Drawing.Size(931, 468);
this.backstageView.Size = new System.Drawing.Size(947, 506);
this.backstageView.TabIndex = 0;
//
// Setup
//
this.ClientSize = new System.Drawing.Size(931, 468);
this.Controls.Add(this.backstageView);
//this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(947, 506);
this.Name = "Setup";
this.Text = "Setup";
this.Size = new System.Drawing.Size(947, 506);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Setup_FormClosing);
this.Load += new System.EventHandler(this.Setup_Load);
this.ResumeLayout(false);

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

@ -34,7 +34,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
var configpanel = new Controls.ConfigPanel();
configpanel.LoadXML("ArduCopterConfig.xml");
this.backstageView.AddPage(new BackstageView.BackstageViewPage(configpanel, "ArduCopter Config"));
this.backstageView.AddPage(new BackstageView.BackstageViewPage(configpanel, "ArduCopter Pids"));
this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigArducopter(), "OLD ArduCopter Config"));
}
@ -45,7 +45,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
var configpanel = new Controls.ConfigPanel();
configpanel.LoadXML("ArduCopterConfig.xml");
this.backstageView.AddPage(new BackstageView.BackstageViewPage(configpanel, "ArduCopter Config"));
this.backstageView.AddPage(new BackstageView.BackstageViewPage(configpanel, "ArduCopter Pids"));
this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigArducopter(), "OLD ArduCopter Config"));
}
@ -53,7 +53,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
else if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane)
{
this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigAccelerometerCalibrationPlane(), "ArduPlane Level"));
this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigArduplane(), "ArduPlane Config"));
this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigArduplane(), "ArduPlane Pids"));
}
this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigFriendlyParams { ParameterMode = ParameterMetaDataConstants.Standard }, "Standard Params"));

77
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.resx
View File

@ -117,81 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAA
AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADOxkjAtnoOAKpJ4vyiK
c+8nh3D/J4Zv/yeHcP8oi3PvKpJ4vy6fg4AzsZIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADjGo2AyspPfLZ+D/yiQ
d/8hlXj/G6F9/xeqg/8XqYL/GKqD/xuhfv8ilnn/KZB3/y2fhP8yspPfN8ajYAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADvRrDA1vpzfL6uN/yel
hP8XvJD/DMyY/wfQl/8FzJP/A8qS/wPJkf8EypL/BsyU/wnRmP8PzZn/Gb2R/yemhP8tqoz/Mb2a3zbQ
qkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAA4y6ZgMbWV/yin
iP8WwZP/Btqf/wDPlf8AyI7/A8aP/yfNnv9T2LP/UNax/03XsP8506b/G8ya/wHKkf8F0Zf/CNuf/xLB
kv8fpYT/J7KQ/y7IomAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wAAAAAAAAAAAAAAAAAAAAAANcajny+w
kf8hqoj/CNSd/wDRlf8Axor/Hcyd/3Lhwf+p7Nj/o+vV/57m0/+X5dD/k+TN/4/jzf+K5Mz/fuHH/0PW
rf8HzJT/ANCT/wDRlv8OpX//HayI/yrFn58AAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAADDC
nmAtro7/H62J/wPWmv8Ay47/AMaO/3XhxP+e6tT/mObP/5Pjy/+Q4sr/jODJ/4ffx/+C3MT/f9vC/3nb
wf9y2r7/adq7/2DauP8ZzZv/Fdae/8T/9/9WxKj/HKuI/y7IomAAAAAAAAAAAAAAAAD///8AAAAAAAAA
AAAiuZMwKKyM/x6ohf8C1Zr/AMmL/wHGjv+49OL///////////9+3ML/f9zD/4Dcwv9+28L/e9rA/3bZ
vv9w1rr/Z9S4/17Rs/9Qz63/Qcyn/3LewP////////////n///8MpH7/JbKP/zXQqUAAAAAAAAAAAP//
/wAAAAAAAAAAABymhN8dnn//BNGa/wDKjP8AxY3/sfHf/////////////////2nXt/9w1rv/c9e8/3TX
vP9x17z/a9W5/2TTtf9Y0K//SMyp/zXFoP9i07X/////////////////f/LR/wDQlf8epYT/Mb2a3wAA
AAAAAAAA////AAAAAAADlnJgFZR1/wq4iv8AzpH/AMCD/4rmzf//////////////////////WdGv/2PU
tf9p1rf/atS4/2nUtv9i0rT/Vc+u/0fKpv8zxZz/Ws+w//////////////////////8GyJL/ANCS/xLB
kv8tq4z/OMajYAAAAAD///8AAAAAAACHZt8NkW//ANKV/wDChP9i27r//////////////////////9Dx
6P9MzKn/Vc+v/17Rsv9g0rP/XNCx/1XNrv9Fyaf/McSd/1fPr///////////////////////QM2m/ynK
oP8JzJX/C9yh/ymmhf80spPfAAAAAP///wAAcUwwAHtc/wCrfP8AyIv/AMKK////////////////////
/////////////5Dgyv9Gyqb/TMyq/07Nq/9MzKn/Qcmj/y/Fnf9Wzq3//////////////////////57k
0v8av5T/Lceg/yzOo/8M05v/Hr6T/zCghf80spIw////AABoRYAAclT/AL2H/wDBhf9R1rL/////////
////////4vfw//////////////////H8+P9KzKn/Ocah/zTFnv8qwpj/Us2t////////////////////
////////DLqM/yDBlv8wxp//OM6m/xPPm/8Xz53/LZF5/y+fg4////8AAGNAvwB7Wf8Aw4j/ALyC/4bj
yP+g5tL/g93E/2HSsv9Pzqz/Us6s//////////////////////9Yzq//Gr2S/0jLp///////////////
/////////////yrDm/8SvI//JMGY/zDHn/81zKT/Is2e/xTUnf8nl3v/LJJ5v////wAAXz3vAIlg/wDA
hf8AuoD/quzZ/5Hjyv9628D/ada2/1jRsP9Jy6f/a9a4//////////////////////+Y4s7/////////
//////////////////+c4tD/AbaH/xW8kf8jwZj/LcWd/y/Jn/8kzJ3/E9Ca/yGjgf8ri3Tv////AABd
PP8Ak2b/AL6D/w/Ekv+m6tf/j+HJ/3vawP9p1rf/W9Gx/0rNqf85yJ//Nsaf////////////////////
/////////////////////////////wCwe/8AtoT/ELqP/xu+k/8jwZj/KMeb/yHKm/8QzZf/HqyG/ymI
cf////8AAF07/wCSZP8AvYL/GMWU/6Dn1P+K38f/ddi+/27Wuf+E3MX/leHN/6fm1f+l5tX/neLQ////
////////////////////////////////////////j9/J/27Vuv9Tzq7/JsKY/xa/kv8aw5T/FcaW/wvL
lf8aqoT/J4dw/////wAAXTv/AJFk/wC9gP8GwY3/mObQ/5rkz/+26dv/y/Hl/8Dt3/+06tz/pebV/5bg
zP+g5NL//////////////v///f7+//7+/v//////7fn2////////////tOnb/6Ll0v+v6Nj/jeDI/zXK
o/8IxJD/BMqS/xaqgv8lh2//////AABeO+8AgVf/AL1//wDBif/R9uv/1PPq/8Tv5P+36t3/rujY/6Lk
0v+U4cv/jt7J//j8+///////+/38//f8+//2+/r/+Pz7//3+/v/m9/P/9Pv6//D6+P9/28L/jd7J/5jj
z/+h5dL/qOvX/4Hmyf8f1J//E596/yOJcO////8AAGA8vwB3U/8p06P/hufM/8Ty5f/D7+T/s+vb/6bm
1P+c4c//j9/K/4vcyP/t+fb///7///j8/P/0+/r/8vr5//P7+f/1+/r/+/39///////i9fL/ZNO1/3HW
vP992sH/htzG/4vhyv+S5dD/mO7W/6X74v80noT/Io90v////wAAZkCAAHla/33ny/945cb/nunV/7Xr
3v+l5tT/luDN/4ndxv992cL/1vLq//v9/P/1+/n/8vv4//L69//z+/j/9Pv5/7Xo2//x+vn/////////
//+y59n/aNS3/3LWvP932r//fNzD/4Ljyf+J7ND/l/bd/yORdf8knH6A////AABuRzAAdlT/Xc6x/23o
xv9s4MH/qurZ/5jiz/+I3cb/edjA/8ju5f/3/Pv/8vv4//H6+P/y+/j/6/f0/7np3v/7/fz//v7+/6fk
1f+56tz///////////9h0bT/aNW4/23Wu/9v3L//dOLG/37w0f9m1rn/Hpt8/ymujTD///8AAAAAAACD
X98po4X/Z+7K/1vgvP+A4sf/jOHK/3rZwv+r59f/9Pv6/+/69//v+vf/8vr4/9fy6/9n0rf/VM6t/6Di
0v/N7+f/adO4/1PMrf9t1Lr/i9zI/1/Rs/9h0rX/ZNe4/2bbvf9s5sb/ePfV/z2ylf8lrozfAAAAAP//
/wAAAAAAAJNsYAWQbf9U1rP/Vee//0rYsf993sb/pebV//P7+v/s+Pb/6/f1/+749v+s5tj/Vc2u/1jP
r/9ZzrD/btW5/1bOr/9Wza//Vs6v/1fOr/9Z0LD/WdCy/1vTtP9d1rX/Xt+8/2btyP9k4L//IaaF/y7D
nmAAAAAA////AAAAAAAAAAAAD6J9zyCjgv9S68L/P9+0/2Pevv/5////7/v6/+v59//j9/L/gtvF/1PN
r/9Wz7D/Wc+x/1nQsf9Zz7H/WM6w/1fPsP9UzrD/VM+w/1TPrv9U0a//U9Oy/1Tatv9Z5sD/Y/LL/zSx
lP8qupbPAAAAAAAAAAD///8AAAAAAAAAAAAYto4wGaeE/y23lP8+5rn/6/////j////w//3/ve/i/2bV
uP9Tzq7/Vc+v/1jPsP9Z0LL/WM+w/1fOsf9Wz7D/Us2w/1HOrf9Qzq3/T9Cu/0zSr/9M2LP/TeC5/1bt
xP9HxaX/KLKQ/zTPqDAAAAAAAAAAAP///wAAAAAAAAAAAAAAAAAkvpdgG6iF/y++m//e/////P///3rl
yf9G0K3/VdKy/1bPsf9Wz7H/Vs6w/1bPsP9Sza//Ucyu/0/Nrf9NzKz/S82s/0fOrP9G0a7/QdWv/0Le
tP9I6L7/Q8Ok/yitjP8yyKJgAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAmwJlgG6iF/yK3
kP8k3q7/H9el/x7Pn/8tzKT/Q9Cs/1HQsP9Q0K7/TM6u/0nMrf9Hzaz/RMyp/0LNqf8+zqn/ONGo/zTV
qf833rD/O+S4/zvCof8orIv/MMSfYAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAA
AAAkvpdgG6iE/xukgv8gy53/HNql/xzRn/8czJz/HcmZ/yXJnP8qyp7/Lcqg/yzLn/8nypz/JMqc/yTO
n/8l1KT/KN2r/y3Tpv8nq4n/JaqJ/yzAm2AAAAAAAAAAAAAAAAAAAAAAAAAAAP///wAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAato8wFKN/zxCScv8RnHn/DbqM/wjIlP8GyZT/BsaS/wbFkf8GxZH/B8WR/wfH
k/8IypX/DMmV/xG3jP8WoX3/Fph2/xqkgs8ft5EwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJVvYACGZM8Aelr/AHlZ/wCFX/8AiWL/AJlr/wCb
bP8AlGf/AI5k/wB/W/8AeFj/AHtb/wCHZd8ClXBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwSzAAaESAAGI/vwBf
Pd8AXTz/AF08/wBdPP8AXz3fAGJAvwBoRIAAcUswAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A/+AD//+AAP/+AAA//AAAH/gAAA/wAAAH4AAAA+AAAAPAAAABwAAAAYAA
AACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAwAAAAcAAAAHgAAAD4AAAA/AA
AAf4AAAP/AAAH/4AAD//gAD//+AD//////8=
</value>
</data>
</root>

7
Tools/ArdupilotMegaPlanner/MAVLink.cs
View File

@ -570,7 +570,6 @@ namespace ArdupilotMega
}
*/
public void getParamList()
{
frmProgressReporter = new ProgressReporterDialogue
@ -2125,7 +2124,7 @@ namespace ArdupilotMega
Array.Resize<byte>(ref temp, count);
if (packetlosttimer.AddSeconds(10) < DateTime.Now)
if (packetlosttimer.AddSeconds(5) < DateTime.Now)
{
packetlosttimer = DateTime.Now;
packetslost = (packetslost * 0.8f);
@ -2211,7 +2210,7 @@ namespace ArdupilotMega
{
synclost++; // actualy sync loss's
if (temp[2] < ((recvpacketcount + 1) % 0x100))
if (temp[2] < ((recvpacketcount + 1)))
{
packetslost += 0x100 - recvpacketcount + temp[2];
}
@ -2220,7 +2219,7 @@ namespace ArdupilotMega
packetslost += temp[2] - recvpacketcount;
}
log.InfoFormat("lost {0} pkts {1}", temp[2], (int)packetslost);
log.InfoFormat("lost {0} pktslost {1}", temp[2], (int)packetslost);
}
packetsnotlost++;

1
Tools/ArdupilotMegaPlanner/MainV2.Designer.cs generated
View File

@ -187,6 +187,7 @@
this.MenuConnect.Padding = new System.Windows.Forms.Padding(0, 0, 72, 72);
this.MenuConnect.Size = new System.Drawing.Size(76, 76);
this.MenuConnect.Click += new System.EventHandler(this.MenuConnect_Click);
this.MenuConnect.MouseHover += new System.EventHandler(this.MenuConnect_MouseHover);
//
// toolStripConnectionControl
//

20
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -259,7 +259,15 @@ namespace ArdupilotMega
}
if (config["MainMaximised"] != null)
{
this.WindowState = (FormWindowState)Enum.Parse(typeof(FormWindowState), config["MainMaximised"].ToString());
// dont allow minimised start state
if (this.WindowState == FormWindowState.Minimized)
{
this.WindowState = FormWindowState.Normal;
this.Location = new Point(100, 100);
}
}
if (config["MainHeight"] != null)
this.Height = int.Parse(config["MainHeight"].ToString());
@ -1728,12 +1736,15 @@ namespace ArdupilotMega
var progressReporterDialogue = ((ProgressReporterDialogue) sender);
progressReporterDialogue.UpdateProgressAndStatus(-1, "Getting Updated Parameters");
ParameterMetaDataParser.GetParameterInformation();
try
{
ParameterMetaDataParser.GetParameterInformation();
}
catch (Exception ex) { log.Error(ex.ToString()); CustomMessageBox.Show("Error getting Parameter Information"); }
#endregion Fetch Parameter Meta Data
progressReporterDialogue.UpdateProgressAndStatus(-1, "Getting Base URL");
// check for updates
if (Debugger.IsAttached)
{
@ -2210,5 +2221,10 @@ namespace ArdupilotMega
{
CMB_serialport_Click(sender, e);
}
private void MenuConnect_MouseHover(object sender, EventArgs e)
{
}
}
}

BIN
Tools/ArdupilotMegaPlanner/Msi/wix.pdb
View File

Binary file not shown.

6
Tools/ArdupilotMegaPlanner/Program.cs
View File

@ -43,6 +43,12 @@ namespace ArdupilotMega
//Common.linearRegression();
if (System.Diagnostics.Debugger.IsAttached)
{
// testing
// Utilities.ParameterMetaDataParser.GetParameterInformation();
}
try
{
Thread.CurrentThread.Name = "Base Thread";

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

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

128
Tools/ArdupilotMegaPlanner/Radio/3DRradio.Designer.cs generated
View File

@ -107,11 +107,9 @@
//
resources.ApplyResources(this.Progressbar, "Progressbar");
this.Progressbar.Name = "Progressbar";
this.toolTip1.SetToolTip(this.Progressbar, resources.GetString("Progressbar.ToolTip"));
//
// S1
//
resources.ApplyResources(this.S1, "S1");
this.S1.FormattingEnabled = true;
this.S1.Items.AddRange(new object[] {
resources.GetString("S1.Items"),
@ -123,6 +121,7 @@
resources.GetString("S1.Items6"),
resources.GetString("S1.Items7"),
resources.GetString("S1.Items8")});
resources.ApplyResources(this.S1, "S1");
this.S1.Name = "S1";
this.toolTip1.SetToolTip(this.S1, resources.GetString("S1.ToolTip"));
//
@ -130,30 +129,25 @@
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip"));
//
// S0
//
resources.ApplyResources(this.S0, "S0");
this.S0.Name = "S0";
this.S0.ReadOnly = true;
this.toolTip1.SetToolTip(this.S0, resources.GetString("S0.ToolTip"));
//
// label2
//
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
this.toolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
this.toolTip1.SetToolTip(this.label3, resources.GetString("label3.ToolTip"));
//
// S2
//
resources.ApplyResources(this.S2, "S2");
this.S2.FormattingEnabled = true;
this.S2.Items.AddRange(new object[] {
resources.GetString("S2.Items"),
@ -165,7 +159,11 @@
resources.GetString("S2.Items6"),
resources.GetString("S2.Items7"),
resources.GetString("S2.Items8"),
resources.GetString("S2.Items9")});
resources.GetString("S2.Items9"),
resources.GetString("S2.Items10"),
resources.GetString("S2.Items11"),
resources.GetString("S2.Items12")});
resources.ApplyResources(this.S2, "S2");
this.S2.Name = "S2";
this.toolTip1.SetToolTip(this.S2, resources.GetString("S2.ToolTip"));
//
@ -173,11 +171,9 @@
//
resources.ApplyResources(this.label4, "label4");
this.label4.Name = "label4";
this.toolTip1.SetToolTip(this.label4, resources.GetString("label4.ToolTip"));
//
// S3
//
resources.ApplyResources(this.S3, "S3");
this.S3.FormattingEnabled = true;
this.S3.Items.AddRange(new object[] {
resources.GetString("S3.Items"),
@ -210,6 +206,7 @@
resources.GetString("S3.Items27"),
resources.GetString("S3.Items28"),
resources.GetString("S3.Items29")});
resources.ApplyResources(this.S3, "S3");
this.S3.Name = "S3";
this.toolTip1.SetToolTip(this.S3, resources.GetString("S3.ToolTip"));
//
@ -217,11 +214,9 @@
//
resources.ApplyResources(this.label5, "label5");
this.label5.Name = "label5";
this.toolTip1.SetToolTip(this.label5, resources.GetString("label5.ToolTip"));
//
// S4
//
resources.ApplyResources(this.S4, "S4");
this.S4.FormattingEnabled = true;
this.S4.Items.AddRange(new object[] {
resources.GetString("S4.Items"),
@ -231,20 +226,8 @@
resources.GetString("S4.Items4"),
resources.GetString("S4.Items5"),
resources.GetString("S4.Items6"),
resources.GetString("S4.Items7"),
resources.GetString("S4.Items8"),
resources.GetString("S4.Items9"),
resources.GetString("S4.Items10"),
resources.GetString("S4.Items11"),
resources.GetString("S4.Items12"),
resources.GetString("S4.Items13"),
resources.GetString("S4.Items14"),
resources.GetString("S4.Items15"),
resources.GetString("S4.Items16"),
resources.GetString("S4.Items17"),
resources.GetString("S4.Items18"),
resources.GetString("S4.Items19"),
resources.GetString("S4.Items20")});
resources.GetString("S4.Items7")});
resources.ApplyResources(this.S4, "S4");
this.S4.Name = "S4";
this.toolTip1.SetToolTip(this.S4, resources.GetString("S4.ToolTip"));
//
@ -252,7 +235,6 @@
//
resources.ApplyResources(this.label6, "label6");
this.label6.Name = "label6";
this.toolTip1.SetToolTip(this.label6, resources.GetString("label6.ToolTip"));
//
// S5
//
@ -264,7 +246,6 @@
//
resources.ApplyResources(this.label7, "label7");
this.label7.Name = "label7";
this.toolTip1.SetToolTip(this.label7, resources.GetString("label7.ToolTip"));
//
// S6
//
@ -276,7 +257,6 @@
//
resources.ApplyResources(this.label8, "label8");
this.label8.Name = "label8";
this.toolTip1.SetToolTip(this.label8, resources.GetString("label8.ToolTip"));
//
// S7
//
@ -304,7 +284,6 @@
//
// RS4
//
resources.ApplyResources(this.RS4, "RS4");
this.RS4.FormattingEnabled = true;
this.RS4.Items.AddRange(new object[] {
resources.GetString("RS4.Items"),
@ -314,26 +293,13 @@
resources.GetString("RS4.Items4"),
resources.GetString("RS4.Items5"),
resources.GetString("RS4.Items6"),
resources.GetString("RS4.Items7"),
resources.GetString("RS4.Items8"),
resources.GetString("RS4.Items9"),
resources.GetString("RS4.Items10"),
resources.GetString("RS4.Items11"),
resources.GetString("RS4.Items12"),
resources.GetString("RS4.Items13"),
resources.GetString("RS4.Items14"),
resources.GetString("RS4.Items15"),
resources.GetString("RS4.Items16"),
resources.GetString("RS4.Items17"),
resources.GetString("RS4.Items18"),
resources.GetString("RS4.Items19"),
resources.GetString("RS4.Items20")});
resources.GetString("RS4.Items7")});
resources.ApplyResources(this.RS4, "RS4");
this.RS4.Name = "RS4";
this.toolTip1.SetToolTip(this.RS4, resources.GetString("RS4.ToolTip"));
//
// RS3
//
resources.ApplyResources(this.RS3, "RS3");
this.RS3.FormattingEnabled = true;
this.RS3.Items.AddRange(new object[] {
resources.GetString("RS3.Items"),
@ -366,12 +332,12 @@
resources.GetString("RS3.Items27"),
resources.GetString("RS3.Items28"),
resources.GetString("RS3.Items29")});
resources.ApplyResources(this.RS3, "RS3");
this.RS3.Name = "RS3";
this.toolTip1.SetToolTip(this.RS3, resources.GetString("RS3.ToolTip"));
//
// RS2
//
resources.ApplyResources(this.RS2, "RS2");
this.RS2.FormattingEnabled = true;
this.RS2.Items.AddRange(new object[] {
resources.GetString("RS2.Items"),
@ -383,13 +349,16 @@
resources.GetString("RS2.Items6"),
resources.GetString("RS2.Items7"),
resources.GetString("RS2.Items8"),
resources.GetString("RS2.Items9")});
resources.GetString("RS2.Items9"),
resources.GetString("RS2.Items10"),
resources.GetString("RS2.Items11"),
resources.GetString("RS2.Items12")});
resources.ApplyResources(this.RS2, "RS2");
this.RS2.Name = "RS2";
this.toolTip1.SetToolTip(this.RS2, resources.GetString("RS2.ToolTip"));
//
// RS1
//
resources.ApplyResources(this.RS1, "RS1");
this.RS1.FormattingEnabled = true;
this.RS1.Items.AddRange(new object[] {
resources.GetString("RS1.Items"),
@ -401,6 +370,7 @@
resources.GetString("RS1.Items6"),
resources.GetString("RS1.Items7"),
resources.GetString("RS1.Items8")});
resources.ApplyResources(this.RS1, "RS1");
this.RS1.Name = "RS1";
this.toolTip1.SetToolTip(this.RS1, resources.GetString("RS1.ToolTip"));
//
@ -413,7 +383,6 @@
//
// S10
//
resources.ApplyResources(this.S10, "S10");
this.S10.FormattingEnabled = true;
this.S10.Items.AddRange(new object[] {
resources.GetString("S10.Items"),
@ -435,12 +404,12 @@
resources.GetString("S10.Items16"),
resources.GetString("S10.Items17"),
resources.GetString("S10.Items18")});
resources.ApplyResources(this.S10, "S10");
this.S10.Name = "S10";
this.toolTip1.SetToolTip(this.S10, resources.GetString("S10.ToolTip"));
//
// S11
//
resources.ApplyResources(this.S11, "S11");
this.S11.FormattingEnabled = true;
this.S11.Items.AddRange(new object[] {
resources.GetString("S11.Items"),
@ -453,32 +422,32 @@
resources.GetString("S11.Items7"),
resources.GetString("S11.Items8"),
resources.GetString("S11.Items9")});
resources.ApplyResources(this.S11, "S11");
this.S11.Name = "S11";
this.toolTip1.SetToolTip(this.S11, resources.GetString("S11.ToolTip"));
//
// S12
//
resources.ApplyResources(this.S12, "S12");
this.S12.FormattingEnabled = true;
this.S12.Items.AddRange(new object[] {
resources.GetString("S12.Items"),
resources.GetString("S12.Items1")});
resources.ApplyResources(this.S12, "S12");
this.S12.Name = "S12";
this.toolTip1.SetToolTip(this.S12, resources.GetString("S12.ToolTip"));
//
// RS12
//
resources.ApplyResources(this.RS12, "RS12");
this.RS12.FormattingEnabled = true;
this.RS12.Items.AddRange(new object[] {
resources.GetString("RS12.Items"),
resources.GetString("RS12.Items1")});
resources.ApplyResources(this.RS12, "RS12");
this.RS12.Name = "RS12";
this.toolTip1.SetToolTip(this.RS12, resources.GetString("RS12.ToolTip"));
//
// RS11
//
resources.ApplyResources(this.RS11, "RS11");
this.RS11.FormattingEnabled = true;
this.RS11.Items.AddRange(new object[] {
resources.GetString("RS11.Items"),
@ -491,12 +460,12 @@
resources.GetString("RS11.Items7"),
resources.GetString("RS11.Items8"),
resources.GetString("RS11.Items9")});
resources.ApplyResources(this.RS11, "RS11");
this.RS11.Name = "RS11";
this.toolTip1.SetToolTip(this.RS11, resources.GetString("RS11.ToolTip"));
//
// RS10
//
resources.ApplyResources(this.RS10, "RS10");
this.RS10.FormattingEnabled = true;
this.RS10.Items.AddRange(new object[] {
resources.GetString("RS10.Items"),
@ -518,12 +487,12 @@
resources.GetString("RS10.Items16"),
resources.GetString("RS10.Items17"),
resources.GetString("RS10.Items18")});
resources.ApplyResources(this.RS10, "RS10");
this.RS10.Name = "RS10";
this.toolTip1.SetToolTip(this.RS10, resources.GetString("RS10.ToolTip"));
//
// S9
//
resources.ApplyResources(this.S9, "S9");
this.S9.FormattingEnabled = true;
this.S9.Items.AddRange(new object[] {
resources.GetString("S9.Items"),
@ -535,12 +504,11 @@
resources.GetString("S9.Items6"),
resources.GetString("S9.Items7"),
resources.GetString("S9.Items8")});
resources.ApplyResources(this.S9, "S9");
this.S9.Name = "S9";
this.toolTip1.SetToolTip(this.S9, resources.GetString("S9.ToolTip"));
//
// S8
//
resources.ApplyResources(this.S8, "S8");
this.S8.FormattingEnabled = true;
this.S8.Items.AddRange(new object[] {
resources.GetString("S8.Items"),
@ -555,12 +523,11 @@
resources.GetString("S8.Items9"),
resources.GetString("S8.Items10"),
resources.GetString("S8.Items11")});
resources.ApplyResources(this.S8, "S8");
this.S8.Name = "S8";
this.toolTip1.SetToolTip(this.S8, resources.GetString("S8.ToolTip"));
//
// RS8
//
resources.ApplyResources(this.RS8, "RS8");
this.RS8.FormattingEnabled = true;
this.RS8.Items.AddRange(new object[] {
resources.GetString("RS8.Items"),
@ -572,12 +539,11 @@
resources.GetString("RS8.Items6"),
resources.GetString("RS8.Items7"),
resources.GetString("RS8.Items8")});
resources.ApplyResources(this.RS8, "RS8");
this.RS8.Name = "RS8";
this.toolTip1.SetToolTip(this.RS8, resources.GetString("RS8.ToolTip"));
//
// RS9
//
resources.ApplyResources(this.RS9, "RS9");
this.RS9.FormattingEnabled = true;
this.RS9.Items.AddRange(new object[] {
resources.GetString("RS9.Items"),
@ -589,59 +555,51 @@
resources.GetString("RS9.Items6"),
resources.GetString("RS9.Items7"),
resources.GetString("RS9.Items8")});
resources.ApplyResources(this.RS9, "RS9");
this.RS9.Name = "RS9";
this.toolTip1.SetToolTip(this.RS9, resources.GetString("RS9.ToolTip"));
//
// RS0
//
resources.ApplyResources(this.RS0, "RS0");
this.RS0.Name = "RS0";
this.RS0.ReadOnly = true;
this.toolTip1.SetToolTip(this.RS0, resources.GetString("RS0.ToolTip"));
//
// label9
//
resources.ApplyResources(this.label9, "label9");
this.label9.Name = "label9";
this.toolTip1.SetToolTip(this.label9, resources.GetString("label9.ToolTip"));
//
// label10
//
resources.ApplyResources(this.label10, "label10");
this.label10.Name = "label10";
this.toolTip1.SetToolTip(this.label10, resources.GetString("label10.ToolTip"));
//
// RTI
//
resources.ApplyResources(this.RTI, "RTI");
this.RTI.Name = "RTI";
this.RTI.ReadOnly = true;
this.toolTip1.SetToolTip(this.RTI, resources.GetString("RTI.ToolTip"));
//
// ATI
//
resources.ApplyResources(this.ATI, "ATI");
this.ATI.Name = "ATI";
this.ATI.ReadOnly = true;
this.toolTip1.SetToolTip(this.ATI, resources.GetString("ATI.ToolTip"));
//
// label11
//
resources.ApplyResources(this.label11, "label11");
this.label11.Name = "label11";
this.toolTip1.SetToolTip(this.label11, resources.GetString("label11.ToolTip"));
//
// label12
//
resources.ApplyResources(this.label12, "label12");
this.label12.Name = "label12";
this.toolTip1.SetToolTip(this.label12, resources.GetString("label12.ToolTip"));
//
// BUT_savesettings
//
resources.ApplyResources(this.BUT_savesettings, "BUT_savesettings");
this.BUT_savesettings.Name = "BUT_savesettings";
this.toolTip1.SetToolTip(this.BUT_savesettings, resources.GetString("BUT_savesettings.ToolTip"));
this.BUT_savesettings.UseVisualStyleBackColor = true;
this.BUT_savesettings.Click += new System.EventHandler(this.BUT_savesettings_Click);
//
@ -649,22 +607,19 @@
//
resources.ApplyResources(this.BUT_getcurrent, "BUT_getcurrent");
this.BUT_getcurrent.Name = "BUT_getcurrent";
this.toolTip1.SetToolTip(this.BUT_getcurrent, resources.GetString("BUT_getcurrent.ToolTip"));
this.BUT_getcurrent.UseVisualStyleBackColor = true;
this.BUT_getcurrent.Click += new System.EventHandler(this.BUT_getcurrent_Click);
//
// lbl_status
//
resources.ApplyResources(this.lbl_status, "lbl_status");
this.lbl_status.BackColor = System.Drawing.Color.Transparent;
resources.ApplyResources(this.lbl_status, "lbl_status");
this.lbl_status.Name = "lbl_status";
this.toolTip1.SetToolTip(this.lbl_status, resources.GetString("lbl_status.ToolTip"));
//
// BUT_upload
//
resources.ApplyResources(this.BUT_upload, "BUT_upload");
this.BUT_upload.Name = "BUT_upload";
this.toolTip1.SetToolTip(this.BUT_upload, resources.GetString("BUT_upload.ToolTip"));
this.BUT_upload.UseVisualStyleBackColor = true;
this.BUT_upload.Click += new System.EventHandler(this.BUT_upload_Click);
//
@ -672,7 +627,6 @@
//
resources.ApplyResources(this.BUT_syncS2, "BUT_syncS2");
this.BUT_syncS2.Name = "BUT_syncS2";
this.toolTip1.SetToolTip(this.BUT_syncS2, resources.GetString("BUT_syncS2.ToolTip"));
this.BUT_syncS2.UseVisualStyleBackColor = true;
this.BUT_syncS2.Click += new System.EventHandler(this.BUT_syncS2_Click);
//
@ -680,7 +634,6 @@
//
resources.ApplyResources(this.BUT_syncS3, "BUT_syncS3");
this.BUT_syncS3.Name = "BUT_syncS3";
this.toolTip1.SetToolTip(this.BUT_syncS3, resources.GetString("BUT_syncS3.ToolTip"));
this.BUT_syncS3.UseVisualStyleBackColor = true;
this.BUT_syncS3.Click += new System.EventHandler(this.BUT_syncS3_Click);
//
@ -688,7 +641,6 @@
//
resources.ApplyResources(this.BUT_syncS5, "BUT_syncS5");
this.BUT_syncS5.Name = "BUT_syncS5";
this.toolTip1.SetToolTip(this.BUT_syncS5, resources.GetString("BUT_syncS5.ToolTip"));
this.BUT_syncS5.UseVisualStyleBackColor = true;
this.BUT_syncS5.Click += new System.EventHandler(this.BUT_syncS5_Click);
//
@ -696,115 +648,96 @@
//
resources.ApplyResources(this.label13, "label13");
this.label13.Name = "label13";
this.toolTip1.SetToolTip(this.label13, resources.GetString("label13.ToolTip"));
//
// label14
//
resources.ApplyResources(this.label14, "label14");
this.label14.Name = "label14";
this.toolTip1.SetToolTip(this.label14, resources.GetString("label14.ToolTip"));
//
// label15
//
resources.ApplyResources(this.label15, "label15");
this.label15.Name = "label15";
this.toolTip1.SetToolTip(this.label15, resources.GetString("label15.ToolTip"));
//
// label16
//
resources.ApplyResources(this.label16, "label16");
this.label16.Name = "label16";
this.toolTip1.SetToolTip(this.label16, resources.GetString("label16.ToolTip"));
//
// label17
//
resources.ApplyResources(this.label17, "label17");
this.label17.Name = "label17";
this.toolTip1.SetToolTip(this.label17, resources.GetString("label17.ToolTip"));
//
// label20
//
resources.ApplyResources(this.label20, "label20");
this.label20.Name = "label20";
this.toolTip1.SetToolTip(this.label20, resources.GetString("label20.ToolTip"));
//
// label21
//
resources.ApplyResources(this.label21, "label21");
this.label21.Name = "label21";
this.toolTip1.SetToolTip(this.label21, resources.GetString("label21.ToolTip"));
//
// label22
//
resources.ApplyResources(this.label22, "label22");
this.label22.Name = "label22";
this.toolTip1.SetToolTip(this.label22, resources.GetString("label22.ToolTip"));
//
// label23
//
resources.ApplyResources(this.label23, "label23");
this.label23.Name = "label23";
this.toolTip1.SetToolTip(this.label23, resources.GetString("label23.ToolTip"));
//
// label24
//
resources.ApplyResources(this.label24, "label24");
this.label24.Name = "label24";
this.toolTip1.SetToolTip(this.label24, resources.GetString("label24.ToolTip"));
//
// label25
//
resources.ApplyResources(this.label25, "label25");
this.label25.Name = "label25";
this.toolTip1.SetToolTip(this.label25, resources.GetString("label25.ToolTip"));
//
// label26
//
resources.ApplyResources(this.label26, "label26");
this.label26.Name = "label26";
this.toolTip1.SetToolTip(this.label26, resources.GetString("label26.ToolTip"));
//
// label27
//
resources.ApplyResources(this.label27, "label27");
this.label27.Name = "label27";
this.toolTip1.SetToolTip(this.label27, resources.GetString("label27.ToolTip"));
//
// label28
//
resources.ApplyResources(this.label28, "label28");
this.label28.Name = "label28";
this.toolTip1.SetToolTip(this.label28, resources.GetString("label28.ToolTip"));
//
// label29
//
resources.ApplyResources(this.label29, "label29");
this.label29.Name = "label29";
this.toolTip1.SetToolTip(this.label29, resources.GetString("label29.ToolTip"));
//
// label30
//
resources.ApplyResources(this.label30, "label30");
this.label30.Name = "label30";
this.toolTip1.SetToolTip(this.label30, resources.GetString("label30.ToolTip"));
//
// label31
//
resources.ApplyResources(this.label31, "label31");
this.label31.Name = "label31";
this.toolTip1.SetToolTip(this.label31, resources.GetString("label31.ToolTip"));
//
// label32
//
resources.ApplyResources(this.label32, "label32");
this.label32.Name = "label32";
this.toolTip1.SetToolTip(this.label32, resources.GetString("label32.ToolTip"));
//
// BUT_syncS8
//
resources.ApplyResources(this.BUT_syncS8, "BUT_syncS8");
this.BUT_syncS8.Name = "BUT_syncS8";
this.toolTip1.SetToolTip(this.BUT_syncS8, resources.GetString("BUT_syncS8.ToolTip"));
this.BUT_syncS8.UseVisualStyleBackColor = true;
this.BUT_syncS8.Click += new System.EventHandler(this.BUT_syncS8_Click);
//
@ -812,7 +745,6 @@
//
resources.ApplyResources(this.BUT_syncS9, "BUT_syncS9");
this.BUT_syncS9.Name = "BUT_syncS9";
this.toolTip1.SetToolTip(this.BUT_syncS9, resources.GetString("BUT_syncS9.ToolTip"));
this.BUT_syncS9.UseVisualStyleBackColor = true;
this.BUT_syncS9.Click += new System.EventHandler(this.BUT_syncS9_Click);
//
@ -820,7 +752,6 @@
//
resources.ApplyResources(this.BUT_syncS10, "BUT_syncS10");
this.BUT_syncS10.Name = "BUT_syncS10";
this.toolTip1.SetToolTip(this.BUT_syncS10, resources.GetString("BUT_syncS10.ToolTip"));
this.BUT_syncS10.UseVisualStyleBackColor = true;
this.BUT_syncS10.Click += new System.EventHandler(this.BUT_syncS10_Click);
//
@ -900,7 +831,6 @@
this.Controls.Add(this.BUT_upload);
this.MinimumSize = new System.Drawing.Size(781, 433);
this.Name = "_3DRradio";
this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip"));
this.ResumeLayout(false);
this.PerformLayout();

33
Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs
View File

@ -16,37 +16,6 @@ namespace ArdupilotMega
{
public partial class _3DRradio : BackStageViewContentPanel
{
/*
responce 0 S0: FORMAT=25
S1: SERIAL_SPEED=57
S2: AIR_SPEED=64
S3: NETID=25
S4: TXPOWER=20
S5: ECC=1
S6: MAVLINK=1
S7: OPPRESEND=1
S8: MIN_FREQ=915000
S9: MAX_FREQ=928000
S10: NUM_CHANNELS=50
S11: DUTY_CYCLE=100
S12: LBT_RSSI=0
S13: MANCHESTER=0
*/
public delegate void LogEventHandler(string message, int level = 0);
public delegate void ProgressEventHandler(double completed);
@ -634,7 +603,7 @@ S13: MANCHESTER=0
Console.Write("Connect Version: " + version.Trim() + "\n");
if (version.Contains("on HM-TRP"))
if (version.Contains("SiK") && version.Contains("on")) // should use a regex....
{
return true;
}

4753
Tools/ArdupilotMegaPlanner/Radio/3DRradio.resx
View File

File diff suppressed because it is too large Load Diff

14
Tools/ArdupilotMegaPlanner/Radio/Uploader.cs
View File

@ -13,7 +13,7 @@ namespace uploader
private int bytes_processed;
public SerialPort port;
private enum Code : byte
public enum Code : byte
{
// response codes
OK = 0x10,
@ -39,6 +39,7 @@ namespace uploader
// device IDs XXX should come with the firmware image...
DEVICE_ID_RF50 = 0x4d,
DEVICE_ID_HM_TRP= 0x4e,
DEVICE_ID_RFD900= 0X42,
// frequency code bytes XXX should come with the firmware image...
FREQ_NONE = 0xf0,
@ -323,6 +324,17 @@ namespace uploader
getSync ();
}
public void getDevice(ref Code device, ref Code freq)
{
send(Code.GET_DEVICE);
send(Code.EOC);
device = (Code)recv();
freq = (Code)recv();
getSync();
}
/// <summary>
/// Expect the two-byte synchronisation codes within the read timeout.

4
Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
View File

@ -34,6 +34,8 @@ namespace ArdupilotMega.Utilities
objXmlTextWriter.Formatting = Formatting.Indented;
objXmlTextWriter.WriteStartDocument();
objXmlTextWriter.WriteStartElement("Params");
foreach (string parameterLocation in parameterLocations)
{
// Write the start element for this parameter location
@ -48,6 +50,8 @@ namespace ArdupilotMega.Utilities
objXmlTextWriter.WriteEndElement();
}
objXmlTextWriter.WriteEndElement();
// Clear the stream
objXmlTextWriter.WriteEndDocument();

2
Tools/ArdupilotMegaPlanner/app.config
View File

@ -9,7 +9,7 @@
<add key="UpdateLocation"
value="http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/bin/Release/"/>
<add key="ParameterLocations"
value="http://ardupilot-mega.googlecode.com/git/ArduCopter/Parameters.pde"/>
value="http://ardupilot-mega.googlecode.com/git/ArduCopter/Parameters.pde;http://ardupilot-mega.googlecode.com/git/ArduPlane/Parameters.pde"/>
<add key="ParameterMetaDataXMLFileName"
value="ParameterMetaData.xml"/>
</appSettings>

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

@ -8,6 +8,10 @@
<appSettings>
<add key="UpdateLocation"
value="http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/bin/Release/"/>
<add key="ParameterLocations"
value="http://ardupilot-mega.googlecode.com/git/ArduCopter/Parameters.pde;http://ardupilot-mega.googlecode.com/git/ArduPlane/Parameters.pde"/>
<add key="ParameterMetaDataXMLFileName"
value="ParameterMetaData.xml"/>
</appSettings>
<log4net>
<appender name="Console" type="log4net.Appender.ConsoleAppender">

BIN
Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb
View File

Binary file not shown.

2
Tools/ArdupilotMegaPlanner/bin/Release/version.txt
View File

@ -1 +1 @@
1.1.4499.14296
1.1.4503.33640

24
Tools/ArdupilotMegaPlanner/georefimage.cs
View File

@ -40,6 +40,7 @@ namespace ArdupilotMega
private Label label4;
private Label label5;
private Label label6;
private Controls.MyButton BUT_networklinkgeoref;
private ArdupilotMega.Controls.MyButton BUT_Geotagimages;
internal Georefimage() {
@ -146,7 +147,7 @@ namespace ArdupilotMega
string[] vals = new string[] { "GPS", (cs.datetime - new DateTime(cs.datetime.Year,cs.datetime.Month,cs.datetime.Day,0,0,0,DateTimeKind.Local)).TotalMilliseconds.ToString(), "1",
cs.satcount.ToString(),cs.lat.ToString(),cs.lng.ToString(),"0.0",cs.alt.ToString(),cs.alt.ToString(),cs.groundspeed.ToString(),cs.groundcourse.ToString()};
cs.satcount.ToString(),cs.lat.ToString(),cs.lng.ToString(),"0.0",cs.alt.ToString(),cs.alt.ToString(),cs.groundspeed.ToString(),cs.yaw.ToString()};
if (oldvalues.Length > 2 && oldvalues[latpos] == vals[latpos]
&& oldvalues[lngpos] == vals[lngpos]
@ -433,6 +434,7 @@ namespace ArdupilotMega
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.BUT_networklinkgeoref = new ArdupilotMega.Controls.MyButton();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit();
@ -492,7 +494,7 @@ namespace ArdupilotMega
// BUT_Geotagimages
//
this.BUT_Geotagimages.Enabled = false;
this.BUT_Geotagimages.Location = new System.Drawing.Point(223, 161);
this.BUT_Geotagimages.Location = new System.Drawing.Point(259, 161);
this.BUT_Geotagimages.Name = "BUT_Geotagimages";
this.BUT_Geotagimages.Size = new System.Drawing.Size(75, 23);
this.BUT_Geotagimages.TabIndex = 9;
@ -512,7 +514,7 @@ namespace ArdupilotMega
//
// BUT_doit
//
this.BUT_doit.Location = new System.Drawing.Point(142, 161);
this.BUT_doit.Location = new System.Drawing.Point(97, 161);
this.BUT_doit.Name = "BUT_doit";
this.BUT_doit.Size = new System.Drawing.Size(75, 23);
this.BUT_doit.TabIndex = 5;
@ -633,9 +635,20 @@ namespace ArdupilotMega
this.label6.TabIndex = 18;
this.label6.Text = "Log Offsets";
//
// BUT_networklinkgeoref
//
this.BUT_networklinkgeoref.Location = new System.Drawing.Point(178, 161);
this.BUT_networklinkgeoref.Name = "BUT_networklinkgeoref";
this.BUT_networklinkgeoref.Size = new System.Drawing.Size(75, 23);
this.BUT_networklinkgeoref.TabIndex = 19;
this.BUT_networklinkgeoref.Text = "Location Kml";
this.BUT_networklinkgeoref.UseVisualStyleBackColor = true;
this.BUT_networklinkgeoref.Click += new System.EventHandler(this.BUT_networklinkgeoref_Click);
//
// Georefimage
//
this.ClientSize = new System.Drawing.Size(452, 362);
this.Controls.Add(this.BUT_networklinkgeoref);
this.Controls.Add(this.label6);
this.Controls.Add(this.label5);
this.Controls.Add(this.label4);
@ -812,6 +825,11 @@ namespace ArdupilotMega
}
}
}
private void BUT_networklinkgeoref_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + "m3u" + Path.DirectorySeparatorChar + "GeoRefnetworklink.kml");
}
}
public class Rational

11
Tools/ArdupilotMegaPlanner/srtm.cs
View File

@ -7,6 +7,7 @@ using System.Net;
using System.Text.RegularExpressions;
using ICSharpCode.SharpZipLib.Zip;
using System.Threading;
using System.Collections;
namespace ArdupilotMega
{
@ -22,6 +23,8 @@ namespace ArdupilotMega
static List<string> queue = new List<string>();
static Hashtable altcache = new Hashtable();
public static int getAltitude(double lat, double lng, double zoom)
{
if (!Directory.Exists(datadirectory))
@ -32,6 +35,12 @@ namespace ArdupilotMega
lat += 0.00083333333333333;
//lng += 0.0008;
if (altcache[lat * lng] != null)
return (int)(short)altcache[lat * lng];
if (altcache.Count > 10000)
altcache = new Hashtable();
int x = (int)Math.Floor(lng);
int y = (int)Math.Floor(lat);
@ -93,6 +102,8 @@ namespace ArdupilotMega
alt = BitConverter.ToInt16(data, 0);
altcache[lat * lng] = alt;
return alt;
}
else if (File.Exists(datadirectory + Path.DirectorySeparatorChar + filename2))

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

@ -28,127 +28,29 @@
/// </summary>
private void InitializeComponent()
{
this.button1 = new ArdupilotMega.Controls.MyButton();
this.BUT_wipeeeprom = new ArdupilotMega.Controls.MyButton();
this.BUT_flashdl = new ArdupilotMega.Controls.MyButton();
this.BUT_flashup = new ArdupilotMega.Controls.MyButton();
this.BUT_dleeprom = new ArdupilotMega.Controls.MyButton();
this.BUT_copy1280 = new ArdupilotMega.Controls.MyButton();
this.BUT_copy2560 = new ArdupilotMega.Controls.MyButton();
this.BUT_copyto2560 = new ArdupilotMega.Controls.MyButton();
this.BUT_copyto1280 = new ArdupilotMega.Controls.MyButton();
this.button2 = new ArdupilotMega.Controls.MyButton();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.BUT_geinjection = new ArdupilotMega.Controls.MyButton();
this.BUT_clearcustommaps = new ArdupilotMega.Controls.MyButton();
this.BUT_lang_edit = new ArdupilotMega.Controls.MyButton();
this.BUT_georefimage = new ArdupilotMega.Controls.MyButton();
this.BUT_follow_me = new ArdupilotMega.Controls.MyButton();
this.BUT_ant_track = new ArdupilotMega.Controls.MyButton();
this.BUT_magcalib = new ArdupilotMega.Controls.MyButton();
this.BUT_ant_track = new ArdupilotMega.Controls.MyButton();
this.BUT_follow_me = new ArdupilotMega.Controls.MyButton();
this.BUT_georefimage = new ArdupilotMega.Controls.MyButton();
this.BUT_lang_edit = new ArdupilotMega.Controls.MyButton();
this.BUT_clearcustommaps = new ArdupilotMega.Controls.MyButton();
this.BUT_geinjection = new ArdupilotMega.Controls.MyButton();
this.button2 = new ArdupilotMega.Controls.MyButton();
this.BUT_copyto2560 = new ArdupilotMega.Controls.MyButton();
this.BUT_copyto1280 = new ArdupilotMega.Controls.MyButton();
this.BUT_copy2560 = new ArdupilotMega.Controls.MyButton();
this.BUT_copy1280 = new ArdupilotMega.Controls.MyButton();
this.BUT_dleeprom = new ArdupilotMega.Controls.MyButton();
this.BUT_flashup = new ArdupilotMega.Controls.MyButton();
this.BUT_flashdl = new ArdupilotMega.Controls.MyButton();
this.BUT_wipeeeprom = new ArdupilotMega.Controls.MyButton();
this.button1 = new ArdupilotMega.Controls.MyButton();
this.test1 = new ArdupilotMega.Controls.OpenGLtest();
this.SuspendLayout();
//
// button1
//
this.button1.Location = new System.Drawing.Point(542, 12);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(125, 23);
this.button1.TabIndex = 0;
this.button1.Text = "upload eeprom";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// BUT_wipeeeprom
//
this.BUT_wipeeeprom.Location = new System.Drawing.Point(411, 12);
this.BUT_wipeeeprom.Name = "BUT_wipeeeprom";
this.BUT_wipeeeprom.Size = new System.Drawing.Size(125, 23);
this.BUT_wipeeeprom.TabIndex = 1;
this.BUT_wipeeeprom.Text = "WIPE eeprom";
this.BUT_wipeeeprom.UseVisualStyleBackColor = true;
this.BUT_wipeeeprom.Click += new System.EventHandler(this.BUT_wipeeeprom_Click);
//
// BUT_flashdl
//
this.BUT_flashdl.Location = new System.Drawing.Point(411, 81);
this.BUT_flashdl.Name = "BUT_flashdl";
this.BUT_flashdl.Size = new System.Drawing.Size(125, 23);
this.BUT_flashdl.TabIndex = 2;
this.BUT_flashdl.Text = "download flash";
this.BUT_flashdl.UseVisualStyleBackColor = true;
this.BUT_flashdl.Click += new System.EventHandler(this.BUT_flashdl_Click);
//
// BUT_flashup
//
this.BUT_flashup.Location = new System.Drawing.Point(542, 81);
this.BUT_flashup.Name = "BUT_flashup";
this.BUT_flashup.Size = new System.Drawing.Size(125, 23);
this.BUT_flashup.TabIndex = 3;
this.BUT_flashup.Text = "upload flash";
this.BUT_flashup.UseVisualStyleBackColor = true;
this.BUT_flashup.Click += new System.EventHandler(this.BUT_flashup_Click);
//
// BUT_dleeprom
//
this.BUT_dleeprom.Location = new System.Drawing.Point(476, 46);
this.BUT_dleeprom.Name = "BUT_dleeprom";
this.BUT_dleeprom.Size = new System.Drawing.Size(125, 23);
this.BUT_dleeprom.TabIndex = 4;
this.BUT_dleeprom.Text = "download eeprom";
this.BUT_dleeprom.UseVisualStyleBackColor = true;
this.BUT_dleeprom.Click += new System.EventHandler(this.BUT_dleeprom_Click);
//
// BUT_copy1280
//
this.BUT_copy1280.Location = new System.Drawing.Point(12, 12);
this.BUT_copy1280.Name = "BUT_copy1280";
this.BUT_copy1280.Size = new System.Drawing.Size(125, 23);
this.BUT_copy1280.TabIndex = 5;
this.BUT_copy1280.Text = "Copy APM 1280";
this.BUT_copy1280.UseVisualStyleBackColor = true;
this.BUT_copy1280.Click += new System.EventHandler(this.BUT_copy1280_Click);
//
// BUT_copy2560
//
this.BUT_copy2560.Location = new System.Drawing.Point(12, 41);
this.BUT_copy2560.Name = "BUT_copy2560";
this.BUT_copy2560.Size = new System.Drawing.Size(125, 23);
this.BUT_copy2560.TabIndex = 6;
this.BUT_copy2560.Text = "Copy APM 2560";
this.BUT_copy2560.UseVisualStyleBackColor = true;
this.BUT_copy2560.Click += new System.EventHandler(this.BUT_copy2560_Click);
//
// BUT_copyto2560
//
this.BUT_copyto2560.Location = new System.Drawing.Point(143, 41);
this.BUT_copyto2560.Name = "BUT_copyto2560";
this.BUT_copyto2560.Size = new System.Drawing.Size(125, 23);
this.BUT_copyto2560.TabIndex = 8;
this.BUT_copyto2560.Text = "Copy to APM 2560";
this.BUT_copyto2560.UseVisualStyleBackColor = true;
//
// BUT_copyto1280
//
this.BUT_copyto1280.Location = new System.Drawing.Point(143, 12);
this.BUT_copyto1280.Name = "BUT_copyto1280";
this.BUT_copyto1280.Size = new System.Drawing.Size(125, 23);
this.BUT_copyto1280.TabIndex = 7;
this.BUT_copyto1280.Text = "Copy to APM 1280";
this.BUT_copyto1280.UseVisualStyleBackColor = true;
this.BUT_copyto1280.Click += new System.EventHandler(this.BUT_copyto1280_Click);
//
// button2
//
this.button2.Location = new System.Drawing.Point(41, 118);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(159, 23);
this.button2.TabIndex = 9;
this.button2.Text = "firmware.hex 2 firmware.bin";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// label1
//
this.label1.AutoSize = true;
@ -176,54 +78,14 @@
this.label3.TabIndex = 13;
this.label3.Text = "1280 - can do full copy\'s 2560- full read, write flash only";
//
// BUT_geinjection
// BUT_magcalib
//
this.BUT_geinjection.Location = new System.Drawing.Point(150, 229);
this.BUT_geinjection.Name = "BUT_geinjection";
this.BUT_geinjection.Size = new System.Drawing.Size(209, 40);
this.BUT_geinjection.TabIndex = 14;
this.BUT_geinjection.Text = "Inject GE into database (now jpgs)";
this.BUT_geinjection.UseVisualStyleBackColor = true;
this.BUT_geinjection.Click += new System.EventHandler(this.BUT_geinjection_Click);
//
// BUT_clearcustommaps
//
this.BUT_clearcustommaps.Location = new System.Drawing.Point(365, 229);
this.BUT_clearcustommaps.Name = "BUT_clearcustommaps";
this.BUT_clearcustommaps.Size = new System.Drawing.Size(209, 40);
this.BUT_clearcustommaps.TabIndex = 15;
this.BUT_clearcustommaps.Text = "Clear Custom Maps from Database";
this.BUT_clearcustommaps.UseVisualStyleBackColor = true;
this.BUT_clearcustommaps.Click += new System.EventHandler(this.BUT_clearcustommaps_Click);
//
// BUT_lang_edit
//
this.BUT_lang_edit.Location = new System.Drawing.Point(323, 164);
this.BUT_lang_edit.Name = "BUT_lang_edit";
this.BUT_lang_edit.Size = new System.Drawing.Size(75, 23);
this.BUT_lang_edit.TabIndex = 16;
this.BUT_lang_edit.Text = "Lang Edit";
this.BUT_lang_edit.UseVisualStyleBackColor = true;
this.BUT_lang_edit.Click += new System.EventHandler(this.BUT_lang_edit_Click);
//
// BUT_georefimage
//
this.BUT_georefimage.Location = new System.Drawing.Point(221, 164);
this.BUT_georefimage.Name = "BUT_georefimage";
this.BUT_georefimage.Size = new System.Drawing.Size(96, 23);
this.BUT_georefimage.TabIndex = 0;
this.BUT_georefimage.Text = "Geo ref images";
this.BUT_georefimage.Click += new System.EventHandler(this.BUT_georefimage_Click);
//
// BUT_follow_me
//
this.BUT_follow_me.Location = new System.Drawing.Point(485, 164);
this.BUT_follow_me.Name = "BUT_follow_me";
this.BUT_follow_me.Size = new System.Drawing.Size(75, 23);
this.BUT_follow_me.TabIndex = 17;
this.BUT_follow_me.Text = "Follow Me";
this.BUT_follow_me.UseVisualStyleBackColor = true;
this.BUT_follow_me.Click += new System.EventHandler(this.BUT_follow_me_Click);
this.BUT_magcalib.Location = new System.Drawing.Point(119, 164);
this.BUT_magcalib.Name = "BUT_magcalib";
this.BUT_magcalib.Size = new System.Drawing.Size(96, 23);
this.BUT_magcalib.TabIndex = 19;
this.BUT_magcalib.Text = "Mag Calib";
this.BUT_magcalib.Click += new System.EventHandler(this.BUT_magcalib_Click);
//
// BUT_ant_track
//
@ -235,20 +97,172 @@
this.BUT_ant_track.UseVisualStyleBackColor = true;
this.BUT_ant_track.Click += new System.EventHandler(this.BUT_ant_track_Click);
//
// BUT_magcalib
// BUT_follow_me
//
this.BUT_magcalib.Location = new System.Drawing.Point(119, 164);
this.BUT_magcalib.Name = "BUT_magcalib";
this.BUT_magcalib.Size = new System.Drawing.Size(96, 23);
this.BUT_magcalib.TabIndex = 19;
this.BUT_magcalib.Text = "Mag Calib";
this.BUT_magcalib.Click += new System.EventHandler(this.BUT_magcalib_Click);
this.BUT_follow_me.Location = new System.Drawing.Point(485, 164);
this.BUT_follow_me.Name = "BUT_follow_me";
this.BUT_follow_me.Size = new System.Drawing.Size(75, 23);
this.BUT_follow_me.TabIndex = 17;
this.BUT_follow_me.Text = "Follow Me";
this.BUT_follow_me.UseVisualStyleBackColor = true;
this.BUT_follow_me.Click += new System.EventHandler(this.BUT_follow_me_Click);
//
// BUT_georefimage
//
this.BUT_georefimage.Location = new System.Drawing.Point(221, 164);
this.BUT_georefimage.Name = "BUT_georefimage";
this.BUT_georefimage.Size = new System.Drawing.Size(96, 23);
this.BUT_georefimage.TabIndex = 0;
this.BUT_georefimage.Text = "Geo ref images";
this.BUT_georefimage.Click += new System.EventHandler(this.BUT_georefimage_Click);
//
// BUT_lang_edit
//
this.BUT_lang_edit.Location = new System.Drawing.Point(323, 164);
this.BUT_lang_edit.Name = "BUT_lang_edit";
this.BUT_lang_edit.Size = new System.Drawing.Size(75, 23);
this.BUT_lang_edit.TabIndex = 16;
this.BUT_lang_edit.Text = "Lang Edit";
this.BUT_lang_edit.UseVisualStyleBackColor = true;
this.BUT_lang_edit.Click += new System.EventHandler(this.BUT_lang_edit_Click);
//
// BUT_clearcustommaps
//
this.BUT_clearcustommaps.Location = new System.Drawing.Point(365, 229);
this.BUT_clearcustommaps.Name = "BUT_clearcustommaps";
this.BUT_clearcustommaps.Size = new System.Drawing.Size(209, 40);
this.BUT_clearcustommaps.TabIndex = 15;
this.BUT_clearcustommaps.Text = "Clear Custom Maps from Database";
this.BUT_clearcustommaps.UseVisualStyleBackColor = true;
this.BUT_clearcustommaps.Click += new System.EventHandler(this.BUT_clearcustommaps_Click);
//
// BUT_geinjection
//
this.BUT_geinjection.Location = new System.Drawing.Point(150, 229);
this.BUT_geinjection.Name = "BUT_geinjection";
this.BUT_geinjection.Size = new System.Drawing.Size(209, 40);
this.BUT_geinjection.TabIndex = 14;
this.BUT_geinjection.Text = "Inject GE into database (now jpgs)";
this.BUT_geinjection.UseVisualStyleBackColor = true;
this.BUT_geinjection.Click += new System.EventHandler(this.BUT_geinjection_Click);
//
// button2
//
this.button2.Location = new System.Drawing.Point(41, 118);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(159, 23);
this.button2.TabIndex = 9;
this.button2.Text = "firmware.hex 2 firmware.bin";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// BUT_copyto2560
//
this.BUT_copyto2560.Location = new System.Drawing.Point(143, 41);
this.BUT_copyto2560.Name = "BUT_copyto2560";
this.BUT_copyto2560.Size = new System.Drawing.Size(125, 23);
this.BUT_copyto2560.TabIndex = 8;
this.BUT_copyto2560.Text = "Copy to APM 2560";
this.BUT_copyto2560.UseVisualStyleBackColor = true;
//
// BUT_copyto1280
//
this.BUT_copyto1280.Location = new System.Drawing.Point(143, 12);
this.BUT_copyto1280.Name = "BUT_copyto1280";
this.BUT_copyto1280.Size = new System.Drawing.Size(125, 23);
this.BUT_copyto1280.TabIndex = 7;
this.BUT_copyto1280.Text = "Copy to APM 1280";
this.BUT_copyto1280.UseVisualStyleBackColor = true;
this.BUT_copyto1280.Click += new System.EventHandler(this.BUT_copyto1280_Click);
//
// BUT_copy2560
//
this.BUT_copy2560.Location = new System.Drawing.Point(12, 41);
this.BUT_copy2560.Name = "BUT_copy2560";
this.BUT_copy2560.Size = new System.Drawing.Size(125, 23);
this.BUT_copy2560.TabIndex = 6;
this.BUT_copy2560.Text = "Copy APM 2560";
this.BUT_copy2560.UseVisualStyleBackColor = true;
this.BUT_copy2560.Click += new System.EventHandler(this.BUT_copy2560_Click);
//
// BUT_copy1280
//
this.BUT_copy1280.Location = new System.Drawing.Point(12, 12);
this.BUT_copy1280.Name = "BUT_copy1280";
this.BUT_copy1280.Size = new System.Drawing.Size(125, 23);
this.BUT_copy1280.TabIndex = 5;
this.BUT_copy1280.Text = "Copy APM 1280";
this.BUT_copy1280.UseVisualStyleBackColor = true;
this.BUT_copy1280.Click += new System.EventHandler(this.BUT_copy1280_Click);
//
// BUT_dleeprom
//
this.BUT_dleeprom.Location = new System.Drawing.Point(476, 46);
this.BUT_dleeprom.Name = "BUT_dleeprom";
this.BUT_dleeprom.Size = new System.Drawing.Size(125, 23);
this.BUT_dleeprom.TabIndex = 4;
this.BUT_dleeprom.Text = "download eeprom";
this.BUT_dleeprom.UseVisualStyleBackColor = true;
this.BUT_dleeprom.Click += new System.EventHandler(this.BUT_dleeprom_Click);
//
// BUT_flashup
//
this.BUT_flashup.Location = new System.Drawing.Point(542, 81);
this.BUT_flashup.Name = "BUT_flashup";
this.BUT_flashup.Size = new System.Drawing.Size(125, 23);
this.BUT_flashup.TabIndex = 3;
this.BUT_flashup.Text = "upload flash";
this.BUT_flashup.UseVisualStyleBackColor = true;
this.BUT_flashup.Click += new System.EventHandler(this.BUT_flashup_Click);
//
// BUT_flashdl
//
this.BUT_flashdl.Location = new System.Drawing.Point(411, 81);
this.BUT_flashdl.Name = "BUT_flashdl";
this.BUT_flashdl.Size = new System.Drawing.Size(125, 23);
this.BUT_flashdl.TabIndex = 2;
this.BUT_flashdl.Text = "download flash";
this.BUT_flashdl.UseVisualStyleBackColor = true;
this.BUT_flashdl.Click += new System.EventHandler(this.BUT_flashdl_Click);
//
// BUT_wipeeeprom
//
this.BUT_wipeeeprom.Location = new System.Drawing.Point(411, 12);
this.BUT_wipeeeprom.Name = "BUT_wipeeeprom";
this.BUT_wipeeeprom.Size = new System.Drawing.Size(125, 23);
this.BUT_wipeeeprom.TabIndex = 1;
this.BUT_wipeeeprom.Text = "WIPE eeprom";
this.BUT_wipeeeprom.UseVisualStyleBackColor = true;
this.BUT_wipeeeprom.Click += new System.EventHandler(this.BUT_wipeeeprom_Click);
//
// button1
//
this.button1.Location = new System.Drawing.Point(542, 12);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(125, 23);
this.button1.TabIndex = 0;
this.button1.Text = "upload eeprom";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// test1
//
this.test1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.test1.BackColor = System.Drawing.Color.Black;
this.test1.Location = new System.Drawing.Point(571, 118);
this.test1.Name = "test1";
this.test1.Size = new System.Drawing.Size(150, 150);
this.test1.TabIndex = 20;
this.test1.VSync = false;
//
// temp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(731, 281);
this.Controls.Add(this.test1);
this.Controls.Add(this.BUT_magcalib);
this.Controls.Add(this.BUT_ant_track);
this.Controls.Add(this.BUT_follow_me);
@ -299,6 +313,7 @@
private ArdupilotMega.Controls.MyButton BUT_follow_me;
private ArdupilotMega.Controls.MyButton BUT_ant_track;
private ArdupilotMega.Controls.MyButton BUT_magcalib;
private Controls.OpenGLtest test1;
//private SharpVectors.Renderers.Forms.SvgPictureBox svgPictureBox1;
}