Merge branch 'master' into blockupdate

This commit is contained in:
Peli de Halleux 2017-10-24 10:02:27 -07:00
commit 60d5271de2
4 changed files with 4 additions and 29 deletions

View File

@ -3,9 +3,3 @@
## Reference #reference ## Reference #reference
* [Reference](/reference) * [Reference](/reference)
* [input](/reference/input)
* [light](/reference/light)
* [music](/reference/music)
* [pins](/reference/pins)
* [control](/reference/control)
* [serial](/reference/serial)

View File

@ -1,19 +1,3 @@
# Reference # Reference
```namespaces TODO
input.onGesture(Gesture.Shake, () => {})
light.showRing('red red red red red red red red red red')
music.playTone(0, 0)
pins.pulseDuration()
control.runInBackground(() => {})
serial.writeLine("");
```
## See Also
[blocks](/blocks), [JavaScript](/javascript), [input](/reference/input), [light](/reference/light), [music](/reference/music),
[control](/reference/control), [pins](/reference/pins), [serial](/reference/serial)
```package
circuit-playground
```

View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-ev3", "name": "pxt-ev3",
"version": "0.0.19", "version": "0.0.20",
"description": "LEGO Mindstorms EV3 for Microsoft MakeCode", "description": "LEGO Mindstorms EV3 for Microsoft MakeCode",
"private": true, "private": true,
"keywords": [ "keywords": [
@ -39,8 +39,8 @@
"semantic-ui-less": "^2.2.4" "semantic-ui-less": "^2.2.4"
}, },
"dependencies": { "dependencies": {
"pxt-common-packages": "0.10.16", "pxt-common-packages": "0.11.7",
"pxt-core": "2.3.1" "pxt-core": "2.3.4"
}, },
"scripts": { "scripts": {
"test": "node node_modules/pxt-core/built/pxt.js travis" "test": "node node_modules/pxt-core/built/pxt.js travis"

View File

@ -110,10 +110,7 @@
"path": "https://www.lego.com/en-us/mindstorms/products/mindstorms-ev3-31313" "path": "https://www.lego.com/en-us/mindstorms/products/mindstorms-ev3-31313"
} }
], ],
"galleries": {
},
"useStartPage": true, "useStartPage": true,
"sideDoc": "tutorials/getting-started",
"invertedMenu": false, "invertedMenu": false,
"invertedMonaco": false, "invertedMonaco": false,
"monacoToolbox": true, "monacoToolbox": true,