From 4d85f0b5ecd31f69c4708844e35651b7ac5331ef Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 7 Jun 2014 22:58:39 +0200 Subject: [PATCH] Hook up receiving messages path --- src/uas/QGCUASFileManager.cc | 6 ++++-- src/uas/UAS.cc | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/uas/QGCUASFileManager.cc b/src/uas/QGCUASFileManager.cc index 3ae7eea2d..f03f84f23 100644 --- a/src/uas/QGCUASFileManager.cc +++ b/src/uas/QGCUASFileManager.cc @@ -76,14 +76,16 @@ void QGCUASFileManager::nothingMessage() void QGCUASFileManager::receiveMessage(LinkInterface* link, mavlink_message_t message) { - emit statusMessage("msg"); + Q_UNUSED(link); if (message.msgid != MAVLINK_MSG_ID_ENCAPSULATED_DATA) { - emit statusMessage("not encap data"); // wtf, not for us return; } + emit statusMessage("msg"); + qDebug() << "FTP GOT MESSAGE"; + mavlink_encapsulated_data_t data; mavlink_msg_encapsulated_data_decode(&message, &data); const RequestHeader *hdr = (const RequestHeader *)&data.data[0]; diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 585781b74..64f133c8f 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -176,6 +176,8 @@ UAS::UAS(MAVLinkProtocol* protocol, QThread* thread, int id) : UASInterface(), componentMulti[i] = false; } + connect(mavlink, SIGNAL(messageReceived(LinkInterface*,mavlink_message_t)), &fileManager, SLOT(receiveMessage(LinkInterface*,mavlink_message_t))); + // Store a list of available actions for this UAS. // Basically everything exposed as a SLOT with no return value or arguments. -- 2.22.0