zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://code.google.com/p/ardupilot-mega

mission-4.1.18
Michael Oborne 13 years ago
parent
54dbb4ace9 a89a1803a8
commit
b5cc7f9ca7
8 changed files with 4372 additions and 5255 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
  2. 34
      Tools/ArdupilotMegaPlanner/JoystickSetup.Designer.cs
  3. 2070
      Tools/ArdupilotMegaPlanner/JoystickSetup.resx
  4. 113
      Tools/ArdupilotMegaPlanner/JoystickSetup.zh-Hans.resx
  5. 158
      Tools/ArdupilotMegaPlanner/MavlinkLog.resx
  6. 222
      Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs
  7. 6935
      Tools/ArdupilotMegaPlanner/Setup/Setup.resx
  8. 90
      Tools/ArdupilotMegaPlanner/Setup/Setup.zh-Hans.resx

5
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
Unescape View File

@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup>
@ -438,6 +438,9 @@ @@ -438,6 +438,9 @@
<EmbeddedResource Include="Controls\XorPlus.resx">
<DependentUpon>XorPlus.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MavlinkLog.zh-Hans.resx">
<DependentUpon>MavlinkLog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SerialInput.resx">
<DependentUpon>SerialInput.cs</DependentUpon>
</EmbeddedResource>

34
Tools/ArdupilotMegaPlanner/JoystickSetup.Designer.cs generated
Unescape View File

@ -92,82 +92,82 @@ @@ -92,82 +92,82 @@
//
// CMB_joysticks
//
this.CMB_joysticks.FormattingEnabled = true;
resources.ApplyResources(this.CMB_joysticks, "CMB_joysticks");
this.CMB_joysticks.FormattingEnabled = true;
this.CMB_joysticks.Name = "CMB_joysticks";
this.CMB_joysticks.SelectedIndexChanged += new System.EventHandler(this.CMB_joysticks_SelectedIndexChanged);
this.CMB_joysticks.Click += new System.EventHandler(this.CMB_joysticks_Click);
//
// CMB_CH1
//
resources.ApplyResources(this.CMB_CH1, "CMB_CH1");
this.CMB_CH1.FormattingEnabled = true;
this.CMB_CH1.Items.AddRange(new object[] {
resources.GetString("CMB_CH1.Items"),
resources.GetString("CMB_CH1.Items1"),
resources.GetString("CMB_CH1.Items2"),
resources.GetString("CMB_CH1.Items3")});
resources.ApplyResources(this.CMB_CH1, "CMB_CH1");
this.CMB_CH1.Name = "CMB_CH1";
this.CMB_CH1.SelectedIndexChanged += new System.EventHandler(this.CMB_CH1_SelectedIndexChanged);
//
// CMB_CH2
//
resources.ApplyResources(this.CMB_CH2, "CMB_CH2");
this.CMB_CH2.FormattingEnabled = true;
this.CMB_CH2.Items.AddRange(new object[] {
resources.GetString("CMB_CH2.Items"),
resources.GetString("CMB_CH2.Items1"),
resources.GetString("CMB_CH2.Items2"),
resources.GetString("CMB_CH2.Items3")});
resources.ApplyResources(this.CMB_CH2, "CMB_CH2");
this.CMB_CH2.Name = "CMB_CH2";
this.CMB_CH2.SelectedIndexChanged += new System.EventHandler(this.CMB_CH2_SelectedIndexChanged);
//
// CMB_CH3
//
resources.ApplyResources(this.CMB_CH3, "CMB_CH3");
this.CMB_CH3.FormattingEnabled = true;
this.CMB_CH3.Items.AddRange(new object[] {
resources.GetString("CMB_CH3.Items"),
resources.GetString("CMB_CH3.Items1"),
resources.GetString("CMB_CH3.Items2"),
resources.GetString("CMB_CH3.Items3")});
resources.ApplyResources(this.CMB_CH3, "CMB_CH3");
this.CMB_CH3.Name = "CMB_CH3";
this.CMB_CH3.SelectedIndexChanged += new System.EventHandler(this.CMB_CH3_SelectedIndexChanged);
//
// CMB_CH4
//
resources.ApplyResources(this.CMB_CH4, "CMB_CH4");
this.CMB_CH4.FormattingEnabled = true;
this.CMB_CH4.Items.AddRange(new object[] {
resources.GetString("CMB_CH4.Items"),
resources.GetString("CMB_CH4.Items1"),
resources.GetString("CMB_CH4.Items2"),
resources.GetString("CMB_CH4.Items3")});
resources.ApplyResources(this.CMB_CH4, "CMB_CH4");
this.CMB_CH4.Name = "CMB_CH4";
this.CMB_CH4.SelectedIndexChanged += new System.EventHandler(this.CMB_CH4_SelectedIndexChanged);
//
// expo_ch1
//
this.expo_ch1.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch1, "expo_ch1");
this.expo_ch1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch1.Name = "expo_ch1";
//
// expo_ch2
//
this.expo_ch2.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch2, "expo_ch2");
this.expo_ch2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch2.Name = "expo_ch2";
//
// expo_ch3
//
this.expo_ch3.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch3, "expo_ch3");
this.expo_ch3.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch3.Name = "expo_ch3";
//
// expo_ch4
//
this.expo_ch4.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch4, "expo_ch4");
this.expo_ch4.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch4.Name = "expo_ch4";
//
// label1
@ -269,19 +269,19 @@ @@ -269,19 +269,19 @@
//
// expo_ch5
//
this.expo_ch5.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch5, "expo_ch5");
this.expo_ch5.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch5.Name = "expo_ch5";
//
// CMB_CH5
//
resources.ApplyResources(this.CMB_CH5, "CMB_CH5");
this.CMB_CH5.FormattingEnabled = true;
this.CMB_CH5.Items.AddRange(new object[] {
resources.GetString("CMB_CH5.Items"),
resources.GetString("CMB_CH5.Items1"),
resources.GetString("CMB_CH5.Items2"),
resources.GetString("CMB_CH5.Items3")});
resources.ApplyResources(this.CMB_CH5, "CMB_CH5");
this.CMB_CH5.Name = "CMB_CH5";
this.CMB_CH5.SelectedIndexChanged += new System.EventHandler(this.CMB_CH5_SelectedIndexChanged);
//
@ -299,19 +299,19 @@ @@ -299,19 +299,19 @@
//
// expo_ch6
//
this.expo_ch6.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch6, "expo_ch6");
this.expo_ch6.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch6.Name = "expo_ch6";
//
// CMB_CH6
//
resources.ApplyResources(this.CMB_CH6, "CMB_CH6");
this.CMB_CH6.FormattingEnabled = true;
this.CMB_CH6.Items.AddRange(new object[] {
resources.GetString("CMB_CH6.Items"),
resources.GetString("CMB_CH6.Items1"),
resources.GetString("CMB_CH6.Items2"),
resources.GetString("CMB_CH6.Items3")});
resources.ApplyResources(this.CMB_CH6, "CMB_CH6");
this.CMB_CH6.Name = "CMB_CH6";
this.CMB_CH6.SelectedIndexChanged += new System.EventHandler(this.CMB_CH6_SelectedIndexChanged);
//
@ -329,19 +329,19 @@ @@ -329,19 +329,19 @@
//
// expo_ch7
//
this.expo_ch7.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch7, "expo_ch7");
this.expo_ch7.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch7.Name = "expo_ch7";
//
// CMB_CH7
//
resources.ApplyResources(this.CMB_CH7, "CMB_CH7");
this.CMB_CH7.FormattingEnabled = true;
this.CMB_CH7.Items.AddRange(new object[] {
resources.GetString("CMB_CH7.Items"),
resources.GetString("CMB_CH7.Items1"),
resources.GetString("CMB_CH7.Items2"),
resources.GetString("CMB_CH7.Items3")});
resources.ApplyResources(this.CMB_CH7, "CMB_CH7");
this.CMB_CH7.Name = "CMB_CH7";
this.CMB_CH7.SelectedIndexChanged += new System.EventHandler(this.CMB_CH7_SelectedIndexChanged);
//
@ -359,19 +359,19 @@ @@ -359,19 +359,19 @@
//
// expo_ch8
//
this.expo_ch8.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.expo_ch8, "expo_ch8");
this.expo_ch8.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.expo_ch8.Name = "expo_ch8";
//
// CMB_CH8
//
resources.ApplyResources(this.CMB_CH8, "CMB_CH8");
this.CMB_CH8.FormattingEnabled = true;
this.CMB_CH8.Items.AddRange(new object[] {
resources.GetString("CMB_CH8.Items"),
resources.GetString("CMB_CH8.Items1"),
resources.GetString("CMB_CH8.Items2"),
resources.GetString("CMB_CH8.Items3")});
resources.ApplyResources(this.CMB_CH8, "CMB_CH8");
this.CMB_CH8.Name = "CMB_CH8";
this.CMB_CH8.SelectedIndexChanged += new System.EventHandler(this.CMB_CH8_SelectedIndexChanged);
//

2070
Tools/ArdupilotMegaPlanner/JoystickSetup.resx
View File

File diff suppressed because it is too large Load Diff

113
Tools/ArdupilotMegaPlanner/JoystickSetup.zh-Hans.resx
Unescape View File

@ -121,15 +121,27 @@ @@ -121,15 +121,27 @@
<data name="expo_ch1.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 66</value>
</data>
<data name="expo_ch1.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="expo_ch2.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 93</value>
</data>
<data name="expo_ch2.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="expo_ch3.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 120</value>
</data>
<data name="expo_ch3.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="expo_ch4.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 147</value>
</data>
<data name="expo_ch4.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>31, 13</value>
</data>
@ -152,16 +164,16 @@ @@ -152,16 +164,16 @@
<value>尾舵</value>
</data>
<data name="revCH1.Location" type="System.Drawing.Point, System.Drawing">
<value>429, 69</value>
<value>396, 69</value>
</data>
<data name="revCH2.Location" type="System.Drawing.Point, System.Drawing">
<value>429, 96</value>
<value>396, 96</value>
</data>
<data name="revCH3.Location" type="System.Drawing.Point, System.Drawing">
<value>429, 123</value>
<value>396, 123</value>
</data>
<data name="revCH4.Location" type="System.Drawing.Point, System.Drawing">
<value>429, 150</value>
<value>396, 150</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>31, 13</value>
@ -188,7 +200,7 @@ @@ -188,7 +200,7 @@
<value>控制器轴</value>
</data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>427, 47</value>
<value>389, 47</value>
</data>
<data name="label9.Size" type="System.Drawing.Size, System.Drawing">
<value>31, 13</value>
@ -196,17 +208,32 @@ @@ -196,17 +208,32 @@
<data name="label9.Text" xml:space="preserve">
<value>反向</value>
</data>
<data name="CHK_elevons.Location" type="System.Drawing.Point, System.Drawing">
<value>418, 81</value>
</data>
<data name="CHK_elevons.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 17</value>
</data>
<data name="CHK_elevons.Text" xml:space="preserve">
<value>升降副翼</value>
</data>
<data name="revCH5.Location" type="System.Drawing.Point, System.Drawing">
<value>396, 179</value>
</data>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
</data>
<data name="label10.Text" xml:space="preserve">
<value>按键 1</value>
</data>
<data name="CMB_butt1action.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 192</value>
<data name="expo_ch5.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 180</value>
</data>
<data name="expo_ch5.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="CMB_butt2action.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 221</value>
<data name="revCH6.Location" type="System.Drawing.Point, System.Drawing">
<value>396, 208</value>
</data>
<data name="label11.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
@ -214,8 +241,14 @@ @@ -214,8 +241,14 @@
<data name="label11.Text" xml:space="preserve">
<value>按键 2</value>
</data>
<data name="CMB_butt3action.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 250</value>
<data name="expo_ch6.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 209</value>
</data>
<data name="expo_ch6.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="revCH7.Location" type="System.Drawing.Point, System.Drawing">
<value>396, 237</value>
</data>
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
@ -223,8 +256,14 @@ @@ -223,8 +256,14 @@
<data name="label12.Text" xml:space="preserve">
<value>按键 3</value>
</data>
<data name="CMB_butt4action.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 279</value>
<data name="expo_ch7.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 238</value>
</data>
<data name="expo_ch7.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="revCH8.Location" type="System.Drawing.Point, System.Drawing">
<value>396, 266</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 13</value>
@ -232,6 +271,21 @@ @@ -232,6 +271,21 @@
<data name="label13.Text" xml:space="preserve">
<value>按键 4</value>
</data>
<data name="expo_ch8.Location" type="System.Drawing.Point, System.Drawing">
<value>323, 267</value>
</data>
<data name="expo_ch8.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 13</value>
</data>
<data name="BUT_detch8.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 23</value>
</data>
<data name="BUT_detch8.Text" xml:space="preserve">
<value>自动检测</value>
</data>
<data name="horizontalProgressBar4.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 262</value>
</data>
<data name="BUT_detch4.Location" type="System.Drawing.Point, System.Drawing">
<value>149, 146</value>
</data>
@ -286,41 +340,32 @@ @@ -286,41 +340,32 @@
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 65</value>
</data>
<data name="BUT_detbutton1.Size" type="System.Drawing.Size, System.Drawing">
<data name="BUT_detch5.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 23</value>
</data>
<data name="BUT_detbutton1.Text" xml:space="preserve">
<data name="BUT_detch5.Text" xml:space="preserve">
<value>自动检测</value>
</data>
<data name="Progbutt1.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 191</value>
</data>
<data name="Progbutt2.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 220</value>
<data name="horizontalProgressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 175</value>
</data>
<data name="BUT_detbutton2.Size" type="System.Drawing.Size, System.Drawing">
<data name="BUT_detch6.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 23</value>
</data>
<data name="BUT_detbutton2.Text" xml:space="preserve">
<data name="BUT_detch6.Text" xml:space="preserve">
<value>自动检测</value>
</data>
<data name="Progbutt3.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 249</value>
<data name="horizontalProgressBar2.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 204</value>
</data>
<data name="BUT_detbutton3.Size" type="System.Drawing.Size, System.Drawing">
<data name="BUT_detch7.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 23</value>
</data>
<data name="BUT_detbutton3.Text" xml:space="preserve">
<data name="BUT_detch7.Text" xml:space="preserve">
<value>自动检测</value>
</data>
<data name="Progbutt4.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 278</value>
</data>
<data name="BUT_detbutton4.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 23</value>
</data>
<data name="BUT_detbutton4.Text" xml:space="preserve">
<value>自动检测</value>
<data name="horizontalProgressBar3.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 233</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

158
Tools/ArdupilotMegaPlanner/MavlinkLog.resx
Unescape View File

@ -117,89 +117,19 @@ @@ -117,89 +117,19 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="BUT_redokml.Location" type="System.Drawing.Point, System.Drawing">
<value>45, 12</value>
</data>
<data name="BUT_redokml.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 23</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="BUT_redokml.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="BUT_redokml.Text" xml:space="preserve">
<value>Create KML</value>
</data>
<data name="&gt;&gt;BUT_redokml.Name" xml:space="preserve">
<value>BUT_redokml</value>
</data>
<data name="&gt;&gt;BUT_redokml.Type" xml:space="preserve">
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c</value>
</data>
<data name="&gt;&gt;BUT_redokml.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;BUT_redokml.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 42</value>
</data>
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>313, 26</value>
</data>
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
<value>progressBar1</value>
</data>
<data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
<value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;progressBar1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="BUT_humanreadable.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="BUT_humanreadable.Location" type="System.Drawing.Point, System.Drawing">
<value>167, 12</value>
</data>
<data name="BUT_humanreadable.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 23</value>
</data>
<data name="BUT_humanreadable.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="BUT_humanreadable.Text" xml:space="preserve">
<value>Convert to Text</value>
</data>
<data name="&gt;&gt;BUT_humanreadable.Name" xml:space="preserve">
<value>BUT_humanreadable</value>
</data>
<data name="&gt;&gt;BUT_humanreadable.Type" xml:space="preserve">
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c</value>
</data>
<data name="&gt;&gt;BUT_humanreadable.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;BUT_humanreadable.ZOrder" xml:space="preserve">
<value>0</value>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>313, 26</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.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>335, 82</value>
<data name="BUT_humanreadable.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 23</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -277,13 +207,83 @@ @@ -277,13 +207,83 @@
AAf4AAAP/AAAH/4AAD//gAD//+AD//////8=
</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Log</value>
<data name="&gt;&gt;BUT_humanreadable.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MavlinkLog</value>
<data name="&gt;&gt;BUT_humanreadable.Name" xml:space="preserve">
<value>BUT_humanreadable</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MavlinkLog</value>
</data>
<data name="&gt;&gt;progressBar1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="BUT_redokml.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 23</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="BUT_humanreadable.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="BUT_redokml.Text" xml:space="preserve">
<value>Create KML</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>335, 82</value>
</data>
<data name="BUT_redokml.Location" type="System.Drawing.Point, System.Drawing">
<value>45, 12</value>
</data>
<data name="&gt;&gt;BUT_redokml.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="BUT_redokml.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="&gt;&gt;BUT_humanreadable.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="BUT_humanreadable.Text" xml:space="preserve">
<value>Convert to Text</value>
</data>
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;BUT_humanreadable.Type" xml:space="preserve">
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_redokml.Type" xml:space="preserve">
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="BUT_humanreadable.Location" type="System.Drawing.Point, System.Drawing">
<value>167, 12</value>
</data>
<data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
<value>progressBar1</value>
</data>
<data name="&gt;&gt;BUT_redokml.Name" xml:space="preserve">
<value>BUT_redokml</value>
</data>
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 42</value>
</data>
<data name="&gt;&gt;BUT_redokml.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Log</value>
</data>
<data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
<value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

90
Tools/ArdupilotMegaPlanner/Setup/Setup.zh-Hans.resx
Unescape View File

@ -117,9 +117,6 @@ @@ -117,9 +117,6 @@
<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>
@ -132,10 +129,31 @@ @@ -132,10 +129,31 @@
<data name="tabBattery.Text" xml:space="preserve">
<value>电池</value>
</data>
<data name="BUT_reset.Text" xml:space="preserve">
<value>重置 APM 为默认设置</value>
<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>
@ -250,6 +268,12 @@ @@ -250,6 +268,12 @@
<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>
@ -268,17 +292,17 @@ @@ -268,17 +292,17 @@
<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 name="label31.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 13</value>
</data>
<data name="label35.Text" xml:space="preserve">
<value>安培/伏特:</value>
<data name="label31.Text" xml:space="preserve">
<value>输入电压:</value>
</data>
<data name="label34.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 13</value>
<data name="label32.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 13</value>
</data>
<data name="label34.Text" xml:space="preserve">
<value>分 压 比:</value>
<data name="label32.Text" xml:space="preserve">
<value>测量的电池电压:</value>
</data>
<data name="label33.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 13</value>
@ -286,17 +310,23 @@ @@ -286,17 +310,23 @@
<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 name="label34.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 13</value>
</data>
<data name="label32.Text" xml:space="preserve">
<value>测量的电池电压:</value>
<data name="label34.Text" xml:space="preserve">
<value>分 压 比:</value>
</data>
<data name="label31.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 13</value>
<data name="label35.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 13</value>
</data>
<data name="label31.Text" xml:space="preserve">
<value>输入电压:</value>
<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>电压传感器校准:
@ -337,6 +367,12 @@ @@ -337,6 +367,12 @@
<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>
@ -367,9 +403,6 @@ @@ -367,9 +403,6 @@
<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>
@ -382,9 +415,6 @@ @@ -382,9 +415,6 @@
<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>
@ -454,6 +484,12 @@ @@ -454,6 +484,12 @@
<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>

Write Preview
Loading…
Cancel
Save