From f43f0bc1020ae95ab0ed2c1499e648735191d858 Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Fri, 11 May 2012 17:07:52 +0800 Subject: [PATCH] APM Planner 1.1.84 3dr radio fix's + rfd900 other misc fixs --- .../3DRRadio/3DRRadio.csproj | 8 +- .../3DRRadio/ChangeLog.txt | 4 + .../ArdupilotMegaPlanner/3DRRadio/Config.resx | 2 +- .../3DRRadio/Properties/AssemblyInfo.cs | 4 +- .../ArdupilotMegaPlanner/ArdupilotMega.csproj | 34 +------- .../Controls/ConfigPanel.cs | 2 +- .../ConfigurationView/ConfigArducopter.cs | 9 +- .../ConfigurationView/ConfigArduplane.cs | 10 +-- .../ConfigurationView/ConfigPlanner.cs | 31 +++++-- .../ConfigurationView/ConfigPlanner.resx | 8 +- .../ConfigurationView/ConfigRawParams.cs | 9 +- .../GCSViews/FlightData.cs | 4 +- Tools/ArdupilotMegaPlanner/Msi/wix.pdb | Bin 19968 -> 0 bytes Tools/ArdupilotMegaPlanner/Program.cs | 2 - .../Properties/AssemblyInfo.cs | 2 +- Tools/ArdupilotMegaPlanner/Radio/3DRradio.cs | 82 ++++++++++++------ .../ArdupilotMegaPlanner/Radio/3DRradio.resx | 37 ++++---- Tools/ArdupilotMegaPlanner/Radio/IHex.cs | 2 + Tools/ArdupilotMegaPlanner/Radio/Uploader.cs | 11 ++- .../ArdupilotMegaPlanner/Utilities/Capture.cs | 4 +- 20 files changed, 134 insertions(+), 131 deletions(-) create mode 100644 Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt delete mode 100644 Tools/ArdupilotMegaPlanner/Msi/wix.pdb diff --git a/Tools/ArdupilotMegaPlanner/3DRRadio/3DRRadio.csproj b/Tools/ArdupilotMegaPlanner/3DRRadio/3DRRadio.csproj index f326d027c5..bd7bf168a4 100644 --- a/Tools/ArdupilotMegaPlanner/3DRRadio/3DRRadio.csproj +++ b/Tools/ArdupilotMegaPlanner/3DRRadio/3DRRadio.csproj @@ -36,7 +36,7 @@ full false bin\Debug\ - DEBUG + TRACE;DEBUG prompt 4 @@ -45,8 +45,7 @@ none true bin\Release\ - - + TRACE prompt 4 @@ -198,6 +197,9 @@ + + Always + diff --git a/Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt b/Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt new file mode 100644 index 0000000000..4ed5654d17 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/3DRRadio/ChangeLog.txt @@ -0,0 +1,4 @@ +0.4 - adjust erase timeout - to prevent lost bootloader sync error. +0.3 - add RFD900 support +0.2 - change packet size to 32 bytes +0.1 - Initial Release - Based off code by Mike Smith diff --git a/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx b/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx index ff6e05843c..40d3377cd0 100644 --- a/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx +++ b/Tools/ArdupilotMegaPlanner/3DRRadio/Config.resx @@ -1519,7 +1519,7 @@ - 3DRRadio Config 0.2 + 3DRRadio Config 0.4 Config diff --git a/Tools/ArdupilotMegaPlanner/3DRRadio/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/3DRRadio/Properties/AssemblyInfo.cs index b17a906705..d39a0cb2b4 100644 --- a/Tools/ArdupilotMegaPlanner/3DRRadio/Properties/AssemblyInfo.cs +++ b/Tools/ArdupilotMegaPlanner/3DRRadio/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.*")] -[assembly: AssemblyFileVersion("0.2.0.0")] +[assembly: AssemblyVersion("0.4.*")] +[assembly: AssemblyFileVersion("0.4.0.0")] diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj index b1e7ab83f7..d229a5f1be 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj @@ -80,7 +80,7 @@ ArdupilotMega_TemporaryKey.pfx - false + true false @@ -516,12 +516,6 @@ MainV2.cs - - UserControl - - - Configuration.cs - UserControl @@ -811,9 +805,6 @@ ImageLabel.cs - - Configuration.cs - Firmware.cs @@ -859,18 +850,6 @@ SerialInput.cs - - Configuration.cs - - - Configuration.cs - - - Configuration.cs - - - Configuration.cs - Firmware.cs @@ -1003,9 +982,6 @@ ResEdit.cs - - Configuration.cs - Firmware.cs @@ -1044,14 +1020,6 @@ MavlinkLog.cs Designer - - Configuration.cs - Designer - - - Configuration.cs - Designer - Firmware.cs Designer diff --git a/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs b/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs index 10bdba60bb..90357f8798 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/ConfigPanel.cs @@ -16,7 +16,7 @@ namespace ArdupilotMega.Controls public partial class ConfigPanel : BackStageViewContentPanel { /// - /// store tempory pending changes + /// store temp pending changes /// Hashtable _changed = new Hashtable(); // store linked param options diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs index caf0c3b6a9..5c4ffe974b 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArducopter.cs @@ -79,14 +79,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView void readToolTips() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Configuration)); - - string data = resources.GetString("MAVParam"); - - if (data == null) - { - data = global::ArdupilotMega.Properties.Resources.MAVParam; - } + string data = global::ArdupilotMega.Properties.Resources.MAVParam; string[] tips = data.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.cs index 8b50355a3c..32dda5b074 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigArduplane.cs @@ -68,14 +68,8 @@ namespace ArdupilotMega.GCSViews.ConfigurationView void readToolTips() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Configuration)); - - string data = resources.GetString("MAVParam"); - - if (data == null) - { - data = global::ArdupilotMega.Properties.Resources.MAVParam; - } + string data = global::ArdupilotMega.Properties.Resources.MAVParam; + string[] tips = data.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs index 9626727278..83ac0f7e7e 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.cs @@ -21,6 +21,29 @@ namespace ArdupilotMega.GCSViews.ConfigurationView private bool startup = false; List languages = new List(); + public class GCSBitmapInfo + { + public int Width { get; set; } + public int Height { get; set; } + public long Fps { get; set; } + public string Standard { get; set; } + public AMMediaType Media { get; set; } + + public GCSBitmapInfo(int width, int height, long fps, string standard, AMMediaType media) + { + Width = width; + Height = height; + Fps = fps; + Standard = standard; + Media = media; + } + + public override string ToString() + { + return Width.ToString() + " x " + Height.ToString() + String.Format(" {0:0.00} fps ", 10000000.0 / Fps) + Standard; + } + } + public ConfigPlanner() { InitializeComponent(); @@ -32,14 +55,12 @@ namespace ArdupilotMega.GCSViews.ConfigurationView // stop first BUT_videostop_Click(sender, e); - var bmp = (GCSViews.Configuration.GCSBitmapInfo)CMB_videoresolutions.SelectedItem; + var bmp = (GCSBitmapInfo)CMB_videoresolutions.SelectedItem; try { MainV2.cam = new WebCamService.Capture(CMB_videosources.SelectedIndex, bmp.Media); - MainV2.cam.showhud = CHK_hudshow.Checked; - MainV2.cam.Start(); MainV2.config["video_options"] = CMB_videoresolutions.SelectedIndex; @@ -83,7 +104,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView AMMediaType media = null; VideoInfoHeader v; VideoStreamConfigCaps c; - List modes = new List(); + List modes = new List(); // Get the ICaptureGraphBuilder2 capGraph = (ICaptureGraphBuilder2)new CaptureGraphBuilder2(); @@ -124,7 +145,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView hr = videoStreamConfig.GetStreamCaps(i, out media, TaskMemPointer); v = (VideoInfoHeader)Marshal.PtrToStructure(media.formatPtr, typeof(VideoInfoHeader)); c = (VideoStreamConfigCaps)Marshal.PtrToStructure(TaskMemPointer, typeof(VideoStreamConfigCaps)); - modes.Add(new GCSViews.Configuration.GCSBitmapInfo(v.BmiHeader.Width, v.BmiHeader.Height, c.MaxFrameInterval, c.VideoStandard.ToString(), media)); + modes.Add(new GCSBitmapInfo(v.BmiHeader.Width, v.BmiHeader.Height, c.MaxFrameInterval, c.VideoStandard.ToString(), media)); } Marshal.FreeCoTaskMem(TaskMemPointer); DsUtils.FreeAMMediaType(media); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx index 7836529e84..820dacd6a5 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigPlanner.resx @@ -1268,7 +1268,7 @@ BUT_Joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null $this @@ -1295,7 +1295,7 @@ BUT_videostop - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null $this @@ -1322,7 +1322,7 @@ BUT_videostart - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null $this @@ -1397,6 +1397,6 @@ ConfigPlanner - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4513.13745, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs index dc992d7842..fc315afedc 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs @@ -310,14 +310,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView void readToolTips() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Configuration)); - - string data = resources.GetString("MAVParam"); - - if (data == null) - { - data = global::ArdupilotMega.Properties.Resources.MAVParam; - } + string data = global::ArdupilotMega.Properties.Resources.MAVParam; string[] tips = data.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index c03769ddef..a2f5d34005 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -985,8 +985,8 @@ namespace ArdupilotMega.GCSViews catch { } } } - - private void FlightData_ParentChanged(object sender, EventArgs e) + + private void FlightData_ParentChanged(object sender, EventArgs e) { if (MainV2.cam != null) { diff --git a/Tools/ArdupilotMegaPlanner/Msi/wix.pdb b/Tools/ArdupilotMegaPlanner/Msi/wix.pdb deleted file mode 100644 index bce0c1ecacf422c8cccb29bffab97004f6f9e78b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19968 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 68 - - 17, 17 - 115 @@ -179,6 +176,9 @@ 4 + + 17, 17 + Serial baud rate in rounded kbps. So 57 means 57600. @@ -561,9 +561,6 @@ 13 - - 17, 17 - TXPOWER is the transmit power in dBm. 20dBm is 100mW. It is useful to set this to lower levels for short range testing. @@ -1736,10 +1733,10 @@ which result in a valid packet CRC 39 - 543, 25 + 531, 25 - 80, 20 + 102, 20 33 @@ -1757,10 +1754,10 @@ which result in a valid packet CRC 37 - 157, 25 + 145, 25 - 80, 20 + 102, 20 32 @@ -1850,7 +1847,7 @@ which result in a valid packet CRC BUT_savesettings - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -1874,7 +1871,7 @@ which result in a valid packet CRC BUT_getcurrent - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -1919,7 +1916,7 @@ which result in a valid packet CRC BUT_upload - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -1943,7 +1940,7 @@ which result in a valid packet CRC BUT_syncS2 - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -1967,7 +1964,7 @@ which result in a valid packet CRC BUT_syncS3 - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -1991,7 +1988,7 @@ which result in a valid packet CRC BUT_syncS5 - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -2559,7 +2556,7 @@ which result in a valid packet CRC BUT_syncS8 - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -2586,7 +2583,7 @@ which result in a valid packet CRC BUT_syncS9 - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -2613,7 +2610,7 @@ which result in a valid packet CRC BUT_syncS10 - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null $this @@ -2640,6 +2637,6 @@ which result in a valid packet CRC _3DRradio - ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4499.32931, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4512.32829, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Radio/IHex.cs b/Tools/ArdupilotMegaPlanner/Radio/IHex.cs index 1a6ce2550d..26e64d8544 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/IHex.cs +++ b/Tools/ArdupilotMegaPlanner/Radio/IHex.cs @@ -64,6 +64,8 @@ namespace uploader if (Count < 1) throw new Exception ("no data in IntelHex file"); log (string.Format ("read {0} bytes from {1}\n", loadedSize, fromPath)); + + sr.Close(); } private void log (string message, int level = 0) diff --git a/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs b/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs index 663f23993b..bc71d364d1 100644 --- a/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs +++ b/Tools/ArdupilotMegaPlanner/Radio/Uploader.cs @@ -222,7 +222,10 @@ namespace uploader { send (Code.CHIP_ERASE); send (Code.EOC); - + + // sleep for 2 second - erase seems to take about 2 seconds + System.Threading.Thread.Sleep(2000); + getSync (); } @@ -319,14 +322,16 @@ namespace uploader freq = (Code)recv (); // XXX should be getting valid board/frequency data from firmware file - if ((id != Code.DEVICE_ID_HM_TRP) && (id != Code.DEVICE_ID_RF50)) - throw new Exception ("bootloader device ID mismatch"); + if ((id != Code.DEVICE_ID_HM_TRP) && (id != Code.DEVICE_ID_RF50) && (id != Code.DEVICE_ID_RFD900)) + throw new Exception ("bootloader device ID mismatch - device:" + id.ToString()); getSync (); } public void getDevice(ref Code device, ref Code freq) { + connect_and_sync(); + send(Code.GET_DEVICE); send(Code.EOC); diff --git a/Tools/ArdupilotMegaPlanner/Utilities/Capture.cs b/Tools/ArdupilotMegaPlanner/Utilities/Capture.cs index 032a061c3a..6d721dea65 100644 --- a/Tools/ArdupilotMegaPlanner/Utilities/Capture.cs +++ b/Tools/ArdupilotMegaPlanner/Utilities/Capture.cs @@ -213,8 +213,6 @@ namespace WebCamService return list; } - public bool showhud = true; - void timer1_Tick(object sender, EventArgs e) { try @@ -376,6 +374,8 @@ namespace WebCamService media.majorType = MediaType.Video; media.subType = MediaSubType.RGB24; media.formatType = FormatType.VideoInfo; + sampGrabber.SetBufferSamples(false); + sampGrabber.SetOneShot(false); hr = sampGrabber.SetMediaType( media ); DsError.ThrowExceptionForHR( hr );