Compare commits

..

16 Commits

Author SHA1 Message Date
e9862751ba 0.5.89 2016-11-15 22:35:12 -08:00
5df83bb079 quick style fix 2016-11-15 22:35:02 -08:00
903c0ec6bd fixing music simulator 2016-11-15 22:28:05 -08:00
4be57eee9a 0.5.88 2016-11-15 20:10:37 -08:00
89a2178ff5 Bump pxt-core to 0.5.75 2016-11-15 20:10:35 -08:00
b3ffabba41 updated translations 2016-11-14 11:25:27 -08:00
c98e65a68c bumped to 0.5.87 2016-11-14 10:36:18 -08:00
2c70784251 0.5.87 2016-11-14 10:26:42 -08:00
00333b0257 Bump pxt-core to 0.5.74 2016-11-14 10:26:40 -08:00
d01c801f63 updated mutable block 2016-11-14 10:25:26 -08:00
05828ddcd9 0.5.86 2016-11-14 10:21:59 -08:00
f473835604 updated serial tranlsations 2016-11-14 10:06:39 -08:00
d82da1f877 updated localizations 2016-11-14 09:44:46 -08:00
94706adc40 0.5.85 2016-11-14 06:10:19 -08:00
79fb4e4ff7 fix missing radio strings 2016-11-14 06:07:19 -08:00
dae84afded add SPI pins 2016-11-14 10:12:35 +01:00
15 changed files with 45 additions and 42 deletions

View File

@ -1,3 +1,3 @@
{
"appref": "v0.5.83"
"appref": "v0.5.87"
}

View File

@ -6,7 +6,8 @@
"enums.d.ts",
"shims.d.ts",
"bluetooth.ts",
"bluetooth.cpp"
"bluetooth.cpp",
"_locales/de/bluetooth-jsdoc-strings.json"
],
"public": true,
"dependencies": {

View File

@ -87,7 +87,7 @@
"String.charAt|block": "Zeichen an Position %pos aus|%this",
"String.compare|block": "vergleiche %this| mit %that",
"String.concat|block": "hänge %this| mit %other aneinander",
"String.fromCharCode|block": "Text aus char code %code",
"String.fromCharCode|block": "Text aus ASCII-Code %code",
"String.isEmpty|block": "%this| ist leer",
"String.length|block": "Länge von %VALUE",
"String.substr|block": "extrahiere aus %this|beginnend mit %start|%length Zeichen",
@ -121,7 +121,7 @@
"game.startCountdown|block": "Countdown| starten (ms) %duration",
"game|block": "Spiel",
"images.createBigImage|block": "erstelle großes Bild",
"images.createImage|block": "Erstelle Bild",
"images.createImage|block": "erstelle Bild",
"images|block": "Bilder",
"input.acceleration|block": "Beschleunigung (mg) |%NAME",
"input.buttonIsPressed|block": "Button|%NAME|ist gedrückt",
@ -142,10 +142,10 @@
"led.plotBarGraph|block": "zeichne Balkendiagramm von %value|bis %high",
"led.plot|block": "Zeichne|x %x|y %y",
"led.point|block": "Punkt|x %x|y %y",
"led.setBrightness|block": "Setze Helligkeit auf %value",
"led.stopAnimation|block": "Halte Animation an",
"led.setBrightness|block": "setze Helligkeit auf %value",
"led.stopAnimation|block": "halte Animation an",
"led.toggle|block": "Schalte zwischen|x %x|y %y",
"led.unplot|block": "Unplot|x %x|y %y",
"led.unplot|block": "schalte Pixel|x %x|y %y aus",
"led|block": "LED",
"motors.dualMotorPower|block": "Motor %motor an|mit %percent",
"motors.motorCommand|block": "Motor %command",
@ -184,7 +184,7 @@
"serial.writeNumber|block": "serial|write number %value",
"serial.writeString|block": "serial|write string %text",
"serial.writeValue|block": "serial|write value %name|= %value",
"serial|block": "seriell",
"serial|block": "Konsole",
"{id:category}Basic": "Grundlagen",
"{id:category}Control": "Steuerung",
"{id:category}Game": "Spiel",
@ -195,7 +195,7 @@
"{id:category}Motors": "Motoren",
"{id:category}Music": "Musik",
"{id:category}Pins": "Pins",
"{id:category}Serial": "Serielle",
"{id:category}Serial": "Konsole",
"{id:category}String": "Zeichenfolge",
"{id:category}Text": "Text"
}

View File

@ -0,0 +1,5 @@
{
"Math.abs": "Returnerar absolutbeloppet av ett tal (värdet utan hänsyn till huruvida det är positivt eller negativt). \nTill exempel är absolutbeloppet av -5 detsamma som absolutbeloppet av 5.",
"Math.max": "Returnerar det större av två givna numeriska uttryck.",
"Math.min": "Returnerar det mindre av två givna numeriska uttryck."
}

View File

@ -8,21 +8,10 @@ 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"
//% parts="speaker" async
void playTone(int freqency, int ms) {
uBit.soundmotor.soundOn(freqency);
if(ms > 0) uBit.sleep(ms);
uBit.soundmotor.soundOff();
}
/**
* Plays a tone through ``speaker``.
* @param frequency pitch of the tone to play in Hertz (Hz)
*/
//% help=music/ring-tone weight=80
//% blockId=device_ring block="ring tone (Hz)|%note=device_note" icon="\uf025" blockGap=8
//% parts="speaker"
void ringTone(int frequency) {
playTone(frequency, 0);
}
}

View File

@ -140,6 +140,16 @@ namespace music {
playTone(0, ms);
}
/**
* Plays a tone through ``speaker``.
* @param frequency pitch of the tone to play in Hertz (Hz)
*/
//% help=music/ring-tone weight=80
//% blockId=device_ring block="ring tone (Hz)|%note=device_note" icon="\uf025" blockGap=8
//% parts="speaker" async
export function ringTone(frequency: number) {
playTone(frequency, 0);
}
/**
* Gets the frequency of a note.

View File

@ -49,4 +49,4 @@
}
}
}
}
}

11
libs/core/shims.d.ts vendored
View File

@ -554,17 +554,8 @@ 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" shim=music::playTone
//% parts="speaker" async shim=music::playTone
function playTone(freqency: number, ms: number): void;
/**
* Plays a tone through ``speaker``.
* @param frequency pitch of the tone to play in Hertz (Hz)
*/
//% help=music/ring-tone weight=80
//% blockId=device_ring block="ring tone (Hz)|%note=device_note" icon="\uf025" blockGap=8
//% parts="speaker" shim=music::ringTone
function ringTone(frequency: number): void;
}
declare namespace pins {

View File

@ -21,4 +21,4 @@
}
},
"installedVersion": "ljipgq"
}
}

View File

@ -1,11 +1,11 @@
{
"radio.onDataPacketReceived|block": "Wenn Datenpaket empfangen",
"radio.onDataPacketReceived|block": "wenn Datenpaket empfangen",
"radio.onDataReceived|block": "Funk auf empfangenen Daten",
"radio.receiveNumber|block": "empfange Nummer über Funk",
"radio.receiveString|block": "empfange Zeichenfolge über Funk",
"radio.receivedSignalStrength|block": "über Funk empfangene Signalstärke",
"radio.sendNumber|block": "sende Nummer %value über Funk",
"radio.sendString|block": "sende String %msg über Funk",
"radio.sendString|block": "sende Zeichenfolge %msg über Funk",
"radio.sendValue|block": "schicke |Wert %name|= %value über Funk",
"radio.setGroup|block": "setze Gruppe %ID über Funk",
"radio.setTransmitPower|block": "setze Übertragungsstärke %power über Funk",

View File

@ -6,7 +6,9 @@
"shims.d.ts",
"enums.d.ts",
"radio.cpp",
"radio.ts"
"radio.ts",
"_locales/de/radio-jsdoc-strings.json",
"_locales/de/radio-strings.json"
],
"public": true,
"dependencies": {

View File

@ -33,7 +33,7 @@ namespace radio {
* received packet from the radio queue.
*/
//% help=radio/on-data-packet-received
//% mutate=true
//% mutate=objectdestructuring
//% mutateText=Packet
//% mutateDefaults="receivedNumber;receivedString:name,receivedNumber:value;receivedString"
//% blockId=radio_on_packet block="on radio received" blockGap=8

View File

@ -1,6 +1,6 @@
{
"name": "pxt-calliope",
"version": "0.5.84",
"version": "0.5.89",
"description": "calliope target for PXT",
"keywords": [
"JavaScript",
@ -34,6 +34,6 @@
"semantic-ui-less": "^2.2.4"
},
"dependencies": {
"pxt-core": "0.5.72"
"pxt-core": "0.5.75"
}
}

View File

@ -121,9 +121,9 @@
"MOTOR2": "M_OUT2"
},
"spiPins": {
"MOSI": "P15",
"MISO": "P14",
"SCK": "P13"
"MOSI": "C_P15",
"MISO": "C_P14",
"SCK": "C_P13"
},
"i2cPins": {
"SDA": "C_P20",

View File

@ -37,6 +37,11 @@
&:extend(.yellow all);
}
#filelist .menu {
width: 100%;
}
/*******************************
Blockly
*******************************/