ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TARGET_NRF5: corrected 'sleep()' to make it work properly on NRF52 as well.

pull/2865/head
Głąbek, Andrzej 2016-09-29 13:31:14 +02:00
parent 7e8aeadfdc
commit eb5fdf05c6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/sleep.c
View File

@ -26,7 +26,6 @@
void sleep(void) void sleep(void)
{ {
// ensure debug is disconnected if semihost is enabled.... // ensure debug is disconnected if semihost is enabled....
NRF_POWER->TASKS_LOWPWR = 1;
SCB->SCR |= SCB_SCR_SEVONPEND_Msk; /* send an event when an interrupt is pending. SCB->SCR |= SCB_SCR_SEVONPEND_Msk; /* send an event when an interrupt is pending.
* This helps with the wakeup from the following app_evt_wait(). */ * This helps with the wakeup from the following app_evt_wait(). */
@ -37,8 +36,11 @@ void sleep(void)
// and check if the soft device is running // and check if the soft device is running
if ((__get_PRIMASK() == 0) && (sd_softdevice_is_enabled(&sd_enabled) == NRF_SUCCESS) && (sd_enabled == 1)) { if ((__get_PRIMASK() == 0) && (sd_softdevice_is_enabled(&sd_enabled) == NRF_SUCCESS) && (sd_enabled == 1)) {
// soft device is enabled, use the primitives from the soft device to go to sleep // soft device is enabled, use the primitives from the soft device to go to sleep
sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
sd_app_evt_wait(); sd_app_evt_wait();
} else { } else {
NRF_POWER->TASKS_LOWPWR = 1;
// Note: it is not possible to just use WFE at this stage because WFE // Note: it is not possible to just use WFE at this stage because WFE
// will read the event register (not accessible) and if an event occured, // will read the event register (not accessible) and if an event occured,
// in the past, it will just clear the event register and continue execution. // in the past, it will just clear the event register and continue execution.