diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-01 16:43:04 +0400 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-01 16:43:04 +0400 |
commit | 1b8004cd8ecf7824584aac9e7fed447714feb716 (patch) | |
tree | c916e20ebda1c3cc04690455051353810ede6721 /src/modules/mavlink/mavlink_orb_subscription.cpp | |
parent | 836f7c435fe31572e45333877142dce8b4d2fc78 (diff) | |
download | px4-firmware-1b8004cd8ecf7824584aac9e7fed447714feb716.tar.gz px4-firmware-1b8004cd8ecf7824584aac9e7fed447714feb716.tar.bz2 px4-firmware-1b8004cd8ecf7824584aac9e7fed447714feb716.zip |
mavlink: add new streams in main loop, minor cleanup and fixes
Diffstat (limited to 'src/modules/mavlink/mavlink_orb_subscription.cpp')
-rw-r--r-- | src/modules/mavlink/mavlink_orb_subscription.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_orb_subscription.cpp b/src/modules/mavlink/mavlink_orb_subscription.cpp index e1208bca9..6279e5366 100644 --- a/src/modules/mavlink/mavlink_orb_subscription.cpp +++ b/src/modules/mavlink/mavlink_orb_subscription.cpp @@ -42,13 +42,14 @@ #include <stdlib.h> #include <string.h> #include <uORB/uORB.h> +#include <stdio.h> #include "mavlink_orb_subscription.h" -MavlinkOrbSubscription::MavlinkOrbSubscription(const orb_id_t topic, size_t size) : _topic(topic), _last_check(0), next(nullptr) +MavlinkOrbSubscription::MavlinkOrbSubscription(const orb_id_t topic) : _topic(topic), _last_check(0), next(nullptr) { - _data = malloc(size); - memset(_data, 0, size); + _data = malloc(topic->o_size); + memset(_data, 0, topic->o_size); _fd = orb_subscribe(_topic); } @@ -58,7 +59,7 @@ MavlinkOrbSubscription::~MavlinkOrbSubscription() free(_data); } -const struct orb_metadata * +const orb_id_t MavlinkOrbSubscription::get_topic() { return _topic; |