Skip to content
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

Fixes hanging on sleep_ms() after deep sleep #83

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes hanging on sleep_ms() after deep sleep #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion src/rp2_common/pico_sleep/sleep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,27 @@ void sleep_goto_sleep_until(datetime_t *t, rtc_callback_t callback) {
// We should have already called the sleep_run_from_dormant_source function
assert(dormant_source_valid(_dormant_source));

// Save these register states to be able to restore afer waking up:
uint clock0_orig = clocks_hw->sleep_en0;
uint clock1_orig = clocks_hw->sleep_en1;
uint save = scb_hw->scr;

// Turn off all clocks when in sleep mode except for RTC
clocks_hw->sleep_en0 = CLOCKS_SLEEP_EN0_CLK_RTC_RTC_BITS;
clocks_hw->sleep_en1 = 0x0;

rtc_set_alarm(t, callback);

uint save = scb_hw->scr;
// Enable deep sleep at the proc
scb_hw->scr = save | M0PLUS_SCR_SLEEPDEEP_BITS;

// Go to sleep
__wfi();

// If these registers are not restored, any __wfi() will take the proc to deep sleep! (Any sleep_ms() for example.)
clocks_hw->sleep_en0 = clock0_orig;
clocks_hw->sleep_en1 = clock1_orig;
scb_hw->scr = save;
}

static void _go_dormant(void) {
Expand Down