diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-26 09:49:30 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-29 16:33:53 +0100 |
| commit | cbe3783d5eeeb6597b1f02f38abf16737f6d4d64 (patch) | |
| tree | 725307dcc42351f4cf63c7e325d6ba7e09b439d9 /src/modules/mavlink/mavlink_main.cpp | |
| parent | 2f7a9eaf6553d7da6c5d6e9b3edf6e710b4dc292 (diff) | |
| download | px4-firmware-cbe3783d5eeeb6597b1f02f38abf16737f6d4d64.tar.gz px4-firmware-cbe3783d5eeeb6597b1f02f38abf16737f6d4d64.tar.bz2 px4-firmware-cbe3783d5eeeb6597b1f02f38abf16737f6d4d64.zip | |
Support topic groups in MAVLink subscription handling
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 9e4ab00df..d6e9982de 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -904,20 +904,20 @@ Mavlink::send_statustext(unsigned char severity, const char *string) mavlink_logbuffer_write(&_logbuffer, &logmsg); } -MavlinkOrbSubscription *Mavlink::add_orb_subscription(const orb_id_t topic) +MavlinkOrbSubscription *Mavlink::add_orb_subscription(const orb_id_t topic, int instance) { /* check if already subscribed to this topic */ MavlinkOrbSubscription *sub; LL_FOREACH(_subscriptions, sub) { - if (sub->get_topic() == topic) { + if (sub->get_topic() == topic && sub->get_instance() == instance) { /* already subscribed */ return sub; } } /* add new subscription */ - MavlinkOrbSubscription *sub_new = new MavlinkOrbSubscription(topic); + MavlinkOrbSubscription *sub_new = new MavlinkOrbSubscription(topic, instance); LL_APPEND(_subscriptions, sub_new); |