diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-14 13:48:03 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-14 13:48:03 +0200 |
| commit | d9f3352d72b39f885458aa2d6250ef64f34c2720 (patch) | |
| tree | a6de9416cd1967d99a69aa3fdfaa4bcf1ea2eb36 /src/modules/mavlink/mavlink_receiver.cpp | |
| parent | 629e73bcf44f820f1936521d6c65cc481792ce5a (diff) | |
| parent | ddc8f1fa5f5b88549af5e4f5f46c751a5f3af3ce (diff) | |
| download | px4-firmware-d9f3352d72b39f885458aa2d6250ef64f34c2720.tar.gz px4-firmware-d9f3352d72b39f885458aa2d6250ef64f34c2720.tar.bz2 px4-firmware-d9f3352d72b39f885458aa2d6250ef64f34c2720.zip | |
Merge branch 'master' of github.com:PX4/Firmware into vision_estimate
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index a0a953f72..43a7abdda 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -79,7 +79,6 @@ __BEGIN_DECLS #include "mavlink_bridge_header.h" #include "mavlink_receiver.h" #include "mavlink_main.h" -#include "util.h" __END_DECLS @@ -996,16 +995,8 @@ MavlinkReceiver::receive_thread(void *arg) /* handle generic messages and commands */ handle_message(&msg); - /* handle packet with waypoint component */ - _mavlink->mavlink_wpm_message_handler(&msg); - - /* handle packet with parameter component */ - _mavlink->mavlink_pm_message_handler(_mavlink->get_channel(), &msg); - - if (_mavlink->get_forwarding_on()) { - /* forward any messages to other mavlink instances */ - Mavlink::forward_message(&msg, _mavlink); - } + /* handle packet with parent object */ + _mavlink->handle_message(&msg); } } } |