adafruit · dhalbert · Apr 28, 2021 · Feb 17, 2021 · Feb 17, 2021 · Feb 20, 2021
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -681,6 +681,7 @@ msgid "Cannot vary frequency on a timer that is already in use"
 msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/pin/PinAlarm.c
+#: ports/nrf/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge. Only level."
 msgstr ""
 
@@ -1287,7 +1288,8 @@ msgstr ""
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 #: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
-#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
+#: ports/esp32s2/common-hal/touchio/TouchIn.c
+#: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Invalid pin"
 msgstr ""
@@ -1665,6 +1667,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
+#: ports/nrf/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
 
@@ -3715,6 +3718,7 @@ msgstr ""
 #: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
 #: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
 #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h
+#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
 #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
 #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
 #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h

diff --git a/main.c b/main.c
@@ -423,6 +423,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
             // it may also return due to another interrupt, that's why we check
             // for deep sleep alarms above. If it wasn't a deep sleep alarm,
             // then we'll idle here again.
+
             #if CIRCUITPY_ALARM
                 common_hal_alarm_pretending_deep_sleep();
             #else

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
@@ -94,6 +94,11 @@ else
   CFLAGS += -flto -flto-partition=none
 endif
 
+ifeq ($(NRF_DEBUG_PRINT), 1)
+  CFLAGS += -DNRF_DEBUG_PRINT=1
+  SRC_SUPERVISOR += supervisor/debug_uart.c
+endif
+
 # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
 CFLAGS += $(OPTIMIZATION_FLAGS)
 

diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk
@@ -7,6 +7,7 @@ MCU_CHIP = nrf52833
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
+CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOMP3 = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_BITMAPTOOLS = 0

diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk
@@ -10,11 +10,13 @@ MCU_CHIP = nrf52833
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
+CIRCUITPY_ALARM = 0
 CIRCUITPY_AESIO = 1
 CIRCUITPY_AUDIOMP3 = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BUSIO = 1
+CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_ERRNO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
@@ -23,10 +25,13 @@ CIRCUITPY_MSGPACK = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_PIXELBUF  = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 1
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 1
 CIRCUITPY_SDCARDIO = 0
+CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_ULAB = 0
 CIRCUITPY_USB_CDC = 0

diff --git a/ports/nrf/common-hal/alarm/SleepMemory.c b/ports/nrf/common-hal/alarm/SleepMemory.c
@@ -0,0 +1,118 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Junji Sakai
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+#include "py/runtime.h"
+#include "common-hal/alarm/__init__.h"
+#include "common-hal/alarm/SleepMemory.h"
+#include "nrf_power.h"
+
+#ifdef NRF_DEBUG_PRINT
+extern void dbg_dump_RAMreg(void);
+#include "supervisor/serial.h" // dbg_printf()
+#endif
+
+__attribute__((section(".uninitialized"))) static uint8_t _sleepmem[SLEEP_MEMORY_LENGTH];
+__attribute__((section(".uninitialized"))) uint8_t sleepmem_wakeup_event;
+__attribute__((section(".uninitialized"))) uint8_t sleepmem_wakeup_pin;
+__attribute__((section(".uninitialized"))) static uint32_t _sleepmem_magicnum;
+#define SLEEP_MEMORY_DATA_GUARD 0xad0000af
+#define SLEEP_MEMORY_DATA_GUARD_MASK 0xff0000ff
+
+static int is_sleep_memory_valid(void) {
+    if ((_sleepmem_magicnum & SLEEP_MEMORY_DATA_GUARD_MASK)
+         == SLEEP_MEMORY_DATA_GUARD) {
+      return 1;
+    }
+    return 0;
+}
+
+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 block = 0; block <= 7; ++block) {
+        nrf_power_rampower_mask_on(NRF_POWER, block,
+                   NRF_POWER_RAMPOWER_S0RETENTION_MASK |
+                   NRF_POWER_RAMPOWER_S1RETENTION_MASK);
+    };
+#ifdef NRF52840
+    nrf_power_rampower_mask_on(NRF_POWER, 8,
+                   NRF_POWER_RAMPOWER_S0RETENTION_MASK |
+                   NRF_POWER_RAMPOWER_S1RETENTION_MASK |
+                   NRF_POWER_RAMPOWER_S2RETENTION_MASK |
+                   NRF_POWER_RAMPOWER_S3RETENTION_MASK |
+                   NRF_POWER_RAMPOWER_S4RETENTION_MASK |
+                   NRF_POWER_RAMPOWER_S5RETENTION_MASK);
+#endif
+#ifdef NRF52833
+    nrf_power_rampower_mask_on(NRF_POWER, 8,
+                   NRF_POWER_RAMPOWER_S0RETENTION_MASK |
+                   NRF_POWER_RAMPOWER_S1RETENTION_MASK);
+#endif
+}
+
+static void initialize_sleep_memory(void) {
+    memset((uint8_t *)_sleepmem, 0, SLEEP_MEMORY_LENGTH);
+    sleepmem_wakeup_event = 0;
+    sleepmem_wakeup_pin   = 0;
+
+    set_memory_retention();
+#ifdef NRF_DEBUG_PRINT
+    //dbg_dump_RAMreg();
+#endif
+
+    _sleepmem_magicnum = SLEEP_MEMORY_DATA_GUARD;
+}
+
+void alarm_sleep_memory_reset(void) {
+    if (!is_sleep_memory_valid()) {
+        initialize_sleep_memory();
+#ifdef NRF_DEBUG_PRINT
+    dbg_printf("sleep memory initialized\r\n");
+#endif
+    }
+}
+
+uint32_t common_hal_alarm_sleep_memory_get_length(alarm_sleep_memory_obj_t *self) {
+    return sizeof(_sleepmem);
+}
+
+bool common_hal_alarm_sleep_memory_set_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, const uint8_t* values, uint32_t len) {
+    if (start_index + len > sizeof(_sleepmem)) {
+        return false;
+    }
+
+    memcpy((uint8_t *) (_sleepmem + start_index), values, len);
+    return true;
+}
+
+void common_hal_alarm_sleep_memory_get_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, uint8_t* values, uint32_t len) {
+    if (start_index + len > sizeof(_sleepmem)) {
+        return;
+    }
+    memcpy(values, (uint8_t *) (_sleepmem + start_index), len);
+}
diff --git a/ports/nrf/common-hal/alarm/SleepMemory.h b/ports/nrf/common-hal/alarm/SleepMemory.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Junji Sakai
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#define MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM_SLEEPMEMORY_H
+
+#include "py/obj.h"
+
+#define SLEEP_MEMORY_LENGTH (256)
+
+typedef struct {
+    mp_obj_base_t base;
+} alarm_sleep_memory_obj_t;
+
+extern void set_memory_retention(void);
+extern void alarm_sleep_memory_reset(void);
+
+#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_ALARM_SLEEPMEMORY_H