MAVFtp: dont override size on requests #2784

Author: meee1

ExtLibs/ArduPilot/Mavlink/MAVFtp.cs

@@ -1478,6 +1478,8 @@ public MemoryStream kCmdReadFile(string file, int size, CancellationTokenSource
             Progress?.Invoke(file, 100);
             _mavint.UnSubscribeToPacketType(sub);
             answer.Position = 0;
+            if (!timeout.Complete)
+                return null;
             if (ex != null)
                 throw ex;
             return answer;
@@ -2182,8 +2184,14 @@ public struct FTPPayloadHeader
             static public implicit operator byte[](FTPPayloadHeader value)
             {
                 if (value.data == null)
+                {
                     value.data = new byte[251 - 12];
-                value.size = (byte) (value.data.Length);
+                }
+                else 
+                {
+                    value.size = (byte)(value.data.Length);
+                }
+                               
                 value.data = value.data.MakeSize(251 - 12);
                 return MavlinkUtil.StructureToByteArray(value);
             }

ExtLibs/ArduPilot/Mavlink/MAVLinkInterface.cs

@@ -1702,7 +1702,7 @@ public async Task<MAVLinkParamList> getParamListMavftpAsync(byte sysid, byte com
                                 frmProgressReporter.UpdateProgressAndStatus(i, $"Getting Param MAVFTP {sysid}-{compid}");
                         };
                         return ftp.GetFile(
-                            "@PARAM/param.pck", cancel, false, 110);
+                            "@PARAM/param.pck", cancel, true, 110);
                     });
                     while (!paramfileTask.IsCompleted)
                     {

Log/MavlinkLog.cs

@@ -1041,6 +1041,13 @@ private async void BUT_convertcsv_Click(object sender, EventArgs e)
                                 string text = "";
                                 mine.DebugPacket(packet, ref text, false, ",");
 
+                                if(packet.data is MAVLink.mavlink_file_transfer_protocol_t)
+                                {
+                                    var msg = (MAVLink.mavlink_file_transfer_protocol_t)packet.data;
+                                    ArduPilot.Mavlink.MAVFtp.FTPPayloadHeader ftphead = msg.payload;
+                                    text = text.TrimEnd() + ", " + ftphead.ToString() + Environment.NewLine;
+                                }
+
                                 if (!String.IsNullOrEmpty(text))
                                     sw.Write(mine.lastlogread.ToString("yyyy-MM-ddTHH:mm:ss.fff") + "," + text);
                             }