diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 11:37:33 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 11:37:33 +0200 |
| commit | faf5c0bf85c743a6a45e04321fac20a69be0e9f0 (patch) | |
| tree | 4f455e96fc83c04fde14609c9b8bb93ab35195f1 /src | |
| parent | b1f223b468ab5ff73c6a39749dbaf43f2f46a90b (diff) | |
| parent | 3e0c318311a05c323f68177d01f461066b06b76d (diff) | |
| download | px4-firmware-faf5c0bf85c743a6a45e04321fac20a69be0e9f0.tar.gz px4-firmware-faf5c0bf85c743a6a45e04321fac20a69be0e9f0.tar.bz2 px4-firmware-faf5c0bf85c743a6a45e04321fac20a69be0e9f0.zip | |
Merge branch 'master' of github.com:PX4/Firmware into prearm_checks
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/mavlink/mavlink_orb_subscription.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/modules/mavlink/mavlink_orb_subscription.cpp b/src/modules/mavlink/mavlink_orb_subscription.cpp index 3807323c2..901fa8f05 100644 --- a/src/modules/mavlink/mavlink_orb_subscription.cpp +++ b/src/modules/mavlink/mavlink_orb_subscription.cpp @@ -44,8 +44,6 @@ #include <uORB/uORB.h> #include <stdio.h> -#include <systemlib/err.h> - #include "mavlink_orb_subscription.h" MavlinkOrbSubscription::MavlinkOrbSubscription(const orb_id_t topic) : @@ -79,23 +77,21 @@ MavlinkOrbSubscription::update(uint64_t *time, void* data) time_topic = 0; } - if (time_topic != *time) { - - if (orb_copy(_topic, _fd, data)) { - /* error copying topic data */ - memset(data, 0, _topic->o_size); - //warnx("err copy, fd: %d, obj: %s, size: %d", _fd, _topic->o_name, _topic->o_size); - return false; + if (orb_copy(_topic, _fd, data)) { + /* error copying topic data */ + memset(data, 0, _topic->o_size); + return false; - } else { - /* data copied successfully */ - _published = true; + } else { + /* data copied successfully */ + _published = true; + if (time_topic != *time) { *time = time_topic; return true; - } - } else { - return false; + } else { + return false; + } } } |