Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
fc2760a
NRF52832 and NRF52840 upgraded to Nordic SDK 14 and SoftDevice 5.0
Jan 17, 2018
bff552d
Linker scripts and startup files for NRF52832
Jan 17, 2018
ad1b986
Linker scripts and startup files for NRF52840
Jan 17, 2018
56cf092
Pin configurations for NRF52832 based boards
Jan 17, 2018
d861bda
Pin configurations for NRF52840 based boards
Jan 17, 2018
0b40ddc
Initial mbed HAL implementation for NRF5x family
Jan 17, 2018
3940d3a
Default SDK configuration for NRF52832 and NRF52840
Jan 17, 2018
efa3461
Change target.json to use new SDK and folder structure for NRF52
Jan 17, 2018
cf61c24
Update critical section for NRF5x
Jan 22, 2018
6827816
Add TRNG device_has for NRF52_DK
sarahmarshy Jan 23, 2018
c049921
Add GCC linker sections for NRF52 SoftDevice
Jan 22, 2018
5c3e494
Renamed MCU_NRF52832 inheritance in MTB_UBLOX_NINA_B1
Jan 31, 2018
60397c5
Renamed NRF52 targets for HAL critical section test
Jan 31, 2018
770b1a3
Simplified critical_section_api.c for NRF52 series
Jan 31, 2018
39c69f1
Optional SoftDevice for the NRF52 series
Feb 1, 2018
0071334
Switch to managed bootloader for SoftDevice merge on NRF52
Feb 2, 2018
2e7b5ba
Fix linker scripts and startup code for NRF52
Feb 5, 2018
3b9ec49
Flash storage for NRF52
Feb 18, 2018
5d52773
Fix NRF52 build error
Feb 20, 2018
fa79e68
Fix TRNG for NRF52
Feb 18, 2018
64baf71
Upgrade NRF52 BLE API to version 5
Feb 22, 2018
f0d1424
Update analogin_api.c for NRF52 SDK 14.2
Feb 26, 2018
ea6c007
Extended PeripheralPins and pinmap for NRF52 series
Feb 23, 2018
6db7e68
Helper functions for sharing hardware peripherals on NRF52
Feb 23, 2018
8dd6276
Fix ISR stack size inconsistencies on NRF52 series
Mar 1, 2018
97426d6
NRF52 BLE: Fix GCC C++11 include error
Mar 5, 2018
cfb4804
NRF52: fix us_ticker IRQ handler
Mar 6, 2018
aeab2ec
Fix potential race condition in nRF5xn.cpp
Mar 8, 2018
f9b371f
Handle required BLE5 softdevice commands
Mar 8, 2018
d11f74c
NRF52 series PWM reimplementation for SDK 14.2
Mar 7, 2018
c9d16e9
Implement SPI API for NRF52x
sarahmarshy Feb 22, 2018
fc8f0e1
I2C HAL update for NRF52
Feb 22, 2018
9502011
README file for NRF52 HAL implementation
Mar 1, 2018
3663494
Serial re-implementation for the NRF52 series
Mar 16, 2018
cafa8ae
Fix serial_putc bug in NRF52 family
Mar 27, 2018
18fa941
Add resource management for serial for the NRF52 family
Mar 27, 2018
b9f91b3
Fix off-by-one error in NRF52 serial implementation
Mar 30, 2018
2c651af
Updated target MTB_LAIRD_BL652 to use SDK 14.2
Mar 26, 2018
b964420
Reorganize targets.json for NRF52 based targets
Apr 5, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions TESTS/mbed_hal/critical_section/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "greentea-client/test_env.h"
#include "mbed.h"
#include "cmsis.h"
#ifdef TARGET_NRF5 // for all NRF5x targets
#if defined(TARGET_NRF5) || defined(TARGET_NRF5x) // for all NRF5x targets
#include "nrf_nvic.h" // for __NRF_NVIC_APP_IRQS_0 / __NRF_NVIC_APP_IRQS_1
#endif

Expand All @@ -30,7 +30,7 @@ bool test_are_interrupts_enabled(void)
{
// NRF5x targets don't disable interrupts when in critical section, instead they mask application interrupts this is due to BLE stack
// (BLE to be operational requires some interrupts to be always enabled)
#ifdef TARGET_NRF52_DK
#ifdef TARGET_NRF52
// check if APP interrupts are masked for NRF52_DK board
return (((NVIC->ISER[0] & __NRF_NVIC_APP_IRQS_0) != 0) || ((NVIC->ISER[1] & __NRF_NVIC_APP_IRQS_1) != 0));
#elif TARGET_NRF5
Expand Down
344 changes: 344 additions & 0 deletions features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/CHANGELOG.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This module contains softdevice which comes with The Nordic Softdevice License Agreement,
a BSD-like licence for binary distributions, offered by Nordic for use in mbed. Some
other files come from the mbed SDK, and are licensed under Apache-2.0. Unless
specifically indicated otherwise in a file, files are licensed under the
Apache 2.0 license, as can be found in: apache-2.0.txt. The Nordic Semiconductor Softdevice
License Agreement can be found in softdevice_nrf51822_licence_agreement.txt.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright (c) 2015 ARM Limited

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"name": "ble-nrf51822",
"version": "2.7.1",
"description": "Nordic stack and drivers for the mbed BLE API.",
"keywords": [
"Bluetooth",
"BLE",
"mbed",
"mbed-official"
],
"author": "Rohit Grover",
"repository": {
"url": "[email protected]:ARMmbed/ble-nRF51822.git",
"type": "git"
},
"homepage": "https://developer.mbed.org/teams/Nordic-Semiconductor/",
"licenses": [
{
"url": "https://spdx.org/licenses/Apache-2.0",
"type": "Apache-2.0"
},
{
"type": "LicenseRef-softdevice_nrf51822_licence_agreement.txt"
}
],
"dependencies": {
"ble": "^2.6.0",
"nrf51-sdk": "^2.4.0"
},
"extraIncludes": [
"source/btle",
"source/btle/custom",
"source/common"
],
"targetDependencies": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* S110/S120/S130 License Agreement
*
* Copyright (c) 2015, Nordic Semiconductor ASA, All rights reserved.
*
* Redistribution. Redistribution and use in binary form, without modification,
* are permitted provided that the following conditions are met:
*
* • Redistributions must reproduce the above copyright notice and the following
* disclaimer in the documentation and/or other materials provided with the
* distribution.
* • Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
* • No reverse engineering, decompilation, or disassembly of this software is
* permitted.
*
* DISCLAIMER.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* /
Loading