diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-29 02:25:42 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-29 02:25:42 -0700 |
| commit | 1ab6eb2fb87c0bff617e4abd100fc8d62817106c (patch) | |
| tree | 83ec4738b45a919e8470cf025e300763adffa00e /src/modules/mavlink/mavlink_main.cpp | |
| parent | e2c96876f2df85e5d1f2b27a368a81bc7a3a24de (diff) | |
| parent | 80a197f0fffb39037ce271bbc2e2107f2208eb01 (diff) | |
| download | px4-firmware-1ab6eb2fb87c0bff617e4abd100fc8d62817106c.tar.gz px4-firmware-1ab6eb2fb87c0bff617e4abd100fc8d62817106c.tar.bz2 px4-firmware-1ab6eb2fb87c0bff617e4abd100fc8d62817106c.zip | |
Merge pull request #1228 from PX4/mavlinkonboard
Mavlink onboard
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index fbe09564b..861c91d47 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -483,7 +483,12 @@ Mavlink::forward_message(const mavlink_message_t *msg, Mavlink *self) Mavlink *inst; LL_FOREACH(_mavlink_instances, inst) { if (inst != self) { - inst->pass_message(msg); + + /* if not in normal mode, we are an onboard link + * onboard links should only pass on messages from the same system ID */ + if(!(self->_mode != MAVLINK_MODE_NORMAL && msg->sysid != mavlink_system.sysid)) { + inst->pass_message(msg); + } } } } |