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

Merge branch 'master' of https://github.com/Microsoft/pxt-microbit

Browse Source
This commit is contained in:
Peli de Halleux 2018-03-06 19:28:05 -08:00
commit cdb79cc4ed
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/device.md
View File

@ -98,7 +98,7 @@ You can attach an external device such as a motor to these and power it using th
## Serial Communication ## Serial Communication
The micro:bit can send an receive data via [serial communication](/device/serial). The serial data can be transfered via USB or BLE. The micro:bit can send and receive data via [serial communication](/device/serial). The serial data can be transfered via USB or BLE.
## Bluetooth Low Energy (BLE) Antenna ## Bluetooth Low Energy (BLE) Antenna
@ -111,4 +111,4 @@ control the micro:bit or the micro:bit can control another BLE device.
## Technical Information ## Technical Information
The micro:bit has been designed to be a bare-board micro controller for use by children aged 11-12. The micro:bit has been designed to be a bare-board micro controller for use by children aged 11-12.
More information is available at the [Microbit Foundation web site](https://microbit.org/guide/. More information is available at the [Microbit Foundation web site](https://microbit.org/guide/).

2
docs/index-ref.json
View File

@ -1,3 +1,3 @@
{ {
"appref": "v0.14.18" "appref": "v0.14.22"
} }

4
docs/types/number.md
View File

@ -9,14 +9,14 @@ For example, this code displays the number 42:
basic.showNumber(42); basic.showNumber(42);
``` ```
## #declareexample ### #declareexample
```block ```block
let num = 42; let num = 42;
basic.showNumber(42); basic.showNumber(42);
``` ```
## #functionreturnexample ### #functionreturnexample
For example the following code gets the display brightness For example the following code gets the display brightness
(using the [brightness function](/reference/led/brightness)) and stores the value in a variable named `brightness`: (using the [brightness function](/reference/led/brightness)) and stores the value in a variable named `brightness`:

2
libs/core/control.cpp
View File

@ -256,7 +256,7 @@ namespace control {
} }
/** /**
* Raises an event in the event bus. * Registers an event handler.
*/ */
//% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src=control_event_source_id|with value %value=control_event_value_id" //% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src=control_event_source_id|with value %value=control_event_value_id"
//% help=control/on-event //% help=control/on-event