Merge branch 'master' into add_do_set_home

ArduPilot · Jan 9, 2025 · 8bcda77 · 8bcda77
2 parents 0aa00a4 + a4eca31
commit 8bcda77
Show file tree

Hide file tree

Showing 7 changed files with 958 additions and 489 deletions.
diff --git a/ExtLibs/ArduPilot/Mavlink/MAVLinkInterface.cs b/ExtLibs/ArduPilot/Mavlink/MAVLinkInterface.cs
@@ -733,7 +733,7 @@ private void OpenBg(IProgressReporterDialogue PRsender, bool getparams)
                 var countDown = new Timer {Interval = 1000, AutoReset = false};
                 countDown.Elapsed += (sender, e) =>
                 {
-                    int secondsRemaining = (deadline - e.SignalTime).Seconds;
+                    int secondsRemaining = Convert.ToInt32((deadline - e.SignalTime).TotalSeconds);
                     frmProgressReporter.UpdateProgressAndStatus(-1, string.Format(Strings.Trying, secondsRemaining));
                     if (secondsRemaining > 0) countDown.Start();
                 };

diff --git a/ExtLibs/Mavlink/Mavlink.cs b/ExtLibs/Mavlink/Mavlink.cs
@@ -5,7 +5,7 @@
 
 public partial class MAVLink
 {
-    public const string MAVLINK_BUILD_DATE = "Wed Dec 18 2024";
+    public const string MAVLINK_BUILD_DATE = "Thu Jan 09 2025";
     public const string MAVLINK_WIRE_PROTOCOL_VERSION = "2.0";
     public const int MAVLINK_MAX_PAYLOAD_LEN = 255;
 
@@ -2429,6 +2429,9 @@ public enum PLANE_MODE: int /*default*/
         ///<summary> LOITER2QLAND | </summary>
         [Description("LOITER2QLAND")]
         LOITER_ALT_QLAND=25, 
+        ///<summary> AUTOLAND | </summary>
+        [Description("AUTOLAND")]
+        AUTOLAND=26, 
 
     };
 

diff --git a/ExtLibs/Mavlink/mavlink.lua b/ExtLibs/Mavlink/mavlink.lua
@@ -901,6 +901,7 @@ local enumEntryName = {
         [23] = "PLANE_MODE_QACRO",
         [24] = "PLANE_MODE_THERMAL",
         [25] = "PLANE_MODE_LOITER_ALT_QLAND",
+        [26] = "PLANE_MODE_AUTOLAND",
     },
     ["COPTER_MODE"] = {
         [0] = "COPTER_MODE_STABILIZE",

diff --git a/ExtLibs/Mavlink/message_definitions/ardupilotmega.xml b/ExtLibs/Mavlink/message_definitions/ardupilotmega.xml
@@ -1146,6 +1146,9 @@
       <entry value="25" name="PLANE_MODE_LOITER_ALT_QLAND">
         <description>LOITER2QLAND</description>
       </entry>
+      <entry value="26" name="PLANE_MODE_AUTOLAND">
+        <description>AUTOLAND</description>
+      </entry>
     </enum>
     <enum name="COPTER_MODE">
       <description>A mapping of copter flight modes for custom_mode field of heartbeat.</description>