aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink/mavlink_ftp.cpp
diff options
context:
space:
mode:
authorDon Gagne <don@thegagnes.com>2014-08-27 17:14:49 -0700
committerDon Gagne <don@thegagnes.com>2014-08-27 17:14:49 -0700
commit0eea110f6fb4e95238a496f3a71b1cb6741625f7 (patch)
treeda7a86b892c457d5756d18eed3c337b13f464d69 /src/modules/mavlink/mavlink_ftp.cpp
parent96f5a823e9e0c878f96a723872e337357a558b14 (diff)
downloadpx4-firmware-0eea110f6fb4e95238a496f3a71b1cb6741625f7.tar.gz
px4-firmware-0eea110f6fb4e95238a496f3a71b1cb6741625f7.tar.bz2
px4-firmware-0eea110f6fb4e95238a496f3a71b1cb6741625f7.zip
Modified to use new FILE_TRANSFER_PROTOCOL message
- Also corrected system/component id transmit/check
Diffstat (limited to 'src/modules/mavlink/mavlink_ftp.cpp')
-rw-r--r--src/modules/mavlink/mavlink_ftp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_ftp.cpp b/src/modules/mavlink/mavlink_ftp.cpp
index 00c8df18c..f4a7bc101 100644
--- a/src/modules/mavlink/mavlink_ftp.cpp
+++ b/src/modules/mavlink/mavlink_ftp.cpp
@@ -114,7 +114,7 @@ MavlinkFTP::_worker(Request *req)
uint32_t messageCRC;
// basic sanity checks; must validate length before use
- if ((hdr->magic != kProtocolMagic) || (hdr->size > kMaxDataLength)) {
+ if (hdr->size > kMaxDataLength) {
errorCode = kErrNoRequest;
goto out;
}
@@ -199,7 +199,7 @@ MavlinkFTP::_reply(Request *req)
{
auto hdr = req->header();
- hdr->magic = kProtocolMagic;
+ hdr->seqNumber = req->header()->seqNumber + 1;
// message is assumed to be already constructed in the request buffer, so generate the CRC
hdr->crc32 = 0;