aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink/mavlink_ftp.cpp
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-06-08 18:51:35 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-06-08 18:51:35 +0200
commita103fef948b7f239afef21a8d0f848151891b409 (patch)
tree4e2bec2b8a9a4490555c1e322a4c2f9da015beb2 /src/modules/mavlink/mavlink_ftp.cpp
parentf84e18f27a84254c9760a771f8ad91f864ba25fe (diff)
downloadpx4-firmware-a103fef948b7f239afef21a8d0f848151891b409.tar.gz
px4-firmware-a103fef948b7f239afef21a8d0f848151891b409.tar.bz2
px4-firmware-a103fef948b7f239afef21a8d0f848151891b409.zip
Fixed threading and transmission issues for FTP
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 d4d659d91..8c29043e0 100644
--- a/src/modules/mavlink/mavlink_ftp.cpp
+++ b/src/modules/mavlink/mavlink_ftp.cpp
@@ -64,7 +64,7 @@ MavlinkFTP::MavlinkFTP()
}
void
-MavlinkFTP::handle_message(mavlink_message_t *msg, mavlink_channel_t channel)
+MavlinkFTP::handle_message(Mavlink* mavlink, mavlink_message_t *msg)
{
// get a free request
auto req = _dqFree();
@@ -73,7 +73,7 @@ MavlinkFTP::handle_message(mavlink_message_t *msg, mavlink_channel_t channel)
if (req != nullptr) {
// decode the request
- if (req->decode(msg, channel)) {
+ if (req->decode(mavlink, msg)) {
// and queue it for the worker
work_queue(LPWORK, &req->work, &MavlinkFTP::_workerTrampoline, req, 0);