From 982065a7b77c126fe33e866dfafed287932ec555 Mon Sep 17 00:00:00 2001 From: Sisinty Sasmita Patra Date: Tue, 13 Sep 2016 16:09:09 -0700 Subject: [PATCH] Speaker: Removed grove dependency * Renamed all files from grovespeaker to speaker * Replaced all instances of grovespeaker with speaker * Updated all CMake files --- docs/images/{grovespeaker.jpg => speaker.jpg} | Bin doxy/samples.mapping.txt | 2 +- examples/c++/CMakeLists.txt | 2 +- .../c++/{grovespeaker.cxx => speaker.cxx} | 6 ++-- examples/java/CMakeLists.txt | 2 +- ...eSpeakerSample.java => SpeakerSample.java} | 8 ++--- .../{grovespeaker.js => speaker.js} | 8 ++--- .../python/{grovespeaker.py => speaker.py} | 6 ++-- src/grovespeaker/CMakeLists.txt | 5 ---- src/grovespeaker/jsupm_grovespeaker.i | 8 ----- src/speaker/CMakeLists.txt | 5 ++++ .../javaupm_speaker.i} | 8 ++--- src/speaker/jsupm_speaker.i | 8 +++++ .../pyupm_speaker.i} | 6 ++-- .../grovespeaker.cxx => speaker/speaker.cxx} | 14 ++++----- .../grovespeaker.hpp => speaker/speaker.hpp} | 28 +++++++++--------- 16 files changed, 58 insertions(+), 58 deletions(-) rename docs/images/{grovespeaker.jpg => speaker.jpg} (100%) rename examples/c++/{grovespeaker.cxx => speaker.cxx} (91%) rename examples/java/{GroveSpeakerSample.java => SpeakerSample.java} (89%) rename examples/javascript/{grovespeaker.js => speaker.js} (88%) rename examples/python/{grovespeaker.py => speaker.py} (90%) delete mode 100644 src/grovespeaker/CMakeLists.txt delete mode 100644 src/grovespeaker/jsupm_grovespeaker.i create mode 100644 src/speaker/CMakeLists.txt rename src/{grovespeaker/javaupm_grovespeaker.i => speaker/javaupm_speaker.i} (63%) create mode 100644 src/speaker/jsupm_speaker.i rename src/{grovespeaker/pyupm_grovespeaker.i => speaker/pyupm_speaker.i} (59%) rename src/{grovespeaker/grovespeaker.cxx => speaker/speaker.cxx} (92%) rename src/{grovespeaker/grovespeaker.hpp => speaker/speaker.hpp} (85%) diff --git a/docs/images/grovespeaker.jpg b/docs/images/speaker.jpg similarity index 100% rename from docs/images/grovespeaker.jpg rename to docs/images/speaker.jpg diff --git a/doxy/samples.mapping.txt b/doxy/samples.mapping.txt index eb52eee6..f044dbe7 100644 --- a/doxy/samples.mapping.txt +++ b/doxy/samples.mapping.txt @@ -20,7 +20,7 @@ relay.cxx RelaySample.java rotary.cxx RotarySample.java grovescam.cxx GROVESCAMSample.java slide.cxx SlideSample.java -grovespeaker.cxx GroveSpeakerSample.java +speaker.cxx SpeakerSample.java vdiv.cxx VDivSample.java water.cxx WaterSample.java grovewfs.cxx GroveWFSSample.java diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index 5e7042e6..4dd378b1 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -154,7 +154,7 @@ add_example (yg1006) add_example (wt5001) add_example (ppd42ns) add_example (mq303a) -add_example (grovespeaker) +add_example (speaker) add_example (rfr359f) add_example (biss0001) add_example (rotaryencoder) diff --git a/examples/c++/grovespeaker.cxx b/examples/c++/speaker.cxx similarity index 91% rename from examples/c++/grovespeaker.cxx rename to examples/c++/speaker.cxx index 4e139e5b..0fad75c4 100644 --- a/examples/c++/grovespeaker.cxx +++ b/examples/c++/speaker.cxx @@ -25,15 +25,15 @@ #include #include #include -#include "grovespeaker.hpp" +#include "speaker.hpp" using namespace std; int main () { //! [Interesting] - // Instantiate a Grove Speaker on digital pin D2 - upm::GroveSpeaker* speaker = new upm::GroveSpeaker(2); + // Instantiate a Speaker on digital pin D2 + upm::Speaker* speaker = new upm::Speaker(2); // Play all 7 of the lowest notes speaker->playAll(); diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index a9937240..a3e0a84c 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -50,7 +50,7 @@ add_example(RelaySample relay) add_example(RotarySample rotary) add_example(GROVESCAMSample grovescam) add_example(SlideSample slide) -add_example(GroveSpeakerSample grovespeaker) +add_example(SpeakerSample speaker) add_example(TemperatureSample temperature) add_example(VDivSample vdiv) add_example(WaterSample water) diff --git a/examples/java/GroveSpeakerSample.java b/examples/java/SpeakerSample.java similarity index 89% rename from examples/java/GroveSpeakerSample.java rename to examples/java/SpeakerSample.java index 2e96c893..941ddb42 100644 --- a/examples/java/GroveSpeakerSample.java +++ b/examples/java/SpeakerSample.java @@ -22,12 +22,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -public class GroveSpeakerSample { +public class SpeakerSample { public static void main(String[] args) throws InterruptedException { // ! [Interesting] - // Instantiate a Grove Speaker on digital pin D2 - upm_grovespeaker.GroveSpeaker speaker = new upm_grovespeaker.GroveSpeaker(2); + // Instantiate a Speaker on digital pin D2 + upm_speaker.Speaker speaker = new upm_speaker.Speaker(2); // Play all 7 of the lowest notes speaker.playAll(); @@ -37,4 +37,4 @@ public class GroveSpeakerSample { // ! [Interesting] } -} \ No newline at end of file +} diff --git a/examples/javascript/grovespeaker.js b/examples/javascript/speaker.js similarity index 88% rename from examples/javascript/grovespeaker.js rename to examples/javascript/speaker.js index de92225e..0a224245 100644 --- a/examples/javascript/grovespeaker.js +++ b/examples/javascript/speaker.js @@ -22,10 +22,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -//Load Grove Speaker module -var groveSpeaker = require('jsupm_grovespeaker'); -// Instantiate a Grove Speaker on digital pin D2 -var mySpeaker = new groveSpeaker.GroveSpeaker(2); +//Load Speaker module +var Speaker = require('jsupm_speaker'); +// Instantiate a Speaker on digital pin D2 +var mySpeaker = new Speaker.Speaker(2); // Play all 7 of the lowest notes mySpeaker.playAll(); diff --git a/examples/python/grovespeaker.py b/examples/python/speaker.py similarity index 90% rename from examples/python/grovespeaker.py rename to examples/python/speaker.py index 6e53b3c5..48e0eadd 100644 --- a/examples/python/grovespeaker.py +++ b/examples/python/speaker.py @@ -22,10 +22,10 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import time, sys, signal, atexit -import pyupm_grovespeaker as upmGrovespeaker +import pyupm_speaker as upmspeaker -# Instantiate a Grove Speaker on digital pin D2 -mySpeaker = upmGrovespeaker.GroveSpeaker(2) +# Instantiate a Speaker on digital pin D2 +mySpeaker = upmspeaker.Speaker(2) # Play all 7 of the lowest notes mySpeaker.playAll() diff --git a/src/grovespeaker/CMakeLists.txt b/src/grovespeaker/CMakeLists.txt deleted file mode 100644 index 171bfd69..00000000 --- a/src/grovespeaker/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set (libname "grovespeaker") -set (libdescription "upm grovespeaker speaker module") -set (module_src ${libname}.cxx) -set (module_hpp ${libname}.hpp) -upm_module_init() diff --git a/src/grovespeaker/jsupm_grovespeaker.i b/src/grovespeaker/jsupm_grovespeaker.i deleted file mode 100644 index ef71438f..00000000 --- a/src/grovespeaker/jsupm_grovespeaker.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovespeaker -%include "../upm.i" - -%{ - #include "grovespeaker.hpp" -%} - -%include "grovespeaker.hpp" diff --git a/src/speaker/CMakeLists.txt b/src/speaker/CMakeLists.txt new file mode 100644 index 00000000..eced0e73 --- /dev/null +++ b/src/speaker/CMakeLists.txt @@ -0,0 +1,5 @@ +upm_mixed_module_init (NAME speaker + DESCRIPTION "UPM Speaker Module" + CPP_HDR speaker.hpp + CPP_SRC speaker.cxx + REQUIRES mraa) diff --git a/src/grovespeaker/javaupm_grovespeaker.i b/src/speaker/javaupm_speaker.i similarity index 63% rename from src/grovespeaker/javaupm_grovespeaker.i rename to src/speaker/javaupm_speaker.i index 4af4564a..f6e5224b 100644 --- a/src/grovespeaker/javaupm_grovespeaker.i +++ b/src/speaker/javaupm_speaker.i @@ -1,16 +1,16 @@ -%module javaupm_grovespeaker +%module javaupm_speaker %include "../upm.i" %{ - #include "grovespeaker.hpp" + #include "speaker.hpp" %} -%include "grovespeaker.hpp" +%include "speaker.hpp" %pragma(java) jniclasscode=%{ static { try { - System.loadLibrary("javaupm_grovespeaker"); + System.loadLibrary("javaupm_speaker"); } catch (UnsatisfiedLinkError e) { System.err.println("Native code library failed to load. \n" + e); System.exit(1); diff --git a/src/speaker/jsupm_speaker.i b/src/speaker/jsupm_speaker.i new file mode 100644 index 00000000..f5a7f76c --- /dev/null +++ b/src/speaker/jsupm_speaker.i @@ -0,0 +1,8 @@ +%module jsupm_speaker +%include "../upm.i" + +%{ + #include "speaker.hpp" +%} + +%include "speaker.hpp" diff --git a/src/grovespeaker/pyupm_grovespeaker.i b/src/speaker/pyupm_speaker.i similarity index 59% rename from src/grovespeaker/pyupm_grovespeaker.i rename to src/speaker/pyupm_speaker.i index 667c872f..da98fb52 100644 --- a/src/grovespeaker/pyupm_grovespeaker.i +++ b/src/speaker/pyupm_speaker.i @@ -1,11 +1,11 @@ // Include doxygen-generated documentation %include "pyupm_doxy2swig.i" -%module pyupm_grovespeaker +%module pyupm_speaker %include "../upm.i" %feature("autodoc", "3"); -%include "grovespeaker.hpp" +%include "speaker.hpp" %{ - #include "grovespeaker.hpp" + #include "speaker.hpp" %} diff --git a/src/grovespeaker/grovespeaker.cxx b/src/speaker/speaker.cxx similarity index 92% rename from src/grovespeaker/grovespeaker.cxx rename to src/speaker/speaker.cxx index 61d25481..35d81881 100644 --- a/src/grovespeaker/grovespeaker.cxx +++ b/src/speaker/speaker.cxx @@ -26,11 +26,11 @@ #include #include -#include "grovespeaker.hpp" +#include "speaker.hpp" using namespace upm; -GroveSpeaker::GroveSpeaker(int pin) +Speaker::Speaker(int pin) { if ( !(m_gpio = mraa_gpio_init(pin)) ) throw std::invalid_argument(std::string(__FUNCTION__) + @@ -46,12 +46,12 @@ GroveSpeaker::GroveSpeaker(int pin) m_note_list['g'] = storeNote(1276, 1204, 638, 602, 319, 301); } -GroveSpeaker::~GroveSpeaker() +Speaker::~Speaker() { mraa_gpio_close(m_gpio); } -NoteData GroveSpeaker::storeNote(int noteDelayLow, int noteDelayLowSharp, +NoteData Speaker::storeNote(int noteDelayLow, int noteDelayLowSharp, int noteDelayMed, int noteDelayMedSharp, int noteDelayHigh, int noteDelayHighSharp) { @@ -65,7 +65,7 @@ NoteData GroveSpeaker::storeNote(int noteDelayLow, int noteDelayLowSharp, return note; } -void GroveSpeaker::playAll() +void Speaker::playAll() { playSound('c', false, "low"); usleep(200000); @@ -83,7 +83,7 @@ void GroveSpeaker::playAll() usleep(500000); } -void GroveSpeaker::playSound(char letter, bool sharp, std::string vocalWeight) +void Speaker::playSound(char letter, bool sharp, std::string vocalWeight) { std::map::iterator it = m_note_list.find(letter); if(it == m_note_list.end()) @@ -134,7 +134,7 @@ void GroveSpeaker::playSound(char letter, bool sharp, std::string vocalWeight) sound(delayTime); } -void GroveSpeaker::sound(int note_delay) +void Speaker::sound(int note_delay) { mraa_result_t error = MRAA_SUCCESS; for (int i = 0; i < 100; i++) diff --git a/src/grovespeaker/grovespeaker.hpp b/src/speaker/speaker.hpp similarity index 85% rename from src/grovespeaker/grovespeaker.hpp rename to src/speaker/speaker.hpp index 535dc484..b897d667 100644 --- a/src/grovespeaker/grovespeaker.hpp +++ b/src/speaker/speaker.hpp @@ -33,8 +33,8 @@ namespace upm { /** - * @brief Grove Speaker library - * @defgroup grovespeaker libupm-grovespeaker + * @brief Speaker library + * @defgroup speaker libupm-speaker * @ingroup seeed gpio sound hak */ typedef struct @@ -47,35 +47,35 @@ typedef struct int delayTimeHighSharp; } NoteData; /** - * @library grovespeaker - * @sensor grovespeaker - * @comname Grove Speaker + * @library speaker + * @sensor speaker libupm-speaker + * @comname Speaker * @type sound * @man seeed * @con gpio * @kit hak * - * @brief API for the Grove Speaker + * @brief API for the Speaker * - * UPM module for the Grove Speaker. + * UPM module for the Speaker. * This sensor can generate different tones and sounds depending on the * frequency of the input signal. * - * @image html grovespeaker.jpg - * @snippet grovespeaker.cxx Interesting + * @image html speaker.jpg + * @snippet speaker.cxx Interesting */ - class GroveSpeaker { + class Speaker { public: /** - * Grove Speaker constructor + * Speaker constructor * * @param pin Digital pin to use */ - GroveSpeaker(int pin); + Speaker(int pin); /** - * GroveSpeaker destructor + * Speaker destructor */ - ~GroveSpeaker(); + ~Speaker(); /** * Plays all alto notes (lowest notes) *