diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs
index 242225c07e..f42c15e9dd 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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.contextMenuStripMap = new System.Windows.Forms.ContextMenuStrip(this.components);
this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.flyToHereAltToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -1268,8 +1268,8 @@
//
// dataGridViewImageColumn1
//
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle1;
resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1");
this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up;
this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
@@ -1277,8 +1277,8 @@
//
// dataGridViewImageColumn2
//
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle2;
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 2048b000d4..31a3739033 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
@@ -20,7 +20,7 @@ using ArdupilotMega.Controls;
using ArdupilotMega.Utilities;
using ArdupilotMega.Controls.BackstageView;
using Crom.Controls.Docking;
-
+using log4net;
using System.Reflection;
// written by michael oborne
@@ -28,6 +28,8 @@ namespace ArdupilotMega.GCSViews
{
partial class FlightData : MyUserControl, IActivate, IDeactivate
{
+ private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
ArdupilotMega.MAVLink comPort = MainV2.comPort;
public static int threadrun = 0;
StreamWriter swlog;
@@ -100,7 +102,12 @@ namespace ArdupilotMega.GCSViews
MainV2.config["FlightSplitter"] = hud1.Width;
if (!MainV2.MONO)
{
- _serializer.Save();
+ try
+ {
+ log.Info("Saving Screen Layout");
+ _serializer.Save();
+ }
+ catch (Exception ex) { log.Error(ex); }
SaveWindowLayout();
}
System.Threading.Thread.Sleep(100);
@@ -239,16 +246,35 @@ namespace ArdupilotMega.GCSViews
}
else
{
+ log.Info("1-"+ DateTime.Now);
SetupDocking();
-
- if (File.Exists(_serializer.SavePath) == true)
+ log.Info("2-" + DateTime.Now);
+ if (File.Exists(_serializer.SavePath) == true )
{
- try
+ FileInfo fi = new FileInfo(_serializer.SavePath);
+
+ if (fi.Length > 500)
{
- _serializer.Load(true, GetFormFromGuid);
+ try
+ {
+ _serializer.Load(true, GetFormFromGuid);
+ log.Info("3-" + DateTime.Now);
+ }
+ catch (Exception ex)
+ {
+ log.Info(ex);
+ try
+ {
+ SetupDocking();
+ }
+ catch (Exception ex2)
+ {
+ log.Info(ex2);
+ }
+ }
}
- catch { }
}
+ log.Info("D-" + DateTime.Now);
}
}
diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
index ff7b77cd3b..ee2c65a0f0 100644
--- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
+++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
@@ -121,15 +121,6 @@
290, 17
-
- 175, 92
-
-
- contextMenuStripMap
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
174, 22
@@ -154,6 +145,15 @@
Flight Planner
+
+ 175, 92
+
+
+ contextMenuStripMap
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
354, 0
@@ -176,6 +176,42 @@
542, 17
+
+ 176, 22
+
+
+ Record Hud to AVI
+
+
+ 176, 22
+
+
+ Stop Record
+
+
+ 176, 22
+
+
+ Set MJPEG source
+
+
+ 176, 22
+
+
+ Set Aspect Ratio
+
+
+ 176, 22
+
+
+ Display Battery Info
+
+
+ 176, 22
+
+
+ User Items
+
177, 158
@@ -205,7 +241,7 @@
hud1
- ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
SubMainLeft.Panel1
@@ -244,7 +280,7 @@
quickView6
- ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabQuick
@@ -268,7 +304,7 @@
quickView5
- ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabQuick
@@ -292,7 +328,7 @@
quickView4
- ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabQuick
@@ -316,7 +352,7 @@
quickView3
- ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabQuick
@@ -340,7 +376,7 @@
quickView2
- ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabQuick
@@ -370,7 +406,7 @@
quickView1
- ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabQuick
@@ -405,11 +441,23 @@
0
+
+ False
+
+
+ 216, 90
+
+
+ 114, 29
+
+
+ 80
+
modifyandSetAlt
- ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -417,11 +465,32 @@
0
+
+ Microsoft Sans Serif, 8.25pt
+
+
+ NoControl
+
+
+ 111, 90
+
+
+ 45, 23
+
+
+ 79
+
+
+ Arm/ Disarm
+
+
+ Arm the Mav
+
BUT_ARM
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -429,11 +498,26 @@
1
+
+ NoControl
+
+
+ 4, 91
+
+
+ 46, 23
+
+
+ 78
+
+
+ Script
+
BUT_script
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -441,11 +525,29 @@
2
+
+ NoControl
+
+
+ 56, 91
+
+
+ 49, 23
+
+
+ 77
+
+
+ Joystick
+
+
+ Setup and enable your joystick
+
BUT_joystick
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -453,11 +555,29 @@
3
+
+ NoControl
+
+
+ 147, 35
+
+
+ 47, 23
+
+
+ 76
+
+
+ &Manual
+
+
+ Change Mode to Manual/Stabalize
+
BUT_quickmanual
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -465,11 +585,29 @@
4
+
+ NoControl
+
+
+ 147, 64
+
+
+ 47, 23
+
+
+ 75
+
+
+ &RTL
+
+
+ Change Mode to RTL
+
BUT_quickrtl
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -477,11 +615,29 @@
5
+
+ NoControl
+
+
+ 147, 6
+
+
+ 47, 23
+
+
+ 74
+
+
+ &Auto
+
+
+ Change mode to Auto
+
BUT_quickauto
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -489,6 +645,18 @@
6
+
+ 0 (Home)
+
+
+ 4, 35
+
+
+ 76, 21
+
+
+ 72
+
CMB_setwp
@@ -501,11 +669,29 @@
7
+
+ NoControl
+
+
+ 86, 35
+
+
+ 55, 23
+
+
+ 73
+
+
+ Set WP
+
+
+ Changes the current target waypoint
+
BUT_setwp
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -513,6 +699,15 @@
8
+
+ 4, 64
+
+
+ 76, 21
+
+
+ 70
+
CMB_modes
@@ -525,11 +720,29 @@
9
+
+ NoControl
+
+
+ 86, 64
+
+
+ 55, 23
+
+
+ 71
+
+
+ Set Mode
+
+
+ Changes to the Mode on the left
+
BUT_setmode
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -537,11 +750,29 @@
10
+
+ NoControl
+
+
+ 162, 90
+
+
+ 47, 23
+
+
+ 52
+
+
+ Clear Track
+
+
+ Clear the recorded path on the map
+
BUT_clear_track
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -549,6 +780,15 @@
11
+
+ 4, 6
+
+
+ 76, 21
+
+
+ 59
+
CMB_action
@@ -561,11 +801,29 @@
12
+
+ NoControl
+
+
+ 200, 6
+
+
+ 69, 23
+
+
+ 69
+
+
+ Set Home Alt
+
+
+ Set the current display alt as 0, ie home alt is shown as 0
+
BUT_Homealt
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -573,11 +831,29 @@
13
+
+ NoControl
+
+
+ 200, 64
+
+
+ 69, 23
+
+
+ 68
+
+
+ Raw Sensor View
+
+
+ View raw Gyro and Accel values, and Raw Radio ins/outs
+
BUT_RAWSensor
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -585,11 +861,29 @@
14
+
+ NoControl
+
+
+ 200, 35
+
+
+ 69, 23
+
+
+ 63
+
+
+ Restart Mission
+
+
+ Restarts the mission from the beginning
+
BUTrestartmission
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -597,11 +891,29 @@
15
+
+ NoControl
+
+
+ 86, 6
+
+
+ 55, 23
+
+
+ 60
+
+
+ Do Action
+
+
+ Preform the action ot the left
+
BUTactiondo
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabActions
@@ -633,11 +945,29 @@
1
+
+ Zoom
+
+
+ Microsoft Sans Serif, 9pt
+
+
+ 3, 6
+
+
+ 0, 0, 0, 0
+
+
+ 100, 100
+
+
+ 82
+
Gvspeed
- AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -645,11 +975,29 @@
0
+
+ Zoom
+
+
+ Microsoft Sans Serif, 9pt
+
+
+ 303, 6
+
+
+ 0, 0, 0, 0
+
+
+ 100, 100
+
+
+ 80
+
Gheading
- ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -657,11 +1005,29 @@
1
+
+ Zoom
+
+
+ Microsoft Sans Serif, 9pt
+
+
+ 203, 6
+
+
+ 0, 0, 0, 0
+
+
+ 100, 100
+
+
+ 81
+
Galt
- AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -669,11 +1035,32 @@
2
+
+ Zoom
+
+
+ Microsoft Sans Serif, 9pt
+
+
+ 103, 6
+
+
+ 0, 0, 0, 0
+
+
+ 100, 100
+
+
+ 79
+
+
+ Double click me to change Max
+
Gspeed
- AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabGauges
@@ -738,11 +1125,26 @@
3
+
+ Top, Right
+
+
+ 253, 54
+
+
+ 51, 20
+
+
+ 79
+
+
+ x 1.0
+
lbl_playbackspeed
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -750,11 +1152,26 @@
0
+
+ Top, Right
+
+
+ 253, 32
+
+
+ 51, 20
+
+
+ 78
+
+
+ 0.00 %
+
lbl_logpercent
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -762,11 +1179,26 @@
1
+
+ Top, Left, Right
+
+
+ 178, 40
+
+
+ 73, 45
+
+
+ 77
+
+
+ Playback Speed
+
NUM_playbackspeed
- ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -774,11 +1206,26 @@
2
+
+ NoControl
+
+
+ 29, 32
+
+
+ 127, 23
+
+
+ 76
+
+
+ Tlog > Kml or Graph
+
BUT_log2kml
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -786,6 +1233,21 @@
3
+
+ Top, Left, Right
+
+
+ NoControl
+
+
+ 178, 3
+
+
+ 110, 45
+
+
+ 75
+
tracklog
@@ -798,11 +1260,26 @@
4
+
+ NoControl
+
+
+ 89, 3
+
+
+ 80, 23
+
+
+ 73
+
+
+ Play/Pause
+
BUT_playlog
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -810,11 +1287,26 @@
5
+
+ NoControl
+
+
+ 3, 3
+
+
+ 80, 23
+
+
+ 71
+
+
+ Load Log
+
BUT_loadtelem
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
tabTLogs
@@ -927,927 +1419,6 @@
1
-
- splitContainer1
-
-
- System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tableMap
-
-
- 0
-
-
- panel1
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tableMap
-
-
- 1
-
-
- Fill
-
-
- 0, 0
-
-
- 2
-
-
- 288, 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
-
-
- 654, 461
-
-
- 360
-
-
- 68
-
-
- False
-
-
- MainH
-
-
- System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 3
-
-
- 176, 22
-
-
- Record Hud to AVI
-
-
- 176, 22
-
-
- Stop Record
-
-
- 176, 22
-
-
- Set MJPEG source
-
-
- 176, 22
-
-
- Set Aspect Ratio
-
-
- 176, 22
-
-
- Display Battery Info
-
-
- 176, 22
-
-
- User Items
-
-
- False
-
-
- 216, 90
-
-
- 114, 29
-
-
- 80
-
-
- modifyandSetAlt
-
-
- ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 0
-
-
- 445, 17
-
-
- Microsoft Sans Serif, 8.25pt
-
-
- NoControl
-
-
- 111, 90
-
-
- 45, 23
-
-
- 79
-
-
- Arm/ Disarm
-
-
- Arm the Mav
-
-
- BUT_ARM
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 1
-
-
- NoControl
-
-
- 4, 91
-
-
- 46, 23
-
-
- 78
-
-
- Script
-
-
- BUT_script
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 2
-
-
- NoControl
-
-
- 56, 91
-
-
- 49, 23
-
-
- 77
-
-
- Joystick
-
-
- Setup and enable your joystick
-
-
- BUT_joystick
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 3
-
-
- NoControl
-
-
- 147, 35
-
-
- 47, 23
-
-
- 76
-
-
- &Manual
-
-
- Change Mode to Manual/Stabalize
-
-
- BUT_quickmanual
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 4
-
-
- NoControl
-
-
- 147, 64
-
-
- 47, 23
-
-
- 75
-
-
- &RTL
-
-
- Change Mode to RTL
-
-
- BUT_quickrtl
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 5
-
-
- NoControl
-
-
- 147, 6
-
-
- 47, 23
-
-
- 74
-
-
- &Auto
-
-
- Change mode to Auto
-
-
- BUT_quickauto
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 6
-
-
- 0 (Home)
-
-
- 4, 35
-
-
- 76, 21
-
-
- 72
-
-
- CMB_setwp
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabActions
-
-
- 7
-
-
- NoControl
-
-
- 86, 35
-
-
- 55, 23
-
-
- 73
-
-
- Set WP
-
-
- Changes the current target waypoint
-
-
- BUT_setwp
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 8
-
-
- 4, 64
-
-
- 76, 21
-
-
- 70
-
-
- CMB_modes
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabActions
-
-
- 9
-
-
- NoControl
-
-
- 86, 64
-
-
- 55, 23
-
-
- 71
-
-
- Set Mode
-
-
- Changes to the Mode on the left
-
-
- BUT_setmode
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 10
-
-
- NoControl
-
-
- 162, 90
-
-
- 47, 23
-
-
- 52
-
-
- Clear Track
-
-
- Clear the recorded path on the map
-
-
- BUT_clear_track
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 11
-
-
- 4, 6
-
-
- 76, 21
-
-
- 59
-
-
- CMB_action
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabActions
-
-
- 12
-
-
- NoControl
-
-
- 200, 6
-
-
- 69, 23
-
-
- 69
-
-
- Set Home Alt
-
-
- Set the current display alt as 0, ie home alt is shown as 0
-
-
- BUT_Homealt
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 13
-
-
- NoControl
-
-
- 200, 64
-
-
- 69, 23
-
-
- 68
-
-
- Raw Sensor View
-
-
- View raw Gyro and Accel values, and Raw Radio ins/outs
-
-
- BUT_RAWSensor
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 14
-
-
- NoControl
-
-
- 200, 35
-
-
- 69, 23
-
-
- 63
-
-
- Restart Mission
-
-
- Restarts the mission from the beginning
-
-
- BUTrestartmission
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 15
-
-
- NoControl
-
-
- 86, 6
-
-
- 55, 23
-
-
- 60
-
-
- Do Action
-
-
- Preform the action ot the left
-
-
- BUTactiondo
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabActions
-
-
- 16
-
-
- Zoom
-
-
- Microsoft Sans Serif, 9pt
-
-
- 3, 6
-
-
- 0, 0, 0, 0
-
-
- 100, 100
-
-
- 82
-
-
- Gvspeed
-
-
- AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabGauges
-
-
- 0
-
-
- Zoom
-
-
- Microsoft Sans Serif, 9pt
-
-
- 303, 6
-
-
- 0, 0, 0, 0
-
-
- 100, 100
-
-
- 80
-
-
- Gheading
-
-
- ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabGauges
-
-
- 1
-
-
- Zoom
-
-
- Microsoft Sans Serif, 9pt
-
-
- 203, 6
-
-
- 0, 0, 0, 0
-
-
- 100, 100
-
-
- 81
-
-
- Galt
-
-
- AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- 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, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabGauges
-
-
- 3
-
-
- Top, Right
-
-
- 253, 54
-
-
- 51, 20
-
-
- 79
-
-
- x 1.0
-
-
- lbl_playbackspeed
-
-
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabTLogs
-
-
- 0
-
-
- Top, Right
-
-
- 253, 32
-
-
- 51, 20
-
-
- 78
-
-
- 0.00 %
-
-
- lbl_logpercent
-
-
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabTLogs
-
-
- 1
-
-
- Top, Left, Right
-
-
- 178, 40
-
-
- 73, 45
-
-
- 77
-
-
- Playback Speed
-
-
- NUM_playbackspeed
-
-
- ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabTLogs
-
-
- 2
-
-
- NoControl
-
-
- 29, 32
-
-
- 127, 23
-
-
- 76
-
-
- Tlog > Kml or Graph
-
-
- BUT_log2kml
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabTLogs
-
-
- 3
-
-
- Top, Left, Right
-
-
- NoControl
-
-
- 178, 3
-
-
- 110, 45
-
-
- 75
-
-
- tracklog
-
-
- System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabTLogs
-
-
- 4
-
-
- NoControl
-
-
- 89, 3
-
-
- 80, 23
-
-
- 73
-
-
- Play/Pause
-
-
- BUT_playlog
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabTLogs
-
-
- 5
-
-
- NoControl
-
-
- 3, 3
-
-
- 80, 23
-
-
- 71
-
-
- Load Log
-
-
- BUT_loadtelem
-
-
- ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- tabTLogs
-
-
- 6
-
Fill
@@ -1921,7 +1492,7 @@
lbl_winddir
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -1951,7 +1522,7 @@
lbl_windvel
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -1984,7 +1555,7 @@
lbl_hdop
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -2017,7 +1588,7 @@
lbl_sats
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -2189,7 +1760,7 @@
gMapControl1
- ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -2230,117 +1801,6 @@
0
-
- TXT_lat
-
-
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- panel1
-
-
- 0
-
-
- Zoomlevel
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel1
-
-
- 1
-
-
- label1
-
-
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- panel1
-
-
- 2
-
-
- TXT_long
-
-
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- panel1
-
-
- 3
-
-
- TXT_alt
-
-
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
-
-
- 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
-
-
- 286, 30
-
-
- 0
-
-
- panel1
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tableMap
-
-
- 1
-
Bottom, Left
@@ -2363,7 +1823,7 @@
TXT_lat
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
panel1
@@ -2420,7 +1880,7 @@
label1
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
panel1
@@ -2450,7 +1910,7 @@
TXT_long
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
panel1
@@ -2480,7 +1940,7 @@
TXT_alt
- ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
panel1
@@ -2560,6 +2020,99 @@
6
+
+ Fill
+
+
+ 1, 428
+
+
+ 0, 0, 0, 0
+
+
+ 286, 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
+
+
+ 288, 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
+
+
+ 654, 461
+
+
+ 360
+
+
+ 68
+
+
+ False
+
+
+ MainH
+
+
+ System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 3
+
Up
@@ -2578,8 +2131,14 @@
714, 17
+
+ 152, 22
+
+
+ Reset
+
- 103, 26
+ 153, 48
contextMenuStripDockContainer
@@ -2611,12 +2170,6 @@
4
-
- 152, 22
-
-
- Reset
-
True
@@ -2729,6 +2282,6 @@
FlightData
- System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4653.13270, Culture=neutral, PublicKeyToken=null
+ System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4661.12645, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs
index 3bb6591379..615802e258 100644
--- a/Tools/ArdupilotMegaPlanner/MainV2.cs
+++ b/Tools/ArdupilotMegaPlanner/MainV2.cs
@@ -1652,13 +1652,15 @@ namespace ArdupilotMega
log.Info("Quitting existing process");
try
{
+ // clean close
MainV2.instance.BeginInvoke((MethodInvoker)delegate()
{
- Application.Exit();
+ MainV2.instance.Close();
});
}
- catch
+ catch (Exception ex)
{
+ log.Error(ex);
Application.Exit();
}
}
diff --git a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs
index cd19f1f820..81f0ac1ccf 100644
--- a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs
+++ b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs
@@ -2788,6 +2788,8 @@ namespace ArdupilotMega
case (int)Common.ac2modes.ALT_HOLD:
case (int)Common.ac2modes.CIRCLE:
case (int)Common.ac2modes.POSITION:
+ case (int)Common.ac2modes.LAND:
+ case (int)Common.ac2modes.OF_LOITER:
mode.base_mode = (byte)MAVLink.MAV_MODE_FLAG.CUSTOM_MODE_ENABLED;
mode.custom_mode = (uint)EnumTranslator.GetValue(modein);
break;
diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs
index d2af21e514..c46c4c05fd 100644
--- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs
+++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs
@@ -2,14 +2,14 @@
-
+
-
-
+
+
@@ -31,7 +31,7 @@
-
+
@@ -68,194 +68,199 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -299,26 +304,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
index aa1334753d..cb86c3c195 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.2.13")]
+[assembly: AssemblyFileVersion("1.2.14")]
[assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/Tools/ArdupilotMegaPlanner/srtm.cs b/Tools/ArdupilotMegaPlanner/srtm.cs
index 96bc6ff7f3..b1602a2046 100644
--- a/Tools/ArdupilotMegaPlanner/srtm.cs
+++ b/Tools/ArdupilotMegaPlanner/srtm.cs
@@ -308,7 +308,9 @@ namespace ArdupilotMega
// check file doesnt already exist
if (File.Exists(datadirectory + Path.DirectorySeparatorChar + (string)name))
{
- return;
+ FileInfo fi = new FileInfo(datadirectory + Path.DirectorySeparatorChar + (string)name);
+ if (fi.Length != 0)
+ return;
}
List list = getListing(baseurl);