Merge branch 'samd-sleep' into samd-sleep-v1

.gitmodules

@@ -154,9 +154,6 @@
 	path = ports/espressif/esp-idf
 	url = https://github.com/espressif/esp-idf.git
 	branch = release/v4.3
-[submodule "ports/espressif/certificates/nina-fw"]
-	path = ports/espressif/certificates/nina-fw
-	url = https://github.com/adafruit/nina-fw.git
 [submodule "frozen/Adafruit_CircuitPython_ST7789"]
 	path = frozen/Adafruit_CircuitPython_ST7789
 	url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789

locale/circuitpython.pot

@@ -1771,6 +1771,7 @@ msgstr ""
 msgid "Only one TouchAlarm can be set in deep sleep."
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
 #: ports/espressif/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
 #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1881,6 +1882,10 @@ msgstr ""
 msgid "Pin must support hardware interrupts"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
+msgid "PinAlarms not available"
+msgstr ""
+
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid ""
@@ -2091,6 +2096,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/SleepMemory.c
 #: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2245,6 +2251,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.c
 #: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"

ports/atmel-samd/common-hal/alarm/__init__.c

@@ -275,4 +275,3 @@ MP_NOINLINE void common_hal_alarm_pretending_deep_sleep(void) {
 void common_hal_alarm_gc_collect(void) {
     gc_collect_ptr(shared_alarm_get_wake_alarm());
 }
-

ports/atmel-samd/common-hal/alarm/pin/PinAlarm.h

@@ -42,7 +42,6 @@ mp_obj_t alarm_pin_pinalarm_find_triggered_alarm(size_t n_alarms, const mp_obj_t
 mp_obj_t alarm_pin_pinalarm_create_wakeup_alarm(void);
 
 void pin_alarm_callback(uint8_t num);
-
 void alarm_pin_pinalarm_reset(void);
 void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
 void alarm_pin_pinalarm_prepare_for_deep_sleep(void);

ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c

@@ -29,7 +29,6 @@
 // #include <stdio.h>
 // #include "shared-bindings/microcontroller/__init__.h"
 
-
 #include "shared-bindings/alarm/time/TimeAlarm.h"
 #include "shared-bindings/time/__init__.h"
 #include "supervisor/port.h"
@@ -44,6 +43,7 @@ void common_hal_alarm_time_timealarm_construct(alarm_time_timealarm_obj_t *self,
     //
     //       UPDATE: for deep sleep at least, it's far more than 3 days since
     //               prescalar is set to 1024. (2^32)/32 seconds so >1500 days?
+
     self->monotonic_time = monotonic_time;
 }
 

ports/atmel-samd/mpconfigport.mk

@@ -98,7 +98,8 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 
 # The ?='s allow overriding in mpconfigboard.mk.
 
-CIRCUITCIRCUITPY_ALARM ?= 0
+
+CIRCUITPY_ALARM ?= 0
 PY_PS2IO ?= 1
 CIRCUITPY_SAMD ?= 1
 CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FULL_BUILD)

ports/espressif/certificates/nina-fw

@@ -1 +0,0 @@
-Subproject commit f2a0e601b23212dda4fe305eab30af49a7c7fb41