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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
Tom Ball 2016-06-16 16:16:08 -04:00
commit 3efbb4fbde
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/basic/clear-screen.md
View File

@ -6,9 +6,9 @@ Turn off all the LED lights on the [LED screen](/device/screen).
basic.clearScreen()
```
### Example: vanishing heart
### Example: Vanishing heart
The following code shows a heart on the screen and then turns off all the LED lights using `clear screen`:
The following code shows a heart on the screen and then turns off all the LED lights.
```blocks
basic.showLeds(`
@ -23,5 +23,5 @@ basic.clearScreen()
### See also
[set brightness](/reference/led/set-brightness), [unplot](/reference/led/unplot), [plot](/reference/led/plot), [Image](/reference/images/image), [clear](/reference/basic/clear-screen)
[set brightness](/reference/led/set-brightness), [unplot](/reference/led/unplot), [plot](/reference/led/plot), [Image](/reference/images/image)

6
package.json
View File

@ -1,6 +1,10 @@
{
"name": "pxt-microbit",
<<<<<<< HEAD
"version": "0.2.166",
=======
"version": "0.2.168",
>>>>>>> origin/master
"description": "BBC micro:bit target for PXT",
"keywords": [
"JavaScript",
@ -29,6 +33,6 @@
"typescript": "^1.8.7"
},
"dependencies": {
"pxt-core": "0.2.179"
"pxt-core": "0.2.180"
}
}