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

always show BLE pairing options in settings dialog (#1187)

Browse Source
This commit is contained in:
Peli de Halleux 2018-09-07 08:02:44 -07:00 committed by GitHub
parent 3b85710bd7
commit 1767e3d10c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libs/bluetooth/pxt.json
View File

@ -20,53 +20,7 @@
"enabled": 1
}
}
},
"optionalConfig": {
"microbit-dal": {
"gatt_table_size": "0x700"
}
},
"userConfigs": [
{
"description": "No Pairing Required: Anyone can connect via Bluetooth.",
"config": {
"microbit-dal": {
"bluetooth": {
"open": 1,
"pairing_mode": 0,
"whitelist": 0,
"security_level": null
}
}
}
},
{
"description": "JustWorks pairing (default): Pairing is automatic once the pairing is initiated.",
"config": {
"microbit-dal": {
"bluetooth": {
"open": null,
"pairing_mode": null,
"whitelist": null,
"security_level": null
}
}
}
},
{
"description": "Passkey pairing: Pairing requires 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"
}

48
libs/core/pxt.json
View File

@ -43,7 +43,7 @@
],
"public": true,
"dependencies": {},
"yotta": {
"yotta": {
"optionalConfig": {
"microbit-dal": {
"bluetooth": {
@ -58,9 +58,51 @@
"open": 0,
"pairing_mode": 1,
"whitelist": 1,
"security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM"
"security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
"gatt_table_size": "0x700"
}
}
}
},
"userConfigs": [
{
"description": "No Pairing Required: Anyone can connect via Bluetooth.",
"config": {
"microbit-dal": {
"bluetooth": {
"open": 1,
"pairing_mode": 0,
"whitelist": 0,
"security_level": null
}
}
}
},
{
"description": "JustWorks pairing (default): Pairing is automatic once the pairing is initiated.",
"config": {
"microbit-dal": {
"bluetooth": {
"open": null,
"pairing_mode": null,
"whitelist": null,
"security_level": null
}
}
}
},
{
"description": "Passkey pairing: Pairing requires 6 digit key to pair.",
"config": {
"microbit-dal": {
"bluetooth": {
"open": 0,
"pairing_mode": 1,
"whitelist": 1,
"security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
}
}
}
}
]
}
}