From 13bdcf762db4dcd3aaf13fc6b040f43c1f27370d Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 19 Apr 2016 09:43:23 -0700 Subject: [PATCH] updated dal definition --- libs/microbit-devices/pxt.json | 8 ++++++-- libs/microbit-radio/pxt.json | 10 +++++++--- libs/microbit/dal.d.ts | 9 +++++++-- libs/microbit/pxt.json | 8 ++++++-- pxtarget.json | 2 +- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/libs/microbit-devices/pxt.json b/libs/microbit-devices/pxt.json index 422f08af..ec7b6ee6 100644 --- a/libs/microbit-devices/pxt.json +++ b/libs/microbit-devices/pxt.json @@ -11,9 +11,13 @@ "dependencies": { "microbit": "file:../microbit" }, - "microbit": { + "yotta": { "config": { - "MICROBIT_BLE_ENABLED": "1" + "microbit-dal": { + "bluetooth": { + "enabled": 1 + } + } } }, "installedVersion": "zakvul" diff --git a/libs/microbit-radio/pxt.json b/libs/microbit-radio/pxt.json index 0b5ed69a..4ac7efd0 100644 --- a/libs/microbit-radio/pxt.json +++ b/libs/microbit-radio/pxt.json @@ -12,10 +12,14 @@ "dependencies": { "microbit": "file:../microbit" }, - "microbit": { + "yotta": { "config": { - "MICROBIT_BLE_ENABLED": "0" + "microbit-dal": { + "bluetooth": { + "enabled": 0 + } + } } }, "installedVersion": "rlfgis" -} +} \ No newline at end of file diff --git a/libs/microbit/dal.d.ts b/libs/microbit/dal.d.ts index 534e964d..bf7467a7 100644 --- a/libs/microbit/dal.d.ts +++ b/libs/microbit/dal.d.ts @@ -2,7 +2,9 @@ declare const enum DAL { // built/yt/yotta_modules/microbit-dal/inc//bluetooth/ExternalEvents.h MICROBIT_ID_BLE = 1000, - MICROBIT_ID_BLE_UART = 1001, + MICROBIT_ID_BLE_UART = 1200, + MICROBIT_BLE_EVT_CONNECTED = 1, + MICROBIT_BLE_EVT_DISCONNECTED = 2, // built/yt/yotta_modules/microbit-dal/inc//bluetooth/MESEvents.h MES_REMOTE_CONTROL_ID = 1001, MES_REMOTE_CONTROL_EVT_PLAY = 1, @@ -294,6 +296,7 @@ declare const enum DAL { // built/yt/yotta_modules/microbit-dal/inc//drivers/MicroBitDisplay.h MICROBIT_DISPLAY_EVT_ANIMATION_COMPLETE = 1, MICROBIT_DISPLAY_EVT_LIGHT_SENSE = 2, + MICROBIT_DISPLAY_DEFAULT_AUTOCLEAR = 1, MICROBIT_DISPLAY_SPACING = 1, MICROBIT_DISPLAY_GREYSCALE_BIT_DEPTH = 8, MICROBIT_DISPLAY_ANIMATE_DEFAULT_POS = -255, @@ -303,7 +306,8 @@ declare const enum DAL { ANIMATION_MODE_PRINT_TEXT = 3, ANIMATION_MODE_SCROLL_IMAGE = 4, ANIMATION_MODE_ANIMATE_IMAGE = 5, - ANIMATION_MODE_PRINT_CHARACTER = 6, + ANIMATION_MODE_ANIMATE_IMAGE_WITH_CLEAR = 6, + ANIMATION_MODE_PRINT_CHARACTER = 7, DISPLAY_MODE_BLACK_AND_WHITE = 0, DISPLAY_MODE_GREYSCALE = 1, DISPLAY_MODE_BLACK_AND_WHITE_LIGHT_SENSE = 2, @@ -384,6 +388,7 @@ declare const enum DAL { MICROBIT_THERMOMETER_PERIOD = 1000, MICROBIT_THERMOMETER_EVT_UPDATE = 1, MICROBIT_THERMOMETER_ADDED_TO_IDLE = 2, + // built/yt/yotta_modules/microbit-dal/inc//platform/yotta_cfg_mappings.h // built/yt/yotta_modules/microbit-dal/inc//types/ManagedString.h // built/yt/yotta_modules/microbit-dal/inc//types/ManagedType.h // built/yt/yotta_modules/microbit-dal/inc//types/Matrix4.h diff --git a/libs/microbit/pxt.json b/libs/microbit/pxt.json index 2b62cdc1..47522623 100644 --- a/libs/microbit/pxt.json +++ b/libs/microbit/pxt.json @@ -31,9 +31,13 @@ ], "public": true, "dependencies": {}, - "microbit": { + "yotta": { "config": { - "MESSAGE_BUS_LISTENER_DEFAULT_FLAGS": "MESSAGE_BUS_LISTENER_QUEUE_IF_BUSY" + "microbit-dal": { + "bluetooth": { + "enabled": 0 + } + } } } } diff --git a/pxtarget.json b/pxtarget.json index 5ced17f6..90cbddc5 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -60,7 +60,7 @@ "autoRun": true }, "compileService": { - "gittag": "v0.1.7", + "gittag": "v0.1.8", "serviceId": "ws" }, "serial": {