From 767fcf76bbe8a4d2462e99e63bc4484006dca002 Mon Sep 17 00:00:00 2001
From: mandrolic <mandrolic@f9c3cf11-9bcb-44bc-f272-b75c42450872>
Date: Wed, 23 Feb 2011 21:43:06 +0000
Subject: [PATCH] Configurator.Net: Added Publishing info, Changes to sensor
 display

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1718 f9c3cf11-9bcb-44bc-f272-b75c42450872
---
 .../ArducopterConfigurator.csproj             |  59 ++++
 .../Views/AcroConfigView.Designer.cs          | 186 +++++++----
 .../Views/AcroConfigView.resx                 |   4 +-
 .../Views/FlightDataView.Designer.cs          | 305 +++++++++---------
 .../Views/FlightDataView.resx                 |  47 +--
 .../controls/CircularIndicatorControl.cs      |   7 +-
 .../Views/mainForm.Designer.cs                |   4 +
 .../Configurator.Net/Views/mainForm.cs        |  10 +
 .../Configurator.Net/configuratorCert.pfx     | Bin 0 -> 1744 bytes
 9 files changed, 369 insertions(+), 253 deletions(-)
 create mode 100644 Configurator/Configurator.Net/configuratorCert.pfx

diff --git a/Configurator/Configurator.Net/ArducopterConfigurator.csproj b/Configurator/Configurator.Net/ArducopterConfigurator.csproj
index 87e4c42f28..278c5bea28 100644
--- a/Configurator/Configurator.Net/ArducopterConfigurator.csproj
+++ b/Configurator/Configurator.Net/ArducopterConfigurator.csproj
@@ -12,6 +12,32 @@
     <AssemblyName>ArducopterConfigurator</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <ManifestCertificateThumbprint>AEF4CA248129E2377F0B2723CB7C9BA864483D54</ManifestCertificateThumbprint>
+    <ManifestKeyFile>configuratorCert.pfx</ManifestKeyFile>
+    <GenerateManifests>true</GenerateManifests>
+    <SignManifests>false</SignManifests>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Background</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <InstallUrl>http://mandrolic.com/configurator/</InstallUrl>
+    <ProductName>Arducopter Configurator</ProductName>
+    <PublisherName>Andrew Radford</PublisherName>
+    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
+    <WebPage>index.htm</WebPage>
+    <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -140,6 +166,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <None Include="configuratorCert.pfx" />
     <None Include="Properties\DataSources\ArducopterConfigurator.PresentationModels.AcroModeConfigVm.datasource" />
     <None Include="Properties\DataSources\ArducopterConfigurator.PresentationModels.FlightDataVm.datasource" />
     <None Include="Properties\DataSources\ArducopterConfigurator.PresentationModels.MainVm.datasource" />
@@ -235,6 +262,38 @@
     <Content Include="Views\icons\install.png" />
     <Content Include="Views\icons\saveIcon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs b/Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs
index 02da4b59d9..b502c703f5 100644
--- a/Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs
+++ b/Configurator/Configurator.Net/Views/AcroConfigView.Designer.cs
@@ -33,36 +33,42 @@
             this.button2 = new System.Windows.Forms.Button();
             this.AcroModeConfigVmBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.numericUpDown9 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown8 = new System.Windows.Forms.NumericUpDown();
             this.numericUpDown3 = new System.Windows.Forms.NumericUpDown();
             this.label7 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
-            this.textBox7 = new System.Windows.Forms.TextBox();
-            this.textBox8 = new System.Windows.Forms.TextBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.numericUpDown7 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown6 = new System.Windows.Forms.NumericUpDown();
             this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.textBox5 = new System.Windows.Forms.TextBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.numericUpDown5 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown4 = new System.Windows.Forms.NumericUpDown();
             this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.textBox2 = new System.Windows.Forms.TextBox();
             this.button1 = new System.Windows.Forms.Button();
             this.textBox10 = new System.Windows.Forms.TextBox();
             this.label10 = new System.Windows.Forms.Label();
             this.toolTips = new System.Windows.Forms.ToolTip(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.AcroModeConfigVmBindingSource)).BeginInit();
             this.groupBox4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit();
             this.groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
             this.groupBox3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -82,12 +88,12 @@
             // 
             // groupBox4
             // 
+            this.groupBox4.Controls.Add(this.numericUpDown9);
+            this.groupBox4.Controls.Add(this.numericUpDown8);
             this.groupBox4.Controls.Add(this.numericUpDown3);
             this.groupBox4.Controls.Add(this.label7);
             this.groupBox4.Controls.Add(this.label8);
             this.groupBox4.Controls.Add(this.label9);
-            this.groupBox4.Controls.Add(this.textBox7);
-            this.groupBox4.Controls.Add(this.textBox8);
             this.groupBox4.Location = new System.Drawing.Point(181, 6);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Size = new System.Drawing.Size(80, 101);
@@ -95,12 +101,40 @@
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "Yaw";
             // 
+            // numericUpDown9
+            // 
+            this.numericUpDown9.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "YawD", true));
+            this.numericUpDown9.DecimalPlaces = 2;
+            this.numericUpDown9.Increment = new decimal(new int[] {
+            5,
+            0,
+            0,
+            131072});
+            this.numericUpDown9.Location = new System.Drawing.Point(23, 71);
+            this.numericUpDown9.Name = "numericUpDown9";
+            this.numericUpDown9.Size = new System.Drawing.Size(50, 20);
+            this.numericUpDown9.TabIndex = 17;
+            // 
+            // numericUpDown8
+            // 
+            this.numericUpDown8.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "PitchI", true));
+            this.numericUpDown8.DecimalPlaces = 2;
+            this.numericUpDown8.Increment = new decimal(new int[] {
+            5,
+            0,
+            0,
+            131072});
+            this.numericUpDown8.Location = new System.Drawing.Point(23, 45);
+            this.numericUpDown8.Name = "numericUpDown8";
+            this.numericUpDown8.Size = new System.Drawing.Size(50, 20);
+            this.numericUpDown8.TabIndex = 16;
+            // 
             // numericUpDown3
             // 
             this.numericUpDown3.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "YawP", true));
             this.numericUpDown3.DecimalPlaces = 2;
             this.numericUpDown3.Increment = new decimal(new int[] {
-            25,
+            5,
             0,
             0,
             131072});
@@ -136,30 +170,14 @@
             this.label9.TabIndex = 3;
             this.label9.Text = "P";
             // 
-            // textBox7
-            // 
-            this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.AcroModeConfigVmBindingSource, "YawD", true));
-            this.textBox7.Location = new System.Drawing.Point(23, 71);
-            this.textBox7.Name = "textBox7";
-            this.textBox7.Size = new System.Drawing.Size(50, 20);
-            this.textBox7.TabIndex = 2;
-            // 
-            // textBox8
-            // 
-            this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.AcroModeConfigVmBindingSource, "YawI", true));
-            this.textBox8.Location = new System.Drawing.Point(23, 45);
-            this.textBox8.Name = "textBox8";
-            this.textBox8.Size = new System.Drawing.Size(50, 20);
-            this.textBox8.TabIndex = 1;
-            // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.numericUpDown7);
+            this.groupBox2.Controls.Add(this.numericUpDown6);
             this.groupBox2.Controls.Add(this.numericUpDown2);
             this.groupBox2.Controls.Add(this.label4);
             this.groupBox2.Controls.Add(this.label5);
             this.groupBox2.Controls.Add(this.label6);
-            this.groupBox2.Controls.Add(this.textBox4);
-            this.groupBox2.Controls.Add(this.textBox5);
             this.groupBox2.Location = new System.Drawing.Point(94, 6);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Size = new System.Drawing.Size(81, 101);
@@ -167,12 +185,40 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Pitch";
             // 
+            // numericUpDown7
+            // 
+            this.numericUpDown7.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "PitchD", true));
+            this.numericUpDown7.DecimalPlaces = 2;
+            this.numericUpDown7.Increment = new decimal(new int[] {
+            5,
+            0,
+            0,
+            131072});
+            this.numericUpDown7.Location = new System.Drawing.Point(23, 71);
+            this.numericUpDown7.Name = "numericUpDown7";
+            this.numericUpDown7.Size = new System.Drawing.Size(50, 20);
+            this.numericUpDown7.TabIndex = 16;
+            // 
+            // numericUpDown6
+            // 
+            this.numericUpDown6.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "PitchI", true));
+            this.numericUpDown6.DecimalPlaces = 2;
+            this.numericUpDown6.Increment = new decimal(new int[] {
+            5,
+            0,
+            0,
+            131072});
+            this.numericUpDown6.Location = new System.Drawing.Point(23, 45);
+            this.numericUpDown6.Name = "numericUpDown6";
+            this.numericUpDown6.Size = new System.Drawing.Size(50, 20);
+            this.numericUpDown6.TabIndex = 15;
+            // 
             // numericUpDown2
             // 
             this.numericUpDown2.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "PitchP", true));
             this.numericUpDown2.DecimalPlaces = 2;
             this.numericUpDown2.Increment = new decimal(new int[] {
-            25,
+            5,
             0,
             0,
             131072});
@@ -208,30 +254,14 @@
             this.label6.TabIndex = 3;
             this.label6.Text = "P";
             // 
-            // textBox4
-            // 
-            this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.AcroModeConfigVmBindingSource, "PitchD", true));
-            this.textBox4.Location = new System.Drawing.Point(23, 71);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(50, 20);
-            this.textBox4.TabIndex = 2;
-            // 
-            // textBox5
-            // 
-            this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.AcroModeConfigVmBindingSource, "PitchI", true));
-            this.textBox5.Location = new System.Drawing.Point(23, 45);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(50, 20);
-            this.textBox5.TabIndex = 1;
-            // 
             // groupBox3
             // 
+            this.groupBox3.Controls.Add(this.numericUpDown5);
+            this.groupBox3.Controls.Add(this.numericUpDown4);
             this.groupBox3.Controls.Add(this.numericUpDown1);
             this.groupBox3.Controls.Add(this.label3);
             this.groupBox3.Controls.Add(this.label2);
             this.groupBox3.Controls.Add(this.label1);
-            this.groupBox3.Controls.Add(this.textBox3);
-            this.groupBox3.Controls.Add(this.textBox2);
             this.groupBox3.Location = new System.Drawing.Point(6, 5);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Size = new System.Drawing.Size(82, 101);
@@ -239,12 +269,40 @@
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "Roll";
             // 
+            // numericUpDown5
+            // 
+            this.numericUpDown5.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "RollD", true));
+            this.numericUpDown5.DecimalPlaces = 2;
+            this.numericUpDown5.Increment = new decimal(new int[] {
+            25,
+            0,
+            0,
+            131072});
+            this.numericUpDown5.Location = new System.Drawing.Point(23, 72);
+            this.numericUpDown5.Name = "numericUpDown5";
+            this.numericUpDown5.Size = new System.Drawing.Size(50, 20);
+            this.numericUpDown5.TabIndex = 15;
+            // 
+            // numericUpDown4
+            // 
+            this.numericUpDown4.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "RollI", true));
+            this.numericUpDown4.DecimalPlaces = 2;
+            this.numericUpDown4.Increment = new decimal(new int[] {
+            25,
+            0,
+            0,
+            131072});
+            this.numericUpDown4.Location = new System.Drawing.Point(23, 46);
+            this.numericUpDown4.Name = "numericUpDown4";
+            this.numericUpDown4.Size = new System.Drawing.Size(50, 20);
+            this.numericUpDown4.TabIndex = 14;
+            // 
             // numericUpDown1
             // 
             this.numericUpDown1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.AcroModeConfigVmBindingSource, "RollP", true));
             this.numericUpDown1.DecimalPlaces = 2;
             this.numericUpDown1.Increment = new decimal(new int[] {
-            25,
+            5,
             0,
             0,
             131072});
@@ -280,22 +338,6 @@
             this.label1.TabIndex = 3;
             this.label1.Text = "P";
             // 
-            // textBox3
-            // 
-            this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.AcroModeConfigVmBindingSource, "RollD", true));
-            this.textBox3.Location = new System.Drawing.Point(23, 71);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(50, 20);
-            this.textBox3.TabIndex = 2;
-            // 
-            // textBox2
-            // 
-            this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.AcroModeConfigVmBindingSource, "RollI", true));
-            this.textBox2.Location = new System.Drawing.Point(23, 45);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(50, 20);
-            this.textBox2.TabIndex = 1;
-            // 
             // button1
             // 
             this.button1.DataBindings.Add(new System.Windows.Forms.Binding("Tag", this.AcroModeConfigVmBindingSource, "UpdateCommand", true));
@@ -341,12 +383,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.AcroModeConfigVmBindingSource)).EndInit();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -360,20 +408,14 @@
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox textBox7;
-        private System.Windows.Forms.TextBox textBox8;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.TextBox textBox5;
         private System.Windows.Forms.GroupBox groupBox3;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.TextBox textBox2;
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.TextBox textBox10;
         private System.Windows.Forms.Label label10;
@@ -382,5 +424,11 @@
         private System.Windows.Forms.NumericUpDown numericUpDown1;
         private System.Windows.Forms.NumericUpDown numericUpDown3;
         private System.Windows.Forms.NumericUpDown numericUpDown2;
+        private System.Windows.Forms.NumericUpDown numericUpDown9;
+        private System.Windows.Forms.NumericUpDown numericUpDown8;
+        private System.Windows.Forms.NumericUpDown numericUpDown7;
+        private System.Windows.Forms.NumericUpDown numericUpDown6;
+        private System.Windows.Forms.NumericUpDown numericUpDown5;
+        private System.Windows.Forms.NumericUpDown numericUpDown4;
     }
 }
diff --git a/Configurator/Configurator.Net/Views/AcroConfigView.resx b/Configurator/Configurator.Net/Views/AcroConfigView.resx
index d9a5877092..a998af8ec4 100644
--- a/Configurator/Configurator.Net/Views/AcroConfigView.resx
+++ b/Configurator/Configurator.Net/Views/AcroConfigView.resx
@@ -124,7 +124,7 @@
   <data name="button2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPY2CgGojfz8Hgd0SKIXC/DBiD2CAxYoFW3fnE
+        YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AAALVSURBVDhPY2CgGojfz8Hgd0SKIXC/DBiD2CAxYoFW3fnE
         yHl37sUvufskFogj591+KF92NhGkXzDjqI5GzdlyqawjBjjNk8g6GpK35t7XGeff/p8OxJ0Hn/3RqjyZ
         yhC4Uyx8xrXDc0++/l+x4cEF3bLjngwM9UyoBlms5LRvOzOncfeT/73HXv7vP/Hqf+GaO+9ks/bbMPiv
         F/DqPTeza9fDz+uuvv9fs/HeVbA4MpBL2eGTv+rWh66Dz/7Hzrx0r2TN7S+xMy7eYXBbLgtWZzyTSyVr
@@ -186,7 +186,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAA11JREFUOE8tkYtTVHUU
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAA11JREFUOE8tkYtTVHUU
         x+8fU5PCUjjlMDT42JB4qcSjoumxk00FG6USapngOrvuDg+BSlYmZQKFxWZyyiBRHBChKMCw5e6CzYag
         su+9+4gWVxb49NulO/d353vO/X7P+Z7zk87/uICm7nvKdcM0X/wV0yWZxss2mjplmnptNPdYOdM9TUOP
         wL3zGDrsFNf+wgHdBB39i0hv1o2g7fRwuHueGP8/q4/hSQKvsyq+ImJD4LggxAU+1D3LwU4Hr33+A9Le
diff --git a/Configurator/Configurator.Net/Views/FlightDataView.Designer.cs b/Configurator/Configurator.Net/Views/FlightDataView.Designer.cs
index aa3816b143..5e9a84a723 100644
--- a/Configurator/Configurator.Net/Views/FlightDataView.Designer.cs
+++ b/Configurator/Configurator.Net/Views/FlightDataView.Designer.cs
@@ -30,9 +30,6 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightDataView));
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.FlightDataVmBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.label5 = new System.Windows.Forms.Label();
@@ -54,9 +51,6 @@
             this.indicatorRollAccel = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
             this.linearIndicatorControl1 = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
             this.linearIndicatorControl2 = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
-            this.linearIndicatorControl4 = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
-            this.linearIndicatorControl5 = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
-            this.linearIndicatorControl6 = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
             this.linearIndicatorControl7 = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
             this.linearIndicatorControl8 = new ArducopterConfigurator.Views.controls.LinearIndicatorControl();
             this.textBox11 = new System.Windows.Forms.TextBox();
@@ -71,44 +65,22 @@
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.cirularIndicatorControl1 = new ArducopterConfigurator.Views.controls.CirularIndicatorControl();
+            this.cirularIndicatorControl2 = new ArducopterConfigurator.Views.controls.CirularIndicatorControl();
+            this.cirularIndicatorControl3 = new ArducopterConfigurator.Views.controls.CirularIndicatorControl();
+            this.cirularIndicatorControl4 = new ArducopterConfigurator.Views.controls.CirularIndicatorControl();
+            this.cirularIndicatorControl5 = new ArducopterConfigurator.Views.controls.CirularIndicatorControl();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.FlightDataVmBindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.SuspendLayout();
             // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(191, 82);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(31, 13);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "Front";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(192, 171);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(30, 13);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "Rear";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(224, 135);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(32, 13);
-            this.label4.TabIndex = 7;
-            this.label4.Text = "Right";
-            // 
             // textBox1
             // 
             this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "MotorLeft", true));
             this.textBox1.Enabled = false;
-            this.textBox1.Location = new System.Drawing.Point(120, 161);
+            this.textBox1.Location = new System.Drawing.Point(99, 162);
             this.textBox1.Name = "textBox1";
             this.textBox1.ReadOnly = true;
             this.textBox1.Size = new System.Drawing.Size(38, 13);
@@ -121,18 +93,18 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(71, 4);
+            this.label5.Location = new System.Drawing.Point(82, 48);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(50, 13);
+            this.label5.Size = new System.Drawing.Size(15, 13);
             this.label5.TabIndex = 10;
-            this.label5.Text = "Roll Gyro";
+            this.label5.Text = "G";
             // 
             // textBox2
             // 
             this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "GyroRoll", true));
             this.textBox2.Enabled = false;
-            this.textBox2.Location = new System.Drawing.Point(241, 4);
+            this.textBox2.Location = new System.Drawing.Point(217, 48);
             this.textBox2.Name = "textBox2";
             this.textBox2.ReadOnly = true;
             this.textBox2.Size = new System.Drawing.Size(35, 13);
@@ -143,7 +115,7 @@
             this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "AccelRoll", true, System.Windows.Forms.DataSourceUpdateMode.Never, null, "N0"));
             this.textBox3.Enabled = false;
-            this.textBox3.Location = new System.Drawing.Point(241, 25);
+            this.textBox3.Location = new System.Drawing.Point(217, 29);
             this.textBox3.Name = "textBox3";
             this.textBox3.ReadOnly = true;
             this.textBox3.Size = new System.Drawing.Size(35, 13);
@@ -152,18 +124,18 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(66, 25);
+            this.label6.Location = new System.Drawing.Point(82, 28);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(55, 13);
+            this.label6.Size = new System.Drawing.Size(14, 13);
             this.label6.TabIndex = 15;
-            this.label6.Text = "Roll Accel";
+            this.label6.Text = "A";
             // 
             // textBox4
             // 
             this.textBox4.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "GyroPitch", true, System.Windows.Forms.DataSourceUpdateMode.Never, null, "N0"));
             this.textBox4.Enabled = false;
-            this.textBox4.Location = new System.Drawing.Point(21, 170);
+            this.textBox4.Location = new System.Drawing.Point(65, 171);
             this.textBox4.Name = "textBox4";
             this.textBox4.ReadOnly = true;
             this.textBox4.Size = new System.Drawing.Size(35, 13);
@@ -173,27 +145,27 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(0, 66);
+            this.label7.Location = new System.Drawing.Point(48, 67);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(56, 13);
+            this.label7.Size = new System.Drawing.Size(14, 13);
             this.label7.TabIndex = 18;
-            this.label7.Text = "Pitch Gyro";
+            this.label7.Text = "A";
             // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(62, 66);
+            this.label8.Location = new System.Drawing.Point(68, 67);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(61, 13);
+            this.label8.Size = new System.Drawing.Size(15, 13);
             this.label8.TabIndex = 21;
-            this.label8.Text = "Pitch Accel";
+            this.label8.Text = "G";
             // 
             // textBox5
             // 
             this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "AccelPitch", true, System.Windows.Forms.DataSourceUpdateMode.Never, null, "N0"));
             this.textBox5.Enabled = false;
-            this.textBox5.Location = new System.Drawing.Point(62, 170);
+            this.textBox5.Location = new System.Drawing.Point(27, 171);
             this.textBox5.Name = "textBox5";
             this.textBox5.ReadOnly = true;
             this.textBox5.Size = new System.Drawing.Size(35, 13);
@@ -203,7 +175,7 @@
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(64, 220);
+            this.label9.Location = new System.Drawing.Point(43, 221);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(53, 13);
             this.label9.TabIndex = 27;
@@ -214,7 +186,7 @@
             this.textBox6.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "GyroYaw", true, System.Windows.Forms.DataSourceUpdateMode.Never, null, "N0"));
             this.textBox6.Enabled = false;
-            this.textBox6.Location = new System.Drawing.Point(237, 221);
+            this.textBox6.Location = new System.Drawing.Point(216, 222);
             this.textBox6.Name = "textBox6";
             this.textBox6.ReadOnly = true;
             this.textBox6.Size = new System.Drawing.Size(35, 13);
@@ -223,7 +195,7 @@
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(242, 66);
+            this.label10.Location = new System.Drawing.Point(221, 67);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(44, 13);
             this.label10.TabIndex = 24;
@@ -234,7 +206,7 @@
             this.textBox7.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "AccelZ", true, System.Windows.Forms.DataSourceUpdateMode.Never, null, "N0"));
             this.textBox7.Enabled = false;
-            this.textBox7.Location = new System.Drawing.Point(251, 170);
+            this.textBox7.Location = new System.Drawing.Point(230, 171);
             this.textBox7.Name = "textBox7";
             this.textBox7.ReadOnly = true;
             this.textBox7.Size = new System.Drawing.Size(35, 13);
@@ -246,7 +218,7 @@
             this.textBox8.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "MotorFront", true));
             this.textBox8.Enabled = false;
-            this.textBox8.Location = new System.Drawing.Point(189, 101);
+            this.textBox8.Location = new System.Drawing.Point(173, 83);
             this.textBox8.Name = "textBox8";
             this.textBox8.ReadOnly = true;
             this.textBox8.Size = new System.Drawing.Size(38, 13);
@@ -257,7 +229,7 @@
             this.textBox9.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox9.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "MotorRear", true));
             this.textBox9.Enabled = false;
-            this.textBox9.Location = new System.Drawing.Point(165, 202);
+            this.textBox9.Location = new System.Drawing.Point(117, 192);
             this.textBox9.Name = "textBox9";
             this.textBox9.ReadOnly = true;
             this.textBox9.Size = new System.Drawing.Size(32, 13);
@@ -268,7 +240,7 @@
             this.textBox10.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.textBox10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "MotorRight", true));
             this.textBox10.Enabled = false;
-            this.textBox10.Location = new System.Drawing.Point(205, 155);
+            this.textBox10.Location = new System.Drawing.Point(186, 163);
             this.textBox10.Name = "textBox10";
             this.textBox10.ReadOnly = true;
             this.textBox10.Size = new System.Drawing.Size(38, 13);
@@ -284,7 +256,7 @@
             this.indicatorRollGyro.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
             this.indicatorRollGyro.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "GyroRoll", true, System.Windows.Forms.DataSourceUpdateMode.Never));
             this.indicatorRollGyro.IsVertical = false;
-            this.indicatorRollGyro.Location = new System.Drawing.Point(126, 4);
+            this.indicatorRollGyro.Location = new System.Drawing.Point(102, 48);
             this.indicatorRollGyro.Max = 500;
             this.indicatorRollGyro.MaxWaterMark = 0;
             this.indicatorRollGyro.Min = -500;
@@ -293,6 +265,7 @@
             this.indicatorRollGyro.Offset = 0;
             this.indicatorRollGyro.Size = new System.Drawing.Size(109, 14);
             this.indicatorRollGyro.TabIndex = 32;
+            this.toolTip1.SetToolTip(this.indicatorRollGyro, "Roll Gyro");
             this.indicatorRollGyro.Value = 100;
             this.indicatorRollGyro.WatermarkLineColor = System.Drawing.Color.DarkGray;
             // 
@@ -306,7 +279,7 @@
             this.indicatorRollAccel.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
             this.indicatorRollAccel.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "AccelRoll", true));
             this.indicatorRollAccel.IsVertical = false;
-            this.indicatorRollAccel.Location = new System.Drawing.Point(126, 24);
+            this.indicatorRollAccel.Location = new System.Drawing.Point(102, 28);
             this.indicatorRollAccel.Max = 500;
             this.indicatorRollAccel.MaxWaterMark = 0;
             this.indicatorRollAccel.Min = -500;
@@ -315,6 +288,7 @@
             this.indicatorRollAccel.Offset = 0;
             this.indicatorRollAccel.Size = new System.Drawing.Size(109, 14);
             this.indicatorRollAccel.TabIndex = 33;
+            this.toolTip1.SetToolTip(this.indicatorRollAccel, "Roll Accelerometer");
             this.indicatorRollAccel.Value = 100;
             this.indicatorRollAccel.WatermarkLineColor = System.Drawing.Color.DarkGray;
             // 
@@ -328,7 +302,7 @@
             this.linearIndicatorControl1.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
             this.linearIndicatorControl1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "GyroPitch", true));
             this.linearIndicatorControl1.IsVertical = true;
-            this.linearIndicatorControl1.Location = new System.Drawing.Point(42, 82);
+            this.linearIndicatorControl1.Location = new System.Drawing.Point(66, 83);
             this.linearIndicatorControl1.Max = 500;
             this.linearIndicatorControl1.MaxWaterMark = 0;
             this.linearIndicatorControl1.Min = -500;
@@ -337,6 +311,7 @@
             this.linearIndicatorControl1.Offset = 0;
             this.linearIndicatorControl1.Size = new System.Drawing.Size(14, 82);
             this.linearIndicatorControl1.TabIndex = 34;
+            this.toolTip1.SetToolTip(this.linearIndicatorControl1, "Pitch Gyro");
             this.linearIndicatorControl1.Value = 100;
             this.linearIndicatorControl1.WatermarkLineColor = System.Drawing.Color.DarkGray;
             // 
@@ -350,7 +325,7 @@
             this.linearIndicatorControl2.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
             this.linearIndicatorControl2.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "AccelPitch", true));
             this.linearIndicatorControl2.IsVertical = true;
-            this.linearIndicatorControl2.Location = new System.Drawing.Point(62, 82);
+            this.linearIndicatorControl2.Location = new System.Drawing.Point(48, 83);
             this.linearIndicatorControl2.Max = 500;
             this.linearIndicatorControl2.MaxWaterMark = 0;
             this.linearIndicatorControl2.Min = -500;
@@ -359,75 +334,10 @@
             this.linearIndicatorControl2.Offset = 0;
             this.linearIndicatorControl2.Size = new System.Drawing.Size(14, 82);
             this.linearIndicatorControl2.TabIndex = 35;
+            this.toolTip1.SetToolTip(this.linearIndicatorControl2, "Pitch Accelerometer");
             this.linearIndicatorControl2.Value = 100;
             this.linearIndicatorControl2.WatermarkLineColor = System.Drawing.Color.Red;
             // 
-            // linearIndicatorControl4
-            // 
-            this.linearIndicatorControl4.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
-            this.linearIndicatorControl4.BarBackgroundLight = System.Drawing.Color.WhiteSmoke;
-            this.linearIndicatorControl4.BarBorderColor = System.Drawing.Color.Maroon;
-            this.linearIndicatorControl4.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
-            this.linearIndicatorControl4.BarDividersCount = 20;
-            this.linearIndicatorControl4.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
-            this.linearIndicatorControl4.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "MotorFront", true));
-            this.linearIndicatorControl4.IsVertical = true;
-            this.linearIndicatorControl4.Location = new System.Drawing.Point(173, 82);
-            this.linearIndicatorControl4.Max = 2000;
-            this.linearIndicatorControl4.MaxWaterMark = 0;
-            this.linearIndicatorControl4.Min = 1000;
-            this.linearIndicatorControl4.MinWatermark = 0;
-            this.linearIndicatorControl4.Name = "linearIndicatorControl4";
-            this.linearIndicatorControl4.Offset = 0;
-            this.linearIndicatorControl4.Size = new System.Drawing.Size(13, 36);
-            this.linearIndicatorControl4.TabIndex = 37;
-            this.linearIndicatorControl4.Value = 100;
-            this.linearIndicatorControl4.WatermarkLineColor = System.Drawing.Color.DarkGray;
-            // 
-            // linearIndicatorControl5
-            // 
-            this.linearIndicatorControl5.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
-            this.linearIndicatorControl5.BarBackgroundLight = System.Drawing.Color.WhiteSmoke;
-            this.linearIndicatorControl5.BarBorderColor = System.Drawing.Color.Maroon;
-            this.linearIndicatorControl5.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
-            this.linearIndicatorControl5.BarDividersCount = 20;
-            this.linearIndicatorControl5.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
-            this.linearIndicatorControl5.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "MotorRear", true));
-            this.linearIndicatorControl5.IsVertical = true;
-            this.linearIndicatorControl5.Location = new System.Drawing.Point(173, 155);
-            this.linearIndicatorControl5.Max = 2000;
-            this.linearIndicatorControl5.MaxWaterMark = 0;
-            this.linearIndicatorControl5.Min = 1000;
-            this.linearIndicatorControl5.MinWatermark = 0;
-            this.linearIndicatorControl5.Name = "linearIndicatorControl5";
-            this.linearIndicatorControl5.Offset = 0;
-            this.linearIndicatorControl5.Size = new System.Drawing.Size(13, 41);
-            this.linearIndicatorControl5.TabIndex = 38;
-            this.linearIndicatorControl5.Value = 100;
-            this.linearIndicatorControl5.WatermarkLineColor = System.Drawing.Color.DarkGray;
-            // 
-            // linearIndicatorControl6
-            // 
-            this.linearIndicatorControl6.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
-            this.linearIndicatorControl6.BarBackgroundLight = System.Drawing.Color.WhiteSmoke;
-            this.linearIndicatorControl6.BarBorderColor = System.Drawing.Color.Maroon;
-            this.linearIndicatorControl6.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
-            this.linearIndicatorControl6.BarDividersCount = 20;
-            this.linearIndicatorControl6.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
-            this.linearIndicatorControl6.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "MotorRear", true));
-            this.linearIndicatorControl6.IsVertical = true;
-            this.linearIndicatorControl6.Location = new System.Drawing.Point(214, 121);
-            this.linearIndicatorControl6.Max = 2000;
-            this.linearIndicatorControl6.MaxWaterMark = 0;
-            this.linearIndicatorControl6.Min = 1000;
-            this.linearIndicatorControl6.MinWatermark = 0;
-            this.linearIndicatorControl6.Name = "linearIndicatorControl6";
-            this.linearIndicatorControl6.Offset = 0;
-            this.linearIndicatorControl6.Size = new System.Drawing.Size(13, 34);
-            this.linearIndicatorControl6.TabIndex = 39;
-            this.linearIndicatorControl6.Value = 100;
-            this.linearIndicatorControl6.WatermarkLineColor = System.Drawing.Color.DarkGray;
-            // 
             // linearIndicatorControl7
             // 
             this.linearIndicatorControl7.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
@@ -438,7 +348,7 @@
             this.linearIndicatorControl7.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
             this.linearIndicatorControl7.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "GyroYaw", true));
             this.linearIndicatorControl7.IsVertical = false;
-            this.linearIndicatorControl7.Location = new System.Drawing.Point(123, 220);
+            this.linearIndicatorControl7.Location = new System.Drawing.Point(102, 221);
             this.linearIndicatorControl7.Max = 500;
             this.linearIndicatorControl7.MaxWaterMark = 0;
             this.linearIndicatorControl7.Min = -500;
@@ -447,6 +357,7 @@
             this.linearIndicatorControl7.Offset = 0;
             this.linearIndicatorControl7.Size = new System.Drawing.Size(109, 14);
             this.linearIndicatorControl7.TabIndex = 40;
+            this.toolTip1.SetToolTip(this.linearIndicatorControl7, "Yaw Gyro");
             this.linearIndicatorControl7.Value = 100;
             this.linearIndicatorControl7.WatermarkLineColor = System.Drawing.Color.DarkGray;
             // 
@@ -460,7 +371,7 @@
             this.linearIndicatorControl8.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
             this.linearIndicatorControl8.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "AccelZ", true));
             this.linearIndicatorControl8.IsVertical = true;
-            this.linearIndicatorControl8.Location = new System.Drawing.Point(262, 82);
+            this.linearIndicatorControl8.Location = new System.Drawing.Point(241, 83);
             this.linearIndicatorControl8.Max = 500;
             this.linearIndicatorControl8.MaxWaterMark = 0;
             this.linearIndicatorControl8.Min = -500;
@@ -469,6 +380,7 @@
             this.linearIndicatorControl8.Offset = 0;
             this.linearIndicatorControl8.Size = new System.Drawing.Size(14, 82);
             this.linearIndicatorControl8.TabIndex = 41;
+            this.toolTip1.SetToolTip(this.linearIndicatorControl8, "Z Accelerometer");
             this.linearIndicatorControl8.Value = 100;
             this.linearIndicatorControl8.WatermarkLineColor = System.Drawing.Color.DarkGray;
             // 
@@ -476,40 +388,43 @@
             // 
             this.textBox11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox11.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "AccelRollOffset", true));
-            this.textBox11.Location = new System.Drawing.Point(184, 44);
+            this.textBox11.Location = new System.Drawing.Point(139, 7);
             this.textBox11.Name = "textBox11";
             this.textBox11.ReadOnly = true;
             this.textBox11.Size = new System.Drawing.Size(35, 20);
             this.textBox11.TabIndex = 42;
             this.textBox11.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.textBox11, "Roll Accelerometer Calibration Offset");
             // 
             // textBox12
             // 
             this.textBox12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "AccelZOffset", true));
-            this.textBox12.Location = new System.Drawing.Point(281, 107);
+            this.textBox12.Location = new System.Drawing.Point(260, 108);
             this.textBox12.Name = "textBox12";
             this.textBox12.ReadOnly = true;
             this.textBox12.Size = new System.Drawing.Size(34, 20);
             this.textBox12.TabIndex = 43;
             this.textBox12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.textBox12, "Z Accelerometer Calibration Offset");
             // 
             // textBox13
             // 
             this.textBox13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox13.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.FlightDataVmBindingSource, "AccelPitchOffset", true));
-            this.textBox13.Location = new System.Drawing.Point(82, 107);
+            this.textBox13.Location = new System.Drawing.Point(8, 108);
             this.textBox13.Name = "textBox13";
             this.textBox13.ReadOnly = true;
             this.textBox13.Size = new System.Drawing.Size(34, 20);
             this.textBox13.TabIndex = 44;
             this.textBox13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.textBox13, "Pictch Accelerometer Calibration Offset");
             // 
             // button2
             // 
             this.button2.DataBindings.Add(new System.Windows.Forms.Binding("Tag", this.FlightDataVmBindingSource, "RefreshCalibrationOffsetsCommand", true));
             this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image")));
-            this.button2.Location = new System.Drawing.Point(301, 213);
+            this.button2.Location = new System.Drawing.Point(280, 214);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(26, 26);
             this.button2.TabIndex = 46;
@@ -519,7 +434,7 @@
             // 
             this.button1.DataBindings.Add(new System.Windows.Forms.Binding("Tag", this.FlightDataVmBindingSource, "UpdateCalibrationOffsetsCommand", true));
             this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image")));
-            this.button1.Location = new System.Drawing.Point(301, 184);
+            this.button1.Location = new System.Drawing.Point(280, 185);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(26, 26);
             this.button1.TabIndex = 45;
@@ -529,16 +444,17 @@
             // 
             this.button3.DataBindings.Add(new System.Windows.Forms.Binding("Tag", this.FlightDataVmBindingSource, "CalculateCalibrationOffsetsCommand", true));
             this.button3.Image = ((System.Drawing.Image)(resources.GetObject("button3.Image")));
-            this.button3.Location = new System.Drawing.Point(301, 155);
+            this.button3.Location = new System.Drawing.Point(280, 156);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(26, 26);
             this.button3.TabIndex = 47;
+            this.toolTip1.SetToolTip(this.button3, "Calibrate Accelerometers");
             this.button3.UseVisualStyleBackColor = true;
             // 
             // label11
             // 
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(333, 162);
+            this.label11.Location = new System.Drawing.Point(312, 163);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(78, 13);
             this.label11.TabIndex = 48;
@@ -547,7 +463,7 @@
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(333, 191);
+            this.label12.Location = new System.Drawing.Point(312, 192);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(84, 13);
             this.label12.TabIndex = 49;
@@ -556,7 +472,7 @@
             // label13
             // 
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(333, 222);
+            this.label13.Location = new System.Drawing.Point(312, 223);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(96, 13);
             this.label13.TabIndex = 50;
@@ -564,19 +480,19 @@
             // 
             // pictureBox1
             // 
-            this.pictureBox1.BackColor = System.Drawing.Color.SkyBlue;
-            this.pictureBox1.Location = new System.Drawing.Point(138, 135);
+            this.pictureBox1.BackColor = System.Drawing.Color.DimGray;
+            this.pictureBox1.Location = new System.Drawing.Point(117, 138);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(89, 10);
+            this.pictureBox1.Size = new System.Drawing.Size(89, 6);
             this.pictureBox1.TabIndex = 51;
             this.pictureBox1.TabStop = false;
             // 
             // pictureBox2
             // 
-            this.pictureBox2.BackColor = System.Drawing.Color.SkyBlue;
-            this.pictureBox2.Location = new System.Drawing.Point(175, 101);
+            this.pictureBox2.BackColor = System.Drawing.Color.DimGray;
+            this.pictureBox2.Location = new System.Drawing.Point(155, 102);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(10, 67);
+            this.pictureBox2.Size = new System.Drawing.Size(6, 67);
             this.pictureBox2.TabIndex = 52;
             this.pictureBox2.TabStop = false;
             // 
@@ -587,6 +503,7 @@
             this.cirularIndicatorControl1.BarBorderColor = System.Drawing.Color.DarkGray;
             this.cirularIndicatorControl1.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
             this.cirularIndicatorControl1.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(144)))), ((int)(((byte)(252)))));
+            this.cirularIndicatorControl1.IsReveresed = false;
             this.cirularIndicatorControl1.IsVertical = false;
             this.cirularIndicatorControl1.Location = new System.Drawing.Point(120, 115);
             this.cirularIndicatorControl1.Max = 100;
@@ -597,11 +514,90 @@
             this.cirularIndicatorControl1.TabIndex = 53;
             this.cirularIndicatorControl1.Value = 50;
             // 
+            // cirularIndicatorControl2
+            // 
+            this.cirularIndicatorControl2.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
+            this.cirularIndicatorControl2.BarBackgroundLight = System.Drawing.Color.WhiteSmoke;
+            this.cirularIndicatorControl2.BarBorderColor = System.Drawing.Color.DimGray;
+            this.cirularIndicatorControl2.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
+            this.cirularIndicatorControl2.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.cirularIndicatorControl2.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "MotorLeft", true, System.Windows.Forms.DataSourceUpdateMode.Never));
+            this.cirularIndicatorControl2.IsReveresed = false;
+            this.cirularIndicatorControl2.IsVertical = true;
+            this.cirularIndicatorControl2.Location = new System.Drawing.Point(99, 121);
+            this.cirularIndicatorControl2.Max = 2000;
+            this.cirularIndicatorControl2.Min = 1000;
+            this.cirularIndicatorControl2.Name = "cirularIndicatorControl2";
+            this.cirularIndicatorControl2.Offset = 0;
+            this.cirularIndicatorControl2.Size = new System.Drawing.Size(40, 40);
+            this.cirularIndicatorControl2.TabIndex = 53;
+            this.cirularIndicatorControl2.Value = 1500;
+            // 
+            // cirularIndicatorControl3
+            // 
+            this.cirularIndicatorControl3.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
+            this.cirularIndicatorControl3.BarBackgroundLight = System.Drawing.Color.WhiteSmoke;
+            this.cirularIndicatorControl3.BarBorderColor = System.Drawing.Color.DimGray;
+            this.cirularIndicatorControl3.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
+            this.cirularIndicatorControl3.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.cirularIndicatorControl3.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "MotorRight", true));
+            this.cirularIndicatorControl3.IsReveresed = false;
+            this.cirularIndicatorControl3.IsVertical = true;
+            this.cirularIndicatorControl3.Location = new System.Drawing.Point(182, 121);
+            this.cirularIndicatorControl3.Max = 2000;
+            this.cirularIndicatorControl3.Min = 1000;
+            this.cirularIndicatorControl3.Name = "cirularIndicatorControl3";
+            this.cirularIndicatorControl3.Offset = 0;
+            this.cirularIndicatorControl3.Size = new System.Drawing.Size(40, 40);
+            this.cirularIndicatorControl3.TabIndex = 54;
+            this.cirularIndicatorControl3.Value = 1500;
+            // 
+            // cirularIndicatorControl4
+            // 
+            this.cirularIndicatorControl4.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
+            this.cirularIndicatorControl4.BarBackgroundLight = System.Drawing.Color.WhiteSmoke;
+            this.cirularIndicatorControl4.BarBorderColor = System.Drawing.Color.DimGray;
+            this.cirularIndicatorControl4.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
+            this.cirularIndicatorControl4.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.cirularIndicatorControl4.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "MotorRear", true));
+            this.cirularIndicatorControl4.IsReveresed = false;
+            this.cirularIndicatorControl4.IsVertical = true;
+            this.cirularIndicatorControl4.Location = new System.Drawing.Point(138, 157);
+            this.cirularIndicatorControl4.Max = 2000;
+            this.cirularIndicatorControl4.Min = 1000;
+            this.cirularIndicatorControl4.Name = "cirularIndicatorControl4";
+            this.cirularIndicatorControl4.Offset = 0;
+            this.cirularIndicatorControl4.Size = new System.Drawing.Size(40, 40);
+            this.cirularIndicatorControl4.TabIndex = 55;
+            this.cirularIndicatorControl4.Value = 1500;
+            // 
+            // cirularIndicatorControl5
+            // 
+            this.cirularIndicatorControl5.BarBackgroundDark = System.Drawing.Color.FromArgb(((int)(((byte)(199)))), ((int)(((byte)(200)))), ((int)(((byte)(201)))));
+            this.cirularIndicatorControl5.BarBackgroundLight = System.Drawing.Color.WhiteSmoke;
+            this.cirularIndicatorControl5.BarBorderColor = System.Drawing.Color.DimGray;
+            this.cirularIndicatorControl5.BarDark = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(68)))), ((int)(((byte)(202)))));
+            this.cirularIndicatorControl5.BarLight = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.cirularIndicatorControl5.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.FlightDataVmBindingSource, "MotorFront", true));
+            this.cirularIndicatorControl5.IsReveresed = false;
+            this.cirularIndicatorControl5.IsVertical = true;
+            this.cirularIndicatorControl5.Location = new System.Drawing.Point(138, 83);
+            this.cirularIndicatorControl5.Max = 2000;
+            this.cirularIndicatorControl5.Min = 1000;
+            this.cirularIndicatorControl5.Name = "cirularIndicatorControl5";
+            this.cirularIndicatorControl5.Offset = 0;
+            this.cirularIndicatorControl5.Size = new System.Drawing.Size(40, 40);
+            this.cirularIndicatorControl5.TabIndex = 56;
+            this.cirularIndicatorControl5.Value = 1500;
+            // 
             // FlightDataView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.cirularIndicatorControl1);
+            this.Controls.Add(this.cirularIndicatorControl5);
+            this.Controls.Add(this.cirularIndicatorControl4);
+            this.Controls.Add(this.cirularIndicatorControl3);
+            this.Controls.Add(this.cirularIndicatorControl2);
             this.Controls.Add(this.label13);
             this.Controls.Add(this.label12);
             this.Controls.Add(this.label11);
@@ -613,9 +609,6 @@
             this.Controls.Add(this.textBox11);
             this.Controls.Add(this.linearIndicatorControl8);
             this.Controls.Add(this.linearIndicatorControl7);
-            this.Controls.Add(this.linearIndicatorControl6);
-            this.Controls.Add(this.linearIndicatorControl5);
-            this.Controls.Add(this.linearIndicatorControl4);
             this.Controls.Add(this.linearIndicatorControl2);
             this.Controls.Add(this.linearIndicatorControl1);
             this.Controls.Add(this.indicatorRollAccel);
@@ -636,14 +629,11 @@
             this.Controls.Add(this.textBox2);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.pictureBox2);
             this.DoubleBuffered = true;
             this.Name = "FlightDataView";
-            this.Size = new System.Drawing.Size(441, 260);
+            this.Size = new System.Drawing.Size(412, 260);
             ((System.ComponentModel.ISupportInitialize)(this.FlightDataVmBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
@@ -655,9 +645,6 @@
         #endregion
 
         private System.Windows.Forms.BindingSource FlightDataVmBindingSource;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
         private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.TextBox textBox2;
@@ -678,9 +665,6 @@
         private ArducopterConfigurator.Views.controls.LinearIndicatorControl indicatorRollAccel;
         private ArducopterConfigurator.Views.controls.LinearIndicatorControl linearIndicatorControl1;
         private ArducopterConfigurator.Views.controls.LinearIndicatorControl linearIndicatorControl2;
-        private ArducopterConfigurator.Views.controls.LinearIndicatorControl linearIndicatorControl4;
-        private ArducopterConfigurator.Views.controls.LinearIndicatorControl linearIndicatorControl5;
-        private ArducopterConfigurator.Views.controls.LinearIndicatorControl linearIndicatorControl6;
         private ArducopterConfigurator.Views.controls.LinearIndicatorControl linearIndicatorControl7;
         private ArducopterConfigurator.Views.controls.LinearIndicatorControl linearIndicatorControl8;
         private System.Windows.Forms.TextBox textBox11;
@@ -695,5 +679,10 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.PictureBox pictureBox2;
         private ArducopterConfigurator.Views.controls.CirularIndicatorControl cirularIndicatorControl1;
+        private ArducopterConfigurator.Views.controls.CirularIndicatorControl cirularIndicatorControl2;
+        private ArducopterConfigurator.Views.controls.CirularIndicatorControl cirularIndicatorControl3;
+        private ArducopterConfigurator.Views.controls.CirularIndicatorControl cirularIndicatorControl4;
+        private ArducopterConfigurator.Views.controls.CirularIndicatorControl cirularIndicatorControl5;
+        private System.Windows.Forms.ToolTip toolTip1;
     }
 }
diff --git a/Configurator/Configurator.Net/Views/FlightDataView.resx b/Configurator/Configurator.Net/Views/FlightDataView.resx
index 073545b4e9..a082ca8f41 100644
--- a/Configurator/Configurator.Net/Views/FlightDataView.resx
+++ b/Configurator/Configurator.Net/Views/FlightDataView.resx
@@ -120,12 +120,15 @@
   <metadata name="FlightDataVmBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>20, 28</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>225, 28</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="button2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAOuwAA
-        DrsBx/jUNgAAAtVJREFUOE9jYKAaiN/PweB3RIohcL8MGIPYIDFigVbd+cTIeXfuxS+5+yQWiCPn3X4o
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAOuAAA
+        DrgBakH1WwAAAtVJREFUOE9jYKAaiN/PweB3RIohcL8MGIPYIDFigVbd+cTIeXfuxS+5+yQWiCPn3X4o
         X3Y2EaRfMOOojkbN2XKprCMGOM2TyDoakrfm3tcZ59/+nw7EnQef/dGqPJnKELhTLHzGtcNzT77+X7Hh
         wQXdsuOeDAz1TKgGWazktG87M6dx95P/vcde/u8/8ep/4Zo772Sz9tsw+K8X8Oo9N7Nr18PP666+/1+z
         8d5VsDgykEvZ4ZO/6taHroPP/sfOvHSvZM3tL7EzLt5hcFsuC1ZnPJNLJWtvYenqGx/mnnr1P3jCme0M
@@ -143,30 +146,30 @@
   <data name="button1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
-        CwsBbQSEtwAAA25JREFUOE8tk21QVHUUxv9LmtOXZupL35ucFJbCSWMofNmQeFOJl8omi6mmgo1SCbVM
-        EGdxdxALKkEmbYKitT44ZZgoDorQUIBgy7JgQwgq+753X6JdF5bl13+X7tz/nXPOfZ7zPOfcuapTP0/z
-        28iwmE94WDz96Coxr3pQrFipEqowQqxSiYSlqICoiKruFysSHhChUFgMz/jEQ/etFM+uf0SIV6t70LY6
-        2Ns+RZj/r4V7MB+LoyzIp8xYknFEAiIy3tM+zu7WSV76+CfEtv2/UH7WTrnRSojFOGVpmSuJEVmJs2Uk
-        2bLG0gLaM7fQGmcpPngJUXSgg7fbJij91hMXve38l65RD5dNYS7cDHDe7OeKRdbGfMzYiDcskW7Lztwh
-        p+I8oqD8EmVf2Sg7PSkVglIhHLe5PEIsl5TIfCyKOyEa5q2v/+ad5lvsONCJyP/gCiXNNkpaJlmUFv9y
-        RDh3M8hFc4CL4146xoL8alboHXEwbQuzKPu9/s1t3miYIufDswhN6Y8UnDSz88So7B6N3ctqUonFf+KW
-        Y2aWT2wnEQpODPFu4wwZ2u8RGSU/sL1xmsKGUc5ZFAkLxRcVX5iMQ3J58WmYIyhn67Tc45X6UQoNZp57
-        U36FzNe+43n9CHm1k2w3mMiruU6RfJl71EymwULeMRP5unGyawcpqLeQqR8k6/gE2+qus2lXOyK9+DRb
-        dX+QpRtCI0EZkqg5PI6mysyWIyZya3rIrR4gWzdAzuHfyay+QXrVDbJrBtn4chsirbiN9E+GyKn8U5L6
-        6ZmYYk7xEfE4cXjvMOtVUJS72F0Bhs1u1mw+Sl7VGJqPhkh9oRWRnNtC2n4Tz+wzs6GiF5vfR8qLRlJ2
-        GHG5ffg8QRSXlaDHitPuQa2pZUNlH6kHB3gq1iCt8AtStX2sq+gnubIfr9/K6mIjiTuNODyTKF4/im8W
-        p+LF7vHzuKaeJ/ZeJWVfL+qsZsSRTztIzP6M9e91o37/Gl6nnzVFbSTln8LvDDDnDmF1+HApNlwuB+qN
-        Dazb0yOxEp/xJfJPQ9Q0XiNpcxNqrWzgsmP1e6R9GwGpanU6cAfu4vbY8cl8bdrnJErcY6WXSdoqHcQa
-        xM6h49KWZjf6k70Ymq+ib+7iWEs3hqYu6pq6qWvppLapj+RNOtam1/HkFj2H6i/wHyZ1+UcXoDkfAAAA
-        AElFTkSuQmCC
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBgAA
+        CwYBZDTpJAAAA11JREFUOE8tkYtTVHUUx+8fU5PCUjjlMDT42JB4qcSjoumxk00FG6USapngOrvuDg+B
+        SlYmZQKFxWZyyiBRHBChKMCw5e6CzYagsu+9+4gWVxb49NulO/d353vO/X7P+Z7zk87/uICm7nvKdcM0
+        X/wV0yWZxss2mjplmnptNPdYOdM9TUOPwL3zGDrsFNf+wgHdBB39i0hv1o2g7fRwuHueGP8/q4/hSQKv
+        syq+ImJD4LggxAU+1D3LwU4Hr33+A9Leoz9RdcVNlcXJCmtJycamVgjjIpNUCyTUIsfGKtre+2gtS5Qd
+        v4FUeqyP97vmqLgYSDZ94P2XwZkAN60xrt2L0C+HGbaLnC3EootkQY1wW9n7kPzqfqTiqhtUfuOi8oJD
+        dIiKDrGkzc0RErGQxJ8kUNIJ6zHe6/ibD8z32X9sAKnok2E0ZheadgdrwuJfnjhX70W5Lke4Phukzxbl
+        Z1lhdNrDgivGmqj3zrcPeLdlnvxPryCpK76j+JxM+dkZUX098W52E51Y+ydpOWFm8yR2Eqf47BQfti6S
+        re1BytZcZl/rAiUtM1y1K4K2klxUcmECr4jlJadhmaiYbcD+mDcaZygxybx0QNxCztuXeNk4TaHBwT6T
+        lULdHUrFz4LTMjkmO4UNVor0s+QZJilutJNjnCS3aY699XfY+VY3UlbZBfbofydXP4VakLKFUH1yFnWt
+        zO5TVgp0IxTUTZCnnyD/5G/k1N0lq/YuebpJdrzehZRZ1kXWF1Pk1/wpROOMzM2zrISIB7x4gg9ZCioo
+        yiPcvgh/yH627DpNYa0N9WdTZLzSiZRW0E7mUSsvHpHZXj2KKxwi/VUL6fst+PwhQoEois9JNODE6w6g
+        UhvYXjNGxvEJnk8UyCz5igztGNuqx0mrGScYdvJ0mYWUcguegAMlGEYJLeFVgrgDYZ5RN/Ls4VukHxlF
+        lWtGOnWmj5S8Zl74aAjVx7cJesNsKe0iteg8YW+EZf8KTk8In+LC5/Og2tHCtkMjgiv42V8jifuRdK23
+        Sd3VhkorCvjcOMMBYd9FRHR1ej34I4/wB9yERLw180tSBO+pipuk7hEOEgUS50STsKU+iPHcKCbzLYzm
+        QRrahzC1DVLfNkR9+wCGtjHSdurZmlXPc7uNnGi8xn9S4RHZGLiTUQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="button3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlhFgAVAPMAADJ/x+/3/5rA40qOzrPP6v///1mX0sHY7lGT0PT4/LfS68bb70qUzgAAAAAAAAAA
-        ACwAAAAAFgAVAAAEU7DISQuoOM+r+/YgB2riiJVmkQgIgAhJmhjGASyIEY+CIV0zgWlw+EkUiBNgyWw6
-        nxmisYA09WLAgXA0QygAhNyOy3LBUhQU2rKuqNHvVNw0L0QAADs=
+        R0lGODlhFgAVAIMAADJ/x+/3/5rA40qOzrPP6v///1mX0sHY7lGT0PT4/LfS68bb70qUzgAAAAAAAAAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQAAAAAACwAAAAAFgAVAAAIdAALCBxIsACAgggTDjyosOFChxAZ
+        QlQocSLCihYLJBCAAAACAQkyJjBg4ACABQgMhJwowIDAgyMFWBxw4KVABQguAtjJs6fPnwlp2iyA02LL
+        kDAHyJw4EoECAARSrmTK0SPIjAQxYjW4taBWrF8zhrU4tkBAADs=
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs b/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs
index 9851adb339..4a26d15727 100644
--- a/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs
+++ b/Configurator/Configurator.Net/Views/controls/CircularIndicatorControl.cs
@@ -175,8 +175,11 @@ namespace ArducopterConfigurator.Views.controls
                 using (var bmp = new Bitmap(width, height))
                 {
                     using (var g1 = Graphics.FromImage(bmp))
-                        GenerateCircle(g1, 0.0F, 0.0F, width, height, _isVertical,0.85F);
-                    
+                    {
+                        var fraction = ((float)(Value - Min))/(Max - Min);
+
+                        GenerateCircle(g1, 0.0F, 0.0F, width, height, _isVertical, fraction);
+                    }
                     g.DrawImage(bmp, 0, 0);
                 }
             }
diff --git a/Configurator/Configurator.Net/Views/mainForm.Designer.cs b/Configurator/Configurator.Net/Views/mainForm.Designer.cs
index 98446082a1..20443b4abf 100644
--- a/Configurator/Configurator.Net/Views/mainForm.Designer.cs
+++ b/Configurator/Configurator.Net/Views/mainForm.Designer.cs
@@ -103,6 +103,7 @@ namespace ArducopterConfigurator
             // 
             // lblConnectionStatus
             // 
+            this.lblConnectionStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.lblConnectionStatus.AutoSize = true;
             this.lblConnectionStatus.Location = new System.Drawing.Point(189, 418);
             this.lblConnectionStatus.Name = "lblConnectionStatus";
@@ -125,6 +126,7 @@ namespace ArducopterConfigurator
             // 
             // button3
             // 
+            this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button3.DataBindings.Add(new System.Windows.Forms.Binding("Tag", this.mainVmBindingSource, "RestoreDefaultsCommand", true, System.Windows.Forms.DataSourceUpdateMode.Never));
             this.button3.Image = ((System.Drawing.Image)(resources.GetObject("button3.Image")));
             this.button3.Location = new System.Drawing.Point(502, 402);
@@ -136,6 +138,7 @@ namespace ArducopterConfigurator
             // 
             // button4
             // 
+            this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button4.DataBindings.Add(new System.Windows.Forms.Binding("Tag", this.mainVmBindingSource, "WriteToEepromCommand", true));
             this.button4.Image = ((System.Drawing.Image)(resources.GetObject("button4.Image")));
             this.button4.Location = new System.Drawing.Point(456, 402);
@@ -159,6 +162,7 @@ namespace ArducopterConfigurator
             this.Controls.Add(this.cmboComPorts);
             this.Controls.Add(this.tabCtrlMonitorVms);
             this.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.mainVmBindingSource, "Name", true));
+            this.MinimumSize = new System.Drawing.Size(550, 400);
             this.Name = "mainForm";
             this.Load += new System.EventHandler(this.MainFormLoaded);
             this.SizeChanged += new System.EventHandler(this.mainForm_SizeChanged);
diff --git a/Configurator/Configurator.Net/Views/mainForm.cs b/Configurator/Configurator.Net/Views/mainForm.cs
index 8dd2dbdb65..5475324a35 100644
--- a/Configurator/Configurator.Net/Views/mainForm.cs
+++ b/Configurator/Configurator.Net/Views/mainForm.cs
@@ -151,6 +151,16 @@ namespace ArducopterConfigurator
         {
             ResizeChildControls();
             BindButtons(_vm);
+
+            if (System.Deployment.Application.ApplicationDeployment.IsNetworkDeployed)
+            {
+                var ad = System.Deployment.Application.ApplicationDeployment.CurrentDeployment;
+                Text = "Arducopter Configurator " + ad.CurrentVersion;
+            }
+            else
+            {
+                Text = "Arducopter Configurator (No Version)";
+            }
         }
 
         private void ResizeChildControls()
diff --git a/Configurator/Configurator.Net/configuratorCert.pfx b/Configurator/Configurator.Net/configuratorCert.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..e25517cbf7f0e5c687a4930382fb4f65c7b60a87
GIT binary patch
literal 1744
zcmY*YdpMM78-M5E9jB;BV-mAV8#@l~jCIO!D2EDTSk`3A$2c|H#%Q#19_36{&f^rL
zvaA&iAL}qFhosDk6(a_1L@CLkQO&-(zOTLZy081WfA{Y`JkKA`4`PFZNCXOEgDIfQ
z*GY~^8#@pfL<Jj+M6*E_Oou^iRO7!&s46rYRSwe}*b6|p|4qruB9IkqWHZD@HbQEk
z?Eh(axdK|+;Muj>^;^3OkVuRG%|>Rgw^$F`mg?L&a(VyR5=1=^&lsnOgpU)+ZR_UO
zs5eW-PQ5%?CuwinT1)C{e-Nv3-Jr0HqJt&R(26f2bQ*m5b!X(J#W~b><Z8YL$;GVs
zJCbiy<p30z&F92EnJJq&R5IZ}dLd7#zrRvGae80qL+QE=Yq6*LpYxhd#jTPs2)dZR
zw&RZd@-WStW@UG{$>efymP?g<R&ECq{O_==G2fl0H=8CpbIVzDkY&lSPU!tgLHgxe
z_aDi=hQpJ_0;&F=idydz*-B#yZs`e~780*@A@>32y9j3cUUP=`yf9$u#TB*aL<i*Q
zmX4kmIDMX4IQo&2agniIrwJzgk=W<i)hTvuHJiR@eKw|qnLdCnF_c|&yVH8Z!E-(}
zcFQT-a%%6-uCjgv)T`XeT_ck*VO92tFFe!nlPa}SZf^&Dv|l@?$7#!z%O%X}?r!j}
zd^Z^NG&7U6->a9J6QnoWN3ao(h3q-Mte|C)$&-lAbPyJs%PxRfTmq?a)LHnj<KasR
zm2f<oKi6veZl)m8U)^C%iEBH<+BvE;^d9|HP0K}>@V0r3%IW9oIHNe->R)v)j3mWG
zzCPB~&gichU}xKMxPg?n_*85})cY`&S+<XCVX)%(s^{(xorf0g6Xv#}v)$(IR`YXG
z2@*8@x!5VCTWq)0ElE_%TN|JjYE*j~jvI)2Z1jpj<^lFccTs1WS<F0kZX?g-PAloR
z_O8cyQ@`6;)CGNOx-VpNX#ap(#upP>$G?>suVIL#Ze>SY8>KI3EZ{;LFu7BL^u}N=
zXBL`>BBv@^U>z#4k*dyC{r8*a)wVVp1jJ<2Xx(Z~r&FF@hF_jj?C#oYZi;(e^*SE2
z5|N1s4<Mz_-&|%75k#XA002N<|B%YWqw0=;A8diJn*t=@KY%}=2V)4velYq5u0Vj%
zC(aBo`GgGNu0S9FAi^CaIBuICK!m;rWe6YwjbNMXLJ%qHE`T!-0<U8NXMu3o1A%h@
z9&m@xZRSTH2+r(a90`QN+*vqh!iz(J;7?O{fbyv?0?z301x#3lEuUYG0bya@fGI8#
z0l=a3p9<n%QU$lA+Tby8Y|%%Wwk_3oHZt_wF?v3z@6C6=XK5P$un^m4tFM<8$+!%d
z)f#({QRT<`nzT|K?J<q>{2YUc_!VIc(e>_vD@lqHZW!X|^N756<L6C39`V)YnC8;2
zZ%*DzIc%}n3&yJHnwEV)srX_wpvb8&D@tur#+&J>x{8ZwLQULK4KF_^)b**-^$f`+
zfrg=_*dr{nyReDF(_Eap)TMY-A%freTCZoVjmfQgPEFtEVyV5PYO2_PNS5Moz<MgB
zeyCA9#eS~MY{obFt}0?xTB$JP1O;h}t{D{T%eci|xraR+eq(wdj5T}tjsJlU(8nmz
z<D%T|lhS$OMh}|Mq3xM#4_@*6n-zQ@Y{!@Je<WshGx~cE-L8;;Sdit>&|_504{P!I
z8X0sUj;9^oJb};Jca@%KFdmS9J`NpNcEs{Q<4Tp*8Wm$=v-~p1GB1JTW#ziLwDuN!
zt+v5UEs!7CP(87$=z7YYrWt49h%{Z4)a8CMR6%@bWHRoRk-vpCj;^;%V-1CzXC@S=
zEdTIC=a;!jp0NCgH|NUWH;0{#3I{uq<6~5L)hl43JI-fvS;lE+eX!a3w4D>GsDA_q
zC+fEg`WJ8A4tSrb8CBkevU5bAqr^u@7FH3X$!W<l2d6hpi27}h1(o*lob!w{E6sr8
z$p=j3<vnk9DlLV&k!`N#4C_*xrVcWCm!Ub*=DVYmQkh{q0kZ+{bd)nzb>woRJ(WLp
zuQcN!l%j@V-<87X6W(&8F6Lch=dk(rrtWH$J{>5A%nT)<`S7Jvb+kc2d7k|b7Fnfu
zy?iop=YGcR0ZF>u(2*Ouf1deh`unLjkU69QVL&N@0t$&kE3=xIs1hC8sVBg$5cFTM
i&0K%kKD4r=BV`OHQOm&Pxra>i{(8jvLSV4{VgCjq2l3PZ

literal 0
HcmV?d00001