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

reset myself, not go REPL, after wakeup from deep sleep.

This commit is contained in:
jun2sak 2021-03-09 00:42:22 +09:00
parent 51c7a49853
commit c8f36e604c
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/nrf/common-hal/alarm/__init__.c
View File

@ -170,6 +170,7 @@ STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t
nrf_sleep_source_t system_on_idle_until_alarm(int64_t timediff_ms, uint32_t prescaler) {
bool have_timeout = false;
uint64_t start_tick = 0, end_tick = 0;
int64_t tickdiff;
#if defined(MICROPY_QSPI_CS)
qspi_flash_enter_sleep();
@ -182,7 +183,6 @@ nrf_sleep_source_t system_on_idle_until_alarm(int64_t timediff_ms, uint32_t pres
dbg_printf("now_ms=%ld timediff_ms=%ld\r\n", (long)now, (long)timediff_ms);
#endif
if (timediff_ms < 0) timediff_ms = 0;
int64_t tickdiff;
if (prescaler == 0) {
// 1 tick = 1/1024 sec = 1000/1024 ms
// -> 1 ms = 1024/1000 ticks
@ -264,6 +264,18 @@ nrf_sleep_source_t system_on_idle_until_alarm(int64_t timediff_ms, uint32_t pres
qspi_flash_exit_sleep();
#endif
tickdiff = port_get_raw_ticks(NULL) - start_tick;
if (prescaler == 0) {
timediff_ms = tickdiff / 1024;
}
else {
timediff_ms = tickdiff * prescaler / 1024;
}
(void)timediff_ms;
#ifdef NRF_DEBUG_PRINT
dbg_printf("lapse %6.1f sec\r\n", (double)(timediff_ms));
#endif
return wakeup_cause;
}
@ -368,10 +380,17 @@ void alarm_pretending_deep_sleep(void) {
#ifdef NRF_DEBUG_PRINT
dbg_printf("wakeup! ");
print_wakeup_cause(cause);
dbg_printf("continue..\r\n");
#endif
alarm_reset();
// if one of Alarm event occurred, reset myself
if (cause == NRF_SLEEP_WAKEUP_GPIO ||
cause == NRF_SLEEP_WAKEUP_TIMER ||
cause == NRF_SLEEP_WAKEUP_TOUCHPAD) {
reset_cpu();
}
// else, just return and go into REPL
}
void common_hal_alarm_gc_collect(void) {