From 40118bcf57f026fd6a58733501c759a9ba87e835 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Wed, 2 Dec 2020 18:05:29 -0800
Subject: Add `board_deinit` for use with sleep

This changes lots of files to unify `board.h` across ports. It adds
`board_deinit` when CIRCUITPY_ALARM is set. `main.c` uses it to
deinit the board before deep sleeping (even when pretending.)

Deep sleep is now a two step process for the port. First, the
port should prepare to deep sleep based on the given alarms. It
should set alarms for both deep and pretend sleep. In particular,
the pretend versions should be set immediately so that we don't
miss an alarm as we shutdown. These alarms should also wake from
`port_idle_until_interrupt` which is used when pretending to deep
sleep.

Second, when real deep sleeping, `alarm_enter_deep_sleep` is called.
The port should set any alarms it didn't during prepare based on
data it saved internally during prepare.

ESP32-S2 sleep is a bit reorganized to locate more logic with
TimeAlarm. This will help it scale to more alarm types.

Fixes #3786
---
 py/circuitpy_mpconfig.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'py')

diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index f04112bfc..0bd889ccd 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -912,6 +912,12 @@ void supervisor_run_background_tasks_if_tick(void);
 #define CIRCUITPY_PYSTACK_SIZE 1536
 #endif
 
+
+// Wait this long imediately after startup to see if we are connected to USB.
+#ifndef CIRCUITPY_USB_CONNECTED_SLEEP_DELAY
+#define CIRCUITPY_USB_CONNECTED_SLEEP_DELAY 5
+#endif
+
 #define CIRCUITPY_BOOT_OUTPUT_FILE "/boot_out.txt"
 
 #define CIRCUITPY_VERBOSE_BLE 0
-- 
cgit v1.2.3


From d83d46a52d4a5da9541cfa4bfa7d13e285fce476 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 10 Dec 2020 14:28:22 -0500
Subject: Invoke scripts with

---
 py/mkenv.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'py')

diff --git a/py/mkenv.mk b/py/mkenv.mk
index cb678e8e7..7e99f59c1 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -56,7 +56,7 @@ RM = rm
 RSYNC = rsync
 SED = sed
 # Linux has 'nproc', macOS has 'sysctl -n hw.logicalcpu', this is cross-platform
-NPROC = $(PYTHON) -c 'import multiprocessing as mp; print(mp.cpu_count())'
+NPROC = $(PYTHON3) -c 'import multiprocessing as mp; print(mp.cpu_count())'
 
 AS = $(CROSS_COMPILE)as
 CC = $(CROSS_COMPILE)gcc
@@ -72,7 +72,7 @@ CXX += -m32
 LD += -m32
 endif
 
-MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py
+MAKE_FROZEN = $(PYTHON3) $(TOP)/tools/make-frozen.py
 MPY_CROSS = $(TOP)/mpy-cross/mpy-cross
 MPY_TOOL = $(PYTHON3) $(TOP)/tools/mpy-tool.py
 PREPROCESS_FROZEN_MODULES = PYTHONPATH=$(TOP)/tools/python-semver $(TOP)/tools/preprocess_frozen_modules.py
-- 
cgit v1.2.3