diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index a5650efb77..04ed05a3fd 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -8,8 +8,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pointCameraHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -1213,8 +1213,8 @@ // // dataGridViewImageColumn1 // - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle3; resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1"); this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up; this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; @@ -1222,8 +1222,8 @@ // // dataGridViewImageColumn2 // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle4; resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2"); this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down; this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index 342ca1dcc0..07849c6661 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -664,7 +664,11 @@ namespace ArdupilotMega.GCSViews } catch { } // Force a redraw - zg1.Invalidate(); + try + { + zg1.Invalidate(); + } + catch { } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 6eb95e738d..e4cf5f65e3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -121,6 +121,15 @@ 290, 17 + + 175, 48 + + + contextMenuStrip1 + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 174, 22 @@ -133,15 +142,6 @@ Point Camera Here - - 175, 48 - - - contextMenuStrip1 - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Fill @@ -167,18 +167,6 @@ 542, 17 - - 172, 22 - - - Record Hud to AVI - - - 172, 22 - - - Stop Record - 173, 48 @@ -228,444 +216,6 @@ 0 - - NoControl - - - 17, 93 - - - 66, 23 - - - 78 - - - Script - - - BUT_script - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 0 - - - NoControl - - - 101, 93 - - - 66, 23 - - - 77 - - - Joystick - - - 445, 17 - - - Setup and enable your joystick - - - BUT_joystick - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 1 - - - NoControl - - - 173, 35 - - - 57, 23 - - - 76 - - - &Manual - - - Change Mode to Manual/Stabalize - - - BUT_quickmanual - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 2 - - - NoControl - - - 173, 64 - - - 57, 23 - - - 75 - - - &RTL - - - Change Mode to RTL - - - BUT_quickrtl - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 3 - - - NoControl - - - 173, 6 - - - 57, 23 - - - 74 - - - &Auto - - - Change mode to Auto - - - BUT_quickauto - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 4 - - - 0 (Home) - - - 4, 35 - - - 91, 21 - - - 72 - - - CMB_setwp - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 5 - - - NoControl - - - 101, 35 - - - 66, 23 - - - 73 - - - Set WP - - - Changes the current target waypoint - - - BUT_setwp - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 6 - - - 4, 64 - - - 91, 21 - - - 70 - - - CMB_modes - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 7 - - - NoControl - - - 101, 64 - - - 66, 23 - - - 71 - - - Set Mode - - - Changes to the Mode on the left - - - BUT_setmode - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 8 - - - NoControl - - - 236, 93 - - - 97, 23 - - - 52 - - - Clear Track - - - Clear the recorded path on the map - - - BUT_clear_track - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 9 - - - 4, 6 - - - 91, 21 - - - 59 - - - CMB_action - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabActions - - - 10 - - - NoControl - - - 236, 6 - - - 97, 23 - - - 69 - - - Set Home Alt - - - Set the current display alt as 0, ie home alt is shown as 0 - - - BUT_Homealt - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 11 - - - NoControl - - - 236, 64 - - - 97, 23 - - - 68 - - - Raw Sensor View - - - View raw Gyro and Accel values, and Raw Radio ins/outs - - - BUT_RAWSensor - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 12 - - - NoControl - - - 236, 35 - - - 97, 23 - - - 63 - - - Restart Mission - - - Restarts the mission from the beginning - - - BUTrestartmission - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 13 - - - NoControl - - - 101, 6 - - - 66, 23 - - - 60 - - - Do Action - - - Preform the action ot the left - - - BUTactiondo - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabActions - - - 14 - - - 4, 22 - - - 407, 116 - - - 2 - - - Actions - tabActions @@ -678,144 +228,6 @@ 0 - - Zoom - - - Microsoft Sans Serif, 9pt - - - 3, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 82 - - - Gvspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 0 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 303, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 80 - - - Gheading - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 1 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 203, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 81 - - - Galt - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 2 - - - Zoom - - - Microsoft Sans Serif, 9pt - - - 103, 6 - - - 0, 0, 0, 0 - - - 100, 100 - - - 79 - - - Double click me to change Max - - - Gspeed - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabGauges - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 0 - - - Gauges - tabGauges @@ -828,24 +240,6 @@ 1 - - True - - - 4, 22 - - - 3, 3, 3, 3 - - - 407, 116 - - - 1 - - - Status - tabStatus @@ -858,171 +252,6 @@ 2 - - 298, 35 - - - 51, 20 - - - 78 - - - 0.00 % - - - lbl_logpercent - - - ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 0 - - - 178, 35 - - - 54, 20 - - - 77 - - - Playback Speed - - - NUM_playbackspeed - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTLogs - - - 1 - - - NoControl - - - 51, 32 - - - 80, 23 - - - 76 - - - Log > KML - - - BUT_log2kml - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 2 - - - NoControl - - - 178, 3 - - - 171, 45 - - - 75 - - - tracklog - - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabTLogs - - - 3 - - - NoControl - - - 89, 3 - - - 80, 23 - - - 73 - - - Play/Pause - - - BUT_playlog - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 4 - - - NoControl - - - 3, 3 - - - 80, 23 - - - 71 - - - Load Log - - - BUT_loadtelem - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabTLogs - - - 5 - - - 4, 22 - - - 407, 116 - - - 3 - - - Telemetry Logs - tabTLogs @@ -1432,6 +661,1299 @@ 0 + + TXT_lat + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 0 + + + Zoomlevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 1 + + + label1 + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 2 + + + TXT_long + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 3 + + + TXT_alt + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + panel1 + + + 4 + + + CHK_autopan + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 5 + + + CB_tuning + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 6 + + + Fill + + + 1, 428 + + + 0, 0, 0, 0 + + + 583, 30 + + + 0 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableMap + + + 1 + + + Fill + + + 0, 0 + + + 2 + + + 585, 459 + + + 75 + + + tableMap + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainH.Panel2 + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,Absolute,30,Absolute,20" /></TableLayoutSettings> + + + MainH.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainH + + + 1 + + + 1008, 461 + + + 417 + + + 68 + + + MainH + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 172, 22 + + + Record Hud to AVI + + + 172, 22 + + + Stop Record + + + BUT_script + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 0 + + + BUT_joystick + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 1 + + + BUT_quickmanual + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 2 + + + BUT_quickrtl + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 3 + + + BUT_quickauto + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 4 + + + CMB_setwp + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 5 + + + BUT_setwp + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 6 + + + CMB_modes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 7 + + + BUT_setmode + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 8 + + + BUT_clear_track + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 9 + + + CMB_action + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 10 + + + BUT_Homealt + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 11 + + + BUT_RAWSensor + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 12 + + + BUTrestartmission + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 13 + + + BUTactiondo + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 14 + + + 4, 22 + + + 407, 116 + + + 2 + + + Actions + + + tabActions + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + + + NoControl + + + 17, 93 + + + 66, 23 + + + 78 + + + Script + + + BUT_script + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 0 + + + 445, 17 + + + NoControl + + + 101, 93 + + + 66, 23 + + + 77 + + + Joystick + + + Setup and enable your joystick + + + BUT_joystick + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 1 + + + NoControl + + + 173, 35 + + + 57, 23 + + + 76 + + + &Manual + + + Change Mode to Manual/Stabalize + + + BUT_quickmanual + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 2 + + + NoControl + + + 173, 64 + + + 57, 23 + + + 75 + + + &RTL + + + Change Mode to RTL + + + BUT_quickrtl + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 3 + + + NoControl + + + 173, 6 + + + 57, 23 + + + 74 + + + &Auto + + + Change mode to Auto + + + BUT_quickauto + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 4 + + + 0 (Home) + + + 4, 35 + + + 91, 21 + + + 72 + + + CMB_setwp + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 5 + + + NoControl + + + 101, 35 + + + 66, 23 + + + 73 + + + Set WP + + + Changes the current target waypoint + + + BUT_setwp + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 6 + + + 4, 64 + + + 91, 21 + + + 70 + + + CMB_modes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 7 + + + NoControl + + + 101, 64 + + + 66, 23 + + + 71 + + + Set Mode + + + Changes to the Mode on the left + + + BUT_setmode + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 8 + + + NoControl + + + 236, 93 + + + 97, 23 + + + 52 + + + Clear Track + + + Clear the recorded path on the map + + + BUT_clear_track + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 9 + + + 4, 6 + + + 91, 21 + + + 59 + + + CMB_action + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabActions + + + 10 + + + NoControl + + + 236, 6 + + + 97, 23 + + + 69 + + + Set Home Alt + + + Set the current display alt as 0, ie home alt is shown as 0 + + + BUT_Homealt + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 11 + + + NoControl + + + 236, 64 + + + 97, 23 + + + 68 + + + Raw Sensor View + + + View raw Gyro and Accel values, and Raw Radio ins/outs + + + BUT_RAWSensor + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 12 + + + NoControl + + + 236, 35 + + + 97, 23 + + + 63 + + + Restart Mission + + + Restarts the mission from the beginning + + + BUTrestartmission + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 13 + + + NoControl + + + 101, 6 + + + 66, 23 + + + 60 + + + Do Action + + + Preform the action ot the left + + + BUTactiondo + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabActions + + + 14 + + + Gvspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 0 + + + Gheading + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 1 + + + Galt + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 2 + + + Gspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 407, 116 + + + 0 + + + Gauges + + + tabGauges + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 3, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 82 + + + Gvspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 0 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 303, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 80 + + + Gheading + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 1 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 203, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 81 + + + Galt + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 2 + + + Zoom + + + Microsoft Sans Serif, 9pt + + + 103, 6 + + + 0, 0, 0, 0 + + + 100, 100 + + + 79 + + + Double click me to change Max + + + Gspeed + + + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabGauges + + + 3 + + + True + + + 4, 22 + + + 3, 3, 3, 3 + + + 407, 116 + + + 1 + + + Status + + + tabStatus + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 2 + + + lbl_logpercent + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 0 + + + NUM_playbackspeed + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 1 + + + BUT_log2kml + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 2 + + + tracklog + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 3 + + + BUT_playlog + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 4 + + + BUT_loadtelem + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 5 + + + 4, 22 + + + 407, 116 + + + 3 + + + Telemetry Logs + + + tabTLogs + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 3 + + + 298, 35 + + + 51, 20 + + + 78 + + + 0.00 % + + + lbl_logpercent + + + ArdupilotMega.MyLabel, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 0 + + + 178, 35 + + + 54, 20 + + + 77 + + + Playback Speed + + + NUM_playbackspeed + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 1 + + + NoControl + + + 51, 32 + + + 80, 23 + + + 76 + + + Log > KML + + + BUT_log2kml + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 2 + + + NoControl + + + 178, 3 + + + 171, 45 + + + 75 + + + tracklog + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabTLogs + + + 3 + + + NoControl + + + 89, 3 + + + 80, 23 + + + 73 + + + Play/Pause + + + BUT_playlog + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 4 + + + NoControl + + + 3, 3 + + + 80, 23 + + + 71 + + + Load Log + + + BUT_loadtelem + + + ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc + + + tabTLogs + + + 5 + Bottom, Left @@ -1651,96 +2173,6 @@ 6 - - Fill - - - 1, 428 - - - 0, 0, 0, 0 - - - 583, 30 - - - 0 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableMap - - - 1 - - - Fill - - - 0, 0 - - - 2 - - - 585, 459 - - - 75 - - - tableMap - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainH.Panel2 - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,Absolute,30,Absolute,20" /></TableLayoutSettings> - - - MainH.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainH - - - 1 - - - 1008, 461 - - - 417 - - - 68 - - - MainH - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Up @@ -1756,6 +2188,9 @@ 17, 17 + + 445, 17 + NoControl diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.Designer.cs index 84db00fb4e..e391627a6f 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.Designer.cs @@ -31,14 +31,14 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightPlanner)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.CHK_altmode = new System.Windows.Forms.CheckBox(); this.CHK_holdalt = new System.Windows.Forms.CheckBox(); this.Commands = new System.Windows.Forms.DataGridView(); @@ -89,6 +89,7 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.panelWaypoints = new BSE.Windows.Forms.Panel(); this.splitter1 = new BSE.Windows.Forms.Splitter(); + this.BUT_loadkml = new ArdupilotMega.MyButton(); this.BUT_zoomto = new ArdupilotMega.MyButton(); this.BUT_Camera = new ArdupilotMega.MyButton(); this.BUT_grid = new ArdupilotMega.MyButton(); @@ -121,7 +122,7 @@ this.label11 = new System.Windows.Forms.Label(); this.panelBASE = new System.Windows.Forms.Panel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.BUT_loadkml = new ArdupilotMega.MyButton(); + this.timer1 = new System.Windows.Forms.Timer(this.components); ((System.ComponentModel.ISupportInitialize)(this.Commands)).BeginInit(); this.panel5.SuspendLayout(); this.panel1.SuspendLayout(); @@ -153,14 +154,14 @@ // this.Commands.AllowUserToAddRows = false; resources.ApplyResources(this.Commands, "Commands"); - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.Commands.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + 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.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.Commands.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.Commands.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Command, this.Param1, @@ -174,17 +175,17 @@ this.Up, this.Down}); this.Commands.Name = "Commands"; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle13.Format = "N0"; - dataGridViewCellStyle13.NullValue = "0"; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - this.Commands.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; - dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Black; - this.Commands.RowsDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.Format = "N0"; + dataGridViewCellStyle5.NullValue = "0"; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + this.Commands.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; + this.Commands.RowsDefaultCellStyle = dataGridViewCellStyle6; this.Commands.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellContentClick); this.Commands.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellEndEdit); this.Commands.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.Commands_DataError); @@ -196,9 +197,9 @@ // // Command // - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69))))); - dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; - this.Command.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69))))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + this.Command.DefaultCellStyle = dataGridViewCellStyle2; this.Command.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox; resources.ApplyResources(this.Command, "Command"); this.Command.Name = "Command"; @@ -264,7 +265,7 @@ // // Up // - this.Up.DefaultCellStyle = dataGridViewCellStyle11; + this.Up.DefaultCellStyle = dataGridViewCellStyle3; resources.ApplyResources(this.Up, "Up"); this.Up.Image = global::ArdupilotMega.Properties.Resources.up; this.Up.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; @@ -272,8 +273,8 @@ // // Down // - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Down.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Down.DefaultCellStyle = dataGridViewCellStyle4; resources.ApplyResources(this.Down, "Down"); this.Down.Image = global::ArdupilotMega.Properties.Resources.down; this.Down.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; @@ -417,8 +418,8 @@ // // dataGridViewImageColumn1 // - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle7; resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1"); this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up; this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; @@ -426,8 +427,8 @@ // // dataGridViewImageColumn2 // - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle8; resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2"); this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down; this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch; @@ -559,6 +560,14 @@ this.splitter1.Name = "splitter1"; this.splitter1.TabStop = false; // + // BUT_loadkml + // + resources.ApplyResources(this.BUT_loadkml, "BUT_loadkml"); + this.BUT_loadkml.Name = "BUT_loadkml"; + this.toolTip1.SetToolTip(this.BUT_loadkml, resources.GetString("BUT_loadkml.ToolTip")); + this.BUT_loadkml.UseVisualStyleBackColor = true; + this.BUT_loadkml.Click += new System.EventHandler(this.BUT_loadkml_Click); + // // BUT_zoomto // resources.ApplyResources(this.BUT_zoomto, "BUT_zoomto"); @@ -844,13 +853,11 @@ resources.ApplyResources(this.panelBASE, "panelBASE"); this.panelBASE.Name = "panelBASE"; // - // BUT_loadkml + // timer1 // - resources.ApplyResources(this.BUT_loadkml, "BUT_loadkml"); - this.BUT_loadkml.Name = "BUT_loadkml"; - this.toolTip1.SetToolTip(this.BUT_loadkml, resources.GetString("BUT_loadkml.ToolTip")); - this.BUT_loadkml.UseVisualStyleBackColor = true; - this.BUT_loadkml.Click += new System.EventHandler(this.BUT_loadkml_Click); + this.timer1.Enabled = true; + this.timer1.Interval = 1000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // // FlightPlanner // @@ -965,5 +972,6 @@ private System.Windows.Forms.DataGridViewImageColumn Down; private MyButton BUT_zoomto; private MyButton BUT_loadkml; + private System.Windows.Forms.Timer timer1; } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs index e2079a3679..3e16841cef 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs @@ -2925,5 +2925,25 @@ namespace ArdupilotMega.GCSViews } } + + private void timer1_Tick(object sender, EventArgs e) + { + try + { + routes.Markers.Clear(); + + PointLatLng currentloc = new PointLatLng(MainV2.cs.lat, MainV2.cs.lng); + + if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane) + { + routes.Markers.Add(new GMapMarkerPlane(currentloc, MainV2.cs.yaw, MainV2.cs.groundcourse, MainV2.cs.nav_bearing, MainV2.cs.target_bearing)); + } + else + { + routes.Markers.Add(new GMapMarkerQuad(currentloc, MainV2.cs.yaw, MainV2.cs.groundcourse, MainV2.cs.nav_bearing)); + } + } + catch { } + } } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.resx index 4526c0fe26..8aeb579016 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.resx @@ -537,75 +537,6 @@ Bottom, Right - - BUT_write - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - panel5 - - - 0 - - - BUT_read - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - panel5 - - - 1 - - - SaveFile - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - panel5 - - - 2 - - - BUT_loadwpfile - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - panel5 - - - 3 - - - 8, 250 - - - 117, 114 - - - 29 - - - panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelAction - - - 1 - NoControl @@ -714,113 +645,29 @@ 3 - - Bottom, Right + + 8, 250 - - label4 + + 117, 114 - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 29 - - panel1 + + panel5 - - 0 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 1 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 2 - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 3 - - - TXT_homealt - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 4 - - - TXT_homelng - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 5 - - - TXT_homelat - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 6 - - - 8, 365 - - - 117, 89 - - - 31 - - - panel1 - - + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panelAction - - 2 + + 1 + + + Bottom, Right True @@ -1005,6 +852,27 @@ 6 + + 8, 365 + + + 117, 89 + + + 31 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelAction + + + 2 + Up @@ -1044,111 +912,6 @@ Bottom, Right - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 1 - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 2 - - - label10 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 3 - - - TXT_mousealt - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 4 - - - TXT_mouselong - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 5 - - - TXT_mouselat - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 6 - - - 8, 130 - - - 114, 79 - - - 38 - - - panel2 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelAction - - - 3 - True @@ -1332,9 +1095,27 @@ 6 - - 172, 17 - + + 8, 130 + + + 114, 79 + + + 38 + + + panel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelAction + + + 3 + Bottom, Right @@ -1347,6 +1128,9 @@ 42 + + 172, 17 + Change the current map type @@ -1470,9 +1254,6 @@ KML overlay - - 172, 17 - Get Camera settings for overlap @@ -1722,105 +1503,6 @@ 3 - - lbl_distance - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelMap - - - 0 - - - lbl_homedist - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelMap - - - 1 - - - lbl_prevdist - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelMap - - - 2 - - - MainMap - - - GMap.NET.WindowsForms.GMapControl, GMap.NET.WindowsForms, Version=1.5.5.5, Culture=neutral, PublicKeyToken=b85b9027b614afef - - - panelMap - - - 3 - - - trackBar1 - - - ArdupilotMega.MyTrackBar, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - panelMap - - - 4 - - - label11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelMap - - - 5 - - - Fill - - - 0, 0 - - - 878, 313 - - - 51 - - - panel6 - - - panelMap - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelBASE - - - 1 - True @@ -1917,6 +1599,93 @@ 17, 17 + + 167, 22 + + + Delete WP + + + 113, 22 + + + Forever + + + 113, 22 + + + Time + + + 113, 22 + + + Circles + + + 167, 22 + + + Loiter + + + 102, 22 + + + Start + + + 102, 22 + + + WP # + + + 167, 22 + + + Jump + + + 164, 6 + + + 167, 22 + + + Measure Distance + + + 167, 22 + + + Rotate Map + + + 174, 22 + + + Add Polygon Point + + + 174, 22 + + + Clear Polygon + + + 167, 22 + + + Grid Polygon + + + 167, 22 + + + Clear Mission + 168, 164 @@ -2092,93 +1861,6 @@ 3 - - 167, 22 - - - Delete WP - - - 167, 22 - - - Loiter - - - 113, 22 - - - Forever - - - 113, 22 - - - Time - - - 113, 22 - - - Circles - - - 167, 22 - - - Jump - - - 102, 22 - - - Start - - - 102, 22 - - - WP # - - - 164, 6 - - - 167, 22 - - - Measure Distance - - - 167, 22 - - - Rotate Map - - - 167, 22 - - - Grid Polygon - - - 174, 22 - - - Add Polygon Point - - - 174, 22 - - - Clear Polygon - - - 167, 22 - - - Clear Mission - Top, Bottom, Right @@ -2242,6 +1924,33 @@ 5 + + Fill + + + 0, 0 + + + 878, 313 + + + 51 + + + panel6 + + + panelMap + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelBASE + + + 1 + Fill @@ -2266,6 +1975,9 @@ 1 + + 269, 17 + True @@ -2452,6 +2164,12 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + timer1 + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FlightPlanner diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs index fd2a7cd1fb..79e20164bd 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs @@ -615,6 +615,8 @@ namespace ArdupilotMega.GCSViews JSBSimSEND.Connect(simIP, simPort); OutputLog.AppendText("Sending to port TCP " + simPort + " (planner->sim)\n"); + System.Threading.Thread.Sleep(2000); + JSBSimSEND.Client.Send(System.Text.Encoding.ASCII.GetBytes("info\n")); JSBSimSEND.Client.Send(System.Text.Encoding.ASCII.GetBytes("set attitude/phi-rad 0\n")); diff --git a/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs b/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs index 736135cb5b..9833042e79 100644 --- a/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs +++ b/Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs @@ -154,7 +154,6 @@ namespace ArdupilotMega.HIL accel3D += air_resistance; Random rand = new Random(); - int fixme; //velocity.X += .02 + rand.NextDouble() * .03; //velocity.Y += .02 + rand.NextDouble() * .03; diff --git a/Tools/ArdupilotMegaPlanner/MAVLink.cs b/Tools/ArdupilotMegaPlanner/MAVLink.cs index 685136fb38..2ddca32b5f 100644 --- a/Tools/ArdupilotMegaPlanner/MAVLink.cs +++ b/Tools/ArdupilotMegaPlanner/MAVLink.cs @@ -2319,7 +2319,7 @@ namespace ArdupilotMega date1 = date1.AddMilliseconds(dateint / 1000); - lastlogread = date1; + lastlogread = date1.ToLocalTime(); MainV2.cs.datetime = lastlogread; diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs index 53b068c165..9698638b7c 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.cs @@ -123,7 +123,7 @@ namespace ArdupilotMega comPort.BaseStream.BaudRate = 115200; - CMB_serialport.Items.AddRange(SerialPort.GetPortNames()); + CMB_serialport.Items.AddRange(GetPortNames()); CMB_serialport.Items.Add("TCP"); CMB_serialport.Items.Add("UDP"); if (CMB_serialport.Items.Count > 0) @@ -248,6 +248,25 @@ namespace ArdupilotMega splash.Close(); } + private string[] GetPortNames() + { + string[] devs = new string[0]; + + if (MONO) + { + devs = Directory.GetFiles("/dev/","*ACM*"); + } + + string[] ports = SerialPort.GetPortNames(); + + string[] all = new string[devs.Length + ports.Length]; + + devs.CopyTo(all, 0); + ports.CopyTo(all, devs.Length); + + return all; + } + internal void ScreenShot() { Rectangle bounds = Screen.GetBounds(Point.Empty); @@ -268,7 +287,7 @@ namespace ArdupilotMega { string oldport = CMB_serialport.Text; CMB_serialport.Items.Clear(); - CMB_serialport.Items.AddRange(SerialPort.GetPortNames()); + CMB_serialport.Items.AddRange(GetPortNames()); CMB_serialport.Items.Add("TCP"); CMB_serialport.Items.Add("UDP"); if (CMB_serialport.Items.Contains(oldport)) @@ -1736,10 +1755,12 @@ namespace ArdupilotMega if (keyData == (Keys.Control | Keys.Y)) // for ryan beall { #if MAVLINK10 - int fixme; - //MainV2.comPort.doCommand(MAVLink.MAV_ACTION.MAV_ACTION_STORAGE_WRITE); + // write + MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_STORAGE, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + //read + ///////MainV2.comPort.doCommand(MAVLink.MAV_CMD.PREFLIGHT_STORAGE, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); #else - MainV2.comPort.doAction(MAVLink.MAV_ACTION.MAV_ACTION_STORAGE_WRITE); + MainV2.comPort.doAction(MAVLink.MAV_ACTION.MAV_ACTION_STORAGE_WRITE); #endif MessageBox.Show("Done MAV_ACTION_STORAGE_WRITE"); return true; diff --git a/Tools/ArdupilotMegaPlanner/MavlinkLog.cs b/Tools/ArdupilotMegaPlanner/MavlinkLog.cs index 3f309a5e99..e9b3058020 100644 --- a/Tools/ArdupilotMegaPlanner/MavlinkLog.cs +++ b/Tools/ArdupilotMegaPlanner/MavlinkLog.cs @@ -53,17 +53,33 @@ namespace ArdupilotMega style.Id = "yellowLineGreenPoly"; style.Line = new LineStyle(new Color32(HexStringToColor("7f00ffff")), 4); + + PolygonStyle pstyle = new PolygonStyle(); pstyle.Color = new Color32(HexStringToColor("7f00ff00")); style.Polygon = pstyle; kml.AddStyle(style); + Style stylet = new Style(); + stylet.Id = "track"; + SharpKml.Dom.IconStyle ico = new SharpKml.Dom.IconStyle(); + stylet.Icon = ico; + ico.Icon = new IconStyle.IconLink(new Uri("http://earth.google.com/images/kml-icons/track-directional/track-none.png")); + stylet.Icon.Scale = 0.5; + //stylet.Label.Scale = 0; + + kml.AddStyle(stylet); + // create sub folders Folder planes = new Folder(); planes.Name = "Planes"; kml.AddFeature(planes); + Folder points = new Folder(); + points.Name = "Points"; + kml.AddFeature(points); + // coords for line string CoordinateCollection coords = new CoordinateCollection(); @@ -157,7 +173,7 @@ namespace ArdupilotMega Placemark pmplane = new Placemark(); - pmplane.Name = "Plane " + a; + pmplane.Name = "Point " + a; @@ -170,6 +186,9 @@ namespace ArdupilotMega loc.Longitude = cs.lng; loc.Altitude = cs.alt; + if (loc.Altitude < 0) + loc.Altitude = 0.01; + SharpKml.Dom.Orientation ori = new SharpKml.Dom.Orientation(); ori.Heading = cs.yaw; ori.Roll = -cs.roll; @@ -192,10 +211,10 @@ namespace ArdupilotMega Description desc = new Description(); desc.Text = @" - Roll: " + model.Orientation.Roll + @" - Pitch: " + model.Orientation.Tilt + @" - Yaw: " + model.Orientation.Heading + @" - + Roll: " + model.Orientation.Roll.Value.ToString("0.00") + @" + Pitch: " + model.Orientation.Tilt.Value.ToString("0.00") + @" + Yaw: " + model.Orientation.Heading.Value.ToString("0.00") + @" + Time: " + cs.datetime.ToString("HH:mm:sszzzzzz") + @" ]]>"; @@ -212,6 +231,25 @@ namespace ArdupilotMega planes.AddFeature(pmplane); + /// + + Placemark pmt = new Placemark(); + + SharpKml.Dom.Point pnt = new SharpKml.Dom.Point(); + pnt.AltitudeMode = SharpKml.Dom.AltitudeMode.Absolute; + pnt.Coordinate = new Vector(cs.lat,cs.lng,cs.alt); + + pmt.Name = "" + a; + + pmt.Description = pmplane.Description; + + pmt.Time = tstamp; + + pmt.Geometry = pnt; + pmt.StyleUrl = new Uri("#track", UriKind.Relative); + + points.AddFeature(pmt); + a++; } @@ -274,8 +312,6 @@ namespace ArdupilotMega zipStream.IsStreamOwner = true; // Makes the Close also Close the underlying stream zipStream.Close(); - File.Delete(filename); - flightdata.Clear(); } @@ -335,6 +371,11 @@ namespace ArdupilotMega cs.UpdateCurrentSettings(null, true, mine); + if (cs.datetime.Second % 5 == 0) + { + //Application.DoEvents(); + } + try { if (MainV2.talk != null) @@ -345,7 +386,7 @@ namespace ArdupilotMega if ((float)(cs.lat + cs.lng) != oldlatlngalt && cs.lat != 0 && cs.lng != 0) { - Console.WriteLine(cs.lat + " " + cs.lng + " " + cs.alt + " lah " + (float)(cs.lat + cs.lng + cs.alt) + "!=" + oldlatlngalt); + Console.WriteLine(cs.lat + " " + cs.lng + " " + cs.alt + " lah " + (float)(cs.lat + cs.lng) + "!=" + oldlatlngalt); CurrentState cs2 = (CurrentState)cs.Clone(); flightdata.Add(cs2); diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 5bb404633b..d921a5af50 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.0.0.0")] -[assembly: AssemblyFileVersion("1.1.3")] +[assembly: AssemblyFileVersion("1.1.4")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs index ecf13e02aa..4d3f37c5c5 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs @@ -34,12 +34,18 @@ this.tabReset = new System.Windows.Forms.TabPage(); this.BUT_reset = new ArdupilotMega.MyButton(); this.tabRadioIn = new System.Windows.Forms.TabPage(); + this.groupBoxElevons = new System.Windows.Forms.GroupBox(); + this.CHK_mixmode = new System.Windows.Forms.CheckBox(); + this.CHK_elevonch2rev = new System.Windows.Forms.CheckBox(); + this.CHK_elevonrev = new System.Windows.Forms.CheckBox(); + this.CHK_elevonch1rev = new System.Windows.Forms.CheckBox(); this.CHK_revch3 = new System.Windows.Forms.CheckBox(); this.CHK_revch4 = new System.Windows.Forms.CheckBox(); this.CHK_revch2 = new System.Windows.Forms.CheckBox(); this.CHK_revch1 = new System.Windows.Forms.CheckBox(); this.BUT_Calibrateradio = new ArdupilotMega.MyButton(); this.BAR8 = new ArdupilotMega.HorizontalProgressBar2(); + this.currentStateBindingSource = new System.Windows.Forms.BindingSource(this.components); this.BAR7 = new ArdupilotMega.HorizontalProgressBar2(); this.BAR6 = new ArdupilotMega.HorizontalProgressBar2(); this.BAR5 = new ArdupilotMega.HorizontalProgressBar2(); @@ -78,12 +84,18 @@ this.CMB_fmode1 = new System.Windows.Forms.ComboBox(); this.BUT_SaveModes = new ArdupilotMega.MyButton(); this.tabHardware = new System.Windows.Forms.TabPage(); + this.CMB_sonartype = new System.Windows.Forms.ComboBox(); + this.CHK_enableoptflow = new System.Windows.Forms.CheckBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.linkLabelmagdec = new System.Windows.Forms.LinkLabel(); this.label100 = new System.Windows.Forms.Label(); this.TXT_declination = new System.Windows.Forms.TextBox(); this.CHK_enableairspeed = new System.Windows.Forms.CheckBox(); this.CHK_enablesonar = new System.Windows.Forms.CheckBox(); this.CHK_enablecompass = new System.Windows.Forms.CheckBox(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tabBattery = new System.Windows.Forms.TabPage(); this.TXT_ampspervolt = new System.Windows.Forms.TextBox(); this.TXT_divider = new System.Windows.Forms.TextBox(); @@ -100,11 +112,14 @@ this.label30 = new System.Windows.Forms.Label(); this.TXT_battcapacity = new System.Windows.Forms.TextBox(); this.CMB_batmontype = new System.Windows.Forms.ComboBox(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.tabArducopter = new System.Windows.Forms.TabPage(); this.label28 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); this.BUT_levelac2 = new ArdupilotMega.MyButton(); + this.pictureBoxQuadX = new System.Windows.Forms.PictureBox(); + this.pictureBoxQuad = new System.Windows.Forms.PictureBox(); this.tabHeli = new System.Windows.Forms.TabPage(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label46 = new System.Windows.Forms.Label(); @@ -155,25 +170,24 @@ this.BUT_swash_manual = new ArdupilotMega.MyButton(); this.HS4 = new ArdupilotMega.HorizontalProgressBar2(); this.HS3 = new ArdupilotMega.VerticalProgressBar2(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.currentStateBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.pictureBox4 = new System.Windows.Forms.PictureBox(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.pictureBox5 = new System.Windows.Forms.PictureBox(); - this.pictureBoxQuadX = new System.Windows.Forms.PictureBox(); - this.pictureBoxQuad = new System.Windows.Forms.PictureBox(); this.Gservoloc = new AGaugeApp.AGauge(); - this.CHK_enableoptflow = new System.Windows.Forms.CheckBox(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.CMB_sonartype = new System.Windows.Forms.ComboBox(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.tabControl1.SuspendLayout(); this.tabReset.SuspendLayout(); this.tabRadioIn.SuspendLayout(); + this.groupBoxElevons.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit(); this.tabModes.SuspendLayout(); this.tabHardware.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabBattery.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); this.tabArducopter.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit(); this.tabHeli.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -182,14 +196,6 @@ ((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HS1_TRIM)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // tabControl1 @@ -223,6 +229,7 @@ // // tabRadioIn // + this.tabRadioIn.Controls.Add(this.groupBoxElevons); this.tabRadioIn.Controls.Add(this.CHK_revch3); this.tabRadioIn.Controls.Add(this.CHK_revch4); this.tabRadioIn.Controls.Add(this.CHK_revch2); @@ -240,6 +247,48 @@ this.tabRadioIn.Name = "tabRadioIn"; this.tabRadioIn.UseVisualStyleBackColor = true; // + // groupBoxElevons + // + this.groupBoxElevons.Controls.Add(this.CHK_mixmode); + this.groupBoxElevons.Controls.Add(this.CHK_elevonch2rev); + this.groupBoxElevons.Controls.Add(this.CHK_elevonrev); + this.groupBoxElevons.Controls.Add(this.CHK_elevonch1rev); + resources.ApplyResources(this.groupBoxElevons, "groupBoxElevons"); + this.groupBoxElevons.Name = "groupBoxElevons"; + this.groupBoxElevons.TabStop = false; + // + // CHK_mixmode + // + resources.ApplyResources(this.CHK_mixmode, "CHK_mixmode"); + this.CHK_mixmode.Name = "CHK_mixmode"; + this.toolTip1.SetToolTip(this.CHK_mixmode, resources.GetString("CHK_mixmode.ToolTip")); + this.CHK_mixmode.UseVisualStyleBackColor = true; + this.CHK_mixmode.CheckedChanged += new System.EventHandler(this.CHK_mixmode_CheckedChanged); + // + // CHK_elevonch2rev + // + resources.ApplyResources(this.CHK_elevonch2rev, "CHK_elevonch2rev"); + this.CHK_elevonch2rev.Name = "CHK_elevonch2rev"; + this.toolTip1.SetToolTip(this.CHK_elevonch2rev, resources.GetString("CHK_elevonch2rev.ToolTip")); + this.CHK_elevonch2rev.UseVisualStyleBackColor = true; + this.CHK_elevonch2rev.CheckedChanged += new System.EventHandler(this.CHK_elevonch2rev_CheckedChanged); + // + // CHK_elevonrev + // + resources.ApplyResources(this.CHK_elevonrev, "CHK_elevonrev"); + this.CHK_elevonrev.Name = "CHK_elevonrev"; + this.toolTip1.SetToolTip(this.CHK_elevonrev, resources.GetString("CHK_elevonrev.ToolTip")); + this.CHK_elevonrev.UseVisualStyleBackColor = true; + this.CHK_elevonrev.CheckedChanged += new System.EventHandler(this.CHK_elevonrev_CheckedChanged); + // + // CHK_elevonch1rev + // + resources.ApplyResources(this.CHK_elevonch1rev, "CHK_elevonch1rev"); + this.CHK_elevonch1rev.Name = "CHK_elevonch1rev"; + this.toolTip1.SetToolTip(this.CHK_elevonch1rev, resources.GetString("CHK_elevonch1rev.ToolTip")); + this.CHK_elevonch1rev.UseVisualStyleBackColor = true; + this.CHK_elevonch1rev.CheckedChanged += new System.EventHandler(this.CHK_elevonch1rev_CheckedChanged); + // // CHK_revch3 // resources.ApplyResources(this.CHK_revch3, "CHK_revch3"); @@ -290,6 +339,10 @@ this.BAR8.Value = 1500; this.BAR8.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(255))))); // + // currentStateBindingSource + // + this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState); + // // BAR7 // this.BAR7.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(255))))); @@ -626,6 +679,33 @@ resources.ApplyResources(this.tabHardware, "tabHardware"); this.tabHardware.Name = "tabHardware"; // + // CMB_sonartype + // + this.CMB_sonartype.FormattingEnabled = true; + this.CMB_sonartype.Items.AddRange(new object[] { + resources.GetString("CMB_sonartype.Items"), + resources.GetString("CMB_sonartype.Items1"), + resources.GetString("CMB_sonartype.Items2")}); + resources.ApplyResources(this.CMB_sonartype, "CMB_sonartype"); + this.CMB_sonartype.Name = "CMB_sonartype"; + this.CMB_sonartype.SelectedIndexChanged += new System.EventHandler(this.CMB_sonartype_SelectedIndexChanged); + // + // CHK_enableoptflow + // + resources.ApplyResources(this.CHK_enableoptflow, "CHK_enableoptflow"); + this.CHK_enableoptflow.Name = "CHK_enableoptflow"; + this.CHK_enableoptflow.UseVisualStyleBackColor = true; + this.CHK_enableoptflow.CheckedChanged += new System.EventHandler(this.CHK_enableoptflow_CheckedChanged); + // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.Color.White; + this.pictureBox2.BackgroundImage = global::ArdupilotMega.Properties.Resources.BR_0016_01_3T; + resources.ApplyResources(this.pictureBox2, "pictureBox2"); + this.pictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.TabStop = false; + // // linkLabelmagdec // resources.ApplyResources(this.linkLabelmagdec, "linkLabelmagdec"); @@ -666,6 +746,32 @@ this.CHK_enablecompass.UseVisualStyleBackColor = true; this.CHK_enablecompass.CheckedChanged += new System.EventHandler(this.CHK_enablecompass_CheckedChanged); // + // pictureBox4 + // + this.pictureBox4.BackColor = System.Drawing.Color.White; + this.pictureBox4.BackgroundImage = global::ArdupilotMega.Properties.Resources.airspeed; + resources.ApplyResources(this.pictureBox4, "pictureBox4"); + this.pictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.TabStop = false; + // + // pictureBox3 + // + this.pictureBox3.BackColor = System.Drawing.Color.White; + this.pictureBox3.BackgroundImage = global::ArdupilotMega.Properties.Resources.sonar; + resources.ApplyResources(this.pictureBox3, "pictureBox3"); + this.pictureBox3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.TabStop = false; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::ArdupilotMega.Properties.Resources.compass; + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.TabStop = false; + // // tabBattery // this.tabBattery.Controls.Add(this.TXT_ampspervolt); @@ -784,6 +890,15 @@ this.CMB_batmontype.Name = "CMB_batmontype"; this.CMB_batmontype.SelectedIndexChanged += new System.EventHandler(this.CMB_batmontype_SelectedIndexChanged); // + // pictureBox5 + // + this.pictureBox5.BackColor = System.Drawing.Color.White; + this.pictureBox5.BackgroundImage = global::ArdupilotMega.Properties.Resources.attocurrent; + resources.ApplyResources(this.pictureBox5, "pictureBox5"); + this.pictureBox5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.TabStop = false; + // // tabArducopter // this.tabArducopter.Controls.Add(this.label28); @@ -818,6 +933,24 @@ this.BUT_levelac2.UseVisualStyleBackColor = true; this.BUT_levelac2.Click += new System.EventHandler(this.BUT_levelac2_Click); // + // pictureBoxQuadX + // + this.pictureBoxQuadX.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBoxQuadX.Image = global::ArdupilotMega.Properties.Resources.frames_04; + 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.frames_03; + resources.ApplyResources(this.pictureBoxQuad, "pictureBoxQuad"); + this.pictureBoxQuad.Name = "pictureBoxQuad"; + this.pictureBoxQuad.TabStop = false; + this.pictureBoxQuad.Click += new System.EventHandler(this.pictureBoxQuad_Click); + // // tabHeli // this.tabHeli.Controls.Add(this.groupBox3); @@ -1244,63 +1377,6 @@ this.HS3.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(148)))), ((int)(((byte)(193)))), ((int)(((byte)(31))))); this.HS3.Paint += new System.Windows.Forms.PaintEventHandler(this.HS3_Paint); // - // currentStateBindingSource - // - this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState); - // - // pictureBox4 - // - this.pictureBox4.BackColor = System.Drawing.Color.White; - this.pictureBox4.BackgroundImage = global::ArdupilotMega.Properties.Resources.airspeed; - resources.ApplyResources(this.pictureBox4, "pictureBox4"); - this.pictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.TabStop = false; - // - // pictureBox3 - // - this.pictureBox3.BackColor = System.Drawing.Color.White; - this.pictureBox3.BackgroundImage = global::ArdupilotMega.Properties.Resources.sonar; - resources.ApplyResources(this.pictureBox3, "pictureBox3"); - this.pictureBox3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.TabStop = false; - // - // pictureBox1 - // - this.pictureBox1.BackgroundImage = global::ArdupilotMega.Properties.Resources.compass; - resources.ApplyResources(this.pictureBox1, "pictureBox1"); - this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.TabStop = false; - // - // pictureBox5 - // - this.pictureBox5.BackColor = System.Drawing.Color.White; - this.pictureBox5.BackgroundImage = global::ArdupilotMega.Properties.Resources.attocurrent; - resources.ApplyResources(this.pictureBox5, "pictureBox5"); - this.pictureBox5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.TabStop = false; - // - // pictureBoxQuadX - // - this.pictureBoxQuadX.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBoxQuadX.Image = global::ArdupilotMega.Properties.Resources.frames_04; - 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.frames_03; - resources.ApplyResources(this.pictureBoxQuad, "pictureBoxQuad"); - this.pictureBoxQuad.Name = "pictureBoxQuad"; - this.pictureBoxQuad.TabStop = false; - this.pictureBoxQuad.Click += new System.EventHandler(this.pictureBoxQuad_Click); - // // Gservoloc // this.Gservoloc.BackColor = System.Drawing.Color.Transparent; @@ -1444,33 +1520,6 @@ this.Gservoloc.Value2 = 180F; this.Gservoloc.Value3 = 0F; // - // CHK_enableoptflow - // - resources.ApplyResources(this.CHK_enableoptflow, "CHK_enableoptflow"); - this.CHK_enableoptflow.Name = "CHK_enableoptflow"; - this.CHK_enableoptflow.UseVisualStyleBackColor = true; - this.CHK_enableoptflow.CheckedChanged += new System.EventHandler(this.CHK_enableoptflow_CheckedChanged); - // - // pictureBox2 - // - this.pictureBox2.BackColor = System.Drawing.Color.White; - this.pictureBox2.BackgroundImage = global::ArdupilotMega.Properties.Resources.BR_0016_01_3T; - resources.ApplyResources(this.pictureBox2, "pictureBox2"); - this.pictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.TabStop = false; - // - // CMB_sonartype - // - this.CMB_sonartype.FormattingEnabled = true; - this.CMB_sonartype.Items.AddRange(new object[] { - resources.GetString("CMB_sonartype.Items"), - resources.GetString("CMB_sonartype.Items1"), - resources.GetString("CMB_sonartype.Items2")}); - resources.ApplyResources(this.CMB_sonartype, "CMB_sonartype"); - this.CMB_sonartype.Name = "CMB_sonartype"; - this.CMB_sonartype.SelectedIndexChanged += new System.EventHandler(this.CMB_sonartype_SelectedIndexChanged); - // // Setup // resources.ApplyResources(this, "$this"); @@ -1484,14 +1533,24 @@ this.tabReset.ResumeLayout(false); this.tabRadioIn.ResumeLayout(false); this.tabRadioIn.PerformLayout(); + this.groupBoxElevons.ResumeLayout(false); + this.groupBoxElevons.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).EndInit(); this.tabModes.ResumeLayout(false); this.tabModes.PerformLayout(); this.tabHardware.ResumeLayout(false); this.tabHardware.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabBattery.ResumeLayout(false); this.tabBattery.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); this.tabArducopter.ResumeLayout(false); this.tabArducopter.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).EndInit(); this.tabHeli.ResumeLayout(false); this.tabHeli.PerformLayout(); this.groupBox3.ResumeLayout(false); @@ -1504,14 +1563,6 @@ ((System.ComponentModel.ISupportInitialize)(this.HS3_TRIM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HS2_TRIM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.HS1_TRIM)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.currentStateBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuadX)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxQuad)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -1655,6 +1706,11 @@ private System.Windows.Forms.CheckBox CHK_enableoptflow; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.ComboBox CMB_sonartype; + private System.Windows.Forms.CheckBox CHK_mixmode; + private System.Windows.Forms.CheckBox CHK_elevonch2rev; + private System.Windows.Forms.CheckBox CHK_elevonch1rev; + private System.Windows.Forms.CheckBox CHK_elevonrev; + private System.Windows.Forms.GroupBox groupBoxElevons; } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.cs b/Tools/ArdupilotMegaPlanner/Setup/Setup.cs index 92648b2a26..1019e1b9d9 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.cs +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.cs @@ -273,6 +273,20 @@ namespace ArdupilotMega.Setup if (tabControl1.SelectedTab == tabRadioIn) { startup = true; + + if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2) + { + groupBoxElevons.Visible = false; + } + + try + { + CHK_mixmode.Checked = MainV2.comPort.param["ELEVON_MIXING"].ToString() == "1"; + CHK_elevonrev.Checked = MainV2.comPort.param["ELEVON_REVERSE"].ToString() == "1"; + CHK_elevonch1rev.Checked = MainV2.comPort.param["ELEVON_CH1_REV"].ToString() == "1"; + CHK_elevonch2rev.Checked = MainV2.comPort.param["ELEVON_CH2_REV"].ToString() == "1"; + } + catch { } // this will fail on arducopter try { CHK_revch1.Checked = MainV2.comPort.param["RC1_REV"].ToString() == "-1"; @@ -280,7 +294,7 @@ namespace ArdupilotMega.Setup 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"); } + catch (Exception ex) { MessageBox.Show("Missing RC rev Param "+ex.ToString()); } startup = false; } @@ -1305,5 +1319,77 @@ namespace ArdupilotMega.Setup } catch { MessageBox.Show("Set SONAR_TYPE Failed"); } } + + private void CHK_mixmode_CheckedChanged(object sender, EventArgs e) + { + if (startup) + return; + try + { + if (MainV2.comPort.param["ELEVON_MIXING"] == null) + { + MessageBox.Show("Not Available on " + MainV2.cs.firmware.ToString()); + } + else + { + MainV2.comPort.setParam("ELEVON_MIXING", ((CheckBox)sender).Checked == true ? 1 : 0); + } + } + catch { MessageBox.Show("Set ELEVON_MIXING Failed"); } + } + + private void CHK_elevonrev_CheckedChanged(object sender, EventArgs e) + { + if (startup) + return; + try + { + if (MainV2.comPort.param["ELEVON_REVERSE"] == null) + { + MessageBox.Show("Not Available on " + MainV2.cs.firmware.ToString()); + } + else + { + MainV2.comPort.setParam("ELEVON_REVERSE", ((CheckBox)sender).Checked == true ? 1 : 0); + } + } + catch { MessageBox.Show("Set ELEVON_REVERSE Failed"); } + } + + private void CHK_elevonch1rev_CheckedChanged(object sender, EventArgs e) + { + if (startup) + return; + try + { + if (MainV2.comPort.param["ELEVON_CH1_REV"] == null) + { + MessageBox.Show("Not Available on " + MainV2.cs.firmware.ToString()); + } + else + { + MainV2.comPort.setParam("ELEVON_CH1_REV", ((CheckBox)sender).Checked == true ? 1 : 0); + } + } + catch { MessageBox.Show("Set ELEVON_CH1_REV Failed"); } + } + + private void CHK_elevonch2rev_CheckedChanged(object sender, EventArgs e) + { + if (startup) + return; + try + { + if (MainV2.comPort.param["ELEVON_CH2_REV"] == null) + { + MessageBox.Show("Not Available on " + MainV2.cs.firmware.ToString()); + } + else + { + MainV2.comPort.setParam("ELEVON_CH2_REV", ((CheckBox)sender).Checked == true ? 1 : 0); + } + } + catch { MessageBox.Show("Set ELEVON_CH2_REV Failed"); } + } } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx index 009bae6e54..7708418170 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx @@ -155,6 +155,184 @@ 0 + + 214, 17 + + + True + + + + NoControl + + + 13, 19 + + + 64, 17 + + + 107 + + + Elevons + + + Enable Elevons + + + CHK_mixmode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBoxElevons + + + 0 + + + True + + + NoControl + + + 292, 19 + + + 111, 17 + + + 110 + + + Elevons CH2 Rev + + + Reverse ch2 elevon + + + CHK_elevonch2rev + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBoxElevons + + + 1 + + + True + + + NoControl + + + 82, 19 + + + 87, 17 + + + 108 + + + Elevons Rev + + + Reverse Elevon direction + + + CHK_elevonrev + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBoxElevons + + + 2 + + + True + + + NoControl + + + 175, 19 + + + 111, 17 + + + 109 + + + Elevons CH1 Rev + + + Reverse ch1 elevon + + + CHK_elevonch1rev + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBoxElevons + + + 3 + + + 21, 340 + + + 409, 42 + + + 111 + + + Elevon Config + + + groupBoxElevons + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRadioIn + + + 0 + + + True + + + NoControl + + + 287, 158 + + + 66, 17 + + + 106 + + + Reverse + CHK_revch3 @@ -165,7 +343,25 @@ tabRadioIn - 0 + 1 + + + True + + + NoControl + + + 315, 310 + + + 66, 17 + + + 105 + + + Reverse CHK_revch4 @@ -177,7 +373,25 @@ tabRadioIn - 1 + 2 + + + True + + + NoControl + + + 71, 158 + + + 66, 17 + + + 104 + + + Reverse CHK_revch2 @@ -189,7 +403,25 @@ tabRadioIn - 2 + 3 + + + True + + + NoControl + + + 315, 12 + + + 66, 17 + + + 103 + + + Reverse CHK_revch1 @@ -201,7 +433,22 @@ tabRadioIn - 3 + 4 + + + NoControl + + + 482, 340 + + + 134, 23 + + + 102 + + + Calibrate Radio BUT_Calibrateradio @@ -213,7 +460,19 @@ tabRadioIn - 4 + 5 + + + 17, 17 + + + 446, 240 + + + 170, 25 + + + 101 BAR8 @@ -225,7 +484,16 @@ tabRadioIn - 5 + 6 + + + 446, 185 + + + 170, 25 + + + 100 BAR7 @@ -237,7 +505,16 @@ tabRadioIn - 6 + 7 + + + 446, 130 + + + 170, 25 + + + 99 BAR6 @@ -249,7 +526,16 @@ tabRadioIn - 7 + 8 + + + 446, 75 + + + 170, 25 + + + 98 BAR5 @@ -261,7 +547,16 @@ tabRadioIn - 8 + 9 + + + 143, 61 + + + 47, 211 + + + 96 BARpitch @@ -273,7 +568,16 @@ tabRadioIn - 9 + 10 + + + 359, 61 + + + 47, 211 + + + 95 BARthrottle @@ -285,7 +589,16 @@ tabRadioIn - 10 + 11 + + + 21, 304 + + + 288, 23 + + + 94 BARyaw @@ -297,7 +610,16 @@ tabRadioIn - 11 + 12 + + + 21, 6 + + + 288, 23 + + + 93 BARroll @@ -309,12 +631,11 @@ tabRadioIn - 12 + 13 4, 22 - 3, 3, 3, 3 @@ -711,24 +1032,6 @@ 2 - - XL-EZ0 - - - LV-EZ0 - - - XL-EXL0 - - - 308, 134 - - - 121, 21 - - - 31 - CMB_sonartype @@ -741,21 +1044,6 @@ 0 - - NoControl - - - 162, 297 - - - 134, 19 - - - 30 - - - Enable Optical Flow - CHK_enableoptflow @@ -768,21 +1056,6 @@ 1 - - Zoom - - - NoControl - - - 78, 271 - - - 75, 75 - - - 29 - pictureBox2 @@ -795,24 +1068,6 @@ 2 - - True - - - NoControl - - - 390, 80 - - - 104, 13 - - - 28 - - - Declination WebSite - linkLabelmagdec @@ -825,21 +1080,6 @@ 3 - - NoControl - - - 305, 57 - - - 72, 16 - - - 23 - - - Declination - label100 @@ -852,21 +1092,6 @@ 4 - - 214, 17 - - - 383, 57 - - - 121, 20 - - - 20 - - - Magnetic Declination (-20.0 to 20.0) eg 2° 3' W is -2.3 - TXT_declination @@ -879,21 +1104,6 @@ 5 - - NoControl - - - 162, 214 - - - 103, 17 - - - 24 - - - Enable Airspeed - CHK_enableairspeed @@ -906,21 +1116,6 @@ 6 - - NoControl - - - 159, 136 - - - 90, 17 - - - 25 - - - Enable Sonar - CHK_enablesonar @@ -933,21 +1128,6 @@ 7 - - NoControl - - - 162, 56 - - - 105, 17 - - - 27 - - - Enable Compass - CHK_enablecompass @@ -960,21 +1140,6 @@ 8 - - Zoom - - - NoControl - - - 78, 188 - - - 75, 75 - - - 3 - pictureBox4 @@ -987,21 +1152,6 @@ 9 - - Zoom - - - NoControl - - - 78, 106 - - - 75, 75 - - - 2 - pictureBox3 @@ -1014,27 +1164,6 @@ 10 - - Zoom - - - - - - NoControl - - - - - - 78, 25 - - - 75, 75 - - - 0 - pictureBox1 @@ -1896,324 +2025,9 @@ 0 - - True - - - NoControl - - - 287, 158 - - - 66, 17 - - - 106 - - - Reverse - - - CHK_revch3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 0 - - - True - - - NoControl - - - 315, 310 - - - 66, 17 - - - 105 - - - Reverse - - - CHK_revch4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 1 - - - True - - - NoControl - - - 71, 158 - - - 66, 17 - - - 104 - - - Reverse - - - CHK_revch2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 2 - - - True - - - NoControl - - - 315, 12 - - - 66, 17 - - - 103 - - - Reverse - - - CHK_revch1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 3 - - - NoControl - - - 482, 340 - - - 134, 23 - - - 102 - - - Calibrate Radio - - - BUT_Calibrateradio - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 4 - 17, 17 - - 446, 240 - - - 170, 25 - - - 101 - - - BAR8 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 5 - - - 446, 185 - - - 170, 25 - - - 100 - - - BAR7 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 6 - - - 446, 130 - - - 170, 25 - - - 99 - - - BAR6 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 7 - - - 446, 75 - - - 170, 25 - - - 98 - - - BAR5 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 8 - - - 143, 61 - - - 47, 211 - - - 96 - - - BARpitch - - - ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 9 - - - 359, 61 - - - 47, 211 - - - 95 - - - BARthrottle - - - ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 10 - - - 21, 304 - - - 288, 23 - - - 94 - - - BARyaw - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 11 - - - 21, 6 - - - 288, 23 - - - 93 - - - BARroll - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 12 - True @@ -3063,6 +2877,339 @@ 28 + + XL-EZ0 + + + LV-EZ0 + + + XL-EXL0 + + + 308, 134 + + + 121, 21 + + + 31 + + + CMB_sonartype + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 0 + + + NoControl + + + 162, 297 + + + 134, 19 + + + 30 + + + Enable Optical Flow + + + CHK_enableoptflow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 1 + + + Zoom + + + NoControl + + + 78, 271 + + + 75, 75 + + + 29 + + + pictureBox2 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 2 + + + True + + + NoControl + + + 390, 80 + + + 104, 13 + + + 28 + + + Declination WebSite + + + linkLabelmagdec + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 3 + + + NoControl + + + 305, 57 + + + 72, 16 + + + 23 + + + Declination + + + label100 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 4 + + + 383, 57 + + + 121, 20 + + + 20 + + + Magnetic Declination (-20.0 to 20.0) eg 2° 3' W is -2.3 + + + TXT_declination + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 5 + + + NoControl + + + 162, 214 + + + 103, 17 + + + 24 + + + Enable Airspeed + + + CHK_enableairspeed + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 6 + + + NoControl + + + 159, 136 + + + 90, 17 + + + 25 + + + Enable Sonar + + + CHK_enablesonar + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 7 + + + NoControl + + + 162, 56 + + + 105, 17 + + + 27 + + + Enable Compass + + + CHK_enablecompass + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 8 + + + Zoom + + + NoControl + + + 78, 188 + + + 75, 75 + + + 3 + + + pictureBox4 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 9 + + + Zoom + + + NoControl + + + 78, 106 + + + 75, 75 + + + 2 + + + pictureBox3 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 10 + + + Zoom + + + + + + NoControl + + + + + + 78, 25 + + + 75, 75 + + + 0 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 11 + 162, 267 @@ -3495,6 +3642,33 @@ 14 + + Zoom + + + NoControl + + + 31, 21 + + + 75, 75 + + + 2 + + + pictureBox5 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabBattery + + + 15 + True @@ -3613,6 +3787,60 @@ will work with hexa's etc 3 + + NoControl + + + 319, 140 + + + 190, 190 + + + Zoom + + + 5 + + + pictureBoxQuadX + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabArducopter + + + 4 + + + NoControl + + + 112, 140 + + + 190, 190 + + + Zoom + + + 4 + + + pictureBoxQuad + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabArducopter + + + 5 + label46 @@ -5083,93 +5311,6 @@ will work with hexa's etc 34 - - 214, 17 - - - 17, 17 - - - Zoom - - - NoControl - - - 31, 21 - - - 75, 75 - - - 2 - - - pictureBox5 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 15 - - - NoControl - - - 319, 140 - - - 190, 190 - - - Zoom - - - 5 - - - pictureBoxQuadX - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabArducopter - - - 4 - - - NoControl - - - 112, 140 - - - 190, 190 - - - Zoom - - - 4 - - - pictureBoxQuad - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabArducopter - - - 5 - Zoom @@ -5200,6 +5341,9 @@ will work with hexa's etc 35 + + 214, 17 + True @@ -5212,18 +5356,18 @@ will work with hexa's etc APMSetup - - toolTip1 - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - currentStateBindingSource System.Windows.Forms.BindingSource, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Setup diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.application b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.application index 19a0b429d3..15ed2a9723 100644 --- a/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.application +++ b/Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.application @@ -11,7 +11,7 @@ - /35AemMq933lmTElQtJvYj/CRU0= + iE+mMwUkgd2TtMwDXN1GYvYa1XY=