diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-26 11:55:41 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-26 11:55:48 +0100 |
| commit | 0474908e1c600d312934fcdd5790813813e799b1 (patch) | |
| tree | 5e47f22e8d98b28453bd0b34e5c982a3f8949d63 | |
| parent | e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119 (diff) | |
| download | px4-firmware-0474908e1c600d312934fcdd5790813813e799b1.tar.gz px4-firmware-0474908e1c600d312934fcdd5790813813e799b1.tar.bz2 px4-firmware-0474908e1c600d312934fcdd5790813813e799b1.zip | |
reenable task flag
| -rw-r--r-- | src/examples/publisher/publisher.cpp | 6 | ||||
| -rw-r--r-- | src/examples/subscriber/subscriber.cpp | 6 | ||||
| -rw-r--r-- | src/platforms/nuttx/px4_nodehandle.cpp | 5 | ||||
| -rw-r--r-- | src/platforms/nuttx/px4_nuttx_impl.cpp | 5 | ||||
| -rw-r--r-- | src/platforms/px4_middleware.h | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/src/examples/publisher/publisher.cpp b/src/examples/publisher/publisher.cpp index 68fd8a5c3..5ee8b459b 100644 --- a/src/examples/publisher/publisher.cpp +++ b/src/examples/publisher/publisher.cpp @@ -32,7 +32,11 @@ using namespace px4; /** * This tutorial demonstrates simple sending of messages over the PX4 middleware system. */ -// __EXPORT bool task_should_exit; + +namespace px4 +{ +bool task_should_exit = false; +} PX4_MAIN_FUNCTION(publisher) { diff --git a/src/examples/subscriber/subscriber.cpp b/src/examples/subscriber/subscriber.cpp index cdadaf2bc..b87231880 100644 --- a/src/examples/subscriber/subscriber.cpp +++ b/src/examples/subscriber/subscriber.cpp @@ -36,8 +36,10 @@ void rc_channels_callback(const PX4_TOPIC_T(rc_channels) *msg) { PX4_INFO("I heard: [%lu]", msg->timestamp_last_valid); } - -// __EXPORT bool task_should_exit; +namespace px4 +{ +bool task_should_exit = false; +} PX4_MAIN_FUNCTION(subscriber) { diff --git a/src/platforms/nuttx/px4_nodehandle.cpp b/src/platforms/nuttx/px4_nodehandle.cpp index 473a5cf77..091b5c6c6 100644 --- a/src/platforms/nuttx/px4_nodehandle.cpp +++ b/src/platforms/nuttx/px4_nodehandle.cpp @@ -37,3 +37,8 @@ * PX4 Middleware Wrapper Nodehandle */ #include <platforms/px4_nodehandle.h> + +namespace px4 +{ +bool task_should_exit = false; +} diff --git a/src/platforms/nuttx/px4_nuttx_impl.cpp b/src/platforms/nuttx/px4_nuttx_impl.cpp index 4b87f68fe..6471e3e38 100644 --- a/src/platforms/nuttx/px4_nuttx_impl.cpp +++ b/src/platforms/nuttx/px4_nuttx_impl.cpp @@ -40,7 +40,6 @@ #include <px4.h> #include <drivers/drv_hrt.h> -extern bool task_should_exit; namespace px4 { @@ -57,9 +56,7 @@ uint64_t get_time_micros() bool ok() { - // return !task_should_exit; - //XXX - return true; + return !task_should_exit; } void spin_once() diff --git a/src/platforms/px4_middleware.h b/src/platforms/px4_middleware.h index eebfc9049..a09d9ac58 100644 --- a/src/platforms/px4_middleware.h +++ b/src/platforms/px4_middleware.h @@ -68,6 +68,8 @@ private: }; +extern bool task_should_exit; + // /** // * A limiter/ saturation. // * The output of update is the input, bounded |