mirror of
https://github.com/eclipse/upm.git
synced 2025-03-14 20:47:30 +03:00
Speaker: Removed grove dependency
* Renamed all files from grovespeaker to speaker * Replaced all instances of grovespeaker with speaker * Updated all CMake files
This commit is contained in:
parent
c759932ee6
commit
982065a7b7
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 97 KiB |
@ -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
|
||||
|
@ -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)
|
||||
|
@ -25,15 +25,15 @@
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <signal.h>
|
||||
#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();
|
@ -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)
|
||||
|
@ -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]
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -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();
|
@ -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()
|
@ -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()
|
@ -1,8 +0,0 @@
|
||||
%module jsupm_grovespeaker
|
||||
%include "../upm.i"
|
||||
|
||||
%{
|
||||
#include "grovespeaker.hpp"
|
||||
%}
|
||||
|
||||
%include "grovespeaker.hpp"
|
5
src/speaker/CMakeLists.txt
Normal file
5
src/speaker/CMakeLists.txt
Normal file
@ -0,0 +1,5 @@
|
||||
upm_mixed_module_init (NAME speaker
|
||||
DESCRIPTION "UPM Speaker Module"
|
||||
CPP_HDR speaker.hpp
|
||||
CPP_SRC speaker.cxx
|
||||
REQUIRES mraa)
|
@ -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);
|
8
src/speaker/jsupm_speaker.i
Normal file
8
src/speaker/jsupm_speaker.i
Normal file
@ -0,0 +1,8 @@
|
||||
%module jsupm_speaker
|
||||
%include "../upm.i"
|
||||
|
||||
%{
|
||||
#include "speaker.hpp"
|
||||
%}
|
||||
|
||||
%include "speaker.hpp"
|
@ -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"
|
||||
%}
|
@ -26,11 +26,11 @@
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
|
||||
#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<char, NoteData>::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++)
|
@ -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)
|
||||
*
|
Loading…
x
Reference in New Issue
Block a user