Skip to content

Commit 6634e46

Browse files
authored
Merge pull request #6547 from marcuschangarm/feature-nrf52
Update Nordic NRF52 based targets to SDK 14.2
2 parents 42d77ec + b964420 commit 6634e46

File tree

451 files changed

+222437
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

451 files changed

+222437
-140
lines changed

TESTS/mbed_hal/critical_section/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "greentea-client/test_env.h"
2121
#include "mbed.h"
2222
#include "cmsis.h"
23-
#ifdef TARGET_NRF5 // for all NRF5x targets
23+
#if defined(TARGET_NRF5) || defined(TARGET_NRF5x) // for all NRF5x targets
2424
#include "nrf_nvic.h" // for __NRF_NVIC_APP_IRQS_0 / __NRF_NVIC_APP_IRQS_1
2525
#endif
2626

@@ -30,7 +30,7 @@ bool test_are_interrupts_enabled(void)
3030
{
3131
// NRF5x targets don't disable interrupts when in critical section, instead they mask application interrupts this is due to BLE stack
3232
// (BLE to be operational requires some interrupts to be always enabled)
33-
#ifdef TARGET_NRF52_DK
33+
#ifdef TARGET_NRF52
3434
// check if APP interrupts are masked for NRF52_DK board
3535
return (((NVIC->ISER[0] & __NRF_NVIC_APP_IRQS_0) != 0) || ((NVIC->ISER[1] & __NRF_NVIC_APP_IRQS_1) != 0));
3636
#elif TARGET_NRF5

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/CHANGELOG.md

Lines changed: 344 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
This module contains softdevice which comes with The Nordic Softdevice License Agreement,
2+
a BSD-like licence for binary distributions, offered by Nordic for use in mbed. Some
3+
other files come from the mbed SDK, and are licensed under Apache-2.0. Unless
4+
specifically indicated otherwise in a file, files are licensed under the
5+
Apache 2.0 license, as can be found in: apache-2.0.txt. The Nordic Semiconductor Softdevice
6+
License Agreement can be found in softdevice_nrf51822_licence_agreement.txt.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright (c) 2015 ARM Limited
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "ble-nrf51822",
3+
"version": "2.7.1",
4+
"description": "Nordic stack and drivers for the mbed BLE API.",
5+
"keywords": [
6+
"Bluetooth",
7+
"BLE",
8+
"mbed",
9+
"mbed-official"
10+
],
11+
"author": "Rohit Grover",
12+
"repository": {
13+
"url": "[email protected]:ARMmbed/ble-nRF51822.git",
14+
"type": "git"
15+
},
16+
"homepage": "https://developer.mbed.org/teams/Nordic-Semiconductor/",
17+
"licenses": [
18+
{
19+
"url": "https://spdx.org/licenses/Apache-2.0",
20+
"type": "Apache-2.0"
21+
},
22+
{
23+
"type": "LicenseRef-softdevice_nrf51822_licence_agreement.txt"
24+
}
25+
],
26+
"dependencies": {
27+
"ble": "^2.6.0",
28+
"nrf51-sdk": "^2.4.0"
29+
},
30+
"extraIncludes": [
31+
"source/btle",
32+
"source/btle/custom",
33+
"source/common"
34+
],
35+
"targetDependencies": {}
36+
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* S110/S120/S130 License Agreement
3+
*
4+
* Copyright (c) 2015, Nordic Semiconductor ASA, All rights reserved.
5+
*
6+
* Redistribution. Redistribution and use in binary form, without modification,
7+
* are permitted provided that the following conditions are met:
8+
*
9+
* • Redistributions must reproduce the above copyright notice and the following
10+
* disclaimer in the documentation and/or other materials provided with the
11+
* distribution.
12+
* • Neither the name of the copyright holder nor the names of its contributors
13+
* may be used to endorse or promote products derived from this software
14+
* without specific prior written permission.
15+
* • No reverse engineering, decompilation, or disassembly of this software is
16+
* permitted.
17+
*
18+
* DISCLAIMER.
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
23+
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
24+
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
26+
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*
30+
* /

0 commit comments

Comments
 (0)