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

ArduCopter/system.pde

@@ -199,6 +199,10 @@ static void init_ardupilot()
 	}
 	#endif
 
+// agmatthews USERHOOKS
+#ifdef USERHOOK_INIT
+   USERHOOK_INIT
+#endif
 	// Logging:
 	// --------
 	// DataFlash log initialization

Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs

@@ -168,6 +168,8 @@ namespace ArdupilotMega.GCSViews
 
                 comPort.ReadBufferSize = 1024 * 1024;
 
+                comPort.PortName = MainV2.comportname;
+
                 comPort.Open();
 
                 System.Threading.Thread t11 = new System.Threading.Thread(delegate()

Tools/ArdupilotMegaPlanner/Log.cs

@@ -75,7 +75,8 @@ namespace ArdupilotMega
                 comPort.DtrEnable = true;
                 //comPort.Open();
             }
-            catch (Exception) {
+            catch (Exception)
+            {
                 MessageBox.Show("Error opening comport");
             }
 
@@ -158,7 +159,8 @@ namespace ArdupilotMega
                         if (!line.Contains("\n"))
                             line = line + "\n";
                     }
-                    catch {
+                    catch
+                    {
                         line = comPort.ReadExisting();
                         //byte[] data = readline(comPort);
                         //line = Encoding.ASCII.GetString(data, 0, data.Length);
@@ -172,7 +174,7 @@ namespace ArdupilotMega
                     {
                         case serialstatus.Connecting:
 
-                            if (line.Contains("reset to FLY") || line.Contains("interactive setup"))
+                            if (line.Contains("reset to FLY") || line.Contains("interactive setup") || line.Contains("CLI:"))
                             {
                                 comPort.Write("logs\r");
                             }
@@ -199,6 +201,8 @@ namespace ArdupilotMega
 
                             MainV2.cs.firmware = MainV2.Firmwares.ArduPlane;
 
+                            TXT_seriallog.AppendText("Createing KML for " + logfile);
+
                             while (tr.Peek() != -1)
                             {
                                 processLine(tr.ReadLine());
@@ -206,7 +210,11 @@ namespace ArdupilotMega
 
                             tr.Close();
 
+                            try
+                            {
                                 writeKML(logfile + ".kml");
+                            }
+                            catch { } // usualy invalid lat long error
                             status = serialstatus.Done;
                             break;
                         case serialstatus.Createfile:
@@ -286,12 +294,15 @@ namespace ArdupilotMega
         {
             try
             {
+                Application.DoEvents();
+
                 line = line.Replace(", ", ",");
                 line = line.Replace(": ", ":");
 
                 string[] items = line.Split(',', ':');
 
-                if (items[0].Contains("CMD")) {
+                if (items[0].Contains("CMD"))
+                {
                     if (flightdata.Count == 0)
                     {
                         if (int.Parse(items[2]) <= (int)MAVLink.MAV_CMD.LAST) // wps
@@ -529,6 +540,9 @@ namespace ArdupilotMega
                 }
                 catch { }
 
+                try
+                {
+
                     pmplane.Point = new KmlPoint((float)model.Location.longitude, (float)model.Location.latitude, (float)model.Location.altitude);
                     pmplane.Point.AltitudeMode = altmode;
 
@@ -540,6 +554,8 @@ namespace ArdupilotMega
                     pmplane.Model = model;
 
                     planes.Add(pmplane);
+                }
+                catch { } // bad lat long value
 
                 lastmodel = mod.model;
 
@@ -643,7 +659,8 @@ namespace ArdupilotMega
                 comPort.Write(a.ToString() + "\r");
                 status = serialstatus.Createfile;
 
-                while (status != serialstatus.Done) {
+                while (status != serialstatus.Done)
+                {
                     System.Threading.Thread.Sleep(100);
                 }
 
@@ -687,6 +704,7 @@ namespace ArdupilotMega
             System.Threading.Thread.Sleep(500);
             comPort.Write("erase\r");
             System.Threading.Thread.Sleep(100);
+            TXT_seriallog.AppendText("!!Allow 30 seconds for erase\n");
             status = serialstatus.Done;
         }
 

Tools/ArdupilotMegaPlanner/MainV2.cs

@@ -321,6 +321,13 @@ namespace ArdupilotMega
                     RichTextBox txtr = (RichTextBox)ctl;
                     txtr.BorderStyle = BorderStyle.None;
                 }
+                else if (((Type)ctl.GetType()) == typeof(CheckedListBox))
+                {
+                    ctl.BackColor = Color.FromArgb(0x43, 0x44, 0x45);
+                    ctl.ForeColor = Color.White;
+                    CheckedListBox txtr = (CheckedListBox)ctl;
+                    txtr.BorderStyle = BorderStyle.None;
+                }
                 else if (((Type)ctl.GetType()) == typeof(TabPage))
                 {
                     ctl.BackColor = Color.FromArgb(0x26, 0x27, 0x28);  //Color.FromArgb(0x43, 0x44, 0x45);
@@ -682,7 +689,7 @@ namespace ArdupilotMega
         private void CMB_serialport_SelectedIndexChanged(object sender, EventArgs e)
         {
             comportname = CMB_serialport.Text;
-            if (comportname == "UDP")
+            if (comportname == "UDP" || comportname == "TCP")
                 CMB_baudrate.Enabled = false;
             else
                 CMB_baudrate.Enabled = true;

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.0.83")]
+[assembly: AssemblyFileVersion("1.0.84")]
 [assembly: NeutralResourcesLanguageAttribute("")]

Tools/ArdupilotMegaPlanner/bin/Release/ArdupilotMegaPlanner.application

@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>xG04b9X6TXBWirLuQOgI+3TR8H0=</dsig:DigestValue>
+        <dsig:DigestValue>sVd4w+f3LroCsyok5UsAi4Bq9eI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>