Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Martin Woolley
2016-06-23 08:06:34 +01:00
38 changed files with 532 additions and 146 deletions

View File

@ -4,6 +4,10 @@
MicroBitUARTService *uart;
using namespace pxt;
/**
* Support for additional Bluetooth services.
*/
//% color=#0082FB weight=20
namespace bluetooth {
/**

View File

@ -1,7 +1,9 @@
// Auto-generated. Do not edit.
/**
* Support for additional Bluetooth services.
*/
//% color=#0082FB weight=20
declare namespace bluetooth {

View File

@ -120,7 +120,9 @@ enum class MesDpadButtonInfo {
_4Up = MES_DPAD_BUTTON_4_UP,
};
/**
* Control a phone with the BBC micro:bit via Bluetooth.
*/
//% color=156 weight=80
namespace devices {
static void genEvent(int id, int event) {

View File

@ -1,7 +1,9 @@
// Auto-generated. Do not edit.
/**
* Control a phone with the BBC micro:bit via Bluetooth.
*/
//% color=156 weight=80
declare namespace devices {