aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB/Subscription.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-11-25 15:58:27 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-11-25 15:58:27 +0100
commit3c6f6618e8709c22ac21f8f0353f292f25da22f7 (patch)
treee472fd1aad3d301213305b1c349b2c507a0c9489 /src/modules/uORB/Subscription.cpp
parent55cf2fc61c7b90725cd960f9c7d72737024f1cfc (diff)
parent579ec36c28d4cbf08d93531853b2b8fd3f3461ac (diff)
downloadpx4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.tar.gz
px4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.tar.bz2
px4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.zip
Merge remote-tracking branch 'upstream/uorbtinymerge' into dev_ros
Diffstat (limited to 'src/modules/uORB/Subscription.cpp')
-rw-r--r--src/modules/uORB/Subscription.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/modules/uORB/Subscription.cpp b/src/modules/uORB/Subscription.cpp
index 3406a66d3..a681ccb30 100644
--- a/src/modules/uORB/Subscription.cpp
+++ b/src/modules/uORB/Subscription.cpp
@@ -56,21 +56,13 @@
namespace uORB
{
-bool __EXPORT SubscriptionBase::updated()
-{
- bool isUpdated = false;
- orb_check(_handle, &isUpdated);
- return isUpdated;
-}
-
template<class T>
Subscription<T>::Subscription(
- List<SubscriptionBase *> * list,
- const struct orb_metadata *meta, unsigned interval) :
+ const struct orb_metadata *meta,
+ unsigned interval,
+ List<SubscriptionNode *> * list) :
T(), // initialize data structure to zero
- SubscriptionBase(list, meta) {
- setHandle(orb_subscribe(getMeta()));
- orb_set_interval(getHandle(), interval);
+ SubscriptionNode(meta, interval, list) {
}
template<class T>