diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-01-17 18:51:40 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-01-17 18:51:40 -0800 |
| commit | fddc98858afb19b87a2ed65b4d2b301b3e1ce667 (patch) | |
| tree | b6b191d85f006425fc9f2a128e89c873820e8a63 | |
| parent | 6404aaf411d7fe5fd96f3a8cbf7a1cb7580a09e7 (diff) | |
fix nonetype handling and nrf never reset
| -rw-r--r-- | ports/nrf/common-hal/microcontroller/Pin.c | 2 | ||||
| -rw-r--r-- | shared-module/displayio/__init__.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/nrf/common-hal/microcontroller/Pin.c b/ports/nrf/common-hal/microcontroller/Pin.c index 268e2f75d..112654c7e 100644 --- a/ports/nrf/common-hal/microcontroller/Pin.c +++ b/ports/nrf/common-hal/microcontroller/Pin.c @@ -53,7 +53,7 @@ void reset_all_pins(void) { } for (uint32_t pin = 0; pin < NUMBER_OF_PINS; ++pin) { - if (!(never_reset_pins[nrf_pin_port(pin)] & (1 << nrf_relative_pin_number(pin)))) { + if ((never_reset_pins[nrf_pin_port(pin)] & (1 << nrf_relative_pin_number(pin))) != 0) { continue; } nrf_gpio_cfg_default(pin); diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c index ccabe9c9d..c8132e2f9 100644 --- a/shared-module/displayio/__init__.c +++ b/shared-module/displayio/__init__.c @@ -13,7 +13,7 @@ primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT]; void displayio_refresh_displays(void) { for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) { - if (displays[i].display.base.type == NULL) { + if (displays[i].display.base.type == NULL || displays[i].display.base.type == &mp_type_NoneType) { continue; } displayio_display_obj_t* display = &displays[i].display; |