From f60e65b38fd051595b465f619a19effa9c13efee Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Wed, 21 Jan 2015 18:05:31 +0100 Subject: [PATCH] clean up subscriber example --- src/examples/subscriber/subscriber_example.cpp | 5 +---- src/examples/subscriber/subscriber_example.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/examples/subscriber/subscriber_example.cpp b/src/examples/subscriber/subscriber_example.cpp index fd462cd2d3..18f1a9eb9b 100644 --- a/src/examples/subscriber/subscriber_example.cpp +++ b/src/examples/subscriber/subscriber_example.cpp @@ -43,8 +43,6 @@ using namespace px4; -// void rc_channels_callback_function(const PX4_TOPIC_T(rc_channels) &msg) { -void rc_channels_callback_function(const px4_rc_channels &msg); void rc_channels_callback_function(const px4_rc_channels &msg) { PX4_INFO("I heard: [%llu]", msg.data().timestamp_last_valid); } @@ -64,9 +62,8 @@ SubscriberExample::SubscriberExample() : /* Do some subscriptions */ /* Function */ - // PX4_SUBSCRIBE(_n, rc_channels, rc_channels_callback_function, _interval); _n.subscribe(rc_channels_callback_function); //ROS version - + // [> Class Method <] // PX4_SUBSCRIBE(_n, rc_channels, SubscriberExample::rc_channels_callback, this, 1000); // [> No callback <] diff --git a/src/examples/subscriber/subscriber_example.h b/src/examples/subscriber/subscriber_example.h index 43dafe010a..883d83be7b 100644 --- a/src/examples/subscriber/subscriber_example.h +++ b/src/examples/subscriber/subscriber_example.h @@ -41,7 +41,7 @@ using namespace px4; -void rc_channels_callback_function(const PX4_TOPIC_T(rc_channels) &msg); +void rc_channels_callback_function(const px4_rc_channels &msg); class SubscriberExample { public: @@ -56,7 +56,6 @@ protected: int32_t _interval; px4_param_t _p_test_float; float _test_float; - // px4::PX4_SUBSCRIBER(rc_channels) * _sub_rc_chan; px4::Subscriber * _sub_rc_chan; // void rc_channels_callback(const PX4_TOPIC_T(rc_channels) &msg);