Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

APM Planner 1.0.76 

update ac2 dataflsh log format
fix ac2 log to KML
fix AP flight mode 6 > always Manual
This commit is contained in:
Michael Oborne 2011-09-25 16:03:00 +08:00
parent 6cddd0c162
commit e88ef23434
16 changed files with 8225 additions and 7619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -495,6 +495,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="apm2.ico" /> <Content Include="apm2.ico" />
<Content Include="hud.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<Content Include="Resources\MAVCmd.zh-Hans.txt" /> <Content Include="Resources\MAVCmd.zh-Hans.txt" />
<Content Include="Resources\MAVParam.zh-Hans.txt" /> <Content Include="Resources\MAVParam.zh-Hans.txt" />
<None Include="Resources\MAVCmd.txt" /> <None Include="Resources\MAVCmd.txt" />

328
Tools/ArdupilotMegaPlanner/GCSViews/Configuration.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

27
Tools/ArdupilotMegaPlanner/GCSViews/Configuration.resx
View File

@ -6506,22 +6506,25 @@ GDI+ = Enabled</value>
<data name="ConfigTabs.ItemSize" type="System.Drawing.Size, System.Drawing"> <data name="ConfigTabs.ItemSize" type="System.Drawing.Size, System.Drawing">
<value>52, 18</value> <value>52, 18</value>
</data> </data>
<metadata name="Default.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Default.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="$this.Localizable" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <data name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>17, 17</value> <value>17, 17</value>
</metadata> </data>
<metadata name="Value.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Value.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="RawValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="RawValue.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="Command.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Command.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<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>
</root> </root>

1
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
View File

@ -131,7 +131,6 @@ namespace ArdupilotMega.GCSViews
} }
} }
catch { } catch { }
} }
void tabControl1_DrawItem(object sender, DrawItemEventArgs e) void tabControl1_DrawItem(object sender, DrawItemEventArgs e)

103
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.Designer.cs generated
View File

@ -132,7 +132,6 @@
// //
resources.ApplyResources(this.CHK_altmode, "CHK_altmode"); resources.ApplyResources(this.CHK_altmode, "CHK_altmode");
this.CHK_altmode.Name = "CHK_altmode"; this.CHK_altmode.Name = "CHK_altmode";
this.toolTip1.SetToolTip(this.CHK_altmode, resources.GetString("CHK_altmode.ToolTip"));
this.CHK_altmode.UseVisualStyleBackColor = true; this.CHK_altmode.UseVisualStyleBackColor = true;
this.CHK_altmode.CheckedChanged += new System.EventHandler(this.CHK_altmode_CheckedChanged); this.CHK_altmode.CheckedChanged += new System.EventHandler(this.CHK_altmode_CheckedChanged);
// //
@ -142,13 +141,12 @@
this.CHK_holdalt.Checked = true; this.CHK_holdalt.Checked = true;
this.CHK_holdalt.CheckState = System.Windows.Forms.CheckState.Checked; this.CHK_holdalt.CheckState = System.Windows.Forms.CheckState.Checked;
this.CHK_holdalt.Name = "CHK_holdalt"; this.CHK_holdalt.Name = "CHK_holdalt";
this.toolTip1.SetToolTip(this.CHK_holdalt, resources.GetString("CHK_holdalt.ToolTip"));
this.CHK_holdalt.UseVisualStyleBackColor = true; this.CHK_holdalt.UseVisualStyleBackColor = true;
// //
// Commands // Commands
// //
resources.ApplyResources(this.Commands, "Commands");
this.Commands.AllowUserToAddRows = false; this.Commands.AllowUserToAddRows = false;
resources.ApplyResources(this.Commands, "Commands");
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -178,7 +176,6 @@
this.Commands.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; this.Commands.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
this.Commands.RowsDefaultCellStyle = dataGridViewCellStyle6; this.Commands.RowsDefaultCellStyle = dataGridViewCellStyle6;
this.toolTip1.SetToolTip(this.Commands, resources.GetString("Commands.ToolTip"));
this.Commands.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellContentClick); this.Commands.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellContentClick);
this.Commands.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellEndEdit); this.Commands.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellEndEdit);
this.Commands.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.Commands_DefaultValuesNeeded); this.Commands.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.Commands_DefaultValuesNeeded);
@ -250,14 +247,12 @@
// //
resources.ApplyResources(this.CHK_geheight, "CHK_geheight"); resources.ApplyResources(this.CHK_geheight, "CHK_geheight");
this.CHK_geheight.Name = "CHK_geheight"; this.CHK_geheight.Name = "CHK_geheight";
this.toolTip1.SetToolTip(this.CHK_geheight, resources.GetString("CHK_geheight.ToolTip"));
this.CHK_geheight.UseVisualStyleBackColor = true; this.CHK_geheight.UseVisualStyleBackColor = true;
// //
// TXT_WPRad // TXT_WPRad
// //
resources.ApplyResources(this.TXT_WPRad, "TXT_WPRad"); resources.ApplyResources(this.TXT_WPRad, "TXT_WPRad");
this.TXT_WPRad.Name = "TXT_WPRad"; this.TXT_WPRad.Name = "TXT_WPRad";
this.toolTip1.SetToolTip(this.TXT_WPRad, resources.GetString("TXT_WPRad.ToolTip"));
this.TXT_WPRad.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TXT_WPRad_KeyPress); this.TXT_WPRad.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TXT_WPRad_KeyPress);
this.TXT_WPRad.Leave += new System.EventHandler(this.TXT_WPRad_Leave); this.TXT_WPRad.Leave += new System.EventHandler(this.TXT_WPRad_Leave);
// //
@ -265,7 +260,6 @@
// //
resources.ApplyResources(this.TXT_DefaultAlt, "TXT_DefaultAlt"); resources.ApplyResources(this.TXT_DefaultAlt, "TXT_DefaultAlt");
this.TXT_DefaultAlt.Name = "TXT_DefaultAlt"; this.TXT_DefaultAlt.Name = "TXT_DefaultAlt";
this.toolTip1.SetToolTip(this.TXT_DefaultAlt, resources.GetString("TXT_DefaultAlt.ToolTip"));
this.TXT_DefaultAlt.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TXT_DefaultAlt_KeyPress); this.TXT_DefaultAlt.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TXT_DefaultAlt_KeyPress);
this.TXT_DefaultAlt.Leave += new System.EventHandler(this.TXT_DefaultAlt_Leave); this.TXT_DefaultAlt.Leave += new System.EventHandler(this.TXT_DefaultAlt_Leave);
// //
@ -273,19 +267,16 @@
// //
resources.ApplyResources(this.LBL_WPRad, "LBL_WPRad"); resources.ApplyResources(this.LBL_WPRad, "LBL_WPRad");
this.LBL_WPRad.Name = "LBL_WPRad"; this.LBL_WPRad.Name = "LBL_WPRad";
this.toolTip1.SetToolTip(this.LBL_WPRad, resources.GetString("LBL_WPRad.ToolTip"));
// //
// LBL_defalutalt // LBL_defalutalt
// //
resources.ApplyResources(this.LBL_defalutalt, "LBL_defalutalt"); resources.ApplyResources(this.LBL_defalutalt, "LBL_defalutalt");
this.LBL_defalutalt.Name = "LBL_defalutalt"; this.LBL_defalutalt.Name = "LBL_defalutalt";
this.toolTip1.SetToolTip(this.LBL_defalutalt, resources.GetString("LBL_defalutalt.ToolTip"));
// //
// TXT_loiterrad // TXT_loiterrad
// //
resources.ApplyResources(this.TXT_loiterrad, "TXT_loiterrad"); resources.ApplyResources(this.TXT_loiterrad, "TXT_loiterrad");
this.TXT_loiterrad.Name = "TXT_loiterrad"; this.TXT_loiterrad.Name = "TXT_loiterrad";
this.toolTip1.SetToolTip(this.TXT_loiterrad, resources.GetString("TXT_loiterrad.ToolTip"));
this.TXT_loiterrad.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TXT_loiterrad_KeyPress); this.TXT_loiterrad.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TXT_loiterrad_KeyPress);
this.TXT_loiterrad.Leave += new System.EventHandler(this.TXT_loiterrad_Leave); this.TXT_loiterrad.Leave += new System.EventHandler(this.TXT_loiterrad_Leave);
// //
@ -293,7 +284,6 @@
// //
resources.ApplyResources(this.label5, "label5"); resources.ApplyResources(this.label5, "label5");
this.label5.Name = "label5"; this.label5.Name = "label5";
this.toolTip1.SetToolTip(this.label5, resources.GetString("label5.ToolTip"));
// //
// panel5 // panel5
// //
@ -303,41 +293,36 @@
this.panel5.Controls.Add(this.SaveFile); this.panel5.Controls.Add(this.SaveFile);
this.panel5.Controls.Add(this.BUT_loadwpfile); this.panel5.Controls.Add(this.BUT_loadwpfile);
this.panel5.Name = "panel5"; this.panel5.Name = "panel5";
this.toolTip1.SetToolTip(this.panel5, resources.GetString("panel5.ToolTip"));
// //
// BUT_write // BUT_write
// //
resources.ApplyResources(this.BUT_write, "BUT_write");
this.BUT_write.ForeColor = System.Drawing.SystemColors.ControlText; this.BUT_write.ForeColor = System.Drawing.SystemColors.ControlText;
resources.ApplyResources(this.BUT_write, "BUT_write");
this.BUT_write.Name = "BUT_write"; this.BUT_write.Name = "BUT_write";
this.toolTip1.SetToolTip(this.BUT_write, resources.GetString("BUT_write.ToolTip"));
this.BUT_write.UseVisualStyleBackColor = true; this.BUT_write.UseVisualStyleBackColor = true;
this.BUT_write.Click += new System.EventHandler(this.BUT_write_Click); this.BUT_write.Click += new System.EventHandler(this.BUT_write_Click);
// //
// BUT_read // BUT_read
// //
resources.ApplyResources(this.BUT_read, "BUT_read");
this.BUT_read.ForeColor = System.Drawing.SystemColors.ControlText; this.BUT_read.ForeColor = System.Drawing.SystemColors.ControlText;
resources.ApplyResources(this.BUT_read, "BUT_read");
this.BUT_read.Name = "BUT_read"; this.BUT_read.Name = "BUT_read";
this.toolTip1.SetToolTip(this.BUT_read, resources.GetString("BUT_read.ToolTip"));
this.BUT_read.UseVisualStyleBackColor = true; this.BUT_read.UseVisualStyleBackColor = true;
this.BUT_read.Click += new System.EventHandler(this.BUT_read_Click); this.BUT_read.Click += new System.EventHandler(this.BUT_read_Click);
// //
// SaveFile // SaveFile
// //
resources.ApplyResources(this.SaveFile, "SaveFile");
this.SaveFile.ForeColor = System.Drawing.SystemColors.ControlText; this.SaveFile.ForeColor = System.Drawing.SystemColors.ControlText;
resources.ApplyResources(this.SaveFile, "SaveFile");
this.SaveFile.Name = "SaveFile"; this.SaveFile.Name = "SaveFile";
this.toolTip1.SetToolTip(this.SaveFile, resources.GetString("SaveFile.ToolTip"));
this.SaveFile.UseVisualStyleBackColor = true; this.SaveFile.UseVisualStyleBackColor = true;
this.SaveFile.Click += new System.EventHandler(this.SaveFile_Click); this.SaveFile.Click += new System.EventHandler(this.SaveFile_Click);
// //
// BUT_loadwpfile // BUT_loadwpfile
// //
resources.ApplyResources(this.BUT_loadwpfile, "BUT_loadwpfile");
this.BUT_loadwpfile.ForeColor = System.Drawing.SystemColors.ControlText; this.BUT_loadwpfile.ForeColor = System.Drawing.SystemColors.ControlText;
resources.ApplyResources(this.BUT_loadwpfile, "BUT_loadwpfile");
this.BUT_loadwpfile.Name = "BUT_loadwpfile"; this.BUT_loadwpfile.Name = "BUT_loadwpfile";
this.toolTip1.SetToolTip(this.BUT_loadwpfile, resources.GetString("BUT_loadwpfile.ToolTip"));
this.BUT_loadwpfile.UseVisualStyleBackColor = true; this.BUT_loadwpfile.UseVisualStyleBackColor = true;
this.BUT_loadwpfile.Click += new System.EventHandler(this.BUT_loadwpfile_Click); this.BUT_loadwpfile.Click += new System.EventHandler(this.BUT_loadwpfile_Click);
// //
@ -352,53 +337,45 @@
this.panel1.Controls.Add(this.TXT_homelng); this.panel1.Controls.Add(this.TXT_homelng);
this.panel1.Controls.Add(this.TXT_homelat); this.panel1.Controls.Add(this.TXT_homelat);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.toolTip1.SetToolTip(this.panel1, resources.GetString("panel1.ToolTip"));
// //
// label4 // label4
// //
resources.ApplyResources(this.label4, "label4"); resources.ApplyResources(this.label4, "label4");
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.TabStop = true; this.label4.TabStop = true;
this.toolTip1.SetToolTip(this.label4, resources.GetString("label4.ToolTip"));
this.label4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.label4_LinkClicked); this.label4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.label4_LinkClicked);
// //
// label3 // label3
// //
resources.ApplyResources(this.label3, "label3"); resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3"; this.label3.Name = "label3";
this.toolTip1.SetToolTip(this.label3, resources.GetString("label3.ToolTip"));
// //
// label2 // label2
// //
resources.ApplyResources(this.label2, "label2"); resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2"; this.label2.Name = "label2";
this.toolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
// //
// Label1 // Label1
// //
resources.ApplyResources(this.Label1, "Label1"); resources.ApplyResources(this.Label1, "Label1");
this.Label1.Name = "Label1"; this.Label1.Name = "Label1";
this.toolTip1.SetToolTip(this.Label1, resources.GetString("Label1.ToolTip"));
// //
// TXT_homealt // TXT_homealt
// //
resources.ApplyResources(this.TXT_homealt, "TXT_homealt"); resources.ApplyResources(this.TXT_homealt, "TXT_homealt");
this.TXT_homealt.Name = "TXT_homealt"; this.TXT_homealt.Name = "TXT_homealt";
this.toolTip1.SetToolTip(this.TXT_homealt, resources.GetString("TXT_homealt.ToolTip"));
this.TXT_homealt.TextChanged += new System.EventHandler(this.TXT_homealt_TextChanged); this.TXT_homealt.TextChanged += new System.EventHandler(this.TXT_homealt_TextChanged);
// //
// TXT_homelng // TXT_homelng
// //
resources.ApplyResources(this.TXT_homelng, "TXT_homelng"); resources.ApplyResources(this.TXT_homelng, "TXT_homelng");
this.TXT_homelng.Name = "TXT_homelng"; this.TXT_homelng.Name = "TXT_homelng";
this.toolTip1.SetToolTip(this.TXT_homelng, resources.GetString("TXT_homelng.ToolTip"));
this.TXT_homelng.TextChanged += new System.EventHandler(this.TXT_homelng_TextChanged); this.TXT_homelng.TextChanged += new System.EventHandler(this.TXT_homelng_TextChanged);
// //
// TXT_homelat // TXT_homelat
// //
resources.ApplyResources(this.TXT_homelat, "TXT_homelat"); resources.ApplyResources(this.TXT_homelat, "TXT_homelat");
this.TXT_homelat.Name = "TXT_homelat"; this.TXT_homelat.Name = "TXT_homelat";
this.toolTip1.SetToolTip(this.TXT_homelat, resources.GetString("TXT_homelat.ToolTip"));
this.TXT_homelat.TextChanged += new System.EventHandler(this.TXT_homelat_TextChanged); this.TXT_homelat.TextChanged += new System.EventHandler(this.TXT_homelat_TextChanged);
this.TXT_homelat.Enter += new System.EventHandler(this.TXT_homelat_Enter); this.TXT_homelat.Enter += new System.EventHandler(this.TXT_homelat_Enter);
// //
@ -424,7 +401,6 @@
// //
resources.ApplyResources(this.label6, "label6"); resources.ApplyResources(this.label6, "label6");
this.label6.Name = "label6"; this.label6.Name = "label6";
this.toolTip1.SetToolTip(this.label6, resources.GetString("label6.ToolTip"));
// //
// panel2 // panel2
// //
@ -437,49 +413,41 @@
this.panel2.Controls.Add(this.TXT_mouselong); this.panel2.Controls.Add(this.TXT_mouselong);
this.panel2.Controls.Add(this.TXT_mouselat); this.panel2.Controls.Add(this.TXT_mouselat);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.toolTip1.SetToolTip(this.panel2, resources.GetString("panel2.ToolTip"));
// //
// label7 // label7
// //
resources.ApplyResources(this.label7, "label7"); resources.ApplyResources(this.label7, "label7");
this.label7.Name = "label7"; this.label7.Name = "label7";
this.toolTip1.SetToolTip(this.label7, resources.GetString("label7.ToolTip"));
// //
// label8 // label8
// //
resources.ApplyResources(this.label8, "label8"); resources.ApplyResources(this.label8, "label8");
this.label8.Name = "label8"; this.label8.Name = "label8";
this.toolTip1.SetToolTip(this.label8, resources.GetString("label8.ToolTip"));
// //
// label9 // label9
// //
resources.ApplyResources(this.label9, "label9"); resources.ApplyResources(this.label9, "label9");
this.label9.Name = "label9"; this.label9.Name = "label9";
this.toolTip1.SetToolTip(this.label9, resources.GetString("label9.ToolTip"));
// //
// label10 // label10
// //
resources.ApplyResources(this.label10, "label10"); resources.ApplyResources(this.label10, "label10");
this.label10.Name = "label10"; this.label10.Name = "label10";
this.toolTip1.SetToolTip(this.label10, resources.GetString("label10.ToolTip"));
// //
// TXT_mousealt // TXT_mousealt
// //
resources.ApplyResources(this.TXT_mousealt, "TXT_mousealt"); resources.ApplyResources(this.TXT_mousealt, "TXT_mousealt");
this.TXT_mousealt.Name = "TXT_mousealt"; this.TXT_mousealt.Name = "TXT_mousealt";
this.toolTip1.SetToolTip(this.TXT_mousealt, resources.GetString("TXT_mousealt.ToolTip"));
// //
// TXT_mouselong // TXT_mouselong
// //
resources.ApplyResources(this.TXT_mouselong, "TXT_mouselong"); resources.ApplyResources(this.TXT_mouselong, "TXT_mouselong");
this.TXT_mouselong.Name = "TXT_mouselong"; this.TXT_mouselong.Name = "TXT_mouselong";
this.toolTip1.SetToolTip(this.TXT_mouselong, resources.GetString("TXT_mouselong.ToolTip"));
// //
// TXT_mouselat // TXT_mouselat
// //
resources.ApplyResources(this.TXT_mouselat, "TXT_mouselat"); resources.ApplyResources(this.TXT_mouselat, "TXT_mouselat");
this.TXT_mouselat.Name = "TXT_mouselat"; this.TXT_mouselat.Name = "TXT_mouselat";
this.toolTip1.SetToolTip(this.TXT_mouselat, resources.GetString("TXT_mouselat.ToolTip"));
// //
// comboBoxMapType // comboBoxMapType
// //
@ -493,17 +461,14 @@
// //
resources.ApplyResources(this.lbl_status, "lbl_status"); resources.ApplyResources(this.lbl_status, "lbl_status");
this.lbl_status.Name = "lbl_status"; this.lbl_status.Name = "lbl_status";
this.toolTip1.SetToolTip(this.lbl_status, resources.GetString("lbl_status.ToolTip"));
// //
// textBox1 // textBox1
// //
resources.ApplyResources(this.textBox1, "textBox1"); resources.ApplyResources(this.textBox1, "textBox1");
this.textBox1.Name = "textBox1"; this.textBox1.Name = "textBox1";
this.toolTip1.SetToolTip(this.textBox1, resources.GetString("textBox1.ToolTip"));
// //
// panelWaypoints // panelWaypoints
// //
resources.ApplyResources(this.panelWaypoints, "panelWaypoints");
this.panelWaypoints.AssociatedSplitter = this.splitter1; this.panelWaypoints.AssociatedSplitter = this.splitter1;
this.panelWaypoints.BackColor = System.Drawing.Color.Transparent; this.panelWaypoints.BackColor = System.Drawing.Color.Transparent;
this.panelWaypoints.CaptionFont = new System.Drawing.Font("Segoe UI", 11.75F, System.Drawing.FontStyle.Bold); this.panelWaypoints.CaptionFont = new System.Drawing.Font("Segoe UI", 11.75F, System.Drawing.FontStyle.Bold);
@ -536,6 +501,7 @@
this.panelWaypoints.CustomColors.ContentGradientBegin = System.Drawing.SystemColors.ButtonFace; this.panelWaypoints.CustomColors.ContentGradientBegin = System.Drawing.SystemColors.ButtonFace;
this.panelWaypoints.CustomColors.ContentGradientEnd = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252))))); this.panelWaypoints.CustomColors.ContentGradientEnd = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
this.panelWaypoints.CustomColors.InnerBorderColor = System.Drawing.SystemColors.Window; this.panelWaypoints.CustomColors.InnerBorderColor = System.Drawing.SystemColors.Window;
resources.ApplyResources(this.panelWaypoints, "panelWaypoints");
this.panelWaypoints.ForeColor = System.Drawing.SystemColors.ControlText; this.panelWaypoints.ForeColor = System.Drawing.SystemColors.ControlText;
this.panelWaypoints.Image = null; this.panelWaypoints.Image = null;
this.panelWaypoints.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; this.panelWaypoints.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
@ -543,18 +509,16 @@
this.panelWaypoints.Name = "panelWaypoints"; this.panelWaypoints.Name = "panelWaypoints";
this.panelWaypoints.PanelStyle = BSE.Windows.Forms.PanelStyle.Default; this.panelWaypoints.PanelStyle = BSE.Windows.Forms.PanelStyle.Default;
this.panelWaypoints.ShowExpandIcon = true; this.panelWaypoints.ShowExpandIcon = true;
this.toolTip1.SetToolTip(this.panelWaypoints, resources.GetString("panelWaypoints.ToolTip"));
this.panelWaypoints.ToolTipTextCloseIcon = null; this.panelWaypoints.ToolTipTextCloseIcon = null;
this.panelWaypoints.ToolTipTextExpandIconPanelCollapsed = null; this.panelWaypoints.ToolTipTextExpandIconPanelCollapsed = null;
this.panelWaypoints.ToolTipTextExpandIconPanelExpanded = null; this.panelWaypoints.ToolTipTextExpandIconPanelExpanded = null;
// //
// splitter1 // splitter1
// //
resources.ApplyResources(this.splitter1, "splitter1");
this.splitter1.BackColor = System.Drawing.Color.Transparent; this.splitter1.BackColor = System.Drawing.Color.Transparent;
resources.ApplyResources(this.splitter1, "splitter1");
this.splitter1.Name = "splitter1"; this.splitter1.Name = "splitter1";
this.splitter1.TabStop = false; this.splitter1.TabStop = false;
this.toolTip1.SetToolTip(this.splitter1, resources.GetString("splitter1.ToolTip"));
// //
// BUT_grid // BUT_grid
// //
@ -574,8 +538,8 @@
// //
// button1 // button1
// //
resources.ApplyResources(this.button1, "button1");
this.button1.ForeColor = System.Drawing.SystemColors.ControlText; this.button1.ForeColor = System.Drawing.SystemColors.ControlText;
resources.ApplyResources(this.button1, "button1");
this.button1.Name = "button1"; this.button1.Name = "button1";
this.toolTip1.SetToolTip(this.button1, resources.GetString("button1.ToolTip")); this.toolTip1.SetToolTip(this.button1, resources.GetString("button1.ToolTip"));
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
@ -583,8 +547,8 @@
// //
// BUT_Add // BUT_Add
// //
resources.ApplyResources(this.BUT_Add, "BUT_Add");
this.BUT_Add.ForeColor = System.Drawing.SystemColors.ControlText; this.BUT_Add.ForeColor = System.Drawing.SystemColors.ControlText;
resources.ApplyResources(this.BUT_Add, "BUT_Add");
this.BUT_Add.Name = "BUT_Add"; this.BUT_Add.Name = "BUT_Add";
this.toolTip1.SetToolTip(this.BUT_Add, resources.GetString("BUT_Add.ToolTip")); this.toolTip1.SetToolTip(this.BUT_Add, resources.GetString("BUT_Add.ToolTip"));
this.BUT_Add.UseVisualStyleBackColor = true; this.BUT_Add.UseVisualStyleBackColor = true;
@ -592,7 +556,6 @@
// //
// panelAction // panelAction
// //
resources.ApplyResources(this.panelAction, "panelAction");
this.panelAction.AssociatedSplitter = null; this.panelAction.AssociatedSplitter = null;
this.panelAction.BackColor = System.Drawing.Color.Transparent; this.panelAction.BackColor = System.Drawing.Color.Transparent;
this.panelAction.CaptionFont = new System.Drawing.Font("Segoe UI", 11.75F, System.Drawing.FontStyle.Bold); this.panelAction.CaptionFont = new System.Drawing.Font("Segoe UI", 11.75F, System.Drawing.FontStyle.Bold);
@ -617,6 +580,7 @@
this.panelAction.CustomColors.ContentGradientBegin = System.Drawing.SystemColors.ButtonFace; this.panelAction.CustomColors.ContentGradientBegin = System.Drawing.SystemColors.ButtonFace;
this.panelAction.CustomColors.ContentGradientEnd = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252))))); this.panelAction.CustomColors.ContentGradientEnd = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
this.panelAction.CustomColors.InnerBorderColor = System.Drawing.SystemColors.Window; this.panelAction.CustomColors.InnerBorderColor = System.Drawing.SystemColors.Window;
resources.ApplyResources(this.panelAction, "panelAction");
this.panelAction.ForeColor = System.Drawing.SystemColors.ControlText; this.panelAction.ForeColor = System.Drawing.SystemColors.ControlText;
this.panelAction.Image = null; this.panelAction.Image = null;
this.panelAction.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; this.panelAction.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
@ -624,7 +588,6 @@
this.panelAction.Name = "panelAction"; this.panelAction.Name = "panelAction";
this.panelAction.PanelStyle = BSE.Windows.Forms.PanelStyle.Default; this.panelAction.PanelStyle = BSE.Windows.Forms.PanelStyle.Default;
this.panelAction.ShowExpandIcon = true; this.panelAction.ShowExpandIcon = true;
this.toolTip1.SetToolTip(this.panelAction, resources.GetString("panelAction.ToolTip"));
this.panelAction.ToolTipTextCloseIcon = null; this.panelAction.ToolTipTextCloseIcon = null;
this.panelAction.ToolTipTextExpandIconPanelCollapsed = null; this.panelAction.ToolTipTextExpandIconPanelCollapsed = null;
this.panelAction.ToolTipTextExpandIconPanelExpanded = null; this.panelAction.ToolTipTextExpandIconPanelExpanded = null;
@ -632,7 +595,6 @@
// //
// panelMap // panelMap
// //
resources.ApplyResources(this.panelMap, "panelMap");
this.panelMap.BackColor = System.Drawing.Color.Transparent; this.panelMap.BackColor = System.Drawing.Color.Transparent;
this.panelMap.Controls.Add(this.lbl_distance); this.panelMap.Controls.Add(this.lbl_distance);
this.panelMap.Controls.Add(this.lbl_homedist); this.panelMap.Controls.Add(this.lbl_homedist);
@ -640,31 +602,28 @@
this.panelMap.Controls.Add(this.MainMap); this.panelMap.Controls.Add(this.MainMap);
this.panelMap.Controls.Add(this.trackBar1); this.panelMap.Controls.Add(this.trackBar1);
this.panelMap.Controls.Add(this.label11); this.panelMap.Controls.Add(this.label11);
resources.ApplyResources(this.panelMap, "panelMap");
this.panelMap.ForeColor = System.Drawing.SystemColors.ControlText; this.panelMap.ForeColor = System.Drawing.SystemColors.ControlText;
this.panelMap.MinimumSize = new System.Drawing.Size(27, 27); this.panelMap.MinimumSize = new System.Drawing.Size(27, 27);
this.panelMap.Name = "panelMap"; this.panelMap.Name = "panelMap";
this.toolTip1.SetToolTip(this.panelMap, resources.GetString("panelMap.ToolTip"));
// //
// lbl_distance // lbl_distance
// //
resources.ApplyResources(this.lbl_distance, "lbl_distance"); resources.ApplyResources(this.lbl_distance, "lbl_distance");
this.lbl_distance.ForeColor = System.Drawing.Color.White; this.lbl_distance.ForeColor = System.Drawing.Color.White;
this.lbl_distance.Name = "lbl_distance"; this.lbl_distance.Name = "lbl_distance";
this.toolTip1.SetToolTip(this.lbl_distance, resources.GetString("lbl_distance.ToolTip"));
// //
// lbl_homedist // lbl_homedist
// //
resources.ApplyResources(this.lbl_homedist, "lbl_homedist"); resources.ApplyResources(this.lbl_homedist, "lbl_homedist");
this.lbl_homedist.ForeColor = System.Drawing.Color.White; this.lbl_homedist.ForeColor = System.Drawing.Color.White;
this.lbl_homedist.Name = "lbl_homedist"; this.lbl_homedist.Name = "lbl_homedist";
this.toolTip1.SetToolTip(this.lbl_homedist, resources.GetString("lbl_homedist.ToolTip"));
// //
// lbl_prevdist // lbl_prevdist
// //
resources.ApplyResources(this.lbl_prevdist, "lbl_prevdist"); resources.ApplyResources(this.lbl_prevdist, "lbl_prevdist");
this.lbl_prevdist.ForeColor = System.Drawing.Color.White; this.lbl_prevdist.ForeColor = System.Drawing.Color.White;
this.lbl_prevdist.Name = "lbl_prevdist"; this.lbl_prevdist.Name = "lbl_prevdist";
this.toolTip1.SetToolTip(this.lbl_prevdist, resources.GetString("lbl_prevdist.ToolTip"));
// //
// MainMap // MainMap
// //
@ -687,12 +646,10 @@
this.MainMap.RoutesEnabled = false; this.MainMap.RoutesEnabled = false;
this.MainMap.ShowTileGridLines = false; this.MainMap.ShowTileGridLines = false;
this.MainMap.streamjpg = ((System.IO.MemoryStream)(resources.GetObject("MainMap.streamjpg"))); this.MainMap.streamjpg = ((System.IO.MemoryStream)(resources.GetObject("MainMap.streamjpg")));
this.toolTip1.SetToolTip(this.MainMap, resources.GetString("MainMap.ToolTip"));
this.MainMap.Zoom = 0D; this.MainMap.Zoom = 0D;
// //
// contextMenuStrip1 // contextMenuStrip1
// //
resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.deleteWPToolStripMenuItem, this.deleteWPToolStripMenuItem,
this.loiterToolStripMenuItem, this.loiterToolStripMenuItem,
@ -703,102 +660,102 @@
this.gridToolStripMenuItem, this.gridToolStripMenuItem,
this.clearMissionToolStripMenuItem}); this.clearMissionToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.toolTip1.SetToolTip(this.contextMenuStrip1, resources.GetString("contextMenuStrip1.ToolTip")); resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
// //
// deleteWPToolStripMenuItem // deleteWPToolStripMenuItem
// //
resources.ApplyResources(this.deleteWPToolStripMenuItem, "deleteWPToolStripMenuItem");
this.deleteWPToolStripMenuItem.Name = "deleteWPToolStripMenuItem"; this.deleteWPToolStripMenuItem.Name = "deleteWPToolStripMenuItem";
resources.ApplyResources(this.deleteWPToolStripMenuItem, "deleteWPToolStripMenuItem");
this.deleteWPToolStripMenuItem.Click += new System.EventHandler(this.deleteWPToolStripMenuItem_Click); this.deleteWPToolStripMenuItem.Click += new System.EventHandler(this.deleteWPToolStripMenuItem_Click);
// //
// loiterToolStripMenuItem // loiterToolStripMenuItem
// //
resources.ApplyResources(this.loiterToolStripMenuItem, "loiterToolStripMenuItem");
this.loiterToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.loiterToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.loiterForeverToolStripMenuItem, this.loiterForeverToolStripMenuItem,
this.loitertimeToolStripMenuItem, this.loitertimeToolStripMenuItem,
this.loitercirclesToolStripMenuItem}); this.loitercirclesToolStripMenuItem});
this.loiterToolStripMenuItem.Name = "loiterToolStripMenuItem"; this.loiterToolStripMenuItem.Name = "loiterToolStripMenuItem";
resources.ApplyResources(this.loiterToolStripMenuItem, "loiterToolStripMenuItem");
// //
// loiterForeverToolStripMenuItem // loiterForeverToolStripMenuItem
// //
resources.ApplyResources(this.loiterForeverToolStripMenuItem, "loiterForeverToolStripMenuItem");
this.loiterForeverToolStripMenuItem.Name = "loiterForeverToolStripMenuItem"; this.loiterForeverToolStripMenuItem.Name = "loiterForeverToolStripMenuItem";
resources.ApplyResources(this.loiterForeverToolStripMenuItem, "loiterForeverToolStripMenuItem");
this.loiterForeverToolStripMenuItem.Click += new System.EventHandler(this.loiterForeverToolStripMenuItem_Click); this.loiterForeverToolStripMenuItem.Click += new System.EventHandler(this.loiterForeverToolStripMenuItem_Click);
// //
// loitertimeToolStripMenuItem // loitertimeToolStripMenuItem
// //
resources.ApplyResources(this.loitertimeToolStripMenuItem, "loitertimeToolStripMenuItem");
this.loitertimeToolStripMenuItem.Name = "loitertimeToolStripMenuItem"; this.loitertimeToolStripMenuItem.Name = "loitertimeToolStripMenuItem";
resources.ApplyResources(this.loitertimeToolStripMenuItem, "loitertimeToolStripMenuItem");
this.loitertimeToolStripMenuItem.Click += new System.EventHandler(this.loitertimeToolStripMenuItem_Click); this.loitertimeToolStripMenuItem.Click += new System.EventHandler(this.loitertimeToolStripMenuItem_Click);
// //
// loitercirclesToolStripMenuItem // loitercirclesToolStripMenuItem
// //
resources.ApplyResources(this.loitercirclesToolStripMenuItem, "loitercirclesToolStripMenuItem");
this.loitercirclesToolStripMenuItem.Name = "loitercirclesToolStripMenuItem"; this.loitercirclesToolStripMenuItem.Name = "loitercirclesToolStripMenuItem";
resources.ApplyResources(this.loitercirclesToolStripMenuItem, "loitercirclesToolStripMenuItem");
this.loitercirclesToolStripMenuItem.Click += new System.EventHandler(this.loitercirclesToolStripMenuItem_Click); this.loitercirclesToolStripMenuItem.Click += new System.EventHandler(this.loitercirclesToolStripMenuItem_Click);
// //
// jumpToolStripMenuItem // jumpToolStripMenuItem
// //
resources.ApplyResources(this.jumpToolStripMenuItem, "jumpToolStripMenuItem");
this.jumpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.jumpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.jumpstartToolStripMenuItem, this.jumpstartToolStripMenuItem,
this.jumpwPToolStripMenuItem}); this.jumpwPToolStripMenuItem});
this.jumpToolStripMenuItem.Name = "jumpToolStripMenuItem"; this.jumpToolStripMenuItem.Name = "jumpToolStripMenuItem";
resources.ApplyResources(this.jumpToolStripMenuItem, "jumpToolStripMenuItem");
// //
// jumpstartToolStripMenuItem // jumpstartToolStripMenuItem
// //
resources.ApplyResources(this.jumpstartToolStripMenuItem, "jumpstartToolStripMenuItem");
this.jumpstartToolStripMenuItem.Name = "jumpstartToolStripMenuItem"; this.jumpstartToolStripMenuItem.Name = "jumpstartToolStripMenuItem";
resources.ApplyResources(this.jumpstartToolStripMenuItem, "jumpstartToolStripMenuItem");
this.jumpstartToolStripMenuItem.Click += new System.EventHandler(this.jumpstartToolStripMenuItem_Click); this.jumpstartToolStripMenuItem.Click += new System.EventHandler(this.jumpstartToolStripMenuItem_Click);
// //
// jumpwPToolStripMenuItem // jumpwPToolStripMenuItem
// //
resources.ApplyResources(this.jumpwPToolStripMenuItem, "jumpwPToolStripMenuItem");
this.jumpwPToolStripMenuItem.Name = "jumpwPToolStripMenuItem"; this.jumpwPToolStripMenuItem.Name = "jumpwPToolStripMenuItem";
resources.ApplyResources(this.jumpwPToolStripMenuItem, "jumpwPToolStripMenuItem");
this.jumpwPToolStripMenuItem.Click += new System.EventHandler(this.jumpwPToolStripMenuItem_Click); this.jumpwPToolStripMenuItem.Click += new System.EventHandler(this.jumpwPToolStripMenuItem_Click);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
// //
// ContextMeasure // ContextMeasure
// //
resources.ApplyResources(this.ContextMeasure, "ContextMeasure");
this.ContextMeasure.Name = "ContextMeasure"; this.ContextMeasure.Name = "ContextMeasure";
resources.ApplyResources(this.ContextMeasure, "ContextMeasure");
this.ContextMeasure.Click += new System.EventHandler(this.ContextMeasure_Click); this.ContextMeasure.Click += new System.EventHandler(this.ContextMeasure_Click);
// //
// rotateMapToolStripMenuItem // rotateMapToolStripMenuItem
// //
resources.ApplyResources(this.rotateMapToolStripMenuItem, "rotateMapToolStripMenuItem");
this.rotateMapToolStripMenuItem.Name = "rotateMapToolStripMenuItem"; this.rotateMapToolStripMenuItem.Name = "rotateMapToolStripMenuItem";
resources.ApplyResources(this.rotateMapToolStripMenuItem, "rotateMapToolStripMenuItem");
this.rotateMapToolStripMenuItem.Click += new System.EventHandler(this.rotateMapToolStripMenuItem_Click); this.rotateMapToolStripMenuItem.Click += new System.EventHandler(this.rotateMapToolStripMenuItem_Click);
// //
// gridToolStripMenuItem // gridToolStripMenuItem
// //
resources.ApplyResources(this.gridToolStripMenuItem, "gridToolStripMenuItem");
this.gridToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.gridToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addPolygonPointToolStripMenuItem, this.addPolygonPointToolStripMenuItem,
this.clearPolygonToolStripMenuItem}); this.clearPolygonToolStripMenuItem});
this.gridToolStripMenuItem.Name = "gridToolStripMenuItem"; this.gridToolStripMenuItem.Name = "gridToolStripMenuItem";
resources.ApplyResources(this.gridToolStripMenuItem, "gridToolStripMenuItem");
// //
// addPolygonPointToolStripMenuItem // addPolygonPointToolStripMenuItem
// //
resources.ApplyResources(this.addPolygonPointToolStripMenuItem, "addPolygonPointToolStripMenuItem");
this.addPolygonPointToolStripMenuItem.Name = "addPolygonPointToolStripMenuItem"; this.addPolygonPointToolStripMenuItem.Name = "addPolygonPointToolStripMenuItem";
resources.ApplyResources(this.addPolygonPointToolStripMenuItem, "addPolygonPointToolStripMenuItem");
this.addPolygonPointToolStripMenuItem.Click += new System.EventHandler(this.addPolygonPointToolStripMenuItem_Click); this.addPolygonPointToolStripMenuItem.Click += new System.EventHandler(this.addPolygonPointToolStripMenuItem_Click);
// //
// clearPolygonToolStripMenuItem // clearPolygonToolStripMenuItem
// //
resources.ApplyResources(this.clearPolygonToolStripMenuItem, "clearPolygonToolStripMenuItem");
this.clearPolygonToolStripMenuItem.Name = "clearPolygonToolStripMenuItem"; this.clearPolygonToolStripMenuItem.Name = "clearPolygonToolStripMenuItem";
resources.ApplyResources(this.clearPolygonToolStripMenuItem, "clearPolygonToolStripMenuItem");
this.clearPolygonToolStripMenuItem.Click += new System.EventHandler(this.clearPolygonToolStripMenuItem_Click); this.clearPolygonToolStripMenuItem.Click += new System.EventHandler(this.clearPolygonToolStripMenuItem_Click);
// //
// clearMissionToolStripMenuItem // clearMissionToolStripMenuItem
// //
resources.ApplyResources(this.clearMissionToolStripMenuItem, "clearMissionToolStripMenuItem");
this.clearMissionToolStripMenuItem.Name = "clearMissionToolStripMenuItem"; this.clearMissionToolStripMenuItem.Name = "clearMissionToolStripMenuItem";
resources.ApplyResources(this.clearMissionToolStripMenuItem, "clearMissionToolStripMenuItem");
this.clearMissionToolStripMenuItem.Click += new System.EventHandler(this.clearMissionToolStripMenuItem_Click); this.clearMissionToolStripMenuItem.Click += new System.EventHandler(this.clearMissionToolStripMenuItem_Click);
// //
// trackBar1 // trackBar1
@ -812,7 +769,6 @@
this.trackBar1.SmallChange = 50; this.trackBar1.SmallChange = 50;
this.trackBar1.TickFrequency = 100; this.trackBar1.TickFrequency = 100;
this.trackBar1.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.trackBar1.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.toolTip1.SetToolTip(this.trackBar1, resources.GetString("trackBar1.ToolTip"));
this.trackBar1.Value = 2D; this.trackBar1.Value = 2D;
this.trackBar1.Scroll += new System.EventHandler(this.trackBar1_Scroll); this.trackBar1.Scroll += new System.EventHandler(this.trackBar1_Scroll);
// //
@ -821,18 +777,16 @@
resources.ApplyResources(this.label11, "label11"); resources.ApplyResources(this.label11, "label11");
this.label11.ForeColor = System.Drawing.Color.White; this.label11.ForeColor = System.Drawing.Color.White;
this.label11.Name = "label11"; this.label11.Name = "label11";
this.toolTip1.SetToolTip(this.label11, resources.GetString("label11.ToolTip"));
// //
// panelBASE // panelBASE
// //
resources.ApplyResources(this.panelBASE, "panelBASE");
this.panelBASE.Controls.Add(this.splitter1); this.panelBASE.Controls.Add(this.splitter1);
this.panelBASE.Controls.Add(this.panelMap); this.panelBASE.Controls.Add(this.panelMap);
this.panelBASE.Controls.Add(this.panelWaypoints); this.panelBASE.Controls.Add(this.panelWaypoints);
this.panelBASE.Controls.Add(this.panelAction); this.panelBASE.Controls.Add(this.panelAction);
this.panelBASE.Controls.Add(this.label6); this.panelBASE.Controls.Add(this.label6);
resources.ApplyResources(this.panelBASE, "panelBASE");
this.panelBASE.Name = "panelBASE"; this.panelBASE.Name = "panelBASE";
this.toolTip1.SetToolTip(this.panelBASE, resources.GetString("panelBASE.ToolTip"));
// //
// FlightPlanner // FlightPlanner
// //
@ -842,7 +796,6 @@
this.Controls.Add(this.panelBASE); this.Controls.Add(this.panelBASE);
this.MinimumSize = new System.Drawing.Size(1008, 461); this.MinimumSize = new System.Drawing.Size(1008, 461);
this.Name = "FlightPlanner"; this.Name = "FlightPlanner";
this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip"));
this.Load += new System.EventHandler(this.Planner_Load); this.Load += new System.EventHandler(this.Planner_Load);
this.Resize += new System.EventHandler(this.Planner_Resize); this.Resize += new System.EventHandler(this.Planner_Resize);
((System.ComponentModel.ISupportInitialize)(this.Commands)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Commands)).EndInit();

47
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.resx
View File

@ -2107,37 +2107,40 @@
<data name="Delete.ToolTipText" xml:space="preserve"> <data name="Delete.ToolTipText" xml:space="preserve">
<value>Delete the row</value> <value>Delete the row</value>
</data> </data>
<metadata name="Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Down.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="Param1.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Param1.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="Command.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Command.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="Param3.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Param3.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <data name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>17, 17</value> <value>17, 17</value>
</metadata> </data>
<metadata name="Param4.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Param4.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="Delete.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Delete.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="$this.Localizable" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="Param2.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Param2.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <data name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>172, 17</value> <value>172, 17</value>
</metadata> </data>
<metadata name="Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="Up.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<data name="MAVCmd" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MAVCmd.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
</root> </root>

15
Tools/ArdupilotMegaPlanner/Log.cs
View File

@ -322,6 +322,21 @@ namespace ArdupilotMega
lastpos = (position[positionindex][position[positionindex].Count - 1]); lastpos = (position[positionindex][position[positionindex].Count - 1]);
lastline = line; lastline = line;
} }
if (items[0].Contains("GPS") && items[4] != "0" && items[4] != "-1")
{
if (position[positionindex] == null)
position[positionindex] = new List<Point3D>();
MainV2.cs.firmware = MainV2.Firmwares.ArduCopter2;
double alt = double.Parse(items[5], new System.Globalization.CultureInfo("en-US"));
position[positionindex].Add(new Point3D(double.Parse(items[4], new System.Globalization.CultureInfo("en-US")), double.Parse(items[3], new System.Globalization.CultureInfo("en-US")), alt));
oldlastpos = lastpos;
lastpos = (position[positionindex][position[positionindex].Count - 1]);
lastline = line;
}
if (items[0].Contains("CTUN")) if (items[0].Contains("CTUN"))
{ {
ctunlast = items; ctunlast = items;

3
Tools/ArdupilotMegaPlanner/MAVLink.cs
View File

@ -33,6 +33,7 @@ namespace ArdupilotMega
bool oldlogformat = false; bool oldlogformat = false;
byte mavlinkversion = 0; byte mavlinkversion = 0;
byte[] readingpacket = new byte[256];
public PointLatLngAlt[] wps = new PointLatLngAlt[200]; public PointLatLngAlt[] wps = new PointLatLngAlt[200];
@ -526,6 +527,8 @@ namespace ArdupilotMega
continue; continue;
} }
modifyParamForDisplay(true, st, ref par.param_value);
param[st] = (par.param_value); param[st] = (par.param_value);
MainV2.givecomport = false; MainV2.givecomport = false;

2
Tools/ArdupilotMegaPlanner/MAVLinkTypes.cs
View File

@ -1,6 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ArdupilotMega namespace ArdupilotMega

145
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -1162,79 +1162,102 @@ namespace ArdupilotMega
//url = url.Replace(" HTTP/1.0", ""); //url = url.Replace(" HTTP/1.0", "");
//url = url.Replace(" HTTP/1.1", ""); //url = url.Replace(" HTTP/1.1", "");
string header = "HTTP/1.1 200 OK\r\nContent-Type: multipart/x-mixed-replace;boundary=APMPLANNER\n\n--APMPLANNER\r\n"; if (url.Contains("websocket"))
byte[] temp = encoding.GetBytes(header);
stream.Write(temp, 0, temp.Length);
while (client.Connected)
{ {
System.Threading.Thread.Sleep(200); // 5hz using (var writer = new StreamWriter(stream))
byte[] data = null;
if (url.ToLower().Contains("hud"))
{ {
GCSViews.FlightData.myhud.streamjpgenable = true; writer.WriteLine("HTTP/1.1 101 Web Socket Protocol Handshake");
data = GCSViews.FlightData.myhud.streamjpg.ToArray(); writer.WriteLine("Upgrade: WebSocket");
writer.WriteLine("Connection: Upgrade");
writer.WriteLine("WebSocket-Origin: http://localhost:56781/");
writer.WriteLine("WebSocket-Location: ws://localhost:56781/websocket/server");
writer.WriteLine("");
while (client.Connected)
{
System.Threading.Thread.Sleep(200);
Console.WriteLine(stream.DataAvailable + " " + client.Available);
stream.WriteByte(0x00);
writer.WriteLine("test from planner");
stream.WriteByte(0xff);
//break;
}
stream.WriteByte(0x00);
//message
stream.WriteByte(0xff);
} }
else if (url.ToLower().Contains("map")) } else if (url.Contains(".html")) {
{ BinaryReader file = new BinaryReader(File.Open("hud.html",FileMode.Open,FileAccess.Read,FileShare.Read));
GCSViews.FlightData.mymap.streamjpgenable = true; byte[] buffer = new byte[1024];
data = GCSViews.FlightData.mymap.streamjpg.ToArray(); while (file.PeekChar() != -1) {
int leng = file.Read(buffer,0,buffer.Length);
stream.Write(buffer,0,leng);
} }
else file.Close();
{ stream.Close();
GCSViews.FlightData.mymap.streamjpgenable = true;
GCSViews.FlightData.myhud.streamjpgenable = true;
Image img1 = Image.FromStream(GCSViews.FlightData.myhud.streamjpg);
Image img2 = Image.FromStream(GCSViews.FlightData.mymap.streamjpg);
int bigger = img1.Height > img2.Height ? img1.Height : img2.Height;
Image imgout = new Bitmap(img1.Width + img2.Width, bigger);
Graphics grap = Graphics.FromImage(imgout);
grap.DrawImageUnscaled(img1, 0, 0);
grap.DrawImageUnscaled(img2, img1.Width, 0);
MemoryStream streamjpg = new MemoryStream();
imgout.Save(streamjpg, System.Drawing.Imaging.ImageFormat.Jpeg);
data = streamjpg.ToArray();
}
header = "Content-Type: image/jpeg\r\nContent-Length: " + data.Length + "\r\n\r\n";
temp = encoding.GetBytes(header);
stream.Write(temp, 0, temp.Length);
stream.Write(data, 0, data.Length);
header = "\r\n--APMPLANNER\r\n";
temp = encoding.GetBytes(header);
stream.Write(temp, 0, temp.Length);
} }
GCSViews.FlightData.mymap.streamjpgenable = false; else if (url.ToLower().Contains("hud") || url.ToLower().Contains("map"))
GCSViews.FlightData.myhud.streamjpgenable = false;
/*
while (client.Connected)
{ {
string header = "HTTP/1.1 200 OK\r\nContent-Type: multipart/x-mixed-replace;boundary=APMPLANNER\n\n--APMPLANNER\r\n";
byte[] data = GCSViews.FlightData.myhud.streamjpg.ToArray();
byte[] request = new byte[1024];
int len = stream.Read(request, 0, request.Length);
Console.WriteLine(System.Text.ASCIIEncoding.ASCII.GetString(request, 0, len));
string header = "HTTP/1.1 200 OK\nContent-Length: " + data.Length + "\nContent-Type: image/jpeg\n\n";
byte[] temp = encoding.GetBytes(header); byte[] temp = encoding.GetBytes(header);
stream.Write(temp, 0, temp.Length); stream.Write(temp, 0, temp.Length);
stream.Write(data, 0, data.Length); while (client.Connected)
{
System.Threading.Thread.Sleep(200); // 5hz
byte[] data = null;
if (url.ToLower().Contains("hud"))
{
GCSViews.FlightData.myhud.streamjpgenable = true;
data = GCSViews.FlightData.myhud.streamjpg.ToArray();
}
else if (url.ToLower().Contains("map"))
{
GCSViews.FlightData.mymap.streamjpgenable = true;
data = GCSViews.FlightData.mymap.streamjpg.ToArray();
}
else
{
GCSViews.FlightData.mymap.streamjpgenable = true;
GCSViews.FlightData.myhud.streamjpgenable = true;
Image img1 = Image.FromStream(GCSViews.FlightData.myhud.streamjpg);
Image img2 = Image.FromStream(GCSViews.FlightData.mymap.streamjpg);
int bigger = img1.Height > img2.Height ? img1.Height : img2.Height;
Image imgout = new Bitmap(img1.Width + img2.Width, bigger);
Graphics grap = Graphics.FromImage(imgout);
grap.DrawImageUnscaled(img1, 0, 0);
grap.DrawImageUnscaled(img2, img1.Width, 0);
MemoryStream streamjpg = new MemoryStream();
imgout.Save(streamjpg, System.Drawing.Imaging.ImageFormat.Jpeg);
data = streamjpg.ToArray();
}
header = "Content-Type: image/jpeg\r\nContent-Length: " + data.Length + "\r\n\r\n";
temp = encoding.GetBytes(header);
stream.Write(temp, 0, temp.Length);
stream.Write(data, 0, data.Length);
header = "\r\n--APMPLANNER\r\n";
temp = encoding.GetBytes(header);
stream.Write(temp, 0, temp.Length);
}
GCSViews.FlightData.mymap.streamjpgenable = false;
GCSViews.FlightData.myhud.streamjpgenable = false;
stream.Close();
} }
*/
stream.Close(); stream.Close();
} }
catch (Exception ee) { Console.WriteLine("Failed mjpg " + ee.Message); } catch (Exception ee) { Console.WriteLine("Failed mjpg " + ee.Message); }
} }

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

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

40
Tools/ArdupilotMegaPlanner/Setup/Setup.cs
View File

@ -248,6 +248,20 @@ namespace ArdupilotMega.Setup
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (tabControl1.SelectedTab == tabRadioIn)
{
startup = true;
try
{
CHK_revch1.Checked = MainV2.comPort.param["RC1_REV"].ToString() == "-1";
CHK_revch2.Checked = MainV2.comPort.param["RC2_REV"].ToString() == "-1";
CHK_revch3.Checked = MainV2.comPort.param["RC3_REV"].ToString() == "-1";
CHK_revch4.Checked = MainV2.comPort.param["RC4_REV"].ToString() == "-1";
}
catch { MessageBox.Show("Missing RC rev Param"); }
startup = false;
}
if (tabControl1.SelectedTab == tabModes) if (tabControl1.SelectedTab == tabModes)
{ {
if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane) // APM if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane) // APM
@ -280,7 +294,8 @@ namespace ArdupilotMega.Setup
CMB_fmode3.Text = Enum.Parse(typeof(Common.apmmodes), MainV2.comPort.param["FLTMODE3"].ToString()).ToString(); CMB_fmode3.Text = Enum.Parse(typeof(Common.apmmodes), MainV2.comPort.param["FLTMODE3"].ToString()).ToString();
CMB_fmode4.Text = Enum.Parse(typeof(Common.apmmodes), MainV2.comPort.param["FLTMODE4"].ToString()).ToString(); CMB_fmode4.Text = Enum.Parse(typeof(Common.apmmodes), MainV2.comPort.param["FLTMODE4"].ToString()).ToString();
CMB_fmode5.Text = Enum.Parse(typeof(Common.apmmodes), MainV2.comPort.param["FLTMODE5"].ToString()).ToString(); CMB_fmode5.Text = Enum.Parse(typeof(Common.apmmodes), MainV2.comPort.param["FLTMODE5"].ToString()).ToString();
CMB_fmode6.Text = Enum.Parse(typeof(Common.apmmodes), MainV2.comPort.param["FLTMODE6"].ToString()).ToString(); CMB_fmode6.Text = Common.apmmodes.MANUAL.ToString();
CMB_fmode6.Enabled = false;
} }
catch { } catch { }
} }
@ -308,6 +323,7 @@ namespace ArdupilotMega.Setup
CMB_fmode4.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE4"].ToString()).ToString(); CMB_fmode4.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE4"].ToString()).ToString();
CMB_fmode5.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE5"].ToString()).ToString(); CMB_fmode5.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE5"].ToString()).ToString();
CMB_fmode6.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE6"].ToString()).ToString(); CMB_fmode6.Text = Enum.Parse(typeof(Common.ac2modes), MainV2.comPort.param["FLTMODE6"].ToString()).ToString();
CMB_fmode6.Enabled = true;
int simple = int.Parse(MainV2.comPort.param["SIMPLE"].ToString()); int simple = int.Parse(MainV2.comPort.param["SIMPLE"].ToString());
@ -1034,6 +1050,17 @@ namespace ArdupilotMega.Setup
void reverseChannel(string name,bool normalreverse,Control progressbar) void reverseChannel(string name,bool normalreverse,Control progressbar)
{ {
if (normalreverse == true)
{
((HorizontalProgressBar2)progressbar).BackgroundColor = Color.FromArgb(148, 193, 31);
((HorizontalProgressBar2)progressbar).ValueColor = Color.FromArgb(0x43, 0x44, 0x45);
}
else
{
((HorizontalProgressBar2)progressbar).BackgroundColor = Color.FromArgb(0x43, 0x44, 0x45);
((HorizontalProgressBar2)progressbar).ValueColor = Color.FromArgb(148, 193, 31);
}
if (startup) if (startup)
return; return;
if (MainV2.comPort.param["SWITCH_ENABLE"] != null && (float)MainV2.comPort.param["SWITCH_ENABLE"] == 1) if (MainV2.comPort.param["SWITCH_ENABLE"] != null && (float)MainV2.comPort.param["SWITCH_ENABLE"] == 1)
@ -1049,17 +1076,6 @@ namespace ArdupilotMega.Setup
{ {
int i = normalreverse == false ? 1 : -1; int i = normalreverse == false ? 1 : -1;
MainV2.comPort.setParam(name, i); MainV2.comPort.setParam(name, i);
if (normalreverse == true)
{
((HorizontalProgressBar2)progressbar).BackgroundColor = Color.FromArgb(148, 193, 31);
((HorizontalProgressBar2)progressbar).ValueColor = Color.FromArgb(0x43, 0x44, 0x45);
}
else
{
((HorizontalProgressBar2)progressbar).BackgroundColor = Color.FromArgb(0x43, 0x44, 0x45);
((HorizontalProgressBar2)progressbar).ValueColor = Color.FromArgb(148, 193, 31);
}
} }
catch { MessageBox.Show("Error Reversing"); } catch { MessageBox.Show("Error Reversing"); }
} }

11718
Tools/ArdupilotMegaPlanner/bin/Release/GCSViews/Configuration.resx
View File

File diff suppressed because it is too large Load Diff

3373
Tools/ArdupilotMegaPlanner/bin/Release/GCSViews/FlightPlanner.resx
View File

File diff suppressed because it is too large Load Diff

18
Tools/ArdupilotMegaPlanner/bin/Release/dataflashlog.xml
View File

@ -4,19 +4,21 @@
<AC2> <AC2>
<GPS> <GPS>
<F1>Time</F1> <F1>Time</F1>
<F2>Fix</F2> <F2>Sats</F2>
<F3>Sats</F3> <F3>Lat</F3>
<F4>Lat</F4> <F4>Long</F4>
<F5>Long</F5> <F5>Mix Alt</F5>
<F6>Mix Alt</F6> <F6>GPSAlt</F6>
<F7>GPSAlt</F7> <F7>GR Speed</F7>
<F8>GR Speed</F8> <F8>CRS</F8>
<F9>CRS</F9>
</GPS> </GPS>
<ATT> <ATT>
<F1>Roll</F1> <F1>Roll</F1>
<F2>Pitch</F2> <F2>Pitch</F2>
<F3>Yaw</F3> <F3>Yaw</F3>
<F4>rc1 servo</F4>
<F5>rc2 servo</F5>
<F6>rc3 servo</F6>
</ATT> </ATT>
<NTUN> <NTUN>
<F1>WP Dist</F1> <F1>WP Dist</F1>

18
Tools/ArdupilotMegaPlanner/dataflashlog.xml
View File

@ -4,19 +4,21 @@
<AC2> <AC2>
<GPS> <GPS>
<F1>Time</F1> <F1>Time</F1>
<F2>Fix</F2> <F2>Sats</F2>
<F3>Sats</F3> <F3>Lat</F3>
<F4>Lat</F4> <F4>Long</F4>
<F5>Long</F5> <F5>Mix Alt</F5>
<F6>Mix Alt</F6> <F6>GPSAlt</F6>
<F7>GPSAlt</F7> <F7>GR Speed</F7>
<F8>GR Speed</F8> <F8>CRS</F8>
<F9>CRS</F9>
</GPS> </GPS>
<ATT> <ATT>
<F1>Roll</F1> <F1>Roll</F1>
<F2>Pitch</F2> <F2>Pitch</F2>
<F3>Yaw</F3> <F3>Yaw</F3>
<F4>rc1 servo</F4>
<F5>rc2 servo</F5>
<F6>rc3 servo</F6>
</ATT> </ATT>
<NTUN> <NTUN>
<F1>WP Dist</F1> <F1>WP Dist</F1>