diff options
| author | Lucian Copeland <hierophect@gmail.com> | 2020-12-14 13:00:57 -0500 |
|---|---|---|
| committer | Lucian Copeland <hierophect@gmail.com> | 2020-12-14 13:00:57 -0500 |
| commit | cac755ba16cd0bd68a3251ca26a1d7ba4099e4fa (patch) | |
| tree | 4541c5fd16b5d42d1c0fa1fb8ff2836451c4d0c5 /py | |
| parent | dc560f0eee74a95e96dd402f76c6aa31ba13d712 (diff) | |
| parent | 6cced494022007e6d1fea1b022b37e5b6212111e (diff) | |
Merge remote-tracking branch 'upstream/main' into esp-analog-hang
Diffstat (limited to 'py')
| -rw-r--r-- | py/circuitpy_mpconfig.h | 6 | ||||
| -rw-r--r-- | py/mkenv.mk | 4 |
2 files changed, 8 insertions, 2 deletions
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 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 |