From 48b5f2a384e7ecc10ee51b453934a009ea9dc48d Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 12 Mar 2020 23:05:12 -0700 Subject: Initial work on SAMD --- py/circuitpy_defns.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'py') diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 92021d0d0..135782cf4 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -282,8 +282,7 @@ SRC_COMMON_HAL_ALL = \ rtc/RTC.c \ rtc/__init__.c \ supervisor/Runtime.c \ - supervisor/__init__.c \ - time/__init__.c + supervisor/__init__.c SRC_COMMON_HAL = $(filter $(SRC_PATTERNS), $(SRC_COMMON_HAL_ALL)) @@ -358,13 +357,14 @@ SRC_SHARED_MODULE_ALL = \ network/__init__.c \ storage/__init__.c \ struct/__init__.c \ + time/__init__.c \ terminalio/Terminal.c \ terminalio/__init__.c \ uheap/__init__.c \ ustack/__init__.c \ _pew/__init__.c \ _pew/PewPew.c \ - _eve/__init__.c + _eve/__init__.c # All possible sources are listed here, and are filtered by SRC_PATTERNS. SRC_SHARED_MODULE = $(filter $(SRC_PATTERNS), $(SRC_SHARED_MODULE_ALL)) -- cgit v1.2.3 From c248730bd1c837fe682232bf096e7260c4d5be3c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 2 Apr 2020 17:36:09 -0700 Subject: Clean up --- py/circuitpy_defns.mk | 4 ++-- supervisor/shared/tick.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'py') diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 342ea4da4..42289c96c 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -300,7 +300,7 @@ $(filter $(SRC_PATTERNS), \ fontio/Glyph.c \ microcontroller/RunMode.c \ math/__init__.c \ - _eve/__init__.c \ + _eve/__init__.c \ ) SRC_BINDINGS_ENUMS += \ @@ -364,7 +364,7 @@ SRC_SHARED_MODULE_ALL = \ ustack/__init__.c \ _pew/__init__.c \ _pew/PewPew.c \ - _eve/__init__.c + _eve/__init__.c # All possible sources are listed here, and are filtered by SRC_PATTERNS. SRC_SHARED_MODULE = $(filter $(SRC_PATTERNS), $(SRC_SHARED_MODULE_ALL)) diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c index de56b64f5..516dff747 100644 --- a/supervisor/shared/tick.c +++ b/supervisor/shared/tick.c @@ -110,7 +110,6 @@ void mp_hal_delay_ms(mp_uint_t delay) { } // Sleep until an interrupt happens. port_sleep_until_interrupt(); - // asm("bkpt"); duration = (port_get_raw_ticks(NULL) - start_tick); port_interrupt_after_ticks(duration); } -- cgit v1.2.3