diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 13:11:29 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 13:11:29 +0200 |
| commit | 5db51bd704a4493fe3a53010b84bede19c980dfc (patch) | |
| tree | 193a48fe1dec40f8a06c5ff33f0c8c1733590852 /src/modules/mavlink/mavlink_receiver.cpp | |
| parent | 045ee8c7c7c4618a8a03f9c9342f53d2fc7333c9 (diff) | |
| parent | 7f0b35a1b4c167ec2ebc2cb7c17fbbd7e032914e (diff) | |
| download | px4-firmware-5db51bd704a4493fe3a53010b84bede19c980dfc.tar.gz px4-firmware-5db51bd704a4493fe3a53010b84bede19c980dfc.tar.bz2 px4-firmware-5db51bd704a4493fe3a53010b84bede19c980dfc.zip | |
Merged master into navigator_rewrite
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 0862f6bf0..59dc79b26 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -114,6 +114,9 @@ MavlinkReceiver::MavlinkReceiver(Mavlink *parent) : _hil_local_alt0(0.0) { memset(&hil_local_pos, 0, sizeof(hil_local_pos)); + + // make sure the FTP server is started + (void)MavlinkFTP::getServer(); } MavlinkReceiver::~MavlinkReceiver() @@ -156,6 +159,10 @@ MavlinkReceiver::handle_message(mavlink_message_t *msg) handle_message_heartbeat(msg); break; + case MAVLINK_MSG_ID_ENCAPSULATED_DATA: + MavlinkFTP::getServer()->handle_message(_mavlink, msg); + break; + default: break; } |