diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-28 16:08:51 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-28 16:08:51 +0100 |
commit | a9c1e4ad6145485805366fad5c08ae7351886ff3 (patch) | |
tree | a32520d33cb1c5b1cf32d6fc640c77634816099b /src/platforms/nuttx | |
parent | cefccc0037f18275b8d8c7e49e15d13801ef28a1 (diff) | |
download | px4-firmware-a9c1e4ad6145485805366fad5c08ae7351886ff3.tar.gz px4-firmware-a9c1e4ad6145485805366fad5c08ae7351886ff3.tar.bz2 px4-firmware-a9c1e4ad6145485805366fad5c08ae7351886ff3.zip |
make px4::ok work, use it in px4::spin
Diffstat (limited to 'src/platforms/nuttx')
-rw-r--r-- | src/platforms/nuttx/module.mk | 5 | ||||
-rw-r--r-- | src/platforms/nuttx/px4_nodehandle.cpp | 19 | ||||
-rw-r--r-- | src/platforms/nuttx/px4_nuttx_impl.cpp | 5 |
3 files changed, 1 insertions, 28 deletions
diff --git a/src/platforms/nuttx/module.mk b/src/platforms/nuttx/module.mk index 1c0ad7aa4..4a2aff824 100644 --- a/src/platforms/nuttx/module.mk +++ b/src/platforms/nuttx/module.mk @@ -35,9 +35,6 @@ # NuttX / uORB adapter library # -SRCS = px4_nuttx_impl.cpp \ - px4_publisher.cpp \ - px4_subscriber.cpp \ - px4_nodehandle.cpp +SRCS = px4_nuttx_impl.cpp MAXOPTIMIZATION = -Os diff --git a/src/platforms/nuttx/px4_nodehandle.cpp b/src/platforms/nuttx/px4_nodehandle.cpp index 7930a0680..ec557e8aa 100644 --- a/src/platforms/nuttx/px4_nodehandle.cpp +++ b/src/platforms/nuttx/px4_nodehandle.cpp @@ -37,27 +37,8 @@ * PX4 Middleware Wrapper Nodehandle */ #include <px4.h> -#include <platforms/px4_nodehandle.h> namespace px4 { -bool task_should_exit = false; - - -void NodeHandle::spinOnce() { - /* Loop through subscriptions, call callback for updated subscriptions */ - uORB::SubscriptionNode *sub = _subs.getHead(); - int count = 0; - - while (sub != nullptr) { - if (count++ > kMaxSubscriptions) { - PX4_WARN("exceeded max subscriptions"); - break; - } - - sub->update(); - sub = sub->getSibling(); - } -} } diff --git a/src/platforms/nuttx/px4_nuttx_impl.cpp b/src/platforms/nuttx/px4_nuttx_impl.cpp index 22daee823..70e292320 100644 --- a/src/platforms/nuttx/px4_nuttx_impl.cpp +++ b/src/platforms/nuttx/px4_nuttx_impl.cpp @@ -54,9 +54,4 @@ uint64_t get_time_micros() return hrt_absolute_time(); } -bool ok() -{ - return !task_should_exit; -} - } |