From a08b8bbcb026a55948bab0c5c1e69ab58838fe63 Mon Sep 17 00:00:00 2001 From: Abhishek Malik Date: Tue, 13 Sep 2016 11:10:13 -0700 Subject: [PATCH] EHR: Removed Grove dependency Signed-off-by: Abhishek Malik --- examples/c++/CMakeLists.txt | 2 +- examples/c++/{groveehr.cxx => ehr.cxx} | 8 +++--- examples/java/CMakeLists.txt | 2 +- .../{GroveEHRSample.java => EHRSample.java} | 6 ++-- examples/javascript/{groveehr.js => ehr.js} | 6 ++-- examples/python/{groveehr.py => ehr.py} | 6 ++-- src/ehr/CMakeLists.txt | 5 ++++ src/{groveehr/groveehr.cxx => ehr/ehr.cxx} | 24 ++++++++-------- src/{groveehr/groveehr.hpp => ehr/ehr.hpp} | 28 +++++++++---------- .../javaupm_groveehr.i => ehr/javaupm_ehr.i} | 8 +++--- src/ehr/jsupm_ehr.i | 8 ++++++ .../pyupm_groveehr.i => ehr/pyupm_ehr.i} | 6 ++-- src/groveehr/CMakeLists.txt | 5 ---- src/groveehr/jsupm_groveehr.i | 8 ------ 14 files changed, 61 insertions(+), 61 deletions(-) rename examples/c++/{groveehr.cxx => ehr.cxx} (93%) rename examples/java/{GroveEHRSample.java => EHRSample.java} (92%) rename examples/javascript/{groveehr.js => ehr.js} (92%) rename examples/python/{groveehr.py => ehr.py} (93%) create mode 100644 src/ehr/CMakeLists.txt rename src/{groveehr/groveehr.cxx => ehr/ehr.cxx} (88%) rename src/{groveehr/groveehr.hpp => ehr/ehr.hpp} (83%) rename src/{groveehr/javaupm_groveehr.i => ehr/javaupm_ehr.i} (67%) create mode 100644 src/ehr/jsupm_ehr.i rename src/{groveehr/pyupm_groveehr.i => ehr/pyupm_ehr.i} (62%) delete mode 100644 src/groveehr/CMakeLists.txt delete mode 100644 src/groveehr/jsupm_groveehr.i diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index e84dab2b..e2606b30 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -143,7 +143,7 @@ add_example (ds1307) add_example (a110x) add_example (gp2y0a) add_example (moisture) -add_example (groveehr) +add_example (ehr) add_example (ta12200) add_example (grovelinefinder) add_example (vdiv) diff --git a/examples/c++/groveehr.cxx b/examples/c++/ehr.cxx similarity index 93% rename from examples/c++/groveehr.cxx rename to examples/c++/ehr.cxx index 73775606..a411f08d 100644 --- a/examples/c++/groveehr.cxx +++ b/examples/c++/ehr.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "groveehr.hpp" +#include "ehr.hpp" using namespace std; @@ -43,8 +43,8 @@ int main() signal(SIGINT, sig_handler); //! [Interesting] - // Instantiate a Grove Ear-clip Heart Rate sensor on digital pin D2 - upm::GroveEHR* heart = new upm::GroveEHR(2); + // Instantiate a Ear-clip Heart Rate sensor on digital pin D2 + upm::EHR* heart = new upm::EHR(2); // set the beat counter to 0, init the clock and start counting beats heart->clearBeatCounter(); @@ -75,4 +75,4 @@ int main() delete heart; return 0; -} +} \ No newline at end of file diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index 1d71e1c5..fafc6c6f 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -33,7 +33,7 @@ add_example(ES08ASample servo) add_example(GroveButtonSample grove) add_example(GroveButton_intrSample grove) add_example(Collision collision) -add_example(GroveEHRSample groveehr) +add_example(EHRSample ehr) add_example(Emg emg) add_example(Gsr gsr) add_example(GroveLed_multiSample grove) diff --git a/examples/java/GroveEHRSample.java b/examples/java/EHRSample.java similarity index 92% rename from examples/java/GroveEHRSample.java rename to examples/java/EHRSample.java index ddec36ac..7ad3e4d3 100644 --- a/examples/java/GroveEHRSample.java +++ b/examples/java/EHRSample.java @@ -23,12 +23,12 @@ */ //NOT TESTED!!! -public class GroveEHRSample { +public class EHRSample { public static void main(String[] args) throws InterruptedException { // ! [Interesting] - // Instantiate a Grove Ear-clip Heart Rate sensor on digital pin D2 - upm_groveehr.GroveEHR heart = new upm_groveehr.GroveEHR(2); + // Instantiate a Ear-clip Heart Rate sensor on digital pin D2 + upm_ehr.EHR heart = new upm_ehr.EHR(2); // set the beat counter to 0, init the clock and start counting beats heart.clearBeatCounter(); diff --git a/examples/javascript/groveehr.js b/examples/javascript/ehr.js similarity index 92% rename from examples/javascript/groveehr.js rename to examples/javascript/ehr.js index 40684900..ab7e8c9d 100644 --- a/examples/javascript/groveehr.js +++ b/examples/javascript/ehr.js @@ -23,9 +23,9 @@ */ // Load heart rate sensor module -var heartRateSensor = require('jsupm_groveehr'); -// Instantiate a Grove Ear-clip Heart Rate sensor on digital pin D2 -var myHeartRateSensor = new heartRateSensor.GroveEHR(2); +var heartRateSensor = require('jsupm_ehr'); +// Instantiate a Ear-clip Heart Rate sensor on digital pin D2 +var myHeartRateSensor = new heartRateSensor.EHR(2); // set the beat counter to 0, init the clock and start counting beats myHeartRateSensor.clearBeatCounter(); diff --git a/examples/python/groveehr.py b/examples/python/ehr.py similarity index 93% rename from examples/python/groveehr.py rename to examples/python/ehr.py index 3dd0ee22..7f1e6335 100644 --- a/examples/python/groveehr.py +++ b/examples/python/ehr.py @@ -23,10 +23,10 @@ import time, sys, signal, atexit -import pyupm_groveehr as upmGroveehr +import pyupm_ehr as upmehr -# Instantiate a Grove Ear-clip Heart Rate sensor on digital pin D2 -myHeartRateSensor = upmGroveehr.GroveEHR(2) +# Instantiate a Ear-clip Heart Rate sensor on digital pin D2 +myHeartRateSensor = upmehr.EHR(2) ## Exit handlers ## diff --git a/src/ehr/CMakeLists.txt b/src/ehr/CMakeLists.txt new file mode 100644 index 00000000..2a47bc7f --- /dev/null +++ b/src/ehr/CMakeLists.txt @@ -0,0 +1,5 @@ +upm_mixed_module_init (NAME ehr + DESCRIPTION "upm ear-clip heart rate sensor module" + CPP_HDR ehr.hpp + CPP_SRC ehr.cxx + REQUIRES mraa) diff --git a/src/groveehr/groveehr.cxx b/src/ehr/ehr.cxx similarity index 88% rename from src/groveehr/groveehr.cxx rename to src/ehr/ehr.cxx index 953e5f5a..bdab8a98 100644 --- a/src/groveehr/groveehr.cxx +++ b/src/ehr/ehr.cxx @@ -26,12 +26,12 @@ #include #include -#include "groveehr.hpp" +#include "ehr.hpp" using namespace upm; using namespace std; -GroveEHR::GroveEHR(int pin) +EHR::EHR(int pin) { if ( !(m_gpio = mraa_gpio_init(pin)) ) { @@ -46,17 +46,17 @@ GroveEHR::GroveEHR(int pin) m_beatCounter = 0; } -GroveEHR::~GroveEHR() +EHR::~EHR() { mraa_gpio_close(m_gpio); } -void GroveEHR::initClock() +void EHR::initClock() { gettimeofday(&m_startTime, NULL); } -uint32_t GroveEHR::getMillis() +uint32_t EHR::getMillis() { struct timeval elapsed, now; uint32_t elapse; @@ -84,36 +84,36 @@ uint32_t GroveEHR::getMillis() return elapse; } -void GroveEHR::clearBeatCounter() +void EHR::clearBeatCounter() { m_beatCounter = 0; } -void GroveEHR::startBeatCounter() +void EHR::startBeatCounter() { // install our interrupt handler mraa_gpio_isr(m_gpio, MRAA_GPIO_EDGE_RISING, &beatISR, this); } -void GroveEHR::stopBeatCounter() +void EHR::stopBeatCounter() { // remove the interrupt handler mraa_gpio_isr_exit(m_gpio); } -uint32_t GroveEHR::beatCounter() +uint32_t EHR::beatCounter() { return m_beatCounter; } -void GroveEHR::beatISR(void *ctx) +void EHR::beatISR(void *ctx) { - upm::GroveEHR *This = (upm::GroveEHR *)ctx; + upm::EHR *This = (upm::EHR *)ctx; This->m_beatCounter++; } -int GroveEHR::heartRate() +int EHR::heartRate() { uint32_t millis = getMillis(); uint32_t beats = beatCounter(); diff --git a/src/groveehr/groveehr.hpp b/src/ehr/ehr.hpp similarity index 83% rename from src/groveehr/groveehr.hpp rename to src/ehr/ehr.hpp index 371fe83f..d102952e 100644 --- a/src/groveehr/groveehr.hpp +++ b/src/ehr/ehr.hpp @@ -30,39 +30,39 @@ namespace upm { /** - * @brief Grove Ear-clip Heart Rate Sensor library - * @defgroup groveehr libupm-groveehr + * @brief Ear-clip Heart Rate Sensor library + * @defgroup ehr libupm-ehr * @ingroup seeed gpio medical */ /** - * @library groveehr - * @sensor groveehr - * @comname Grove Ear-clip Heart Rate Sensor + * @library ehr + * @sensor ehr + * @comname Ear-clip Heart Rate Sensor * @type medical * @man seeed * @con gpio * - * @brief API for the Grove Ear-clip Heart Rate Sensor + * @brief API for the Ear-clip Heart Rate Sensor * - * UPM module for the Grove ear-clip heart rate sensor. It is used to measure your + * UPM module for the ear-clip heart rate sensor. It is used to measure your * heart rate. * - * @image html groveehr.jpg - * @snippet groveehr.cxx Interesting + * @image html ehr.jpg + * @snippet ehr.cxx Interesting */ - class GroveEHR { + class EHR { public: /** - * GroveEHR constructor + * EHR constructor * * @param pin Digital pin to use */ - GroveEHR(int pin); + EHR(int pin); /** - * GroveEHR destructor + * EHR destructor */ - ~GroveEHR(); + ~EHR(); /** * Returns the time of milliseconds elapsed since initClock() * was last called. diff --git a/src/groveehr/javaupm_groveehr.i b/src/ehr/javaupm_ehr.i similarity index 67% rename from src/groveehr/javaupm_groveehr.i rename to src/ehr/javaupm_ehr.i index 2ac1d9c4..6cce692d 100644 --- a/src/groveehr/javaupm_groveehr.i +++ b/src/ehr/javaupm_ehr.i @@ -1,18 +1,18 @@ -%module javaupm_groveehr +%module javaupm_ehr %include "../upm.i" %ignore beatISR; %{ - #include "groveehr.hpp" + #include "ehr.hpp" %} -%include "groveehr.hpp" +%include "ehr.hpp" %pragma(java) jniclasscode=%{ static { try { - System.loadLibrary("javaupm_groveehr"); + System.loadLibrary("javaupm_ehr"); } catch (UnsatisfiedLinkError e) { System.err.println("Native code library failed to load. \n" + e); System.exit(1); diff --git a/src/ehr/jsupm_ehr.i b/src/ehr/jsupm_ehr.i new file mode 100644 index 00000000..ef76d195 --- /dev/null +++ b/src/ehr/jsupm_ehr.i @@ -0,0 +1,8 @@ +%module jsupm_ehr +%include "../upm.i" + +%{ + #include "ehr.hpp" +%} + +%include "ehr.hpp" diff --git a/src/groveehr/pyupm_groveehr.i b/src/ehr/pyupm_ehr.i similarity index 62% rename from src/groveehr/pyupm_groveehr.i rename to src/ehr/pyupm_ehr.i index 002a85e1..b01eba97 100644 --- a/src/groveehr/pyupm_groveehr.i +++ b/src/ehr/pyupm_ehr.i @@ -1,11 +1,11 @@ // Include doxygen-generated documentation %include "pyupm_doxy2swig.i" -%module pyupm_groveehr +%module pyupm_ehr %include "../upm.i" %feature("autodoc", "3"); -%include "groveehr.hpp" +%include "ehr.hpp" %{ - #include "groveehr.hpp" + #include "ehr.hpp" %} diff --git a/src/groveehr/CMakeLists.txt b/src/groveehr/CMakeLists.txt deleted file mode 100644 index f53d9c2e..00000000 --- a/src/groveehr/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set (libname "groveehr") -set (libdescription "upm grove ear-clip heart rate sensor module") -set (module_src ${libname}.cxx) -set (module_hpp ${libname}.hpp) -upm_module_init() diff --git a/src/groveehr/jsupm_groveehr.i b/src/groveehr/jsupm_groveehr.i deleted file mode 100644 index 3005cc9f..00000000 --- a/src/groveehr/jsupm_groveehr.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveehr -%include "../upm.i" - -%{ - #include "groveehr.hpp" -%} - -%include "groveehr.hpp"