From 5e37830bb7851eeb1579ed6466aa447d7ffb0593 Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Mon, 11 Jan 2016 16:45:57 -0800 Subject: [PATCH] pulsensor: updated header to include namespace and generate proper html/xml with doxygen Signed-off-by: Mihai Tudor Panu --- examples/c++/pulsensor.cxx | 2 ++ src/pulsensor/pulsensor.cxx | 2 ++ src/pulsensor/pulsensor.h | 36 +++++++++++++++--------------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/examples/c++/pulsensor.cxx b/examples/c++/pulsensor.cxx index 2c0a9caa..dcb9cbab 100644 --- a/examples/c++/pulsensor.cxx +++ b/examples/c++/pulsensor.cxx @@ -27,6 +27,8 @@ #include "pulsensor.h" #include +using namespace upm; + int doWork = 0; void diff --git a/src/pulsensor/pulsensor.cxx b/src/pulsensor/pulsensor.cxx index 433b8169..73d9a09a 100644 --- a/src/pulsensor/pulsensor.cxx +++ b/src/pulsensor/pulsensor.cxx @@ -30,6 +30,8 @@ #include "pulsensor.h" +using namespace upm; + #if defined(JAVACALLBACK) Pulsensor::Pulsensor (Callback *obj_call) : pin_ctx(0) { diff --git a/src/pulsensor/pulsensor.h b/src/pulsensor/pulsensor.h index c82a1412..8c9866d4 100644 --- a/src/pulsensor/pulsensor.h +++ b/src/pulsensor/pulsensor.h @@ -40,6 +40,20 @@ #define TRUE HIGH #define FALSE LOW +/** + * Callback data struct + */ +struct clbk_data { + int is_heart_beat; /**< heartbeat check */ +}; + +#if defined(SWIGJAVA) || defined(JAVACALLBACK) +#include "Callback.h" +#else +typedef void (* callback_handler) (clbk_data); +#endif + +namespace upm { /** * @brief Pulsensor Pulse Sensor library * @defgroup pulsensor libupm-pulsensor @@ -63,26 +77,6 @@ * @image html pulsensor.jpg * @snippet pulsensor.cxx Interesting */ - -/*! - * @struct clbk_data - * @brief callback data - */ -struct clbk_data { - int is_heart_beat; /**< heartbeat check */ -}; - - -#if defined(SWIGJAVA) || defined(JAVACALLBACK) -#include "Callback.h" -#else -typedef void (* callback_handler) (clbk_data); -#endif - -/*! - * @class Pulsensor - * @brief The context for the heartbeat pulse sensor - */ class Pulsensor { public: @@ -120,4 +114,4 @@ private: #endif volatile uint16_t ctx_counter; }; - +}