diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-14 09:56:14 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-14 09:56:14 +0200 |
| commit | 574b7fc854bd331ab3e45bae4f1fb06675e3aae5 (patch) | |
| tree | f012369f9be99c3af1aa08298b4d2d9cbc93317f /src/modules/mavlink/mavlink_receiver.cpp | |
| parent | cf4a11c7e7cfa524992a96d41d885da38ab95ebd (diff) | |
| parent | ddc8f1fa5f5b88549af5e4f5f46c751a5f3af3ce (diff) | |
| download | px4-firmware-574b7fc854bd331ab3e45bae4f1fb06675e3aae5.tar.gz px4-firmware-574b7fc854bd331ab3e45bae4f1fb06675e3aae5.tar.bz2 px4-firmware-574b7fc854bd331ab3e45bae4f1fb06675e3aae5.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
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 769c1b7ca..bd1296f62 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 @@ -1014,16 +1013,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); } } } |