summaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2019-06-06 17:49:32 -0400
committerDan Halbert <halbert@halwitz.org>2019-06-06 17:49:32 -0400
commit62de2506e47c14a71c7a9fe04360697ccb966aeb (patch)
tree2d6363f88e5d7c4666094138e217ec6a2a2b6b2b /ports
parentc90ce2b9fa98dc8c2a1298524bc434d07393ad6a (diff)
Include display objects in gc.
Diffstat (limited to 'ports')
-rw-r--r--ports/nrf/background.c4
-rw-r--r--ports/nrf/supervisor/port.c10
2 files changed, 10 insertions, 4 deletions
diff --git a/ports/nrf/background.c b/ports/nrf/background.c
index 3fb5febd3..9c4f3ab27 100644
--- a/ports/nrf/background.c
+++ b/ports/nrf/background.c
@@ -29,7 +29,7 @@
#include "supervisor/usb.h"
#include "supervisor/shared/stack.h"
-#ifdef CIRCUITPY_DISPLAYIO
+#if CIRCUITPY_DISPLAYIO
#include "shared-module/displayio/__init__.h"
#endif
@@ -48,7 +48,7 @@ void run_background_tasks(void) {
filesystem_background();
usb_background();
- #ifdef CIRCUITPY_DISPLAYIO
+ #if CIRCUITPY_DISPLAYIO
displayio_refresh_displays();
#endif
running_background_tasks = false;
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index 85ecd6afe..8fbf75498 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -93,16 +93,22 @@ void reset_port(void) {
i2c_reset();
spi_reset();
uart_reset();
+
+#if CIRCUITPY_PULSEIO
pwmout_reset();
pulseout_reset();
pulsein_reset();
+#endif
+
timers_reset();
- #if CIRCUITPY_RTC
+#if CIRCUITPY_RTC
rtc_reset();
- #endif
+#endif
+#if CIRCUITPY_BLEIO
bleio_reset();
+#endif
reset_all_pins();
}