Mission Planner 1.2.87

add asratio change load iris defaults to use compare add okcancel to custom mesagebox add partial refresh to pid config screens add ability to load default params for frames. add rally point display in FD add df log to kml in FD add grad + dist to FP add load and save rally points to file interface out df to kml generation tweak get params on mavlink log fix rally point alt when loading from mav update 3drradio config - custom fw, new url, new extension, new max window add gpstime tweak paramcompare add accel scan in control-f
Kevin-Xia-carbonix · Nov 22, 2013 · 48df347 · 48df347
1 parent 0bce543
commit 48df347
Show file tree

Hide file tree

Showing 53 changed files with 5,276 additions and 1,833 deletions.
diff --git a/3DRRadio/ChangeLog.txt b/3DRRadio/ChangeLog.txt
@@ -1,4 +1,6 @@
-1.02 - fix frequency display and add device id
+1.2 - fix file already exists error
+1.1 - add custom fw upload & change stable fw download urls
+1.02 - fix frequency display and add device id
 1.0a - fix 868 freq range
 1.0 - added rf freeq for 868
 0.9 - added rfd900a

diff --git a/3DRRadio/Config.resx b/3DRRadio/Config.resx
@@ -405,13 +405,13 @@
     <value>RSSI</value>
   </data>
   <data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 22</value>
+    <value>152, 22</value>
   </data>
   <data name="helpToolStripMenuItem.Text" xml:space="preserve">
     <value>Help</value>
   </data>
   <data name="projectPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 22</value>
+    <value>152, 22</value>
   </data>
   <data name="projectPageToolStripMenuItem.Text" xml:space="preserve">
     <value>Project Page</value>
@@ -1591,7 +1591,7 @@
 </value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>3DRRadio Config 1.02</value>
+    <value>3DRRadio Config 1.2 - by Michael Oborne</value>
   </data>
   <data name="&gt;&gt;settingsToolStripMenuItem.Name" xml:space="preserve">
     <value>settingsToolStripMenuItem</value>

diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,4 +1,22 @@
-* Mission Planner 1.2.86
+* Mission Planner 1.2.87
+add asratio
+change load iris defaults to use compare
+add okcancel to custom mesagebox
+add partial refresh to pid config screens
+add ability to load default params for frames.
+add rally point display in FD
+add df log to kml in FD
+add grad + dist to FP
+add load and save rally points to file
+interface out df to kml generation
+tweak get params on mavlink log
+fix rally point alt when loading from mav
+update 3drradio config - custom fw, new url, new extension, new max window
+add gpstime
+tweak paramcompare
+add accel scan in control-f
+
+* Mission Planner 1.2.86
 spline display support
 doublebuffer quick view
 move hud message text to bottom of hud & always ontop

diff --git a/CurrentState.cs b/CurrentState.cs
@@ -87,6 +87,8 @@ public float alt
         public float airspeed { get { return _airspeed * multiplierspeed; } set { _airspeed = value; } }
         [DisplayText("Airspeed Target (speed)")]
         public float targetairspeed { get { return _targetairspeed; } }
+        [DisplayText("Airspeed Ratio")]
+        public float asratio { get; set; }
         [DisplayText("GroundSpeed (speed)")]
         public float groundspeed { get { return _groundspeed * multiplierspeed; } set { _groundspeed = value; } }
         float _airspeed;
@@ -437,6 +439,7 @@ public float DistRSSIRemain {
 
         // reference
         public DateTime datetime { get; set; }
+        public DateTime gpstime { get; set; }
 
         // HIL
         public int hilch1 { get; set; }
@@ -671,17 +674,26 @@ enum gcs_severity {
                         //MAVLink.packets[(byte)MAVLink.MSG_NAMES.HIL_CONTROLS] = null;
                     }
 
+                    bytearray = mavinterface.MAV.packets[(byte)MAVLink.MAVLINK_MSG_ID.AIRSPEED_AUTOCAL];
+
+                    if (bytearray != null)
+                    {
+                        var asac = bytearray.ByteArrayToStructure<MAVLink.mavlink_airspeed_autocal_t>(6);
+
+                        asratio = asac.ratio;
+                    }
+
                     bytearray = mavinterface.MAV.packets[(byte)MAVLink.MAVLINK_MSG_ID.SYSTEM_TIME];
 
                     if (bytearray != null)
                     {
                         var systime = bytearray.ByteArrayToStructure<MAVLink.mavlink_system_time_t>(6);
 
-                        DateTime newtime = DateTime.Now;
+                        DateTime date1 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+                        date1 = date1.AddMilliseconds(systime.time_unix_usec / 1000);
 
-                          //UInt64 ms_per_week = 7000ULL*86400ULL;
-     //UInt64 unix_offset = 17000ULL*86400ULL + 52*10*7000ULL*86400ULL - 15000ULL;
-    //UInt64 fix_time_ms = unix_offset + time_week*ms_per_week + time_week_ms;
+                        gpstime = date1;
                     }
 
                     bytearray = mavinterface.MAV.packets[(byte)MAVLink.MAVLINK_MSG_ID.HWSTATUS];

diff --git a/ExtLibs/Controls/CustomMessageBox.cs b/ExtLibs/Controls/CustomMessageBox.cs
@@ -262,6 +262,36 @@ private static void AddButtonsToForm(Form msgBoxFrm, MessageBoxButtons buttons)
                     msgBoxFrm.CancelButton = butno;
                     break;
 
+                case MessageBoxButtons.OKCancel:
+
+                    if (msgBoxFrm.Width < (75 * 2 + FORM_X_MARGIN * 3))
+                        msgBoxFrm.Width = (75 * 2 + FORM_X_MARGIN * 3);
+
+                    var butok = new MyButton
+                    {
+                        Size = new Size(75, 23),
+                        Text = "OK",
+                        Left = msgBoxFrm.Width - 75 * 2 - FORM_X_MARGIN * 2,
+                        Top = msgBoxFrm.Height - 23 - FORM_Y_MARGIN - titleHeight
+                    };
+
+                    butok.Click += delegate { _state = DialogResult.OK; msgBoxFrm.Close(); };
+                    msgBoxFrm.Controls.Add(butok);
+                    msgBoxFrm.AcceptButton = butok;
+
+                    var butcancel = new MyButton
+                    {
+                        Size = new Size(75, 23),
+                        Text = "Cancel",
+                        Left = msgBoxFrm.Width - 75 - FORM_X_MARGIN,
+                        Top = msgBoxFrm.Height - 23 - FORM_Y_MARGIN - titleHeight
+                    };
+
+                    butcancel.Click += delegate { _state = DialogResult.Cancel; msgBoxFrm.Close(); };
+                    msgBoxFrm.Controls.Add(butcancel);
+                    msgBoxFrm.CancelButton = butcancel;
+                    break;
+
                 default:
                     throw new NotImplementedException("Only MessageBoxButtons.OK and YesNo supported at this time");
             }

diff --git a/ExtLibs/Controls/RangeControl.cs b/ExtLibs/Controls/RangeControl.cs
@@ -139,7 +139,7 @@ protected void numericUpDown1_ValueChanged(object sender, EventArgs e)
       protected void trackBar1_ValueChanged(object sender, EventArgs e)
       {
           numericUpDown1.Value = map(trackBar1.Value, 0, 100, numericUpDown1.Minimum, numericUpDown1.Maximum);
-         numericUpDown1.Text = (numericUpDown1.Value).ToString();
+         //numericUpDown1.Text = (numericUpDown1.Value).ToString();
 
          if (ValueChanged != null)
              ValueChanged(this,Name, Value);

diff --git a/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs b/GCSViews/ConfigurationView/ConfigArducopter.Designer.cs