Compare commits

...

25 Commits

Author SHA1 Message Date
1d56be507a 0.9.1 2017-02-08 15:43:49 -08:00
6504007a65 bumped to v0.9 2017-02-08 15:43:41 -08:00
fc0526e47c 0.8.6 2017-02-08 15:42:54 -08:00
cb47a6a291 Bump pxt-core to 0.11.25 2017-02-08 15:42:52 -08:00
6f8060a8c7 allow analog operations on digital pins (#353) 2017-02-08 15:42:39 -08:00
4a8897c0a4 0.8.5 2017-02-07 22:52:08 -08:00
839a26e5a7 Bump pxt-core to 0.11.24 2017-02-07 22:52:06 -08:00
b46802804c 0.8.4 2017-02-07 14:19:03 -08:00
34d1fac337 Bump pxt-core to 0.11.22 2017-02-07 14:19:01 -08:00
39c41f26b1 0.8.3 2017-02-07 12:58:38 -08:00
083a192a5b Bump pxt-core to 0.11.20 2017-02-07 12:58:36 -08:00
76cbad0cec 0.8.2 2017-02-06 22:30:45 -08:00
ed84d49667 Bump pxt-core to 0.11.16 2017-02-06 22:30:43 -08:00
b9d867cf4e Enabled text blocks (#352) 2017-02-06 13:36:24 -08:00
226dfa281a 0.8.1 2017-02-03 20:39:55 -08:00
cc4f6c66da Bump pxt-core to 0.11.13 2017-02-03 20:39:54 -08:00
49ecac6332 Showimage (#351)
* support for interval in showImage, showFrame

* added default arg to showFrame
2017-02-03 20:39:18 -08:00
638e1d3c53 0.7.55 2017-02-03 15:44:29 -08:00
712bc0ada4 Bump pxt-core to 0.11.12 2017-02-03 15:44:26 -08:00
8437f0cf3c enable sharing 2017-02-03 15:23:46 -08:00
9641c4b5ec fixed pin-pressed 2017-02-02 23:26:55 -08:00
e29216c709 0.7.54 2017-02-02 23:22:56 -08:00
06e255eeb9 Bump pxt-core to 0.11.11 2017-02-02 23:22:54 -08:00
91c70e9809 0.7.53 2017-02-02 23:18:38 -08:00
8014712994 Bump pxt-core to 0.11.10 2017-02-02 23:18:36 -08:00
9 changed files with 90 additions and 23 deletions

View File

@ -21,7 +21,7 @@ Use pin press to switch guitar play on/off
## Blocks
```cards
var on = false
let on = false
on;
if (on) { } else {}
input.onPinPressed(TouchPin.P1, () => {})
@ -106,7 +106,7 @@ input.onPinPressed(TouchPin.P1, () => {
*Final code*
TODO: do we want to use `on = !on;` or be more direct in flipping the switch? `on = true; on = false;`
```blocks
var on = false
let on = false
basic.forever(() => {
if (on) {
music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),

View File

@ -7,6 +7,19 @@
"AcceleratorRange.OneG|block": "1g",
"AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity",
"AcceleratorRange.TwoG|block": "2g",
"AnalogPin.P11|block": "P11 (write only)",
"AnalogPin.P12|block": "P12 (write only)",
"AnalogPin.P13|block": "P13 (write only)",
"AnalogPin.P14|block": "P14 (write only)",
"AnalogPin.P15|block": "P15 (write only)",
"AnalogPin.P16|block": "P16 (write only)",
"AnalogPin.P19|block": "P19 (write only)",
"AnalogPin.P20|block": "P20 (write only)",
"AnalogPin.P5|block": "P5 (write only)",
"AnalogPin.P6|block": "P6 (write only)",
"AnalogPin.P7|block": "P5 (write only)",
"AnalogPin.P8|block": "P8 (write only)",
"AnalogPin.P9|block": "P9 (write only)",
"BaudRate.BaudRate115200|block": "115200",
"BaudRate.BaudRate9600|block": "9600",
"BeatFraction.Breve|block": "4",
@ -125,13 +138,13 @@
"PulseValue.Low|block": "low",
"Rotation.Pitch|block": "pitch",
"Rotation.Roll|block": "roll",
"String.charAt|block": "char from %this|at %pos",
"String.compare|block": "compare %this| to %that",
"String.concat|block": "join %this|%other",
"String.charAt|block": "char from %this=text|at %pos",
"String.compare|block": "compare %this=text| to %that",
"String.concat|block": "join %this=text|%other",
"String.fromCharCode|block": "text from char code %code",
"String.isEmpty|block": "%this| is empty",
"String.isEmpty|block": "%this=text| is empty",
"String.length|block": "length of %VALUE",
"String.substr|block": "substring of %this|from %start|of length %length",
"String.substr|block": "substring of %this=text|from %start|of length %length",
"String|block": "String",
"basic.clearScreen|block": "clear screen",
"basic.forever|block": "forever",

26
libs/core/enums.d.ts vendored
View File

@ -280,6 +280,32 @@ declare namespace led {
P3 = 10, // MICROBIT_ID_IO_P3
P4 = 11, // MICROBIT_ID_IO_P4
P10 = 17, // MICROBIT_ID_IO_P10
//% block="P5 (write only)"
P5 = 12, // MICROBIT_ID_IO_P5
//% block="P6 (write only)"
P6 = 13, // MICROBIT_ID_IO_P6
//% block="P5 (write only)"
P7 = 14, // MICROBIT_ID_IO_P7
//% block="P8 (write only)"
P8 = 15, // MICROBIT_ID_IO_P8
//% block="P9 (write only)"
P9 = 16, // MICROBIT_ID_IO_P9
//% block="P11 (write only)"
P11 = 18, // MICROBIT_ID_IO_P11
//% block="P12 (write only)"
P12 = 19, // MICROBIT_ID_IO_P12
//% block="P13 (write only)"
P13 = 20, // MICROBIT_ID_IO_P13
//% block="P14 (write only)"
P14 = 21, // MICROBIT_ID_IO_P14
//% block="P15 (write only)"
P15 = 22, // MICROBIT_ID_IO_P15
//% block="P16 (write only)"
P16 = 23, // MICROBIT_ID_IO_P16
//% block="P19 (write only)"
P19 = 24, // MICROBIT_ID_IO_P19
//% block="P20 (write only)"
P20 = 25, // MICROBIT_ID_IO_P20
}

View File

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

View File

@ -29,6 +29,32 @@ enum class AnalogPin {
P3 = MICROBIT_ID_IO_P3,
P4 = MICROBIT_ID_IO_P4,
P10 = MICROBIT_ID_IO_P10,
//% block="P5 (write only)"
P5 = MICROBIT_ID_IO_P5,
//% block="P6 (write only)"
P6 = MICROBIT_ID_IO_P6,
//% block="P5 (write only)"
P7 = MICROBIT_ID_IO_P7,
//% block="P8 (write only)"
P8 = MICROBIT_ID_IO_P8,
//% block="P9 (write only)"
P9 = MICROBIT_ID_IO_P9,
//% block="P11 (write only)"
P11 = MICROBIT_ID_IO_P11,
//% block="P12 (write only)"
P12 = MICROBIT_ID_IO_P12,
//% block="P13 (write only)"
P13 = MICROBIT_ID_IO_P13,
//% block="P14 (write only)"
P14 = MICROBIT_ID_IO_P14,
//% block="P15 (write only)"
P15 = MICROBIT_ID_IO_P15,
//% block="P16 (write only)"
P16 = MICROBIT_ID_IO_P16,
//% block="P19 (write only)"
P19 = MICROBIT_ID_IO_P19,
//% block="P20 (write only)"
P20 = MICROBIT_ID_IO_P20
};
enum class PulseValue {

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "pxt-microbit",
"version": "0.7.52",
"version": "0.9.1",
"description": "micro:bit target for PXT",
"keywords": [
"JavaScript",
@ -36,6 +36,6 @@
"semantic-ui-less": "^2.2.4"
},
"dependencies": {
"pxt-core": "0.11.9"
"pxt-core": "0.11.25"
}
}

View File

@ -14,8 +14,8 @@
"cloud": {
"workspace": false,
"packages": true,
"sharing": false,
"publish": false,
"sharing": true,
"publishing": true,
"preferredPackages": [
"Microsoft/pxt-neopixel",
"Microsoft/pxt-filesystem"
@ -72,6 +72,7 @@
"loopsBlocks": true,
"logicBlocks": true,
"variablesBlocks": true,
"textBlocks": true,
"onStartColor": "#0078D7",
"onStartNamespace": "basic",
"onStartWeight": 54

View File

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