Compare commits

...

5 Commits

Author SHA1 Message Date
Matthias L. Jugel
910987fcea 0.8.25 2017-02-19 11:44:36 +01:00
Matthias L. Jugel
7c8c35a326 fix comments and parameter typo 2017-02-19 11:44:16 +01:00
thinkberg
7ad9a1cab8 0.8.24 2017-02-19 11:22:53 +01:00
thinkberg
97ba83f660 Merge branch 'calliope-mini-2016' of github.com:microsoft/pxt-calliope into calliope-mini-2016 2017-02-19 11:22:49 +01:00
thinkberg
d69bd0e0e4 fix play ringtone (#MINI-32) 2017-02-19 11:19:26 +01:00
4 changed files with 11 additions and 6 deletions

View File

@@ -180,6 +180,7 @@
"music.noteFrequency": "Gets the frequency of a note.",
"music.noteFrequency|param|name": "the note name",
"music.playTone": "Plays a tone through ``speaker`` for the given duration.",
"music.playTone|param|frequency": "pitch of the tone to play in Hertz (Hz)",
"music.playTone|param|ms": "tone duration in milliseconds (ms)",
"music.rest": "Rests (plays nothing) for a specified time through pin ``P0``.",
"music.rest|param|ms": "rest duration in milliseconds (ms)",

View File

@@ -9,9 +9,13 @@ namespace music {
//% help=music/play-tone weight=90
//% blockId=device_play_note block="play|tone %note=device_note|for %duration=device_beat" icon="\uf025" blockGap=8
//% parts="speaker" async
void playTone(int freqency, int ms) {
uBit.soundmotor.soundOn(freqency);
if(ms > 0) uBit.sleep(ms);
uBit.soundmotor.soundOff();
void playTone(int frequency, int ms) {
if(frequency > 0) uBit.soundmotor.soundOn(frequency);
else uBit.soundmotor.soundOff();
if(ms > 0) {
uBit.sleep(ms);
uBit.soundmotor.soundOff();
}
}
}

View File

@@ -555,7 +555,7 @@ declare namespace music {
//% help=music/play-tone weight=90
//% blockId=device_play_note block="play|tone %note=device_note|for %duration=device_beat" icon="\uf025" blockGap=8
//% parts="speaker" async shim=music::playTone
function playTone(freqency: number, ms: number): void;
function playTone(frequency: number, ms: number): void;
}
declare namespace pins {

View File

@@ -1,6 +1,6 @@
{
"name": "pxt-calliope",
"version": "0.8.23",
"version": "0.8.25",
"description": "Calliope Mini editor for PXT",
"keywords": [
"JavaScript",