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

Disable two image blocks - they crash block injection

Browse Source
This commit is contained in:
Michal Moskal 2016-04-02 18:09:31 -07:00
parent e6dc3b8974
commit 9b68519aff
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/microbit-devices/shims.d.ts vendored
View File

@ -43,7 +43,7 @@ declare namespace devices {
* @param name TODO * @param name TODO
* @param body TODO * @param body TODO
*/ */
//% help=devices/on-gamepad-button weight=40 shim=micro_bit::onGamepadButton //% help=devices/on-gamepad-button weight=40
//% weight=25 //% weight=25
//% blockId=devices_gamepad_event block="on gamepad button|%NAME" icon="\uf11b" shim=devices::onGamepadButton //% blockId=devices_gamepad_event block="on gamepad button|%NAME" icon="\uf11b" shim=devices::onGamepadButton
function onGamepadButton(name: MesDpadButtonInfo, body: () => void): void; function onGamepadButton(name: MesDpadButtonInfo, body: () => void): void;
@ -59,7 +59,7 @@ declare namespace devices {
* Registers code to run when the device notifies about a change of signal strength. * Registers code to run when the device notifies about a change of signal strength.
* @param body TODO * @param body TODO
*/ */
//% shim=micro_bit::onSignalStrengthChanged weight=23 help=devices/on-signal-strength-changed //% weight=23 help=devices/on-signal-strength-changed
//% blockId=devices_signal_strength_changed_event block="on signal strength changed" icon="\uf012" shim=devices::onSignalStrengthChanged //% blockId=devices_signal_strength_changed_event block="on signal strength changed" icon="\uf012" shim=devices::onSignalStrengthChanged
function onSignalStrengthChanged(body: () => void): void; function onSignalStrengthChanged(body: () => void): void;
} }

4
libs/microbit/images.cpp
View File

@ -27,7 +27,7 @@ namespace ImageMethods {
* @param xOffset TODO * @param xOffset TODO
*/ */
//% help=images/show-image weight=80 async //% help=images/show-image weight=80 async
//% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8 //% BUGblockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8
void showImage(Image i, int xOffset = 0) { void showImage(Image i, int xOffset = 0) {
uBit.display.print(MicroBitImage(i), -xOffset, 0, 0); uBit.display.print(MicroBitImage(i), -xOffset, 0, 0);
} }
@ -38,7 +38,7 @@ namespace ImageMethods {
* @param interval time between each animation step in milli seconds, eg: 200 * @param interval time between each animation step in milli seconds, eg: 200
*/ */
//% help=images/show-image weight=79 async //% help=images/show-image weight=79 async
//% blockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8 //% BUGblockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8
void scrollImage(Image id, int frameOffset = 0, int interval = 200) { void scrollImage(Image id, int frameOffset = 0, int interval = 200) {
MicroBitImage i(id); MicroBitImage i(id);
if (i.getWidth() <= 5) if (i.getWidth() <= 5)

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

@ -111,7 +111,7 @@ declare interface Image {
* @param xOffset TODO * @param xOffset TODO
*/ */
//% help=images/show-image weight=80 async //% help=images/show-image weight=80 async
//% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8 xOffset.defl=0 shim=ImageMethods::showImage //% BUGblockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8 xOffset.defl=0 shim=ImageMethods::showImage
showImage(xOffset?: number): void; showImage(xOffset?: number): void;
/** /**
@ -120,7 +120,7 @@ declare interface Image {
* @param interval time between each animation step in milli seconds, eg: 200 * @param interval time between each animation step in milli seconds, eg: 200
*/ */
//% help=images/show-image weight=79 async //% help=images/show-image weight=79 async
//% blockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8 frameOffset.defl=0 interval.defl=200 shim=ImageMethods::scrollImage //% BUGblockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8 frameOffset.defl=0 interval.defl=200 shim=ImageMethods::scrollImage
scrollImage(frameOffset?: number, interval?: number): void; scrollImage(frameOffset?: number, interval?: number): void;
/** /**