Compare commits

...

9 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
Matthias L. Jugel
3e46d4c615 0.8.23 2017-02-18 15:42:01 +01:00
Matthias L. Jugel
2a3f2d4b11 fix 115200 string 2017-02-18 15:41:52 +01:00
Matthias L. Jugel
d9b3f2fbef add 57600 as baud selection 2017-02-18 15:32:21 +01:00
Matthias L. Jugel
978e0fd765 updated for Calliope mini board rev 0.3 (2016) 2017-02-18 15:25:12 +01:00
10 changed files with 19 additions and 10 deletions

View File

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

View File

@ -8,6 +8,7 @@
"AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity", "AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity",
"AcceleratorRange.TwoG|block": "2g", "AcceleratorRange.TwoG|block": "2g",
"BaudRate.BaudRate115200|block": "115200", "BaudRate.BaudRate115200|block": "115200",
"BaudRate.BaudRate56700|block": "57600",
"BaudRate.BaudRate9600|block": "9600", "BaudRate.BaudRate9600|block": "9600",
"BeatFraction.Eighth|block": "1/8", "BeatFraction.Eighth|block": "1/8",
"BeatFraction.Half|block": "1/2", "BeatFraction.Half|block": "1/2",
@ -94,9 +95,7 @@
"Rotation.Roll|block": "roll", "Rotation.Roll|block": "roll",
"String.charAt|block": "char from %this=text|at %pos", "String.charAt|block": "char from %this=text|at %pos",
"String.compare|block": "compare %this=text| to %that", "String.compare|block": "compare %this=text| to %that",
"String.concat|block": "join %this=text|%other",
"String.fromCharCode|block": "text from char code %code", "String.fromCharCode|block": "text from char code %code",
"String.isEmpty|block": "%this=text| is empty",
"String.length|block": "length of %VALUE", "String.length|block": "length of %VALUE",
"String.substr|block": "substring of %this=text|from %start|of length %length", "String.substr|block": "substring of %this=text|from %start|of length %length",
"String|block": "String", "String|block": "String",

View File

@ -7,7 +7,7 @@
"AcceleratorRange.OneG|block": "1g", "AcceleratorRange.OneG|block": "1g",
"AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g", "AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g",
"AcceleratorRange.TwoG|block": "2g", "AcceleratorRange.TwoG|block": "2g",
"BaudRate.BaudRate115200|block": "11520", "BaudRate.BaudRate115200|block": "115200",
"BaudRate.BaudRate9600|block": "9600", "BaudRate.BaudRate9600|block": "9600",
"BeatFraction.Eighth|block": "1/8", "BeatFraction.Eighth|block": "1/8",
"BeatFraction.Half|block": "1/2", "BeatFraction.Half|block": "1/2",

1
libs/core/dal.d.ts vendored
View File

@ -192,6 +192,7 @@ declare const enum DAL {
MICROBIT_SERIAL_EVT_TX_EMPTY = 2, MICROBIT_SERIAL_EVT_TX_EMPTY = 2,
MICROBIT_UART_S_EVT_TX_EMPTY = 3, MICROBIT_UART_S_EVT_TX_EMPTY = 3,
// built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeRGB.h // built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeRGB.h
RGB_LED_MAX_INTENSITY = 40,
// built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeSoundMotor.h // built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeSoundMotor.h
CALLIOPE_SM_DEFAULT_DUTY_M = 50, CALLIOPE_SM_DEFAULT_DUTY_M = 50,
CALLIOPE_SM_DEFAULT_DUTY_S = 100, CALLIOPE_SM_DEFAULT_DUTY_S = 100,

View File

@ -339,6 +339,8 @@ declare namespace motors {
declare enum BaudRate { declare enum BaudRate {
//% block=115200 //% block=115200
BaudRate115200 = 115200, BaudRate115200 = 115200,
//% block=57600
BaudRate56700 = 57600,
//% block=9600 //% block=9600
BaudRate9600 = 9600, BaudRate9600 = 9600,
} }

View File

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

View File

@ -12,6 +12,8 @@ enum SerialPin {
enum BaudRate { enum BaudRate {
//% block=115200 //% block=115200
BaudRate115200 = 115200, BaudRate115200 = 115200,
//% block=57600
BaudRate56700 = 57600,
//% block=9600 //% block=9600
BaudRate9600 = 9600 BaudRate9600 = 9600
}; };

View File

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

View File

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

View File

@ -171,7 +171,7 @@
"yottaTarget": "calliope-mini-classic-gcc", "yottaTarget": "calliope-mini-classic-gcc",
"yottaCorePackage": "microbit", "yottaCorePackage": "microbit",
"githubCorePackage": "calliope-mini/microbit", "githubCorePackage": "calliope-mini/microbit",
"gittag": "v2.0.0-rc7-calliope-p9", "gittag": "v2.0.0-rc7-calliope-p9-2016-2",
"serviceId": "calliope" "serviceId": "calliope"
}, },
"serial": { "serial": {