Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Revision 81:796f36bfa718, committed 2019-08-15
- Comitter:
- mbed_official
- Date:
- Thu Aug 15 17:00:47 2019 +0100
- Parent:
- 80:b1d92e01177c
- Commit message:
- Merge pull request #252 from donatieng/mbed_os_update
Update Master branch to use Mbed OS 5.13.1
.
Commit copied from https://github.com/ARMmbed/mbed-os-example-ble
Changed in this revision
mbed-os.lib | Show annotated file Show diff for this revision Revisions of this file |
mbed_app.json | Show annotated file Show diff for this revision Revisions of this file |
--- a/mbed-os.lib Wed Feb 27 13:00:52 2019 +0000 +++ b/mbed-os.lib Thu Aug 15 17:00:47 2019 +0100 @@ -1,1 +1,1 @@ -https://github.com/ARMmbed/mbed-os/#51d55508e8400b60af467005646c4e2164738d48 +https://github.com/ARMmbed/mbed-os/#5941d1718339116cd12914238ec331c84da3d08f
--- a/mbed_app.json Wed Feb 27 13:00:52 2019 +0000 +++ b/mbed_app.json Thu Aug 15 17:00:47 2019 +0100 @@ -13,14 +13,10 @@ "target.extra_labels_add": ["CORDIO", "CORDIO_BLUENRG"] }, "NRF52840_DK": { - "target.features_add": ["BLE"], - "target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"], - "target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL", "NORDIC_SOFTDEVICE"] + "target.features_add": ["BLE"] }, "NRF52_DK": { - "target.features_add": ["BLE"], - "target.extra_labels_add": ["CORDIO", "CORDIO_LL", "SOFTDEVICE_NONE", "NORDIC_CORDIO"], - "target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL", "NORDIC_SOFTDEVICE"] + "target.features_add": ["BLE"] } } }