c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Microsoft/pxt-microbit

Browse Source
This commit is contained in:
Michael Elliot Braun 2016-04-26 10:46:32 -07:00
commit 3b3e402ffa
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/microbit/serial.cpp
View File

@ -15,7 +15,7 @@ namespace serial {
/** /**
* Sends a piece of text through Serial connection. * Sends a piece of text through Serial connection.
*/ */
//% //% blockId=serial_writestring block="serial write %text"
void writeString(StringData *text) { void writeString(StringData *text) {
uBit.serial.send(ManagedString(text)); uBit.serial.send(ManagedString(text));
} }

3
libs/microbit/serial.ts
View File

@ -8,7 +8,7 @@ namespace serial {
* @param value to send over serial * @param value to send over serial
*/ */
//% help=serial/write-line //% help=serial/write-line
//% blockId=serial_writeline block="serial|write %text" //% blockId=serial_writeline block="serial|write line %text"
export function writeLine(text: string): void { export function writeLine(text: string): void {
writeString(text); writeString(text);
writeString("\r\n"); writeString("\r\n");
@ -17,6 +17,7 @@ namespace serial {
/** /**
* Prints a numeric value to the serial * Prints a numeric value to the serial
*/ */
//% blockId=serial_writenumber block="serial|write number %value"
export function writeNumber(value: number): void { export function writeNumber(value: number): void {
writeString(value.toString()); writeString(value.toString());
} }

2
libs/microbit/shims.d.ts vendored
View File

@ -528,7 +528,7 @@ declare namespace serial {
/** /**
* Sends a piece of text through Serial connection. * Sends a piece of text through Serial connection.
*/ */
//% shim=serial::writeString //% blockId=serial_writestring block="serial write %text" shim=serial::writeString
function writeString(text: string): void; function writeString(text: string): void;
} }

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-microbit", "name": "pxt-microbit",
"version": "0.2.90", "version": "0.2.91",
"description": "BBC micro:bit target for PXT", "description": "BBC micro:bit target for PXT",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",
@ -29,6 +29,6 @@
"typescript": "^1.8.7" "typescript": "^1.8.7"
}, },
"dependencies": { "dependencies": {
"pxt-core": "0.2.98" "pxt-core": "0.2.99"
} }
} }