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

BLE mode by default (#1429)

Browse Source 
* set open mode as default + pairing mode supported too

* remove comment
This commit is contained in:
Peli de Halleux 2018-10-15 13:11:35 -07:00 committed by GitHub
parent 7e98936482
commit 192588d8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/projects/micro-chat.md
View File

@ -11,13 +11,9 @@ Use the **radio** to send and receive messages with other @boardname@.
Use ``||input:on button pressed||`` to send a text message over radio with ``||radio:send string||``. Use ``||input:on button pressed||`` to send a text message over radio with ``||radio:send string||``.
Every @boardname@ nearby will receive this message. Every @boardname@ nearby will receive this message.
You can also add the ``||basic:show icon||`` and ``||basic:clear screen||`` blocks to show a simple animation when the message is sent.
```blocks ```blocks
input.onButtonPressed(Button.A, () => { input.onButtonPressed(Button.A, () => {
radio.sendString("Yo"); radio.sendString("Yo");
basic.showIcon(IconNames.Chessboard)
basic.clearScreen();
}); });
``` ```
@ -48,8 +44,6 @@ Press button **A** on the simulator, you will notice that a second @boardname@ a
```blocks ```blocks
input.onButtonPressed(Button.A, () => { input.onButtonPressed(Button.A, () => {
radio.sendString("Yo"); radio.sendString("Yo");
basic.showIcon(IconNames.Chessboard)
basic.clearScreen();
}); });
radio.onReceivedString(function (receivedString) { radio.onReceivedString(function (receivedString) {
basic.showString(receivedString); basic.showString(receivedString);
@ -65,9 +59,6 @@ If you two @boardname@s, download the program to each one. Press button **A** on
Use the ``||radio:set group||`` block to assign a **group** number to your program. You will only receive messages from @boardname@s within the same group. Use this to avoid receiving messages from every @boardname@ that is transmitting. Use the ``||radio:set group||`` block to assign a **group** number to your program. You will only receive messages from @boardname@s within the same group. Use this to avoid receiving messages from every @boardname@ that is transmitting.
```blocks ```blocks
/**
* Pick a unique group in your classroom!
*/
radio.setGroup(123) radio.setGroup(123)
``` ```

19
libs/core/pxt.json
View File

@ -57,9 +57,9 @@
"device_info_service": 1, "device_info_service": 1,
"eddystone_url": 1, "eddystone_url": 1,
"eddystone_uid": 1, "eddystone_uid": 1,
"open": 0, "open": 1,
"pairing_mode": 1, "pairing_mode": 1,
"whitelist": 1, "whitelist": 0,
"security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM", "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
"partial_flashing": 1 "partial_flashing": 1
} }
@ -67,26 +67,24 @@
}, },
"userConfigs": [ "userConfigs": [
{ {
"description": "No Pairing Required: Anyone can connect via Bluetooth.", "description": "No Pairing Required (default): Anyone can connect via Bluetooth.",
"config": { "config": {
"microbit-dal": { "microbit-dal": {
"bluetooth": { "bluetooth": {
"open": 1, "open": null,
"pairing_mode": null, "whitelist": null,
"whitelist": 0,
"security_level": null "security_level": null
} }
} }
} }
}, },
{ {
"description": "JustWorks pairing (default): Pairing is automatic once the pairing is initiated.", "description": "JustWorks pairing: Pairing is automatic once the pairing is initiated.",
"config": { "config": {
"microbit-dal": { "microbit-dal": {
"bluetooth": { "bluetooth": {
"open": null, "open": 0,
"pairing_mode": null, "whitelist": 1,
"whitelist": null,
"security_level": null "security_level": null
} }
} }
@ -98,7 +96,6 @@
"microbit-dal": { "microbit-dal": {
"bluetooth": { "bluetooth": {
"open": 0, "open": 0,
"pairing_mode": null,
"whitelist": 1, "whitelist": 1,
"security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM" "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
} }