From f4aa1bf8afc4af7bd987cf5d0e1723bf300de30c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 30 May 2017 15:37:24 -0700 Subject: [PATCH] moving ble options into bluetooth project, use Just Works by default --- libs/bluetooth/pxt.json | 47 ++++++++++++++++++++++++++++++++++++++--- libs/core/pxt.json | 43 +------------------------------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/libs/bluetooth/pxt.json b/libs/bluetooth/pxt.json index 3e7f7ff2..10f7f0cd 100644 --- a/libs/bluetooth/pxt.json +++ b/libs/bluetooth/pxt.json @@ -25,12 +25,53 @@ "enabled": 1 } } - }, + }, "optionalConfig": { "microbit-dal": { "gatt_table_size": "0x700" - } - } + } + }, + "userConfigs": [ + { + "description": "Unsecure Pairing: Anyone can connect via Bluetooth.", + "config": { + "microbit-dal": { + "bluetooth": { + "open": 1, + "pairing_mode": 0, + "whitelist": 0, + "security_level": null + } + } + } + }, + { + "description": "JustWorks pairing (default): Button press to pair.", + "config": { + "microbit-dal": { + "bluetooth": { + "open": null, + "pairing_mode": null, + "whitelist": null, + "security_level": null + } + } + } + }, + { + "description": "Passkey pairing: Button press and 6 digit key to pair.", + "config": { + "microbit-dal": { + "bluetooth": { + "open": 0, + "pairing_mode": 1, + "whitelist": 1, + "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM" + } + } + } + } + ] }, "installedVersion": "vzlhfd" } \ No newline at end of file diff --git a/libs/core/pxt.json b/libs/core/pxt.json index 85bcf661..8ad9ac0f 100644 --- a/libs/core/pxt.json +++ b/libs/core/pxt.json @@ -70,47 +70,6 @@ "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM" } } - }, - "userConfigs": [ - { - "description": "Bluetooth Unsecure Pairing: Anyone can connect via Bluetooth.", - "config": { - "microbit-dal": { - "bluetooth": { - "open": 1, - "pairing_mode": 0, - "whitelist": 0, - "security_level": null - } - } - } - }, - { - "description": "Bluetooth JustWorks pairing (default): Button press to pair.", - "config": { - "microbit-dal": { - "bluetooth": { - "open": null, - "pairing_mode": null, - "whitelist": null, - "security_level": null - } - } - } - }, - { - "description": "Bluetooth Passkey pairing: Button press and 6 digit key to pair.", - "config": { - "microbit-dal": { - "bluetooth": { - "open": 0, - "pairing_mode": 1, - "whitelist": 1, - "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM" - } - } - } - } - ] + } } } \ No newline at end of file