Skip to content

Commit b65ff6c

Browse files
author
Donatien Garnier
committed
Merge branch 'master' into gap-example
2 parents 461c857 + 5f467b6 commit b65ff6c

File tree

26 files changed

+658
-56
lines changed

26 files changed

+658
-56
lines changed

BLE_BatteryLevel/.mbedignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

BLE_BatteryLevel/mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#182bbd51bc8d1b6217477c2b5de3f1d0c5e6249f
1+
https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36

BLE_Beacon/.mbedignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

BLE_Beacon/mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#182bbd51bc8d1b6217477c2b5de3f1d0c5e6249f
1+
https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36

BLE_Beacon/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This example advertises a UUID, a major and minor number and the transmission st
1010

1111
The sample application can be seen on any BLE scanner on a smartphone. If you don't have a scanner on your phone, please install :
1212

13-
- [nRF Master Control Panel](https://play.google.com/store/apps/details?id=no.nordicsemi.android.mcp) for Android.
13+
- [nRF Connect for Mobile](https://play.google.com/store/apps/details?id=no.nordicsemi.android.mcp) for Android.
1414

1515
- [LightBlue](https://itunes.apple.com/gb/app/lightblue-bluetooth-low-energy/id557428110?mt=8) for iPhone.
1616

BLE_Button/.mbedignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

BLE_Button/mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#182bbd51bc8d1b6217477c2b5de3f1d0c5e6249f
1+
https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36

BLE_Button/mbed_app.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
"NRF52_DK": {
1414
"ble_button_pin_name": "BUTTON1"
1515
},
16+
"MTB_UBLOX_NINA_B1": {
17+
"ble_button_pin_name": "BUTTON1"
18+
},
1619
"K64F": {
1720
"target.features_add": ["BLE"],
1821
"target.extra_labels_add": ["ST_BLUENRG"],

BLE_GAPButton/.mbedignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

BLE_GAPButton/mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#182bbd51bc8d1b6217477c2b5de3f1d0c5e6249f
1+
https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36

0 commit comments

Comments
 (0)