djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Hosted Weblate 2021-08-23 18:46:18 +02:00
commit 6f05591f66
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/nrf/supervisor/port.c
View File

@ -364,12 +364,9 @@ void port_idle_until_interrupt(void) {
sd_softdevice_is_enabled(&sd_enabled);
if (sd_enabled) {
uint8_t is_nested_critical_region;
sd_nvic_critical_region_enter(&is_nested_critical_region);
if (!background_callback_pending()) {
sd_app_evt_wait();
}
sd_nvic_critical_region_exit(is_nested_critical_region);
} else {
// Call wait for interrupt ourselves if the SD isn't enabled.
// Note that `wfi` should be called with interrupts disabled,