diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj index bc6a9fc8a9cc9f29444c27e327072cbc35eb19eb..7a63c6dae00b95ecc4ba8449228b2a554c66a367 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj @@ -1129,6 +1129,7 @@ <Content Include="mavcmd.xml"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> + <None Include="Resources\octox.png" /> <None Include="Resources\y6.png" /> <None Include="Resources\new frames-13.png" /> <None Include="Resources\new frames-12.png" /> diff --git a/Tools/ArdupilotMegaPlanner/Common.cs b/Tools/ArdupilotMegaPlanner/Common.cs index 312dcbe6ca5b2cae900898c05a2ae2f7b5522deb..c6453757d3a135e72063e82231276f97aaee14e0 100644 --- a/Tools/ArdupilotMegaPlanner/Common.cs +++ b/Tools/ArdupilotMegaPlanner/Common.cs @@ -348,14 +348,23 @@ namespace ArdupilotMega public enum apmmodes { + [DisplayText("Manual")] MANUAL = 0, + [DisplayText("Circle")] CIRCLE = 1, + [DisplayText("Stabilize")] STABILIZE = 2, + [DisplayText("FBW A")] FLY_BY_WIRE_A = 5, + [DisplayText("FBW B")] FLY_BY_WIRE_B = 6, + [DisplayText("Auto")] AUTO = 10, + [DisplayText("RTL")] RTL = 11, + [DisplayText("Loiter")] LOITER = 12, + [DisplayText("Guided")] GUIDED = 15 } @@ -383,7 +392,7 @@ namespace ArdupilotMega LAND = 9, // AUTO control OF_LOITER = 10, [Private(true)] - APPROACH = 11 + APPROACH = 11 } public enum ac2ch7modes @@ -434,7 +443,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, diff --git a/Tools/ArdupilotMegaPlanner/Controls/ConnectionControl.Designer.cs b/Tools/ArdupilotMegaPlanner/Controls/ConnectionControl.Designer.cs index 0d932cf9c0bd6fd50d7355eb106f986a4113e322..72c5781a3d61add30e934f3190eb86aeb7ec87e4 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/ConnectionControl.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/ConnectionControl.Designer.cs @@ -36,10 +36,6 @@ // cmb_Baud // this.cmb_Baud.FormattingEnabled = true; - this.cmb_Baud.Location = new System.Drawing.Point(130, 12); - this.cmb_Baud.Name = "cmb_Baud"; - this.cmb_Baud.Size = new System.Drawing.Size(70, 21); - this.cmb_Baud.TabIndex = 0; this.cmb_Baud.Items.AddRange(new object[] { "4800", "9600", @@ -49,6 +45,10 @@ "38400", "57600", "115200"}); + this.cmb_Baud.Location = new System.Drawing.Point(130, 12); + this.cmb_Baud.Name = "cmb_Baud"; + this.cmb_Baud.Size = new System.Drawing.Size(70, 21); + this.cmb_Baud.TabIndex = 0; // // cmb_ConnectionType // @@ -70,11 +70,12 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackgroundImage = global::ArdupilotMega.Properties.Resources.bg; this.Controls.Add(this.cmb_Connection); this.Controls.Add(this.cmb_ConnectionType); this.Controls.Add(this.cmb_Baud); this.Name = "ConnectionControl"; - this.Size = new System.Drawing.Size(211, 75); + this.Size = new System.Drawing.Size(230, 76); this.ResumeLayout(false); } diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs index ffd2da68ef92dcd414398716efac737717c8d530..a185006355f6b26a3f530c35a5c4441b0ef295e8 100644 --- a/Tools/ArdupilotMegaPlanner/CurrentState.cs +++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs @@ -535,9 +535,6 @@ namespace ArdupilotMega case (byte)(100 + Common.ac2modes.APPROACH): mode = EnumTranslator.GetDisplayText(Common.ac2modes.APPROACH); break; - case (byte)(100 + Common.ac2modes.APPROACH): - mode = "APPROACH"; - break; case (byte)(100 + Common.ac2modes.POSITION): mode = EnumTranslator.GetDisplayText(Common.ac2modes.POSITION); break; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.Designer.cs deleted file mode 100644 index 1304694720a24790d672c1488daf9f2a4903f84d..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.Designer.cs +++ /dev/null @@ -1,110 +0,0 @@ -namespace ArdupilotMega.GCSViews.ConfigurationView -{ - partial class ConfigAccelerometerCalibration - { - /// <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(ConfigAccelerometerCalibration)); - this.label28 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.pictureBoxQuadX = new System.Windows.Forms.PictureBox(); - this.pictureBoxQuad = new System.Windows.Forms.PictureBox(); - this.BUT_levelac2 = new ArdupilotMega.MyButton(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit(); - this.SuspendLayout(); - // - // label28 - // - resources.ApplyResources(this.label28, "label28"); - this.label28.Name = "label28"; - // - // label16 - // - resources.ApplyResources(this.label16, "label16"); - this.label16.Name = "label16"; - // - // label15 - // - resources.ApplyResources(this.label15, "label15"); - this.label15.Name = "label15"; - // - // pictureBoxQuadX - // - this.pictureBoxQuadX.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBoxQuadX.Image = global::ArdupilotMega.Properties.Resources.quadx; - resources.ApplyResources(this.pictureBoxQuadX, "pictureBoxQuadX"); - this.pictureBoxQuadX.Name = "pictureBoxQuadX"; - this.pictureBoxQuadX.TabStop = false; - this.pictureBoxQuadX.Click += new System.EventHandler(this.pictureBoxQuadX_Click); - // - // pictureBoxQuad - // - this.pictureBoxQuad.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBoxQuad.Image = global::ArdupilotMega.Properties.Resources.quad; - resources.ApplyResources(this.pictureBoxQuad, "pictureBoxQuad"); - this.pictureBoxQuad.Name = "pictureBoxQuad"; - this.pictureBoxQuad.TabStop = false; - this.pictureBoxQuad.Click += new System.EventHandler(this.pictureBoxQuad_Click); - // - // BUT_levelac2 - // - resources.ApplyResources(this.BUT_levelac2, "BUT_levelac2"); - this.BUT_levelac2.Name = "BUT_levelac2"; - this.BUT_levelac2.UseVisualStyleBackColor = true; - this.BUT_levelac2.Click += new System.EventHandler(this.BUT_levelac2_Click); - // - // ConfigAccelerometerCalibration - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label28); - this.Controls.Add(this.label16); - this.Controls.Add(this.label15); - this.Controls.Add(this.pictureBoxQuadX); - this.Controls.Add(this.pictureBoxQuad); - this.Controls.Add(this.BUT_levelac2); - this.Name = "ConfigAccelerometerCalibration"; - this.Load += new System.EventHandler(this.ConfigAccelerometerCalibration_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Label label28; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.PictureBox pictureBoxQuadX; - private System.Windows.Forms.PictureBox pictureBoxQuad; - private MyButton BUT_levelac2; - } -} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.cs deleted file mode 100644 index c4023e5b5c1a8eaca4af6b3e622df05bf1567da7..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using ArdupilotMega.Controls.BackstageView; - -namespace ArdupilotMega.GCSViews.ConfigurationView -{ - public partial class ConfigAccelerometerCalibration : BackStageViewContentPanel - { - public ConfigAccelerometerCalibration() - { - InitializeComponent(); - } - - private void pictureBoxQuadX_Click(object sender, EventArgs e) - { - try - { - MainV2.comPort.setParam("FRAME", 1f); - CustomMessageBox.Show("Set to x"); - } - catch { CustomMessageBox.Show("Set frame failed"); } - } - - private void BUT_levelac2_Click(object sender, EventArgs e) - { - try - { -#if MAVLINK10 - int fixme; // needs to be accel only - MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_CALIBRATION,1,1,1,1,1,1,1); -#else - MainV2.comPort.doAction(MAVLink.MAV_ACTION.MAV_ACTION_CALIBRATE_ACC); -#endif - - BUT_levelac2.Text = "Complete"; - } - catch - { - CustomMessageBox.Show("Failed to level : ac2 2.0.37+ is required"); - } - } - - private void pictureBoxQuad_Click(object sender, EventArgs e) - { - try - { - MainV2.comPort.setParam("FRAME", 0f); - CustomMessageBox.Show("Set to +"); - } - catch { CustomMessageBox.Show("Set frame failed"); } - } - - private void ConfigAccelerometerCalibration_Load(object sender, EventArgs e) - { - if (!MainV2.comPort.BaseStream.IsOpen) - { - this.Enabled = false; - return; - } - else - { - this.Enabled = true; - } - } - } -} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.es-ES.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.es-ES.resx deleted file mode 100644 index 70ad73f1af84a8cec236442b9c51462353fceab5..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.es-ES.resx +++ /dev/null @@ -1,315 +0,0 @@ -<?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> - <data name="SV3_POS_.Text" xml:space="preserve"> - <value>180</value> - </data> - <data name="BUT_HS4save.Text" xml:space="preserve"> - <value>Manual</value> - </data> - <data name="label12.Text" xml:space="preserve"> - <value>PWM 0 - 1230</value> - </data> - <data name="label10.Text" xml:space="preserve"> - <value>PWM 1621 - 1749</value> - </data> - <data name="label13.Text" xml:space="preserve"> - <value>Modo actual:</value> - </data> - <data name="CHK_enableoptflow.Text" xml:space="preserve"> - <value>Habilitar el flujo óptico</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>NOTA: Las imágenes son sólo para su presentación</value> - </data> - <data name="CB_simple5.Text" xml:space="preserve"> - <value>Modo Simple</value> - </data> - <data name="label11.Text" xml:space="preserve"> - <value>PWM 1750 +</value> - </data> - <data name="CHK_elevonch1rev.Text" xml:space="preserve"> - <value>Elevons CH1 Rev</value> - </data> - <data name="label14.Text" xml:space="preserve"> - <value>PWM Actual:</value> - </data> - <data name="$this.Text" xml:space="preserve"> - <value>APMSetup</value> - </data> - <data name="label17.Text" xml:space="preserve"> - <value>Swash-Servo posición</value> - </data> - <data name="CHK_enablecompass.Text" xml:space="preserve"> - <value>Activar Compas</value> - </data> - <data name="CB_simple4.Text" xml:space="preserve"> - <value>Modo Simple</value> - </data> - <data name="tabArducopter.Text" xml:space="preserve"> - <value>ArduCopter2</value> - </data> - <data name="CB_simple1.Text" xml:space="preserve"> - <value>Modo Simple</value> - </data> - <data name="label15.Text" xml:space="preserve"> - <value>Ajuste Chásis (+ or x)</value> - </data> - <data name="SV2_POS_.Text" xml:space="preserve"> - <value>60</value> - </data> - <data name="label18.Text" xml:space="preserve"> - <value>1</value> - </data> - <data name="CB_simple6.Text" xml:space="preserve"> - <value>Modo Simple</value> - </data> - <data name="CB_simple3.Text" xml:space="preserve"> - <value>Modo Simple</value> - </data> - <data name="label19.Text" xml:space="preserve"> - <value>2</value> - </data> - <data name="tabModes.Text" xml:space="preserve"> - <value>Modos</value> - </data> - <data name="CB_simple2.Text" xml:space="preserve"> - <value>Modo Simple</value> - </data> - <data name="label20.Text" xml:space="preserve"> - <value>3</value> - </data> - <data name="tabReset.Text" xml:space="preserve"> - <value>Reset</value> - </data> - <data name="SV1_POS_.Text" xml:space="preserve"> - <value>-60</value> - </data> - <data name="label21.Text" xml:space="preserve"> - <value>Superior</value> - </data> - <data name="label22.Text" xml:space="preserve"> - <value>Swash de Viaje</value> - </data> - <data name="lbl_currentmode.Text" xml:space="preserve"> - <value>Manual</value> - </data> - <data name="label23.Text" xml:space="preserve"> - <value>Timón de Viaje</value> - </data> - <data name="textBox3.Text" xml:space="preserve"> - <value>Calibración del sensor de voltaje:Para calibrar el sensor, use un multÃmetro para medir la tensión que sale de la CES de la baterÃa-la eliminación del circuito (se trata de cables negro y rojo en el cable de tres hilos que suministra energÃa a la placa APM).Luego reste 0,3 V de ese valor y entrar en él en el campo # 1 a la izquierda.</value> - </data> - <data name="BUT_Calibrateradio.Text" xml:space="preserve"> - <value>Calibrar Radio</value> - </data> - <data name="label24.Text" xml:space="preserve"> - <value>Max</value> - </data> - <data name="label2.Text" xml:space="preserve"> - <value>Modo de Vuelo 2</value> - </data> - <data name="label25.Text" xml:space="preserve"> - <value>Alabeo Max</value> - </data> - <data name="label3.Text" xml:space="preserve"> - <value>Modo de Vuelo 3</value> - </data> - <data name="label26.Text" xml:space="preserve"> - <value>Cabeceo Max</value> - </data> - <data name="label27.Text" xml:space="preserve"> - <value>por ejemplo, en grados 2 ° 3 'W es -2,3</value> - </data> - <data name="label1.Text" xml:space="preserve"> - <value>Modo de Vuelo 1</value> - </data> - <data name="label28.Text" xml:space="preserve"> - <value>Nivel tu quad para establecer las compensaciones por defecto acel</value> - </data> - <data name="label6.Text" xml:space="preserve"> - <value>Modo de Vuelo 6</value> - </data> - <data name="label29.Text" xml:space="preserve"> - <value>Capacidad</value> - </data> - <data name="label100.Text" xml:space="preserve"> - <value>Declinación</value> - </data> - <data name="CHK_enablesonar.Text" xml:space="preserve"> - <value>Activar Sonar</value> - </data> - <data name="label7.Text" xml:space="preserve"> - <value>PWM 1231 - 1360</value> - </data> - <data name="tabRadioIn.Text" xml:space="preserve"> - <value>Entrada Radio</value> - </data> - <data name="groupBox4.Text" xml:space="preserve"> - <value>Calibración</value> - </data> - <data name="HS4_MIN.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="label4.Text" xml:space="preserve"> - <value>Modo de Vuelo 4</value> - </data> - <data name="label5.Text" xml:space="preserve"> - <value>Modo de Vuelo 5</value> - </data> - <data name="groupBox3.Text" xml:space="preserve"> - <value>Gyro</value> - </data> - <data name="label8.Text" xml:space="preserve"> - <value>PWM 1361 - 1490</value> - </data> - <data name="tabHardware.Text" xml:space="preserve"> - <value>Hardware</value> - </data> - <data name="label9.Text" xml:space="preserve"> - <value>PWM 1491 - 1620</value> - </data> - <data name="linkLabelmagdec.Text" xml:space="preserve"> - <value>Sitio Web Declinación</value> - </data> - <data name="HS4_MAX.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="tabBattery.Text" xml:space="preserve"> - <value>BaterÃa</value> - </data> - <data name="BUT_0collective.Text" xml:space="preserve"> - <value>Cero</value> - </data> - <data name="CHK_enableairspeed.Text" xml:space="preserve"> - <value>Activar Airspeed</value> - </data> - <data name="PIT_MAX_.Text" xml:space="preserve"> - <value>4500</value> - </data> - <data name="BUT_reset.Text" xml:space="preserve"> - <value>Restablecer los Ajustes de hardware APM</value> - </data> - <data name="GYR_GAIN_.Text" xml:space="preserve"> - <value>1000</value> - </data> - <data name="label30.Text" xml:space="preserve"> - <value>Monitor</value> - </data> -</root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.fr.resx deleted file mode 100644 index 1bd274beea2e052315a0ab1e83d3619dcf47cbf1..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.fr.resx +++ /dev/null @@ -1,312 +0,0 @@ -<?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> - <data name="SV3_POS_.Text" xml:space="preserve"> - <value>180</value> - </data> - <data name="BUT_HS4save.Text" xml:space="preserve"> - <value>Manuel</value> - </data> - <data name="label12.Text" xml:space="preserve"> - <value>PWM 0 - 1230</value> - </data> - <data name="label10.Text" xml:space="preserve"> - <value>PWM 1621 - 1749</value> - </data> - <data name="label13.Text" xml:space="preserve"> - <value>Mode Courant:</value> - </data> - <data name="CHK_enableoptflow.Text" xml:space="preserve"> - <value>Activ. capteur optique</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>NOTE: images pou presentation uniquement. Fonctionnel pour Hex, Octo etc...</value> - </data> - <data name="CB_simple5.Text" xml:space="preserve"> - <value>Mode Simple</value> - </data> - <data name="label11.Text" xml:space="preserve"> - <value>PWM 1750 +</value> - </data> - <data name="CHK_elevonch1rev.Text" xml:space="preserve"> - <value>Elevons CH1 Rev</value> - </data> - <data name="label14.Text" xml:space="preserve"> - <value>PWM Actuel:</value> - </data> - <data name="$this.Text" xml:space="preserve"> - <value>APMSetup</value> - </data> - <data name="label17.Text" xml:space="preserve"> - <value>Swash-Servo position</value> - </data> - <data name="CHK_enablecompass.Text" xml:space="preserve"> - <value>Activ. Boussole</value> - </data> - <data name="CB_simple4.Text" xml:space="preserve"> - <value>Mode Simple</value> - </data> - <data name="tabArducopter.Text" xml:space="preserve"> - <value>ArduCopter2</value> - </data> - <data name="CB_simple1.Text" xml:space="preserve"> - <value>Mode Simple</value> - </data> - <data name="label15.Text" xml:space="preserve"> - <value>type de châssis (+ ou x)</value> - </data> - <data name="SV2_POS_.Text" xml:space="preserve"> - <value>60</value> - </data> - <data name="label18.Text" xml:space="preserve"> - <value>1</value> - </data> - <data name="CB_simple6.Text" xml:space="preserve"> - <value>Mode Simple</value> - </data> - <data name="CB_simple3.Text" xml:space="preserve"> - <value>Mode Simple</value> - </data> - <data name="label19.Text" xml:space="preserve"> - <value>2</value> - </data> - <data name="tabModes.Text" xml:space="preserve"> - <value>Modes</value> - </data> - <data name="CB_simple2.Text" xml:space="preserve"> - <value>Mode Simple</value> - </data> - <data name="label20.Text" xml:space="preserve"> - <value>3</value> - </data> - <data name="tabReset.Text" xml:space="preserve"> - <value>Réinit.</value> - </data> - <data name="SV1_POS_.Text" xml:space="preserve"> - <value>-60</value> - </data> - <data name="label21.Text" xml:space="preserve"> - <value>Haut</value> - </data> - <data name="label22.Text" xml:space="preserve"> - <value>Mouvement Swash</value> - </data> - <data name="lbl_currentmode.Text" xml:space="preserve"> - <value>Manuel</value> - </data> - <data name="label23.Text" xml:space="preserve"> - <value>Deplac. du Gouvernail</value> - </data> - <data name="textBox3.Text" xml:space="preserve"> - <value>Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas</value> - </data> - <data name="BUT_Calibrateradio.Text" xml:space="preserve"> - <value>Calibrer Radio</value> - </data> - <data name="label24.Text" xml:space="preserve"> - <value>Max</value> - </data> - <data name="label2.Text" xml:space="preserve"> - <value>Mode de vol 2</value> - </data> - <data name="label25.Text" xml:space="preserve"> - <value>Roulis Max</value> - </data> - <data name="label3.Text" xml:space="preserve"> - <value>Mode de vol 2</value> - </data> - <data name="label26.Text" xml:space="preserve"> - <value>Tangage Max</value> - </data> - <data name="label27.Text" xml:space="preserve"> - <value>en degrés eg 2° 3' W est -2.3</value> - </data> - <data name="label1.Text" xml:space="preserve"> - <value>Mode de vol 1</value> - </data> - <data name="label28.Text" xml:space="preserve"> - <value>Niveler l'apareil pour copensation des accels</value> - </data> - <data name="label6.Text" xml:space="preserve"> - <value>Mode de vol 6</value> - </data> - <data name="label29.Text" xml:space="preserve"> - <value>Capacité</value> - </data> - <data name="label100.Text" xml:space="preserve"> - <value>Déclination</value> - </data> - <data name="CHK_enablesonar.Text" xml:space="preserve"> - <value>Activer Sonar</value> - </data> - <data name="label7.Text" xml:space="preserve"> - <value>PWM 1231 - 1360</value> - </data> - <data name="tabRadioIn.Text" xml:space="preserve"> - <value>Entrée Radio</value> - </data> - <data name="HS4_MIN.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="label4.Text" xml:space="preserve"> - <value>Mode de vol 4</value> - </data> - <data name="label5.Text" xml:space="preserve"> - <value>Mode de vol 5</value> - </data> - <data name="groupBox3.Text" xml:space="preserve"> - <value>Gyro</value> - </data> - <data name="label8.Text" xml:space="preserve"> - <value>PWM 1361 - 1490</value> - </data> - <data name="tabHardware.Text" xml:space="preserve"> - <value>Matériel</value> - </data> - <data name="label9.Text" xml:space="preserve"> - <value>PWM 1491 - 1620</value> - </data> - <data name="linkLabelmagdec.Text" xml:space="preserve"> - <value>Site Web Déclination</value> - </data> - <data name="HS4_MAX.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="tabBattery.Text" xml:space="preserve"> - <value>Batterie</value> - </data> - <data name="BUT_0collective.Text" xml:space="preserve"> - <value>Zéro</value> - </data> - <data name="CHK_enableairspeed.Text" xml:space="preserve"> - <value>Activ. Airspeed</value> - </data> - <data name="PIT_MAX_.Text" xml:space="preserve"> - <value>4500</value> - </data> - <data name="BUT_reset.Text" xml:space="preserve"> - <value>Rà Z tout parametres du APM</value> - </data> - <data name="GYR_GAIN_.Text" xml:space="preserve"> - <value>1000</value> - </data> - <data name="label30.Text" xml:space="preserve"> - <value>Moniteur</value> - </data> -</root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.it-IT.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.it-IT.resx deleted file mode 100644 index 2b2636c8132c76e5855c9dbb2c87151786f287c3..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.it-IT.resx +++ /dev/null @@ -1,318 +0,0 @@ -<?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> - <data name="SV3_POS_.Text" xml:space="preserve"> - <value>180</value> - </data> - <data name="BUT_HS4save.Text" xml:space="preserve"> - <value>Manuale</value> - </data> - <data name="label12.Text" xml:space="preserve"> - <value>PWM 0 - 1230</value> - </data> - <data name="label10.Text" xml:space="preserve"> - <value>PWM 1621 - 1749</value> - </data> - <data name="label13.Text" xml:space="preserve"> - <value>Modo Corrente:</value> - </data> - <data name="CHK_enableoptflow.Text" xml:space="preserve"> - <value>Abilita Flusso ottico</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>Nota: le immagini sono sono per presentazione, funzionerà con Hexa, etc.</value> - </data> - <data name="CB_simple5.Text" xml:space="preserve"> - <value>Modo Semplice</value> - </data> - <data name="label11.Text" xml:space="preserve"> - <value>PWM 1750 +</value> - </data> - <data name="CHK_elevonch1rev.Text" xml:space="preserve"> - <value>Elevatore CH1 Rev</value> - </data> - <data name="label14.Text" xml:space="preserve"> - <value>PWM Corrente:</value> - </data> - <data name="$this.Text" xml:space="preserve"> - <value>Imposta APM</value> - </data> - <data name="label17.Text" xml:space="preserve"> - <value>Posizione del servo del piatto</value> - </data> - <data name="CHK_enablecompass.Text" xml:space="preserve"> - <value>Abilita Magnetometro</value> - </data> - <data name="CB_simple4.Text" xml:space="preserve"> - <value>Modo Semplice</value> - </data> - <data name="tabArducopter.Text" xml:space="preserve"> - <value>ArduCopter2</value> - </data> - <data name="CB_simple1.Text" xml:space="preserve"> - <value>Modo Semplice</value> - </data> - <data name="label15.Text" xml:space="preserve"> - <value>Imposta Frame (+ or x)</value> - </data> - <data name="SV2_POS_.Text" xml:space="preserve"> - <value>60</value> - </data> - <data name="label18.Text" xml:space="preserve"> - <value>1</value> - </data> - <data name="CB_simple6.Text" xml:space="preserve"> - <value>Modo Semplice</value> - </data> - <data name="CB_simple3.Text" xml:space="preserve"> - <value>Modo Semplice</value> - </data> - <data name="label19.Text" xml:space="preserve"> - <value>2</value> - </data> - <data name="tabModes.Text" xml:space="preserve"> - <value>Modi</value> - </data> - <data name="CB_simple2.Text" xml:space="preserve"> - <value>Modo Semplice</value> - </data> - <data name="label20.Text" xml:space="preserve"> - <value>3</value> - </data> - <data name="tabReset.Text" xml:space="preserve"> - <value>Riavvia</value> - </data> - <data name="SV1_POS_.Text" xml:space="preserve"> - <value>-60</value> - </data> - <data name="label21.Text" xml:space="preserve"> - <value>Alto</value> - </data> - <data name="label22.Text" xml:space="preserve"> - <value>Escursione del piatto</value> - </data> - <data name="lbl_currentmode.Text" xml:space="preserve"> - <value>Manuale</value> - </data> - <data name="label23.Text" xml:space="preserve"> - <value>Escursione Timone</value> - </data> - <data name="textBox3.Text" xml:space="preserve"> - <value>Calibarzione del sensore di voltaggio: -1. Misura il valtaggio di ingresso di APM e inseriscilo nel box sotto -2. Misura il voltaggio della batteria e inseriscilo nel box sotto -3. Dalle caratteristiche del sensore di corrente, inserisci il valore degli ampere per volt nel box qui sotto</value> - </data> - <data name="BUT_Calibrateradio.Text" xml:space="preserve"> - <value>Calibrazione Radio</value> - </data> - <data name="label24.Text" xml:space="preserve"> - <value>Massimo</value> - </data> - <data name="label2.Text" xml:space="preserve"> - <value>Modo di volo 2</value> - </data> - <data name="label25.Text" xml:space="preserve"> - <value>Rollio massimo</value> - </data> - <data name="label3.Text" xml:space="preserve"> - <value>Modo di volo 3</value> - </data> - <data name="label26.Text" xml:space="preserve"> - <value>Passo massimo</value> - </data> - <data name="label27.Text" xml:space="preserve"> - <value>in gradi es 2° 3' W is -2.3</value> - </data> - <data name="label1.Text" xml:space="preserve"> - <value>Modo di volo 1</value> - </data> - <data name="label28.Text" xml:space="preserve"> - <value>Livella il quad per impostare gli accelerometri</value> - </data> - <data name="label6.Text" xml:space="preserve"> - <value>Modo di volo 6</value> - </data> - <data name="label29.Text" xml:space="preserve"> - <value>Capacità </value> - </data> - <data name="label100.Text" xml:space="preserve"> - <value>Declinazione</value> - </data> - <data name="CHK_enablesonar.Text" xml:space="preserve"> - <value>Attiva Sonar</value> - </data> - <data name="label7.Text" xml:space="preserve"> - <value>PWM 1231 - 1360</value> - </data> - <data name="tabRadioIn.Text" xml:space="preserve"> - <value>Ingresso Radio</value> - </data> - <data name="groupBox4.Text" xml:space="preserve"> - <value>Calibration</value> - </data> - <data name="HS4_MIN.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="label4.Text" xml:space="preserve"> - <value>Modo di volo 4</value> - </data> - <data name="label5.Text" xml:space="preserve"> - <value>Modo di volo 5</value> - </data> - <data name="groupBox3.Text" xml:space="preserve"> - <value>Giroscopio</value> - </data> - <data name="label8.Text" xml:space="preserve"> - <value>PWM 1361 - 1490</value> - </data> - <data name="tabHardware.Text" xml:space="preserve"> - <value>Hardware</value> - </data> - <data name="label9.Text" xml:space="preserve"> - <value>PWM 1491 - 1620</value> - </data> - <data name="linkLabelmagdec.Text" xml:space="preserve"> - <value>Sito Web per la Declinazione</value> - </data> - <data name="HS4_MAX.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="tabBattery.Text" xml:space="preserve"> - <value>Batteria</value> - </data> - <data name="BUT_0collective.Text" xml:space="preserve"> - <value>Zero</value> - </data> - <data name="CHK_enableairspeed.Text" xml:space="preserve"> - <value>Attiva Sensore Velocità </value> - </data> - <data name="PIT_MAX_.Text" xml:space="preserve"> - <value>4500</value> - </data> - <data name="BUT_reset.Text" xml:space="preserve"> - <value>Resetta APM ai valori di Default</value> - </data> - <data name="GYR_GAIN_.Text" xml:space="preserve"> - <value>1000</value> - </data> - <data name="label30.Text" xml:space="preserve"> - <value>Monitor</value> - </data> -</root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.pl.resx deleted file mode 100644 index 057b9327168c6471be22139b5d017e20582de843..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.pl.resx +++ /dev/null @@ -1,318 +0,0 @@ -<?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> - <data name="SV3_POS_.Text" xml:space="preserve"> - <value>180</value> - </data> - <data name="BUT_HS4save.Text" xml:space="preserve"> - <value>RÄ™czne</value> - </data> - <data name="label12.Text" xml:space="preserve"> - <value>PWM 0 - 1230</value> - </data> - <data name="label10.Text" xml:space="preserve"> - <value>PWM 1621 - 1749</value> - </data> - <data name="label13.Text" xml:space="preserve"> - <value>Aktualny tryb:</value> - </data> - <data name="CHK_enableoptflow.Text" xml:space="preserve"> - <value>Włącz Optical Flow</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>UWAGA: Obrazy sÄ… wyłącznie do prezentacji, dziaÅ‚ajÄ… jedynie z hexa, itp.</value> - </data> - <data name="CB_simple5.Text" xml:space="preserve"> - <value>Tryb prosty</value> - </data> - <data name="label11.Text" xml:space="preserve"> - <value>PWM 1750 +</value> - </data> - <data name="CHK_elevonch1rev.Text" xml:space="preserve"> - <value>Odwr. Elevon CH1</value> - </data> - <data name="label14.Text" xml:space="preserve"> - <value>Aktualny PWM:</value> - </data> - <data name="$this.Text" xml:space="preserve"> - <value>Ustawienia APM</value> - </data> - <data name="label17.Text" xml:space="preserve"> - <value>Pozycja serwa pÅ‚yty ster.</value> - </data> - <data name="CHK_enablecompass.Text" xml:space="preserve"> - <value>Włącz kompas</value> - </data> - <data name="CB_simple4.Text" xml:space="preserve"> - <value>Tryb prosty</value> - </data> - <data name="tabArducopter.Text" xml:space="preserve"> - <value>ArduCopter2</value> - </data> - <data name="CB_simple1.Text" xml:space="preserve"> - <value>Tryb prosty</value> - </data> - <data name="label15.Text" xml:space="preserve"> - <value>Ustawienie ramy (+ lub x)</value> - </data> - <data name="SV2_POS_.Text" xml:space="preserve"> - <value>60</value> - </data> - <data name="label18.Text" xml:space="preserve"> - <value>1</value> - </data> - <data name="CB_simple6.Text" xml:space="preserve"> - <value>Tryb prosty</value> - </data> - <data name="CB_simple3.Text" xml:space="preserve"> - <value>Tryb prosty</value> - </data> - <data name="label19.Text" xml:space="preserve"> - <value>2</value> - </data> - <data name="tabModes.Text" xml:space="preserve"> - <value>Tryby</value> - </data> - <data name="CB_simple2.Text" xml:space="preserve"> - <value>Tryb prosty</value> - </data> - <data name="label20.Text" xml:space="preserve"> - <value>3</value> - </data> - <data name="tabReset.Text" xml:space="preserve"> - <value>Reset</value> - </data> - <data name="SV1_POS_.Text" xml:space="preserve"> - <value>-60</value> - </data> - <data name="label21.Text" xml:space="preserve"> - <value>Góra</value> - </data> - <data name="label22.Text" xml:space="preserve"> - <value>Zakres ruchu pÅ‚yty sterujÄ…cej</value> - </data> - <data name="lbl_currentmode.Text" xml:space="preserve"> - <value>RÄ™czne</value> - </data> - <data name="label23.Text" xml:space="preserve"> - <value>Zakres steru kierunku</value> - </data> - <data name="textBox3.Text" xml:space="preserve"> - <value>Kalibracja czujnika napiÄ™cia: -1. Zmierz napiÄ™cie wejÅ›ciowe APM i wpisz poniżej -2. Zmierz napiÄ™cie baterii i wpisz poniżej -3. Wpisz poniżej ilość amperów/wolt [A/V] z dokumentacji czujnika prÄ…du</value> - </data> - <data name="BUT_Calibrateradio.Text" xml:space="preserve"> - <value>Kalibracja radia</value> - </data> - <data name="label24.Text" xml:space="preserve"> - <value>Max</value> - </data> - <data name="label2.Text" xml:space="preserve"> - <value>Tryb lotu 2</value> - </data> - <data name="label25.Text" xml:space="preserve"> - <value>Max przechylenie</value> - </data> - <data name="label3.Text" xml:space="preserve"> - <value>Tryb lotu 3</value> - </data> - <data name="label26.Text" xml:space="preserve"> - <value>Max pochylenie</value> - </data> - <data name="label27.Text" xml:space="preserve"> - <value>w stopniech np. 2° 3' W to -2.3</value> - </data> - <data name="label1.Text" xml:space="preserve"> - <value>Tryb lotu 1</value> - </data> - <data name="label28.Text" xml:space="preserve"> - <value>Wypoziomuj quada żeby stawić domyÅ›le offsety przysp.</value> - </data> - <data name="label6.Text" xml:space="preserve"> - <value>Tryb lotu 6</value> - </data> - <data name="label29.Text" xml:space="preserve"> - <value>Pojemność</value> - </data> - <data name="label100.Text" xml:space="preserve"> - <value>Deklinacja</value> - </data> - <data name="CHK_enablesonar.Text" xml:space="preserve"> - <value>Włącz sonar</value> - </data> - <data name="label7.Text" xml:space="preserve"> - <value>PWM 1231 - 1360</value> - </data> - <data name="tabRadioIn.Text" xml:space="preserve"> - <value>WejÅ›cia radia</value> - </data> - <data name="groupBox4.Text" xml:space="preserve"> - <value>Calibration</value> - </data> - <data name="HS4_MIN.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="label4.Text" xml:space="preserve"> - <value>Tryb lotu 4</value> - </data> - <data name="label5.Text" xml:space="preserve"> - <value>Tryb lotu 5</value> - </data> - <data name="groupBox3.Text" xml:space="preserve"> - <value>Å»yro</value> - </data> - <data name="label8.Text" xml:space="preserve"> - <value>PWM 1361 - 1490</value> - </data> - <data name="tabHardware.Text" xml:space="preserve"> - <value>Hardware</value> - </data> - <data name="label9.Text" xml:space="preserve"> - <value>PWM 1491 - 1620</value> - </data> - <data name="linkLabelmagdec.Text" xml:space="preserve"> - <value>Strona www deklinacji</value> - </data> - <data name="HS4_MAX.Text" xml:space="preserve"> - <value>1500</value> - </data> - <data name="tabBattery.Text" xml:space="preserve"> - <value>Bateria</value> - </data> - <data name="BUT_0collective.Text" xml:space="preserve"> - <value>Zero</value> - </data> - <data name="CHK_enableairspeed.Text" xml:space="preserve"> - <value>Włącz prÄ™dkość powietrza</value> - </data> - <data name="PIT_MAX_.Text" xml:space="preserve"> - <value>4500</value> - </data> - <data name="BUT_reset.Text" xml:space="preserve"> - <value>Reset APM do stawieÅ„ domyÅ›lnych</value> - </data> - <data name="GYR_GAIN_.Text" xml:space="preserve"> - <value>1000</value> - </data> - <data name="label30.Text" xml:space="preserve"> - <value>Monitor</value> - </data> -</root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.resx deleted file mode 100644 index d866d08ac01fea75663b3a82e8407c6c3c995daa..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.resx +++ /dev/null @@ -1,310 +0,0 @@ -<?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> - <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="label28.AutoSize" type="System.Boolean, mscorlib"> - <value>True</value> - </data> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="label28.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="label28.Location" type="System.Drawing.Point, System.Drawing"> - <value>124, 13</value> - </data> - <data name="label28.Size" type="System.Drawing.Size, System.Drawing"> - <value>210, 13</value> - </data> - <data name="label28.TabIndex" type="System.Int32, mscorlib"> - <value>15</value> - </data> - <data name="label28.Text" xml:space="preserve"> - <value>Level your quad to set default accel offsets</value> - </data> - <data name=">>label28.Name" xml:space="preserve"> - <value>label28</value> - </data> - <data name=">>label28.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=">>label28.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>label28.ZOrder" xml:space="preserve"> - <value>0</value> - </data> - <data name="label16.AutoSize" type="System.Boolean, mscorlib"> - <value>True</value> - </data> - <data name="label16.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <data name="label16.Location" type="System.Drawing.Point, System.Drawing"> - <value>124, 308</value> - </data> - <data name="label16.Size" type="System.Drawing.Size, System.Drawing"> - <value>192, 26</value> - </data> - <data name="label16.TabIndex" type="System.Int32, mscorlib"> - <value>13</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>NOTE: images are for presentation only -will work with hexa's etc</value> - </data> - <data name=">>label16.Name" xml:space="preserve"> - <value>label16</value> - </data> - <data name=">>label16.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=">>label16.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>label16.ZOrder" xml:space="preserve"> - <value>1</value> - </data> - <data name="label15.AutoSize" type="System.Boolean, mscorlib"> - <value>True</value> - </data> - <data name="label15.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <data name="label15.Location" type="System.Drawing.Point, System.Drawing"> - <value>167, 99</value> - </data> - <data name="label15.Size" type="System.Drawing.Size, System.Drawing"> - <value>102, 13</value> - </data> - <data name="label15.TabIndex" type="System.Int32, mscorlib"> - <value>12</value> - </data> - <data name="label15.Text" xml:space="preserve"> - <value>Frame Setup (+ or x)</value> - </data> - <data name=">>label15.Name" xml:space="preserve"> - <value>label15</value> - </data> - <data name=">>label15.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=">>label15.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>label15.ZOrder" xml:space="preserve"> - <value>2</value> - </data> - <data name="pictureBoxQuadX.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <data name="pictureBoxQuadX.Location" type="System.Drawing.Point, System.Drawing"> - <value>226, 115</value> - </data> - <data name="pictureBoxQuadX.Size" type="System.Drawing.Size, System.Drawing"> - <value>190, 190</value> - </data> - <data name="pictureBoxQuadX.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> - <value>Zoom</value> - </data> - <data name="pictureBoxQuadX.TabIndex" type="System.Int32, mscorlib"> - <value>11</value> - </data> - <data name=">>pictureBoxQuadX.Name" xml:space="preserve"> - <value>pictureBoxQuadX</value> - </data> - <data name=">>pictureBoxQuadX.Type" xml:space="preserve"> - <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>pictureBoxQuadX.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>pictureBoxQuadX.ZOrder" xml:space="preserve"> - <value>3</value> - </data> - <data name="pictureBoxQuad.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <data name="pictureBoxQuad.Location" type="System.Drawing.Point, System.Drawing"> - <value>19, 115</value> - </data> - <data name="pictureBoxQuad.Size" type="System.Drawing.Size, System.Drawing"> - <value>190, 190</value> - </data> - <data name="pictureBoxQuad.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> - <value>Zoom</value> - </data> - <data name="pictureBoxQuad.TabIndex" type="System.Int32, mscorlib"> - <value>10</value> - </data> - <data name=">>pictureBoxQuad.Name" xml:space="preserve"> - <value>pictureBoxQuad</value> - </data> - <data name=">>pictureBoxQuad.Type" xml:space="preserve"> - <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>pictureBoxQuad.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>pictureBoxQuad.ZOrder" xml:space="preserve"> - <value>4</value> - </data> - <data name="BUT_levelac2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <data name="BUT_levelac2.Location" type="System.Drawing.Point, System.Drawing"> - <value>181, 42</value> - </data> - <data name="BUT_levelac2.Size" type="System.Drawing.Size, System.Drawing"> - <value>75, 23</value> - </data> - <data name="BUT_levelac2.TabIndex" type="System.Int32, mscorlib"> - <value>14</value> - </data> - <data name="BUT_levelac2.Text" xml:space="preserve"> - <value>Level</value> - </data> - <data name=">>BUT_levelac2.Name" xml:space="preserve"> - <value>BUT_levelac2</value> - </data> - <data name=">>BUT_levelac2.Type" xml:space="preserve"> - <value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value> - </data> - <data name=">>BUT_levelac2.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>BUT_levelac2.ZOrder" xml:space="preserve"> - <value>5</value> - </data> - <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> - <value>6, 13</value> - </data> - <data name="$this.Size" type="System.Drawing.Size, System.Drawing"> - <value>439, 356</value> - </data> - <data name=">>$this.Name" xml:space="preserve"> - <value>ConfigAccelerometerCalibration</value> - </data> - <data name=">>$this.Type" xml:space="preserve"> - <value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value> - </data> -</root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.zh-Hans.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.zh-Hans.resx deleted file mode 100644 index f96892c423b112b28127ad582686f33464b57c5b..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.zh-Hans.resx +++ /dev/null @@ -1,496 +0,0 @@ -<?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> - <data name="tabRadioIn.Text" xml:space="preserve"> - <value>é¥æŽ§è¾“å…¥</value> - </data> - <data name="tabModes.Text" xml:space="preserve"> - <value>模å¼</value> - </data> - <data name="tabHardware.Text" xml:space="preserve"> - <value>硬件</value> - </data> - <data name="tabBattery.Text" xml:space="preserve"> - <value>ç”µæ± </value> - </data> - <data name="tabHeli.Text" xml:space="preserve"> - <value>AC2 ç›´å‡æœº</value> - </data> - <data name="groupBoxElevons.Text" xml:space="preserve"> - <value>上é™å‰¯ç¿¼ (Elevon) é…ç½®</value> - </data> - <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="CHK_elevonch2rev.Size" type="System.Drawing.Size, System.Drawing"> - <value>115, 17</value> - </data> - <data name="CHK_elevonch2rev.Text" xml:space="preserve"> - <value>Elevons CH2 逆转</value> - </data> - <data name="CHK_elevonrev.Size" type="System.Drawing.Size, System.Drawing"> - <value>91, 17</value> - </data> - <data name="CHK_elevonrev.Text" xml:space="preserve"> - <value>Elevons 逆转</value> - </data> - <data name="CHK_elevonch1rev.Size" type="System.Drawing.Size, System.Drawing"> - <value>115, 17</value> - </data> - <data name="CHK_elevonch1rev.Text" xml:space="preserve"> - <value>Elevons CH1 逆转</value> - </data> - <data name="CHK_revch3.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch3.Text" xml:space="preserve"> - <value>逆转</value> - </data> - <data name="CHK_revch4.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch4.Text" xml:space="preserve"> - <value>逆转</value> - </data> - <data name="CHK_revch2.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch2.Text" xml:space="preserve"> - <value>逆转</value> - </data> - <data name="CHK_revch1.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch1.Text" xml:space="preserve"> - <value>逆转</value> - </data> - <data name="BUT_Calibrateradio.Text" xml:space="preserve"> - <value>æ ¡å‡†é¥æŽ§</value> - </data> - <data name="CB_simple6.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple6.Text" xml:space="preserve"> - <value>ç®€å•æ¨¡å¼</value> - </data> - <data name="CB_simple5.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple5.Text" xml:space="preserve"> - <value>ç®€å•æ¨¡å¼</value> - </data> - <data name="CB_simple4.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple4.Text" xml:space="preserve"> - <value>ç®€å•æ¨¡å¼</value> - </data> - <data name="CB_simple3.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple3.Text" xml:space="preserve"> - <value>ç®€å•æ¨¡å¼</value> - </data> - <data name="CB_simple2.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple2.Text" xml:space="preserve"> - <value>ç®€å•æ¨¡å¼</value> - </data> - <data name="CB_simple1.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple1.Text" xml:space="preserve"> - <value>ç®€å•æ¨¡å¼</value> - </data> - <data name="label14.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label14.Text" xml:space="preserve"> - <value>å½“å‰ PWM:</value> - </data> - <data name="label13.Size" type="System.Drawing.Size, System.Drawing"> - <value>58, 13</value> - </data> - <data name="label13.Text" xml:space="preserve"> - <value>当剿¨¡å¼:</value> - </data> - <data name="label6.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label6.Text" xml:space="preserve"> - <value>é£žè¡Œæ¨¡å¼ 6</value> - </data> - <data name="label5.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label5.Text" xml:space="preserve"> - <value>é£žè¡Œæ¨¡å¼ 5</value> - </data> - <data name="label4.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label4.Text" xml:space="preserve"> - <value>é£žè¡Œæ¨¡å¼ 4</value> - </data> - <data name="label3.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label3.Text" xml:space="preserve"> - <value>é£žè¡Œæ¨¡å¼ 3</value> - </data> - <data name="label2.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label2.Text" xml:space="preserve"> - <value>é£žè¡Œæ¨¡å¼ 2</value> - </data> - <data name="label1.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label1.Text" xml:space="preserve"> - <value>é£žè¡Œæ¨¡å¼ 1</value> - </data> - <data name="BUT_SaveModes.Text" xml:space="preserve"> - <value>ä¿å˜æ¨¡å¼</value> - </data> - <data name="label27.Text" xml:space="preserve"> - <value>å进制, 2° 3' W 就是 -2.3</value> - </data> - <data name="CHK_enableoptflow.Text" xml:space="preserve"> - <value>å¯ç”¨å…‰æµ</value> - </data> - <data name="linkLabelmagdec.Size" type="System.Drawing.Size, System.Drawing"> - <value>67, 13</value> - </data> - <data name="linkLabelmagdec.Text" xml:space="preserve"> - <value>ç£å角网站</value> - </data> - <data name="label100.Text" xml:space="preserve"> - <value>ç£åè§’</value> - </data> - <data name="CHK_enableairspeed.Text" xml:space="preserve"> - <value>å¯ç”¨ç©ºé€Ÿè®¡</value> - </data> - <data name="CHK_enablesonar.Text" xml:space="preserve"> - <value>å¯ç”¨å£°çº³</value> - </data> - <data name="CHK_enablecompass.Text" xml:space="preserve"> - <value>å¯ç”¨ç½—盘</value> - </data> - <data name="label31.Size" type="System.Drawing.Size, System.Drawing"> - <value>58, 13</value> - </data> - <data name="label31.Text" xml:space="preserve"> - <value>输入电压:</value> - </data> - <data name="label32.Size" type="System.Drawing.Size, System.Drawing"> - <value>94, 13</value> - </data> - <data name="label32.Text" xml:space="preserve"> - <value>测é‡çš„ç”µæ± ç”µåŽ‹:</value> - </data> - <data name="label33.Size" type="System.Drawing.Size, System.Drawing"> - <value>58, 13</value> - </data> - <data name="label33.Text" xml:space="preserve"> - <value>ç”µæ± ç”µåŽ‹:</value> - </data> - <data name="label34.Size" type="System.Drawing.Size, System.Drawing"> - <value>52, 13</value> - </data> - <data name="label34.Text" xml:space="preserve"> - <value>分 压 比:</value> - </data> - <data name="label35.Size" type="System.Drawing.Size, System.Drawing"> - <value>63, 13</value> - </data> - <data name="label35.Text" xml:space="preserve"> - <value>安培/ä¼ç‰¹:</value> - </data> - <data name="label47.Size" type="System.Drawing.Size, System.Drawing"> - <value>48, 18</value> - </data> - <data name="label47.Text" xml:space="preserve"> - <value>ä¼ æ„Ÿå™¨</value> - </data> - <data name="textBox3.Text" xml:space="preserve"> - <value>ç”µåŽ‹ä¼ æ„Ÿå™¨æ ¡å‡†: -1. 测é‡APMè¾“å…¥ç”µåŽ‹ï¼Œè¾“å…¥åˆ°ä¸‹æ–¹çš„æ–‡æœ¬æ¡†ä¸ -2. 测é‡ç”µæ± ç”µåŽ‹ï¼Œè¾“å…¥åˆ°ä¸‹æ–¹çš„æ–‡æœ¬æ¡†ä¸ -3. 从当å‰çš„ä¼ æ„Ÿå™¨çš„æ•°æ®è¡¨ä¸æ‰¾åˆ°å®‰åŸ¹/ä¼ç‰¹ï¼Œè¾“入到下方的文本框ä¸</value> - </data> - <data name="label29.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label29.Text" xml:space="preserve"> - <value>容é‡</value> - </data> - <data name="label30.Size" type="System.Drawing.Size, System.Drawing"> - <value>48, 13</value> - </data> - <data name="label30.Text" xml:space="preserve"> - <value>监控器</value> - </data> - <data name="label28.Size" type="System.Drawing.Size, System.Drawing"> - <value>175, 13</value> - </data> - <data name="label28.Text" xml:space="preserve"> - <value>设置水平é¢çš„é»˜è®¤åŠ é€Ÿåº¦è®¡åç§»</value> - </data> - <data name="label16.Size" type="System.Drawing.Size, System.Drawing"> - <value>261, 13</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>注: å›¾ç‰‡åªæ˜¯ç”¨äºŽå±•示,设置å¯ä»¥ç”¨äºŽå…è½´ç‰æœºæž¶</value> - </data> - <data name="label15.Size" type="System.Drawing.Size, System.Drawing"> - <value>93, 13</value> - </data> - <data name="label15.Text" xml:space="preserve"> - <value>机架设置 (+ 或 x)</value> - </data> - <data name="BUT_levelac2.Text" xml:space="preserve"> - <value>找平</value> - </data> - <data name="BUT_HS4save.Text" xml:space="preserve"> - <value>手动</value> - </data> - <data name="BUT_swash_manual.Text" xml:space="preserve"> - <value>手动</value> - </data> - <data name="label46.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label46.Text" xml:space="preserve"> - <value>感度</value> - </data> - <data name="label45.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label45.Text" xml:space="preserve"> - <value>å¯ç”¨</value> - </data> - <data name="label44.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label44.Text" xml:space="preserve"> - <value>微调</value> - </data> - <data name="label43.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label43.Text" xml:space="preserve"> - <value>逆转</value> - </data> - <data name="label42.Size" type="System.Drawing.Size, System.Drawing"> - <value>43, 13</value> - </data> - <data name="label42.Text" xml:space="preserve"> - <value>æ–¹å‘舵</value> - </data> - <data name="label24.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label24.Text" xml:space="preserve"> - <value>最大</value> - </data> - <data name="label40.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label40.Text" xml:space="preserve"> - <value>最å°</value> - </data> - <data name="label41.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label41.Text" xml:space="preserve"> - <value>最低</value> - </data> - <data name="label21.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label21.Text" xml:space="preserve"> - <value>最高</value> - </data> - <data name="BUT_0collective.Text" xml:space="preserve"> - <value>0度</value> - </data> - <data name="label39.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label39.Text" xml:space="preserve"> - <value>微调</value> - </data> - <data name="label38.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label38.Text" xml:space="preserve"> - <value>逆转</value> - </data> - <data name="label37.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label37.Text" xml:space="preserve"> - <value>ä½ç½®</value> - </data> - <data name="label36.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label36.Text" xml:space="preserve"> - <value>舵机</value> - </data> - <data name="label26.Size" type="System.Drawing.Size, System.Drawing"> - <value>55, 13</value> - </data> - <data name="label26.Text" xml:space="preserve"> - <value>最大俯仰</value> - </data> - <data name="label25.Size" type="System.Drawing.Size, System.Drawing"> - <value>55, 13</value> - </data> - <data name="label25.Text" xml:space="preserve"> - <value>最大侧倾</value> - </data> - <data name="label23.Size" type="System.Drawing.Size, System.Drawing"> - <value>55, 13</value> - </data> - <data name="label23.Text" xml:space="preserve"> - <value>舵机行程</value> - </data> - <data name="label22.Size" type="System.Drawing.Size, System.Drawing"> - <value>79, 13</value> - </data> - <data name="label22.Text" xml:space="preserve"> - <value>斜盘水平微调</value> - </data> - <data name="label17.Size" type="System.Drawing.Size, System.Drawing"> - <value>79, 13</value> - </data> - <data name="label17.Text" xml:space="preserve"> - <value>斜盘舵机ä½ç½®</value> - </data> - <data name="tabReset.Text" xml:space="preserve"> - <value>é‡ç½®</value> - </data> - <data name="BUT_reset.Text" xml:space="preserve"> - <value>é‡ç½® APM 为默认设置</value> - </data> - <data name="$this.Text" xml:space="preserve"> - <value>APM设置</value> - </data> -</root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.zh-TW.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.zh-TW.resx deleted file mode 100644 index 0c03fbf8ed6bd5befc34246175bf1adf106cce43..0000000000000000000000000000000000000000 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibration.zh-TW.resx +++ /dev/null @@ -1,460 +0,0 @@ -<?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> - <data name="tabReset.Text" xml:space="preserve"> - <value>é‡ç½®</value> - </data> - <data name="tabRadioIn.Text" xml:space="preserve"> - <value>é™æŽ§è¼¸å…¥</value> - </data> - <data name="tabModes.Text" xml:space="preserve"> - <value>模å¼</value> - </data> - <data name="tabHardware.Text" xml:space="preserve"> - <value>硬件</value> - </data> - <data name="tabBattery.Text" xml:space="preserve"> - <value>é›»æ± </value> - </data> - <data name="BUT_reset.Text" xml:space="preserve"> - <value>é‡ç½® APM 為默èªè¨ç½®</value> - </data> - <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="CHK_revch3.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch3.Text" xml:space="preserve"> - <value>逆轉</value> - </data> - <data name="CHK_revch4.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch4.Text" xml:space="preserve"> - <value>逆轉</value> - </data> - <data name="CHK_revch2.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch2.Text" xml:space="preserve"> - <value>逆轉</value> - </data> - <data name="CHK_revch1.Size" type="System.Drawing.Size, System.Drawing"> - <value>50, 17</value> - </data> - <data name="CHK_revch1.Text" xml:space="preserve"> - <value>逆轉</value> - </data> - <data name="BUT_Calibrateradio.Text" xml:space="preserve"> - <value>æ ¡æº–é™æŽ§</value> - </data> - <data name="CB_simple6.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple6.Text" xml:space="preserve"> - <value>簡單模å¼</value> - </data> - <data name="CB_simple5.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple5.Text" xml:space="preserve"> - <value>簡單模å¼</value> - </data> - <data name="CB_simple4.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple4.Text" xml:space="preserve"> - <value>簡單模å¼</value> - </data> - <data name="CB_simple3.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple3.Text" xml:space="preserve"> - <value>簡單模å¼</value> - </data> - <data name="CB_simple2.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple2.Text" xml:space="preserve"> - <value>簡單模å¼</value> - </data> - <data name="CB_simple1.Size" type="System.Drawing.Size, System.Drawing"> - <value>74, 17</value> - </data> - <data name="CB_simple1.Text" xml:space="preserve"> - <value>簡單模å¼</value> - </data> - <data name="label14.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label14.Text" xml:space="preserve"> - <value>ç•¶å‰ PWM:</value> - </data> - <data name="label13.Size" type="System.Drawing.Size, System.Drawing"> - <value>58, 13</value> - </data> - <data name="label13.Text" xml:space="preserve"> - <value>ç•¶å‰æ¨¡å¼:</value> - </data> - <data name="label6.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label6.Text" xml:space="preserve"> - <value>é£›è¡Œæ¨¡å¼ 6</value> - </data> - <data name="label5.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label5.Text" xml:space="preserve"> - <value>é£›è¡Œæ¨¡å¼ 5</value> - </data> - <data name="label4.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label4.Text" xml:space="preserve"> - <value>é£›è¡Œæ¨¡å¼ 4</value> - </data> - <data name="label3.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label3.Text" xml:space="preserve"> - <value>é£›è¡Œæ¨¡å¼ 3</value> - </data> - <data name="label2.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label2.Text" xml:space="preserve"> - <value>é£›è¡Œæ¨¡å¼ 2</value> - </data> - <data name="label1.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 13</value> - </data> - <data name="label1.Text" xml:space="preserve"> - <value>é£›è¡Œæ¨¡å¼ 1</value> - </data> - <data name="BUT_SaveModes.Text" xml:space="preserve"> - <value>ä¿å˜æ¨¡å¼</value> - </data> - <data name="linkLabelmagdec.Size" type="System.Drawing.Size, System.Drawing"> - <value>67, 13</value> - </data> - <data name="linkLabelmagdec.Text" xml:space="preserve"> - <value>ç£å角網站</value> - </data> - <data name="label100.Text" xml:space="preserve"> - <value>ç£åè§’</value> - </data> - <data name="CHK_enableairspeed.Text" xml:space="preserve"> - <value>啟用空速計</value> - </data> - <data name="CHK_enablesonar.Text" xml:space="preserve"> - <value>啟用è²ç´</value> - </data> - <data name="CHK_enablecompass.Text" xml:space="preserve"> - <value>啟用羅盤</value> - </data> - <data name="label35.Size" type="System.Drawing.Size, System.Drawing"> - <value>63, 13</value> - </data> - <data name="label35.Text" xml:space="preserve"> - <value>安培/ä¼ç‰¹:</value> - </data> - <data name="label34.Size" type="System.Drawing.Size, System.Drawing"> - <value>52, 13</value> - </data> - <data name="label34.Text" xml:space="preserve"> - <value>分 壓 比:</value> - </data> - <data name="label33.Size" type="System.Drawing.Size, System.Drawing"> - <value>58, 13</value> - </data> - <data name="label33.Text" xml:space="preserve"> - <value>é›»æ± é›»å£“:</value> - </data> - <data name="label32.Size" type="System.Drawing.Size, System.Drawing"> - <value>94, 13</value> - </data> - <data name="label32.Text" xml:space="preserve"> - <value>測é‡çš„é›»æ± é›»å£“:</value> - </data> - <data name="label31.Size" type="System.Drawing.Size, System.Drawing"> - <value>58, 13</value> - </data> - <data name="label31.Text" xml:space="preserve"> - <value>輸入電壓:</value> - </data> - <data name="textBox3.Text" xml:space="preserve"> - <value>é›»å£“å‚³æ„Ÿå™¨æ ¡æº–: -1. 測é‡APMè¼¸å…¥é›»å£“ï¼Œè¼¸å…¥åˆ°ä¸‹æ–¹çš„æ–‡æœ¬æ¡†ä¸ -2. 測é‡é›»æ± é›»å£“ï¼Œè¼¸å…¥åˆ°ä¸‹æ–¹çš„æ–‡æœ¬æ¡†ä¸ -3. 從當å‰çš„å‚³æ„Ÿå™¨çš„æ•¸æ“šè¡¨ä¸æ‰¾åˆ°å®‰åŸ¹/ä¼ç‰¹ï¼Œè¼¸å…¥åˆ°ä¸‹æ–¹çš„æ–‡æœ¬æ¡†ä¸</value> - </data> - <data name="label29.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label29.Text" xml:space="preserve"> - <value>容é‡</value> - </data> - <data name="label30.Size" type="System.Drawing.Size, System.Drawing"> - <value>48, 13</value> - </data> - <data name="label30.Text" xml:space="preserve"> - <value>監控器</value> - </data> - <data name="label28.Size" type="System.Drawing.Size, System.Drawing"> - <value>175, 13</value> - </data> - <data name="label28.Text" xml:space="preserve"> - <value>è¨ç½®æ°´å¹³é¢çš„默èªåŠ é€Ÿåº¦è¨ˆåç§»</value> - </data> - <data name="label16.Size" type="System.Drawing.Size, System.Drawing"> - <value>261, 13</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>注: åœ–ç‰‡åªæ˜¯ç”¨æ–¼å±•示,è¨ç½®å¯ä»¥ç”¨æ–¼å…è»¸ç‰æ©Ÿæž¶</value> - </data> - <data name="label15.Size" type="System.Drawing.Size, System.Drawing"> - <value>93, 13</value> - </data> - <data name="label15.Text" xml:space="preserve"> - <value>機架è¨ç½® (+ 或 x)</value> - </data> - <data name="BUT_levelac2.Text" xml:space="preserve"> - <value>找平</value> - </data> - <data name="label46.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label46.Text" xml:space="preserve"> - <value>感度</value> - </data> - <data name="label45.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label45.Text" xml:space="preserve"> - <value>啟用</value> - </data> - <data name="label44.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label44.Text" xml:space="preserve"> - <value>微調</value> - </data> - <data name="label43.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label43.Text" xml:space="preserve"> - <value>逆轉</value> - </data> - <data name="label42.Size" type="System.Drawing.Size, System.Drawing"> - <value>43, 13</value> - </data> - <data name="label42.Text" xml:space="preserve"> - <value>æ–¹å‘舵</value> - </data> - <data name="BUT_HS4save.Text" xml:space="preserve"> - <value>手動</value> - </data> - <data name="label24.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label24.Text" xml:space="preserve"> - <value>最大</value> - </data> - <data name="label40.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label40.Text" xml:space="preserve"> - <value>最å°</value> - </data> - <data name="BUT_swash_manual.Text" xml:space="preserve"> - <value>手動</value> - </data> - <data name="label41.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label41.Text" xml:space="preserve"> - <value>最低</value> - </data> - <data name="label21.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label21.Text" xml:space="preserve"> - <value>最高</value> - </data> - <data name="BUT_0collective.Text" xml:space="preserve"> - <value>0度</value> - </data> - <data name="label39.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label39.Text" xml:space="preserve"> - <value>微調</value> - </data> - <data name="label38.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label38.Text" xml:space="preserve"> - <value>逆轉</value> - </data> - <data name="label37.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label37.Text" xml:space="preserve"> - <value>ä½ç½®</value> - </data> - <data name="label36.Size" type="System.Drawing.Size, System.Drawing"> - <value>31, 13</value> - </data> - <data name="label36.Text" xml:space="preserve"> - <value>舵機</value> - </data> - <data name="label26.Size" type="System.Drawing.Size, System.Drawing"> - <value>55, 13</value> - </data> - <data name="label26.Text" xml:space="preserve"> - <value>最大俯仰</value> - </data> - <data name="label25.Size" type="System.Drawing.Size, System.Drawing"> - <value>55, 13</value> - </data> - <data name="label25.Text" xml:space="preserve"> - <value>最大å´å‚¾</value> - </data> - <data name="label23.Size" type="System.Drawing.Size, System.Drawing"> - <value>55, 13</value> - </data> - <data name="label23.Text" xml:space="preserve"> - <value>舵機行程</value> - </data> - <data name="label22.Size" type="System.Drawing.Size, System.Drawing"> - <value>79, 13</value> - </data> - <data name="label22.Text" xml:space="preserve"> - <value>斜盤水平微調</value> - </data> - <data name="label17.Size" type="System.Drawing.Size, System.Drawing"> - <value>79, 13</value> - </data> - <data name="label17.Text" xml:space="preserve"> - <value>斜盤舵機ä½ç½®</value> - </data> - <data name="$this.Text" xml:space="preserve"> - <value>APMè¨ç½®</value> - </data> -</root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs index a61b888aa70ea8164964d4010fbfff036c523355..823abeb9abc2931cf1ae80bd8672ef824582b4ef 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.Designer.cs @@ -30,13 +30,20 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigAccelerometerCalibrationQuad)); this.label28 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); this.pictureBoxQuadX = new System.Windows.Forms.PictureBox(); this.pictureBoxQuad = new System.Windows.Forms.PictureBox(); this.BUT_levelac2 = new ArdupilotMega.MyButton(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); this.SuspendLayout(); // // label28 @@ -44,11 +51,6 @@ resources.ApplyResources(this.label28, "label28"); this.label28.Name = "label28"; // - // label16 - // - resources.ApplyResources(this.label16, "label16"); - this.label16.Name = "label16"; - // // label15 // resources.ApplyResources(this.label15, "label15"); @@ -79,12 +81,51 @@ this.BUT_levelac2.UseVisualStyleBackColor = true; this.BUT_levelac2.Click += new System.EventHandler(this.BUT_levelac2_Click); // + // pictureBox1 + // + this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBox1.Image = global::ArdupilotMega.Properties.Resources.frames_06; + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBoxQuadX_Click); + // + // pictureBox2 + // + this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBox2.Image = global::ArdupilotMega.Properties.Resources.hexa; + resources.ApplyResources(this.pictureBox2, "pictureBox2"); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBoxQuad_Click); + // + // pictureBox3 + // + this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBox3.Image = global::ArdupilotMega.Properties.Resources.octox; + resources.ApplyResources(this.pictureBox3, "pictureBox3"); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.TabStop = false; + this.pictureBox3.Click += new System.EventHandler(this.pictureBoxQuadX_Click); + // + // pictureBox4 + // + this.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBox4.Image = global::ArdupilotMega.Properties.Resources.octo; + resources.ApplyResources(this.pictureBox4, "pictureBox4"); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.TabStop = false; + this.pictureBox4.Click += new System.EventHandler(this.pictureBoxQuad_Click); + // // ConfigAccelerometerCalibrationQuad // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.pictureBox3); + this.Controls.Add(this.pictureBox4); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.pictureBox2); this.Controls.Add(this.label28); - this.Controls.Add(this.label16); this.Controls.Add(this.label15); this.Controls.Add(this.pictureBoxQuadX); this.Controls.Add(this.pictureBoxQuad); @@ -93,6 +134,10 @@ this.Load += new System.EventHandler(this.ConfigAccelerometerCalibration_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -101,10 +146,13 @@ #endregion private System.Windows.Forms.Label label28; - private System.Windows.Forms.Label label16; private System.Windows.Forms.Label label15; private System.Windows.Forms.PictureBox pictureBoxQuadX; private System.Windows.Forms.PictureBox pictureBoxQuad; private MyButton BUT_levelac2; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.PictureBox pictureBox4; } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx index e8ff56c3df3170b35c22ade9b318318600709195..fafc62b415747875244e6c12cc83371240d1de8d 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigAccelerometerCalibrationQuad.resx @@ -127,16 +127,16 @@ </data> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="label28.Location" type="System.Drawing.Point, System.Drawing"> - <value>124, 13</value> + <value>194, 8</value> </data> <data name="label28.Size" type="System.Drawing.Size, System.Drawing"> - <value>210, 13</value> + <value>239, 13</value> </data> <data name="label28.TabIndex" type="System.Int32, mscorlib"> <value>15</value> </data> <data name="label28.Text" xml:space="preserve"> - <value>Level your quad to set default accel offsets</value> + <value>Level your MultiCopter to set default accel offsets</value> </data> <data name=">>label28.Name" xml:space="preserve"> <value>label28</value> @@ -148,38 +148,7 @@ <value>$this</value> </data> <data name=">>label28.ZOrder" xml:space="preserve"> - <value>0</value> - </data> - <data name="label16.AutoSize" type="System.Boolean, mscorlib"> - <value>True</value> - </data> - <data name="label16.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <data name="label16.Location" type="System.Drawing.Point, System.Drawing"> - <value>124, 308</value> - </data> - <data name="label16.Size" type="System.Drawing.Size, System.Drawing"> - <value>192, 26</value> - </data> - <data name="label16.TabIndex" type="System.Int32, mscorlib"> - <value>13</value> - </data> - <data name="label16.Text" xml:space="preserve"> - <value>NOTE: images are for presentation only -will work with hexa's etc</value> - </data> - <data name=">>label16.Name" xml:space="preserve"> - <value>label16</value> - </data> - <data name=">>label16.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=">>label16.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>label16.ZOrder" xml:space="preserve"> - <value>1</value> + <value>4</value> </data> <data name="label15.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> @@ -188,7 +157,7 @@ will work with hexa's etc</value> <value>NoControl</value> </data> <data name="label15.Location" type="System.Drawing.Point, System.Drawing"> - <value>167, 99</value> + <value>254, 94</value> </data> <data name="label15.Size" type="System.Drawing.Size, System.Drawing"> <value>102, 13</value> @@ -209,16 +178,16 @@ will work with hexa's etc</value> <value>$this</value> </data> <data name=">>label15.ZOrder" xml:space="preserve"> - <value>2</value> + <value>5</value> </data> <data name="pictureBoxQuadX.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> <data name="pictureBoxQuadX.Location" type="System.Drawing.Point, System.Drawing"> - <value>226, 115</value> + <value>71, 285</value> </data> <data name="pictureBoxQuadX.Size" type="System.Drawing.Size, System.Drawing"> - <value>190, 190</value> + <value>150, 150</value> </data> <data name="pictureBoxQuadX.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> <value>Zoom</value> @@ -236,16 +205,16 @@ will work with hexa's etc</value> <value>$this</value> </data> <data name=">>pictureBoxQuadX.ZOrder" xml:space="preserve"> - <value>3</value> + <value>6</value> </data> <data name="pictureBoxQuad.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> <data name="pictureBoxQuad.Location" type="System.Drawing.Point, System.Drawing"> - <value>19, 115</value> + <value>71, 115</value> </data> <data name="pictureBoxQuad.Size" type="System.Drawing.Size, System.Drawing"> - <value>190, 190</value> + <value>150, 150</value> </data> <data name="pictureBoxQuad.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> <value>Zoom</value> @@ -263,10 +232,10 @@ will work with hexa's etc</value> <value>$this</value> </data> <data name=">>pictureBoxQuad.ZOrder" xml:space="preserve"> - <value>4</value> + <value>7</value> </data> <data name="BUT_levelac2.Location" type="System.Drawing.Point, System.Drawing"> - <value>182, 43</value> + <value>269, 38</value> </data> <data name="BUT_levelac2.Size" type="System.Drawing.Size, System.Drawing"> <value>75, 23</value> @@ -281,13 +250,121 @@ will work with hexa's etc</value> <value>BUT_levelac2</value> </data> <data name=">>BUT_levelac2.Type" xml:space="preserve"> - <value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4492.39671, Culture=neutral, PublicKeyToken=null</value> + <value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.1.4496.35237, Culture=neutral, PublicKeyToken=null</value> </data> <data name=">>BUT_levelac2.Parent" xml:space="preserve"> <value>$this</value> </data> <data name=">>BUT_levelac2.ZOrder" xml:space="preserve"> - <value>5</value> + <value>8</value> + </data> + <data name="pictureBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> + <value>NoControl</value> + </data> + <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing"> + <value>227, 285</value> + </data> + <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing"> + <value>150, 150</value> + </data> + <data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> + <value>Zoom</value> + </data> + <data name="pictureBox1.TabIndex" type="System.Int32, mscorlib"> + <value>18</value> + </data> + <data name=">>pictureBox1.Name" xml:space="preserve"> + <value>pictureBox1</value> + </data> + <data name=">>pictureBox1.Type" xml:space="preserve"> + <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>pictureBox1.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>pictureBox1.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name="pictureBox2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> + <value>NoControl</value> + </data> + <data name="pictureBox2.Location" type="System.Drawing.Point, System.Drawing"> + <value>227, 115</value> + </data> + <data name="pictureBox2.Size" type="System.Drawing.Size, System.Drawing"> + <value>150, 150</value> + </data> + <data name="pictureBox2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> + <value>Zoom</value> + </data> + <data name="pictureBox2.TabIndex" type="System.Int32, mscorlib"> + <value>17</value> + </data> + <data name=">>pictureBox2.Name" xml:space="preserve"> + <value>pictureBox2</value> + </data> + <data name=">>pictureBox2.Type" xml:space="preserve"> + <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>pictureBox2.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>pictureBox2.ZOrder" xml:space="preserve"> + <value>3</value> + </data> + <data name="pictureBox3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> + <value>NoControl</value> + </data> + <data name="pictureBox3.Location" type="System.Drawing.Point, System.Drawing"> + <value>383, 285</value> + </data> + <data name="pictureBox3.Size" type="System.Drawing.Size, System.Drawing"> + <value>150, 150</value> + </data> + <data name="pictureBox3.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> + <value>Zoom</value> + </data> + <data name="pictureBox3.TabIndex" type="System.Int32, mscorlib"> + <value>20</value> + </data> + <data name=">>pictureBox3.Name" xml:space="preserve"> + <value>pictureBox3</value> + </data> + <data name=">>pictureBox3.Type" xml:space="preserve"> + <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>pictureBox3.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>pictureBox3.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name="pictureBox4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> + <value>NoControl</value> + </data> + <data name="pictureBox4.Location" type="System.Drawing.Point, System.Drawing"> + <value>383, 115</value> + </data> + <data name="pictureBox4.Size" type="System.Drawing.Size, System.Drawing"> + <value>150, 150</value> + </data> + <data name="pictureBox4.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> + <value>Zoom</value> + </data> + <data name="pictureBox4.TabIndex" type="System.Int32, mscorlib"> + <value>19</value> + </data> + <data name=">>pictureBox4.Name" xml:space="preserve"> + <value>pictureBox4</value> + </data> + <data name=">>pictureBox4.Type" xml:space="preserve"> + <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>pictureBox4.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>pictureBox4.ZOrder" xml:space="preserve"> + <value>1</value> </data> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> @@ -296,12 +373,12 @@ will work with hexa's etc</value> <value>6, 13</value> </data> <data name="$this.Size" type="System.Drawing.Size, System.Drawing"> - <value>439, 356</value> + <value>621, 460</value> </data> <data name=">>$this.Name" xml:space="preserve"> <value>ConfigAccelerometerCalibrationQuad</value> </data> <data name=">>$this.Type" xml:space="preserve"> - <value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4492.39671, Culture=neutral, PublicKeyToken=null</value> + <value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4496.35237, Culture=neutral, PublicKeyToken=null</value> </data> </root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs index 863b3b996457eb281375bc31c021a2e8f01dc3e7..faf008c6ac7ceb219505b7217b3b22cd91a6934f 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs @@ -159,36 +159,28 @@ namespace ArdupilotMega.GCSViews.ConfigurationView CB_simple5.Visible = false; CB_simple6.Visible = false; - CMB_fmode1.Items.Clear(); - CMB_fmode2.Items.Clear(); - CMB_fmode3.Items.Clear(); - CMB_fmode4.Items.Clear(); - CMB_fmode5.Items.Clear(); - CMB_fmode6.Items.Clear(); - var flightModes = EnumTranslator.Translate<Common.apmmodes>(); - - CMB_fmode1.DataSource = flightModes; + CMB_fmode1.DataSource = EnumTranslator.Translate<Common.apmmodes>().ToList(); CMB_fmode1.ValueMember = "Value"; CMB_fmode1.DisplayMember = "Value"; - CMB_fmode2.DataSource = flightModes; + CMB_fmode2.DataSource = EnumTranslator.Translate<Common.apmmodes>().ToList(); CMB_fmode2.ValueMember = "Value"; CMB_fmode2.DisplayMember = "Value"; - CMB_fmode3.DataSource = flightModes; + CMB_fmode3.DataSource = EnumTranslator.Translate<Common.apmmodes>().ToList(); CMB_fmode3.ValueMember = "Value"; CMB_fmode3.DisplayMember = "Value"; - CMB_fmode4.DataSource = flightModes; + CMB_fmode4.DataSource = EnumTranslator.Translate<Common.apmmodes>().ToList(); CMB_fmode4.ValueMember = "Value"; CMB_fmode4.DisplayMember = "Value"; - CMB_fmode5.DataSource = flightModes; + CMB_fmode5.DataSource = EnumTranslator.Translate<Common.apmmodes>().ToList(); CMB_fmode5.ValueMember = "Value"; CMB_fmode5.DisplayMember = "Value"; - CMB_fmode6.DataSource = flightModes; + CMB_fmode6.DataSource = EnumTranslator.Translate<Common.apmmodes>().ToList(); CMB_fmode6.ValueMember = "Value"; CMB_fmode6.DisplayMember = "Value"; @@ -206,36 +198,27 @@ namespace ArdupilotMega.GCSViews.ConfigurationView } if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2) // ac2 { - CMB_fmode1.Items.Clear(); - CMB_fmode2.Items.Clear(); - CMB_fmode3.Items.Clear(); - CMB_fmode4.Items.Clear(); - CMB_fmode5.Items.Clear(); - CMB_fmode6.Items.Clear(); - - var flightModes = EnumTranslator.Translate<Common.apmmodes>(); - - CMB_fmode1.DataSource = flightModes; + CMB_fmode1.DataSource = EnumTranslator.Translate<Common.ac2modes>().ToList(); CMB_fmode1.ValueMember = "Value"; CMB_fmode1.DisplayMember = "Value"; - CMB_fmode2.DataSource = flightModes; + CMB_fmode2.DataSource = EnumTranslator.Translate<Common.ac2modes>().ToList(); CMB_fmode2.ValueMember = "Value"; CMB_fmode2.DisplayMember = "Value"; - CMB_fmode3.DataSource = flightModes; + CMB_fmode3.DataSource = EnumTranslator.Translate<Common.ac2modes>().ToList(); CMB_fmode3.ValueMember = "Value"; CMB_fmode3.DisplayMember = "Value"; - CMB_fmode4.DataSource = flightModes; + CMB_fmode4.DataSource = EnumTranslator.Translate<Common.ac2modes>().ToList(); CMB_fmode4.ValueMember = "Value"; CMB_fmode4.DisplayMember = "Value"; - CMB_fmode5.DataSource = flightModes; + CMB_fmode5.DataSource = EnumTranslator.Translate<Common.ac2modes>().ToList(); CMB_fmode5.ValueMember = "Value"; CMB_fmode5.DisplayMember = "Value"; - CMB_fmode6.DataSource = flightModes; + CMB_fmode6.DataSource = EnumTranslator.Translate<Common.ac2modes>().ToList(); CMB_fmode6.ValueMember = "Value"; CMB_fmode6.DisplayMember = "Value"; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs index 71cbc02c9f8d1b927c002ece9fe928ad35b2b854..fbd2dcbc8312fd682dc5c02966ddfddf2b4bd67a 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs @@ -20,8 +20,8 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigFlightModes(), "Flight Modes")); this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigHardwareOptions(), "Hardware Options")); this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigBatteryMonitoring(), "Battery Monitor")); - this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigAccelerometerCalibrationQuad(), "Level Calibration Quad")); - this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigAccelerometerCalibrationPlane(), "Level Calibration Plane")); + this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigAccelerometerCalibrationQuad(), "ArduCopter Level")); + this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigAccelerometerCalibrationPlane(), "ArduPlane Level")); this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ConfigTradHeli(), "Heli Setup")); this.backstageView.AddPage(new BackstageView.BackstageViewPage(new ArdupilotMega._3DRradio(), "3DR Radio")); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs index f6e873f156ba06fa0f737df35b1ef1c980e8873d..5e386318598f7ac3e4e77ca65233ae2d8f210d68 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs @@ -524,7 +524,7 @@ namespace ArdupilotMega.GCSViews Down.Image = global::ArdupilotMega.Properties.Resources.down; } - void updateCMDParams() + public void updateCMDParams() { cmdParamNames = readCMDXML(); diff --git a/Tools/ArdupilotMegaPlanner/MainV2.Designer.cs b/Tools/ArdupilotMegaPlanner/MainV2.Designer.cs index 31a34c309fb2587c9bdff5e266eec9f67cb8968b..f0c1ea12b00754d7f801cc4eedd3f2ad70451503 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.Designer.cs @@ -186,14 +186,17 @@ this.MenuConnect.Name = "MenuConnect"; 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.Click += new System.EventHandler(this.MenuConnect_Click); // // toolStripConnectionControl // this.toolStripConnectionControl.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripConnectionControl.BackColor = System.Drawing.Color.Transparent; + this.toolStripConnectionControl.BackColor = System.Drawing.SystemColors.Control; + this.toolStripConnectionControl.BackgroundImage = global::ArdupilotMega.Properties.Resources.bg; + this.toolStripConnectionControl.Margin = new System.Windows.Forms.Padding(0); this.toolStripConnectionControl.Name = "toolStripConnectionControl"; - this.toolStripConnectionControl.Size = new System.Drawing.Size(203, 73); + this.toolStripConnectionControl.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.toolStripConnectionControl.Size = new System.Drawing.Size(233, 76); // // MainV2 // @@ -232,8 +235,8 @@ private System.Windows.Forms.ToolStripButton MenuFirmware; private System.Windows.Forms.ToolStripButton MenuTerminal; private System.Windows.Forms.ToolStripButton MenuConnect; - + private System.Windows.Forms.ToolStripButton MenuHelp; - private ArdupilotMega.Controls.ToolStripConnectionControl toolStripConnectionControl; + private Controls.ToolStripConnectionControl toolStripConnectionControl; } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs index 1ec1a49d08dd0bbd742bded717a17edbcbd924ba..83e817b7e129e5d49519fec508bb34ec989ca657 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.cs @@ -402,6 +402,9 @@ namespace ArdupilotMega temp.Dock = DockStyle.Fill; + // refresh ap/ac specific items + FlightPlanner.updateCMDParams(); + MyView.Controls.Add(temp); } @@ -579,13 +582,13 @@ namespace ArdupilotMega } catch { } - if (config["CHK_resetapmonconnect"] == null || bool.Parse(config["CHK_resetapmonconnect"].ToString()) == true) - comPort.BaseStream.toggleDTR(); - // false here comPort.BaseStream.DtrEnable = false; comPort.BaseStream.RtsEnable = false; + if (config["CHK_resetapmonconnect"] == null || bool.Parse(config["CHK_resetapmonconnect"].ToString()) == true) + comPort.BaseStream.toggleDTR(); + // cleanup from any previous sessions if (comPort.logfile != null) comPort.logfile.Close(); diff --git a/Tools/ArdupilotMegaPlanner/Msi/wix.pdb b/Tools/ArdupilotMegaPlanner/Msi/wix.pdb index 8902849b6ab3d1d5e688af3df087677246baab1e..2d3c43918b28a85dab27db8f74975b70e7568756 100644 Binary files a/Tools/ArdupilotMegaPlanner/Msi/wix.pdb and b/Tools/ArdupilotMegaPlanner/Msi/wix.pdb differ diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index cb2a8ac978b92c6deda8ba7852cf8ab110049688..f7879443a53a50a0cea171cfa286bb6acc7d8565 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs +++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Resources; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.1.*")] -[assembly: AssemblyFileVersion("1.1.73")] +[assembly: AssemblyFileVersion("1.1.74")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Properties/Resources.Designer.cs b/Tools/ArdupilotMegaPlanner/Properties/Resources.Designer.cs index df3eb279aec03697e15acbcc623b093f59308670..96e58a5541cecf580d7b3a9d09316e9bdec84af0 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/Resources.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Properties/Resources.Designer.cs @@ -257,6 +257,13 @@ namespace ArdupilotMega.Properties { } } + public static System.Drawing.Bitmap octox { + get { + object obj = ResourceManager.GetObject("octox", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + public static System.Drawing.Bitmap opticalflow { get { object obj = ResourceManager.GetObject("opticalflow", resourceCulture); diff --git a/Tools/ArdupilotMegaPlanner/Properties/Resources.resx b/Tools/ArdupilotMegaPlanner/Properties/Resources.resx index 8601c8c688521ae4967dce8fd1ad5901d8c09ba4..34718bee1f9b85c5d3b10fc070afb8c8ed1dfa3d 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/Resources.resx +++ b/Tools/ArdupilotMegaPlanner/Properties/Resources.resx @@ -1225,8 +1225,11 @@ <data name="y6" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\y6.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="MAVParam" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\MAVParam.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="octox" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\octox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root> \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb index b4768625fb68b6190a5e5250b74a477d28298884..cd53d0368abba016576d826c794c617f3e7eacb3 100644 Binary files a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb and b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.pdb differ diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/version.txt b/Tools/ArdupilotMegaPlanner/bin/Release/version.txt index 0b1ae78e9c1899a5f2a3c0a5001288850fca748c..061ff9cbb6cf009b0e343f521f1eda8671039359 100644 --- a/Tools/ArdupilotMegaPlanner/bin/Release/version.txt +++ b/Tools/ArdupilotMegaPlanner/bin/Release/version.txt @@ -1 +1 @@ -1.1.4494.38818 \ No newline at end of file +1.1.4496.35998 \ No newline at end of file