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

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

Browse Source
This commit is contained in:
Max Holliday 2021-10-03 17:16:27 -06:00 committed by GitHub
commit b95325e3c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -154,9 +154,6 @@
path = ports/espressif/esp-idf path = ports/espressif/esp-idf
url = https://github.com/espressif/esp-idf.git url = https://github.com/espressif/esp-idf.git
branch = release/v4.3 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"] [submodule "frozen/Adafruit_CircuitPython_ST7789"]
path = frozen/Adafruit_CircuitPython_ST7789 path = frozen/Adafruit_CircuitPython_ST7789
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789 url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789

7
locale/circuitpython.pot
View File

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

1
ports/atmel-samd/common-hal/alarm/__init__.c
View File

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

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

@ -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); mp_obj_t alarm_pin_pinalarm_create_wakeup_alarm(void);
void pin_alarm_callback(uint8_t num); void pin_alarm_callback(uint8_t num);
void alarm_pin_pinalarm_reset(void); 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_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
void alarm_pin_pinalarm_prepare_for_deep_sleep(void); void alarm_pin_pinalarm_prepare_for_deep_sleep(void);

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

@ -29,7 +29,6 @@
// #include <stdio.h> // #include <stdio.h>
// #include "shared-bindings/microcontroller/__init__.h" // #include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/alarm/time/TimeAlarm.h" #include "shared-bindings/alarm/time/TimeAlarm.h"
#include "shared-bindings/time/__init__.h" #include "shared-bindings/time/__init__.h"
#include "supervisor/port.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 // 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? // prescalar is set to 1024. (2^32)/32 seconds so >1500 days?
self->monotonic_time = monotonic_time; self->monotonic_time = monotonic_time;
} }

3
ports/atmel-samd/mpconfigport.mk
View File

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

1
ports/espressif/certificates/nina-fw

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