mirror of
https://github.com/eclipse/upm.git
synced 2025-07-01 09:21:12 +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:

committed by
Noel Eck

parent
c759932ee6
commit
982065a7b7
@ -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()
|
Reference in New Issue
Block a user