Compare commits

...

7 Commits

8 changed files with 17 additions and 9 deletions

View File

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

View File

@ -7,7 +7,7 @@
"AcceleratorRange.OneG|block": "1g",
"AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g",
"AcceleratorRange.TwoG|block": "2g",
"BaudRate.BaudRate115200|block": "11520",
"BaudRate.BaudRate115200|block": "115200",
"BaudRate.BaudRate9600|block": "9600",
"BeatFraction.Eighth|block": "1/8",
"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_UART_S_EVT_TX_EMPTY = 3,
// 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
CALLIOPE_SM_DEFAULT_DUTY_M = 50,
CALLIOPE_SM_DEFAULT_DUTY_S = 100,

View File

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

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

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

View File

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

View File

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