Skip to content

NRF52840_DK: Enable lp us ticker support #7001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2018
Merged

NRF52840_DK: Enable lp us ticker support #7001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89cfb5c
NRF52840_DK: Enable lp us ticker support
mprse May 24, 2018
2ec9e41
Make common_rtc.c compatible with SDK 14.2 and move it common dir
mprse May 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
239 changes: 0 additions & 239 deletions targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/common_rtc.c
View file
Open in desktop

This file was deleted.

16 changes: 12 additions & 4 deletions ...IC/TARGET_NRF5x/TARGET_NRF51/common_rtc.c → ...s/TARGET_NORDIC/TARGET_NRF5x/common_rtc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,16 @@
#include "lp_ticker_api.h"
#include "mbed_critical.h"

#if defined(NRF52_ERRATA_20)
#include "softdevice_handler.h"
#if defined(NRF52_PAN_20)
/* Macro for testing if the SoftDevice is active, regardless of whether the
* application is build with the SoftDevice or not.
*/
#if defined(SOFTDEVICE_PRESENT)
#include "nrf_sdh.h"
#define NRF_HAL_SD_IS_ENABLED() nrf_sdh_is_enabled()
#else
#define NRF_HAL_SD_IS_ENABLED() 0
#endif
#endif


Expand Down Expand Up @@ -92,8 +100,8 @@ void COMMON_RTC_IRQ_HANDLER(void)
/* Function for fix errata 20: RTC Register values are invalid. */
__STATIC_INLINE void errata_20(void)
{
#if defined(NRF52_ERRATA_20)
if (!softdevice_handler_is_enabled())
#if defined(NRF52_PAN_20)
if (!NRF_HAL_SD_IS_ENABLED())
{
NRF_CLOCK->EVENTS_LFCLKSTARTED = 0;
NRF_CLOCK->TASKS_LFCLKSTART = 1;
Expand Down
6 changes: 4 additions & 2 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3644,6 +3644,7 @@
"I2C_ASYNCH",
"INTERRUPTIN",
"ITM",
"LPTICKER",
"PORTIN",
"PORTINOUT",
"PORTOUT",
Expand All @@ -3656,7 +3657,8 @@
"SPI",
"SPI_ASYNCH",
"STCLK_OFF_DURING_SLEEP",
"TRNG"
"TRNG",
"USTICKER"
],
"extra_labels": [
"NORDIC",
Expand Down Expand Up @@ -3692,7 +3694,7 @@
"NRF52840_DK": {
"supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52840"],
"release_versions": [],
"release_versions": ["5"],
"device_name": "nRF52840_xxAA"
},
"BLUEPILL_F103C8": {
Expand Down