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

set RAM retention just before deep sleep

This commit is contained in:
jun2sak 2021-02-24 00:12:25 +09:00
parent 105042e870
commit 0f188befb6
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/nrf/common-hal/alarm/SleepMemory.c
View File

@ -26,13 +26,13 @@
*/
#include <string.h>
#ifdef MY_DEBUGUART
#include "supervisor/serial.h" // dbg_printf()
#endif
#include "py/runtime.h"
#include "common-hal/alarm/SleepMemory.h"
#ifdef MY_DEBUGUART
extern void dbg_dump_RAMreg(void);
#endif
#define RTC_DATA_ATTR __attribute__((section(".uninitialized")))
static RTC_DATA_ATTR uint8_t _sleep_mem[SLEEP_MEMORY_LENGTH];
static RTC_DATA_ATTR uint32_t _sleep_mem_magicnum;
@ -47,11 +47,8 @@ static int is_sleep_memory_valid(void) {
return 0;
}
extern void dbg_dump_RAMreg(void);
static void initialize_sleep_memory(void) {
memset((uint8_t *)_sleep_mem, 0, SLEEP_MEMORY_LENGTH);
// also, set RAM[n].POWER register for RAM retention
void set_memory_retention(void) {
// set RAM[n].POWER register for RAM retention
// nRF52840 has RAM[0..7].Section[0..1] and RAM[8].Section[0..5]
// nRF52833 has RAM[0..7].Section[0..1] and RAM[8].Section[0,1]
for(int ram = 0; ram <= 7; ++ram) {
@ -63,6 +60,12 @@ static void initialize_sleep_memory(void) {
#ifdef NRF52833
NRF_POWER->RAM[8].POWERSET = 0x00030000; // RETENTION for section 0,1
#endif
}
static void initialize_sleep_memory(void) {
memset((uint8_t *)_sleep_mem, 0, SLEEP_MEMORY_LENGTH);
set_memory_retention();
#ifdef MY_DEBUGUART
dbg_dump_RAMreg();
#endif

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

@ -202,12 +202,17 @@ void common_hal_alarm_set_deep_sleep_alarms(size_t n_alarms, const mp_obj_t *ala
_setup_sleep_alarms(true, n_alarms, alarms);
}
extern void set_memory_retention(void);
void NORETURN alarm_enter_deep_sleep(void) {
alarm_pin_pinalarm_prepare_for_deep_sleep();
//alarm_touch_touchalarm_prepare_for_deep_sleep(); // XXX
uint8_t sd_enabled;
sd_softdevice_is_enabled(&sd_enabled);
set_memory_retention();
#ifdef MY_DEBUGUART
dbg_printf("go system off.. %d\r\n", sd_enabled);
#endif