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:
Peli de Halleux 2017-10-15 22:28:59 -07:00
commit e4f3d7a882
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/core/icons.ts
View File

@ -274,6 +274,9 @@ namespace images {
//% weight=50 blockGap=8 //% weight=50 blockGap=8
//% help=images/icon-image //% help=images/icon-image
//% blockId=builtin_image block="icon image %i" //% blockId=builtin_image block="icon image %i"
//% i.fieldEditor="gridpicker"
//% i.fieldOptions.width="400" i.fieldOptions.columns="5"
//% i.fieldOptions.itemColour="black" i.fieldOptions.tooltips="true"
export function iconImage(i: IconNames): Image { export function iconImage(i: IconNames): Image {
switch (i) { switch (i) {
case IconNames.Heart: return images.createImage(` case IconNames.Heart: return images.createImage(`

4
libs/core/serial.cpp
View File

@ -148,6 +148,10 @@ namespace serial {
//% help=serial/redirect-to //% help=serial/redirect-to
//% blockId=serial_redirect block="serial|redirect to|TX %tx|RX %rx|at baud rate %rate" //% blockId=serial_redirect block="serial|redirect to|TX %tx|RX %rx|at baud rate %rate"
//% blockExternalInputs=1 //% blockExternalInputs=1
//% tx.fieldEditor="gridpicker" tx.fieldOptions.columns=3
//% tx.fieldOptions.tooltips="false"
//% rx.fieldEditor="gridpicker" rx.fieldOptions.columns=3
//% rx.fieldOptions.tooltips="false"
void redirect(SerialPin tx, SerialPin rx, BaudRate rate) { void redirect(SerialPin tx, SerialPin rx, BaudRate rate) {
MicroBitPin* txp = getPin(tx); if (!tx) return; MicroBitPin* txp = getPin(tx); if (!tx) return;
MicroBitPin* rxp = getPin(rx); if (!rx) return; MicroBitPin* rxp = getPin(rx); if (!rx) return;

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

@ -821,7 +821,11 @@ declare namespace serial {
//% weight=10 //% weight=10
//% help=serial/redirect-to //% help=serial/redirect-to
//% blockId=serial_redirect block="serial|redirect to|TX %tx|RX %rx|at baud rate %rate" //% blockId=serial_redirect block="serial|redirect to|TX %tx|RX %rx|at baud rate %rate"
//% blockExternalInputs=1 shim=serial::redirect //% blockExternalInputs=1
//% tx.fieldEditor="gridpicker" tx.fieldOptions.columns=3
//% tx.fieldOptions.tooltips="false"
//% rx.fieldEditor="gridpicker" rx.fieldOptions.columns=3
//% rx.fieldOptions.tooltips="false" shim=serial::redirect
function redirect(tx: SerialPin, rx: SerialPin, rate: BaudRate): void; function redirect(tx: SerialPin, rx: SerialPin, rate: BaudRate): void;
} }