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

Showimage (#351)

Browse Source 
* support for interval in showImage, showFrame

* added default arg to showFrame
This commit is contained in:
Peli de Halleux
2017-02-03 20:39:18 -08:00
committed by GitHub
parent 638e1d3c53
commit 49ecac6332
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/core/images.cpp
View File

@@ -43,9 +43,9 @@ namespace ImageMethods {
*/ */
//% help=images/show-image weight=80 blockNamespace=images //% help=images/show-image weight=80 blockNamespace=images
//% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8 //% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8
//% parts="ledmatrix" //% parts="ledmatrix" async
void showImage(Image sprite, int xOffset) { void showImage(Image sprite, int xOffset, int interval = 400) {
uBit.display.print(MicroBitImage(sprite), -xOffset, 0, 0); uBit.display.print(MicroBitImage(sprite), -xOffset, 0, 0, interval);
} }
/** /**
@@ -150,7 +150,7 @@ namespace ImageMethods {
*/ */
//% weight=70 help=images/show-frame //% weight=70 help=images/show-frame
//% parts="ledmatrix" //% parts="ledmatrix"
void showFrame(Image i, int frame) { void showFrame(Image i, int frame, int interval = 400) {
showImage(i, frame * 5); showImage(i, frame * 5, interval);
} }
} }

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

@@ -40,8 +40,8 @@ declare interface Image {
*/ */
//% help=images/show-image weight=80 blockNamespace=images //% help=images/show-image weight=80 blockNamespace=images
//% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8 //% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8
//% parts="ledmatrix" shim=ImageMethods::showImage //% parts="ledmatrix" async interval.defl=400 shim=ImageMethods::showImage
showImage(xOffset: number): void; showImage(xOffset: number, interval?: number): void;
/** /**
* Draws the ``index``-th frame of the image on the screen. * Draws the ``index``-th frame of the image on the screen.
@@ -118,8 +118,8 @@ declare interface Image {
* @param frame TODO * @param frame TODO
*/ */
//% weight=70 help=images/show-frame //% weight=70 help=images/show-frame
//% parts="ledmatrix" shim=ImageMethods::showFrame //% parts="ledmatrix" interval.defl=400 shim=ImageMethods::showFrame
showFrame(frame: number): void; showFrame(frame: number, interval?: number): void;
} }

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "pxt-microbit", "name": "pxt-microbit",
"version": "0.7.55", "version": "0.8.0",
"description": "micro:bit target for PXT", "description": "micro:bit target for PXT",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",

7
sim/state/ledmatrix.ts
View File

@@ -129,10 +129,11 @@ namespace pxsim.images {
} }
namespace pxsim.ImageMethods { namespace pxsim.ImageMethods {
export function showImage(leds: Image, offset: number) { export function showImage(leds: Image, offset: number, interval: number) {
pxtrt.nullCheck(leds) pxtrt.nullCheck(leds)
leds.copyTo(offset, 5, board().ledMatrixState.image, 0) leds.copyTo(offset, 5, board().ledMatrixState.image, 0)
runtime.queueDisplayUpdate() runtime.queueDisplayUpdate()
basic.pause(interval);
} }
export function plotImage(leds: Image, offset: number): void { export function plotImage(leds: Image, offset: number): void {
@@ -155,8 +156,8 @@ namespace pxsim.ImageMethods {
ImageMethods.plotImage(leds, frame * Image.height); ImageMethods.plotImage(leds, frame * Image.height);
} }
export function showFrame(leds: Image, frame: number) { export function showFrame(leds: Image, frame: number, interval: number) {
ImageMethods.showImage(leds, frame * Image.height); ImageMethods.showImage(leds, frame * Image.height, interval);
} }
export function pixel(leds: Image, x: number, y: number): number { export function pixel(leds: Image, x: number, y: number): number {