From 297f391548b76d09db3cfa17134397729daed911 Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Mon, 4 Jun 2012 17:56:46 +0800 Subject: [PATCH] APM Planner 1.1.92 add dump -1 option to log dump fix terminal issue with logs fix mavlink 1.0 manual/stablaize Mode fix config screen showing incorrect tab --- .../Antenna/ArduTracker.cs | 8 +- .../Antenna/ITrackerOutput.cs | 2 +- Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs | 16 +- .../Arduino/ArduinoSTK.cs | 26 ++ .../Controls/BackstageView/BackstageView.cs | 8 +- .../GCSViews/FlightData.cs | 5 +- .../GCSViews/FlightData.resx | 68 ++-- .../ArdupilotMegaPlanner/GCSViews/Terminal.cs | 2 + Tools/ArdupilotMegaPlanner/Log.Designer.cs | 10 + Tools/ArdupilotMegaPlanner/Log.cs | 13 + Tools/ArdupilotMegaPlanner/Log.resx | 52 ++- Tools/ArdupilotMegaPlanner/Msi/installer.wxs | 342 +++++++++--------- Tools/ArdupilotMegaPlanner/Program.cs | 24 ++ .../Properties/AssemblyInfo.cs | 2 +- Tools/ArdupilotMegaPlanner/mavcmd.xml | 2 +- 15 files changed, 344 insertions(+), 236 deletions(-) diff --git a/Tools/ArdupilotMegaPlanner/Antenna/ArduTracker.cs b/Tools/ArdupilotMegaPlanner/Antenna/ArduTracker.cs index 8b4fee9116..1093a34d6a 100644 --- a/Tools/ArdupilotMegaPlanner/Antenna/ArduTracker.cs +++ b/Tools/ArdupilotMegaPlanner/Antenna/ArduTracker.cs @@ -58,7 +58,7 @@ namespace ArdupilotMega.Antenna } public bool Setup() { - + return true; } @@ -96,7 +96,7 @@ namespace ArdupilotMega.Antenna // conver the angle into a 0-pwmrange value int target = (int)((((PointAtAngle / range) * 2.0) * (PanPWMRange / 2) * _panreverse + centerpos)); - // Console.WriteLine("P " + Angle + " " + target + " " + PointAtAngle); + // Console.WriteLine("P " + Angle + " " + target + " " + PointAtAngle); currentpan = target; @@ -111,7 +111,7 @@ namespace ArdupilotMega.Antenna int target = (int)((((PointAtAngle / range) * 2.0) * (TiltPWMRange / 2) * _tiltreverse + 1500)); - // Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle); + // Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle); currenttilt = target; @@ -152,4 +152,4 @@ namespace ArdupilotMega.Antenna } } -} +} \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Antenna/ITrackerOutput.cs b/Tools/ArdupilotMegaPlanner/Antenna/ITrackerOutput.cs index 4791cae5f9..2a4b665b2b 100644 --- a/Tools/ArdupilotMegaPlanner/Antenna/ITrackerOutput.cs +++ b/Tools/ArdupilotMegaPlanner/Antenna/ITrackerOutput.cs @@ -26,7 +26,7 @@ namespace ArdupilotMega.Antenna bool Setup(); bool Pan(double Angle); bool Tilt(double Angle); - bool PanAndTilt(double Pan,double Tilt); + bool PanAndTilt(double Pan, double Tilt); bool Close(); } } diff --git a/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs b/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs index e7e52d3047..9cdd6a7a20 100644 --- a/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs +++ b/Tools/ArdupilotMegaPlanner/Antenna/Maestro.cs @@ -24,7 +24,7 @@ namespace ArdupilotMega.Antenna public int PanPWMRange { get; set; } public int TiltPWMRange { get; set; } - public bool PanReverse { get { return _panreverse == -1; } set { _panreverse = value == true ? -1 : 1 ; } } + public bool PanReverse { get { return _panreverse == -1; } set { _panreverse = value == true ? -1 : 1; } } public bool TiltReverse { get { return _tiltreverse == -1; } set { _tiltreverse = value == true ? -1 : 1; } } int _panreverse = 1; @@ -52,11 +52,11 @@ namespace ArdupilotMega.Antenna { ComPort.Open(); } - catch (Exception ex) { System.Windows.Forms.CustomMessageBox.Show("Connect failed " + ex.Message,"Error"); return false; } + catch (Exception ex) { System.Windows.Forms.CustomMessageBox.Show("Connect failed " + ex.Message, "Error"); return false; } return true; } - public bool Setup() + public bool Setup() { int target = 100; // speed @@ -86,7 +86,7 @@ namespace ArdupilotMega.Antenna return input; } - double wrap_range(double input,double range) + double wrap_range(double input, double range) { if (input > range) return input - 360; @@ -112,10 +112,10 @@ namespace ArdupilotMega.Antenna Console.WriteLine("P " + Angle + " " + target + " " + PointAtAngle); - var buffer = new byte[] { 0xff,PanAddress,target}; + var buffer = new byte[] { 0xff, PanAddress, target }; ComPort.Write(buffer, 0, buffer.Length); - return true; + return true; } public bool Tilt(double Angle) @@ -124,14 +124,14 @@ namespace ArdupilotMega.Antenna short PointAtAngle = Constrain((Angle - TrimTilt), TiltStartRange, TiltEndRange); - byte target = (byte)((((PointAtAngle / range ) * 2) * 127 + 127) * _tiltreverse); + byte target = (byte)((((PointAtAngle / range) * 2) * 127 + 127) * _tiltreverse); //Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle); var buffer = new byte[] { 0xff, TiltAddress, target }; ComPort.Write(buffer, 0, buffer.Length); - return true; + return true; } public bool PanAndTilt(double pan, double tilt) diff --git a/Tools/ArdupilotMegaPlanner/Arduino/ArduinoSTK.cs b/Tools/ArdupilotMegaPlanner/Arduino/ArduinoSTK.cs index 3a3a825e66..e2665799b3 100644 --- a/Tools/ArdupilotMegaPlanner/Arduino/ArduinoSTK.cs +++ b/Tools/ArdupilotMegaPlanner/Arduino/ArduinoSTK.cs @@ -315,6 +315,32 @@ namespace ArdupilotMega.Arduino return true; } + public byte getChipType(byte part = 0) + { + byte answer = 0x00; + + byte[] command = new byte[] { (byte)'V', 0x30, 0x01, part, 0x01, (byte)' ' }; + this.Write(command, 0, command.Length); + + byte[] chr = new byte[1]; + + this.Read(chr, 0, 1); + + if (chr[0] == 0x14) + { + this.Read(chr, 0, 1); + answer = (byte)chr[0]; + + this.Read(chr, 0, 1); + if (chr[0] == 0x10) + { + return answer; + } + } + + return answer; + } + public new bool Close() { try diff --git a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs index 45c5e2d68a..0564ce64df 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs @@ -249,10 +249,10 @@ namespace ArdupilotMega.Controls.BackstageView { // deactivate the old page _activePage.Page.Close(); - // Pages.ForEach(x => - // { - // x.Page.Visible = false; - // }); + Pages.ForEach(x => + { + x.Page.Visible = false; + }); // deactivate button _activePage.Page.Visible = false; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index fa3eb1105c..7c2feefa58 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -1253,7 +1253,10 @@ namespace ArdupilotMega.GCSViews { ((Button)sender).Enabled = false; #if MAVLINK10 - MainV2.comPort.setMode("Manual"); + if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane) + MainV2.comPort.setMode("Manual"); + if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2) + MainV2.comPort.setMode("Stabilize"); #else comPort.doAction(MAVLink.MAV_ACTION.MAV_ACTION_SET_MANUAL); #endif diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index a4d22f16e0..ad0c1f9f1f 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -226,7 +226,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -265,7 +265,7 @@ BUT_script - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -298,7 +298,7 @@ BUT_joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -328,7 +328,7 @@ BUT_quickmanual - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -358,7 +358,7 @@ BUT_quickrtl - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -388,7 +388,7 @@ BUT_quickauto - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -442,7 +442,7 @@ BUT_setwp - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -493,7 +493,7 @@ BUT_setmode - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -523,7 +523,7 @@ BUT_clear_track - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -574,7 +574,7 @@ BUT_Homealt - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -604,7 +604,7 @@ BUT_RAWSensor - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -634,7 +634,7 @@ BUTrestartmission - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -664,7 +664,7 @@ BUTactiondo - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabActions @@ -718,7 +718,7 @@ Gvspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabGauges @@ -748,7 +748,7 @@ Gheading - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabGauges @@ -778,7 +778,7 @@ Galt - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabGauges @@ -811,7 +811,7 @@ Gspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabGauges @@ -895,7 +895,7 @@ lbl_playbackspeed - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabTLogs @@ -922,7 +922,7 @@ lbl_logpercent - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabTLogs @@ -949,7 +949,7 @@ NUM_playbackspeed - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabTLogs @@ -976,7 +976,7 @@ BUT_log2kml - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1030,7 +1030,7 @@ BUT_playlog - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1057,7 +1057,7 @@ BUT_loadtelem - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1246,7 +1246,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1279,7 +1279,7 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1309,7 +1309,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1339,7 +1339,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1511,7 +1511,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1574,7 +1574,7 @@ TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null panel1 @@ -1631,7 +1631,7 @@ label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null panel1 @@ -1661,7 +1661,7 @@ TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null panel1 @@ -1691,7 +1691,7 @@ TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null panel1 @@ -1892,7 +1892,7 @@ label6 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null $this @@ -1988,6 +1988,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs index 289bf7cf57..4d0ca21159 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs @@ -53,6 +53,8 @@ namespace ArdupilotMega.GCSViews { a++; } + if (a == (buffer.Length-1)) + break; } addText(ASCIIEncoding.ASCII.GetString(buffer,0,a+1)); diff --git a/Tools/ArdupilotMegaPlanner/Log.Designer.cs b/Tools/ArdupilotMegaPlanner/Log.Designer.cs index 5268c07d9e..92c4948aee 100644 --- a/Tools/ArdupilotMegaPlanner/Log.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Log.Designer.cs @@ -37,6 +37,7 @@ this.TXT_status = new System.Windows.Forms.TextBox(); this.BUT_redokml = new ArdupilotMega.Controls.MyButton(); this.BUT_firstperson = new ArdupilotMega.Controls.MyButton(); + this.BUT_dumpdf = new ArdupilotMega.Controls.MyButton(); this.SuspendLayout(); // // TXT_seriallog @@ -92,10 +93,18 @@ this.BUT_firstperson.UseVisualStyleBackColor = true; this.BUT_firstperson.Click += new System.EventHandler(this.BUT_firstperson_Click); // + // BUT_dumpdf + // + resources.ApplyResources(this.BUT_dumpdf, "BUT_dumpdf"); + this.BUT_dumpdf.Name = "BUT_dumpdf"; + this.BUT_dumpdf.UseVisualStyleBackColor = true; + this.BUT_dumpdf.Click += new System.EventHandler(this.BUT_dumpdf_Click); + // // Log // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.BUT_dumpdf); this.Controls.Add(this.BUT_firstperson); this.Controls.Add(this.BUT_redokml); this.Controls.Add(this.TXT_status); @@ -122,5 +131,6 @@ private ArdupilotMega.Controls.MyButton BUT_redokml; private System.Windows.Forms.TextBox TXT_seriallog; private ArdupilotMega.Controls.MyButton BUT_firstperson; + private Controls.MyButton BUT_dumpdf; } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Log.cs b/Tools/ArdupilotMegaPlanner/Log.cs index 520c59ac44..4b65e4985d 100644 --- a/Tools/ArdupilotMegaPlanner/Log.cs +++ b/Tools/ArdupilotMegaPlanner/Log.cs @@ -1014,5 +1014,18 @@ namespace ArdupilotMega cmd.Clear(); } + private void BUT_dumpdf_Click(object sender, EventArgs e) + { + if (status == serialstatus.Done) + { + // add -1 entry + CHK_logs.Items.Add(-1, true); + + System.Threading.Thread t11 = new System.Threading.Thread(delegate() { downloadsinglethread(); }); + t11.Name = "Log download single thread"; + t11.Start(); + } + } + } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Log.resx b/Tools/ArdupilotMegaPlanner/Log.resx index cf6b035012..4b99ecc7a9 100644 --- a/Tools/ArdupilotMegaPlanner/Log.resx +++ b/Tools/ArdupilotMegaPlanner/Log.resx @@ -141,7 +141,7 @@ $this - 7 + 8 13, 13 @@ -159,13 +159,13 @@ BUT_DLall - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null $this - 6 + 7 13, 43 @@ -183,13 +183,13 @@ BUT_DLthese - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null $this - 5 + 6 13, 187 @@ -207,13 +207,13 @@ BUT_clearlogs - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null $this - 4 + 5 13, 72 @@ -234,7 +234,7 @@ $this - 3 + 4 False @@ -258,7 +258,7 @@ $this - 2 + 3 13, 311 @@ -276,13 +276,13 @@ BUT_redokml - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null $this - 1 + 2 13, 282 @@ -300,12 +300,40 @@ BUT_firstperson - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null $this + 1 + + + + NoControl + + + 12, 243 + + + 116, 33 + + + 10 + + + (adv) Dump All DF + + + BUT_dumpdf + + + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null + + + $this + + 0 diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index 342ffa31d7..5b1e02ff74 100644 --- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs +++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs @@ -2,14 +2,14 @@ - + - - + + @@ -31,7 +31,7 @@ - + @@ -47,199 +47,201 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + @@ -281,26 +283,26 @@ - - - - - - - - - + + + + + + + + - - + + - + + diff --git a/Tools/ArdupilotMegaPlanner/Program.cs b/Tools/ArdupilotMegaPlanner/Program.cs index 30beb88a83..4d028762a2 100644 --- a/Tools/ArdupilotMegaPlanner/Program.cs +++ b/Tools/ArdupilotMegaPlanner/Program.cs @@ -42,7 +42,31 @@ namespace ArdupilotMega //Common.linearRegression(); //Console.WriteLine(srtm.getAltitude(-35.115676879882812, 117.94178754638671,20)); + /* + Arduino.ArduinoSTK comport = new Arduino.ArduinoSTK(); + comport.PortName = "com4"; + + comport.BaudRate = 57600; + + comport.Open(); + + comport.connectAP(); + + comport.sync(); + + comport.sync(); + + Console.WriteLine( comport.getChipType(0)); + + Console.WriteLine(comport.getChipType(1)); + + Console.WriteLine(comport.getChipType(2)); + + Console.ReadLine(); + + return; + */ if (System.Diagnostics.Debugger.IsAttached) { // testing diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 742da1752e..f5b9c7920f 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs +++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Resources; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.1.*")] -[assembly: AssemblyFileVersion("1.1.91")] +[assembly: AssemblyFileVersion("1.1.92")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/mavcmd.xml b/Tools/ArdupilotMegaPlanner/mavcmd.xml index c1bb78fad0..80317d8542 100644 --- a/Tools/ArdupilotMegaPlanner/mavcmd.xml +++ b/Tools/ArdupilotMegaPlanner/mavcmd.xml @@ -295,7 +295,7 @@ Alt - Angle + Pitch Angle