Skip to content
This repository has been archived by the owner on Dec 2, 2019. It is now read-only.

Change default bluetooth settings #1

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Change default bluetooth settings #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3d34799
Open BLE
Amerlander Mar 19, 2019
77076ef
Update pxt.json
Amerlander Mar 19, 2019
9bb48de
Merge pull request #1 from Amerlander/patch-1
Amerlander Mar 19, 2019
d2f3c71
Merge pull request #2 from Amerlander/patch-2
Amerlander Mar 19, 2019
2297abc
Merge branch 'patch-1'
Amerlander Mar 19, 2019
5e61413
Merge branch 'master' into patch-1
Amerlander Mar 19, 2019
dd63198
Merge pull request #3 from Amerlander/patch-1
Amerlander Mar 19, 2019
a8ef254
Merge branch 'master' into ChangedefaultBluetoothSettings
Mar 19, 2019
01d7e50
Default Text
Mar 19, 2019
67f1f02
BLE
Mar 20, 2019
c8e097c
BLE Changes
Mar 20, 2019
73c4911
default value
Mar 21, 2019
9c1efbd
revert change
Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ hexcache
*.iml
.vscode/.BROWSE.VC.DB-shm
.vscode/.BROWSE.VC.DB-wal

package-lock\.json

yarn\.lock
15 changes: 13 additions & 2 deletions libs/blocksprj/pxt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,23 @@
"name": "{0} block",
"dependencies": {
"core": "file:../core",
"radio": "file:../radio"
"bluetooth": "file:../bluetooth"
},
"description": "",
"files": [
"main.blocks",
"main.ts",
"README.md"
]
],
"yotta": {
"config": {
"microbit-dal": {
"bluetooth": {
"open": 1,
"pairing_mode": 0,
"whitelist": 0
}
}
}
}
}
4 changes: 2 additions & 2 deletions libs/bluetooth/pxt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"userConfigs": [
{
"description": "No Pairing Required: Anyone can connect via Bluetooth.",
"description": "No Pairing Required (default): Anyone can connect via Bluetooth.",
"config": {
"microbit-dal": {
"bluetooth": {
Expand All @@ -41,7 +41,7 @@
}
},
{
"description": "JustWorks pairing (default): Pairing is automatic once the pairing is initiated.",
"description": "JustWorks pairing: Pairing is automatic once the pairing is initiated.",
"config": {
"microbit-dal": {
"bluetooth": {
Expand Down
12 changes: 6 additions & 6 deletions libs/core/pxt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@
"bluetooth": {
"private_addressing": 0,
"advertising_timeout": 0,
"tx_power": 6,
"tx_power": 7,
"dfu_service": 1,
"event_service": 1,
"device_info_service": 1,
"eddystone_url": 1,
"eddystone_uid": 1,
"open": 0,
"pairing_mode": 1,
"whitelist": 1,
"security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM"
"open": 1,
"pairing_mode": 0,
"whitelist": 0,
"security_level": null
}
}
}
}
}
}
Loading