From 05d8885a1ab959fabdbb77f99408b2e7dc78b97c Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Wed, 16 Jan 2019 12:04:42 -0800
Subject: Rework displays in prep for dynamic support and 8bit parallel.

---
 shared-module/displayio/Display.c  | 149 +++++++++++++++++++++++++++++++++++++
 shared-module/displayio/Display.h  |  55 ++++++++++++++
 shared-module/displayio/__init__.c |  57 +++++---------
 shared-module/displayio/__init__.h |  16 ++++
 4 files changed, 237 insertions(+), 40 deletions(-)
 create mode 100644 shared-module/displayio/Display.c
 create mode 100644 shared-module/displayio/Display.h

(limited to 'shared-module')

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
new file mode 100644
index 000000000..0a14e74bb
--- /dev/null
+++ b/shared-module/displayio/Display.c
@@ -0,0 +1,149 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/displayio/Display.h"
+
+#include "py/runtime.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/displayio/ParallelBus.h"
+
+#include <stdint.h>
+
+#include "tick.h"
+
+#define DELAY 0x80
+
+void common_hal_displayio_display_construct(displayio_display_obj_t* self,
+        mp_obj_t bus, uint16_t width, uint16_t height, int16_t colstart, int16_t rowstart,
+        uint16_t color_depth, uint8_t set_column_command, uint8_t set_row_command,
+        uint8_t write_ram_command, uint8_t* init_sequence, uint16_t init_sequence_len) {
+    self->width = width;
+    self->height = height;
+    self->color_depth = color_depth;
+    self->set_column_command = set_column_command;
+    self->set_row_command = set_row_command;
+    self->write_ram_command = write_ram_command;
+    self->current_group = NULL;
+    self->colstart = colstart;
+    self->rowstart = rowstart;
+
+    if (MP_OBJ_IS_TYPE(bus, &displayio_parallelbus_type)) {
+        self->begin_transaction = common_hal_displayio_parallelbus_begin_transaction;
+        self->send = common_hal_displayio_parallelbus_send;
+        self->end_transaction = common_hal_displayio_parallelbus_end_transaction;
+    } else if (MP_OBJ_IS_TYPE(bus, &displayio_fourwire_type)) {
+        self->begin_transaction = common_hal_displayio_fourwire_begin_transaction;
+        self->send = common_hal_displayio_fourwire_send;
+        self->end_transaction = common_hal_displayio_fourwire_end_transaction;
+    } else {
+        mp_raise_ValueError(translate("Unsupported display bus type"));
+    }
+    self->bus = bus;
+
+    uint32_t i = 0;
+    self->begin_transaction(self->bus);
+    while (i < init_sequence_len) {
+        uint8_t *cmd = init_sequence + i;
+        uint8_t data_size = *(cmd + 1);
+        bool delay = (data_size & DELAY) != 0;
+        data_size &= ~DELAY;
+        uint8_t *data = cmd + 2;
+        self->send(self->bus, true, cmd, 1);
+        self->send(self->bus, false, data, data_size);
+        if (delay) {
+            data_size++;
+            uint16_t delay_length_ms = *(cmd + 1 + data_size);
+            if (delay_length_ms == 255) {
+                delay_length_ms = 500;
+            }
+            uint64_t start = ticks_ms;
+            while (ticks_ms - start < delay_length_ms) {}
+        } else {
+            uint64_t start = ticks_ms;
+            while (ticks_ms - start < 10) {}
+        }
+        i += 2 + data_size;
+    }
+    self->end_transaction(self->bus);
+}
+
+void common_hal_displayio_display_show(displayio_display_obj_t* self, displayio_group_t* root_group) {
+    self->current_group = root_group;
+    common_hal_displayio_display_refresh_soon(self);
+}
+
+void common_hal_displayio_display_refresh_soon(displayio_display_obj_t* self) {
+    self->refresh = true;
+}
+
+int32_t common_hal_displayio_display_wait_for_frame(displayio_display_obj_t* self) {
+    uint64_t last_refresh = self->last_refresh;
+    while (last_refresh == self->last_refresh) {
+        MICROPY_VM_HOOK_LOOP
+    }
+    return 0;
+}
+
+void displayio_display_start_region_update(displayio_display_obj_t* self, uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
+    // TODO(tannewt): Handle displays with single byte bounds.
+    self->begin_transaction(self->bus);
+    uint16_t data[2];
+    self->send(self->bus, true, &self->set_column_command, 1);
+    data[0] = __builtin_bswap16(x0 + self->colstart);
+    data[1] = __builtin_bswap16(x1 + self->colstart);
+    self->send(self->bus, false, (uint8_t*) data, 4);
+    self->send(self->bus, true, &self->set_row_command, 1);
+    data[0] = __builtin_bswap16(y0 + self->rowstart);
+    data[1] = __builtin_bswap16(y1 + self->rowstart);
+    self->send(self->bus, false, (uint8_t*) data, 4);
+    self->send(self->bus, true, &self->write_ram_command, 1);
+}
+
+void displayio_display_finish_region_update(displayio_display_obj_t* self) {
+    self->end_transaction(self->bus);
+}
+
+bool displayio_display_frame_queued(displayio_display_obj_t* self) {
+    // Refresh at ~30 fps.
+    return (ticks_ms - self->last_refresh) > 32;
+}
+
+bool displayio_display_refresh_queued(displayio_display_obj_t* self) {
+    return self->refresh || (self->current_group != NULL && displayio_group_needs_refresh(self->current_group));
+}
+
+void displayio_display_finish_refresh(displayio_display_obj_t* self) {
+    if (self->current_group != NULL) {
+        displayio_group_finish_refresh(self->current_group);
+    }
+    self->refresh = false;
+    self->last_refresh = ticks_ms;
+}
+
+bool displayio_display_send_pixels(displayio_display_obj_t* self, uint32_t* pixels, uint32_t length) {
+    self->send(self->bus, false, (uint8_t*) pixels, length * 4);
+    return true;
+}
diff --git a/shared-module/displayio/Display.h b/shared-module/displayio/Display.h
new file mode 100644
index 000000000..1f1355d31
--- /dev/null
+++ b/shared-module/displayio/Display.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_DISPLAY_H
+#define MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_DISPLAY_H
+
+#include "shared-module/displayio/Group.h"
+
+typedef bool (*display_bus_begin_transaction)(mp_obj_t bus);
+typedef void (*display_bus_send)(mp_obj_t bus, bool command, uint8_t *data, uint32_t data_length);
+typedef void (*display_bus_end_transaction)(mp_obj_t bus);
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t bus;
+    uint16_t width;
+    uint16_t height;
+    uint16_t color_depth;
+    uint8_t set_column_command;
+    uint8_t set_row_command;
+    uint8_t write_ram_command;
+    displayio_group_t *current_group;
+    bool refresh;
+    uint64_t last_refresh;
+    int16_t colstart;
+    int16_t rowstart;
+    display_bus_begin_transaction begin_transaction;
+    display_bus_send send;
+    display_bus_end_transaction end_transaction;
+} displayio_display_obj_t;
+
+#endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_DISPLAY_H
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index f1a00db9f..b528c3289 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -1,44 +1,17 @@
-#include "shared-bindings/displayio/FourWire.h"
 
-extern displayio_fourwire_obj_t board_display_obj;
+#include "shared-module/displayio/__init__.h"
 
-void start_region_update(displayio_fourwire_obj_t* display, uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
-    // TODO delegate between different display types
-    displayio_fourwire_start_region_update(display, x0, y0, x1, y1);
-}
-
-void finish_region_update(displayio_fourwire_obj_t* display) {
-    // TODO delegate between different display types
-    displayio_fourwire_finish_region_update(display);
-}
-
-void finish_refresh(displayio_fourwire_obj_t* display) {
-    // TODO delegate between different display types
-    displayio_fourwire_finish_refresh(display);
-}
-
-bool frame_queued(displayio_fourwire_obj_t* display) {
-    // TODO delegate between different display types
-    return displayio_fourwire_frame_queued(display);
-}
-
-bool refresh_queued(displayio_fourwire_obj_t* display) {
-    // TODO delegate between different display types
-    return displayio_fourwire_refresh_queued(display);
-}
+#include "shared-bindings/displayio/Display.h"
 
-bool send_pixels(displayio_fourwire_obj_t* display, uint32_t* pixels, uint32_t length) {
-    // TODO delegate between different display types
-    return displayio_fourwire_send_pixels(display, pixels, length);
-}
+primary_display_t primary_display;
 
 void displayio_refresh_display(void) {
-    displayio_fourwire_obj_t* display = &board_display_obj;
+    displayio_display_obj_t* display = &primary_display.display;
 
-    if (!frame_queued(display)) {
+    if (!displayio_display_frame_queued(display)) {
         return;
     }
-    if (refresh_queued(display)) {
+    if (displayio_display_refresh_queued(display)) {
         PORT->Group[1].DIRSET.reg = 1 << 22;
 
         // We compute the pixels
@@ -50,7 +23,7 @@ void displayio_refresh_display(void) {
         //size_t row_size = (x1 - x0);
         uint16_t buffer_size = 256;
         uint32_t buffer[buffer_size / 2];
-        start_region_update(display, x0, y0, x1, y1);
+        displayio_display_start_region_update(display, x0, y0, x1, y1);
         for (uint16_t y = y0; y < y1; ++y) {
             for (uint16_t x = x0; x < x1; ++x) {
                 uint16_t* pixel = &(((uint16_t*)buffer)[index]);
@@ -72,8 +45,8 @@ void displayio_refresh_display(void) {
                 index += 1;
                 // The buffer is full, send it.
                 if (index >= buffer_size) {
-                    if (!send_pixels(display, buffer, buffer_size / 2)) {
-                        finish_region_update(display);
+                    if (!displayio_display_send_pixels(display, buffer, buffer_size / 2)) {
+                        displayio_display_finish_region_update(display);
                         return;
                     }
                     index = 0;
@@ -81,11 +54,15 @@ void displayio_refresh_display(void) {
             }
         }
         // Send the remaining data.
-        if (index && !send_pixels(display, buffer, index * 2)) {
-            finish_region_update(display);
+        if (index && !displayio_display_send_pixels(display, buffer, index * 2)) {
+            displayio_display_finish_region_update(display);
             return;
         }
-        finish_region_update(display);
+        displayio_display_finish_region_update(display);
     }
-    finish_refresh(display);
+    displayio_display_finish_refresh(display);
+}
+
+void reset_primary_display(void) {
+    common_hal_displayio_display_show(&primary_display.display, NULL);
 }
diff --git a/shared-module/displayio/__init__.h b/shared-module/displayio/__init__.h
index 556af430d..84db98fcc 100644
--- a/shared-module/displayio/__init__.h
+++ b/shared-module/displayio/__init__.h
@@ -27,6 +27,22 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO___INIT___H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO___INIT___H
 
+#include "shared-bindings/displayio/Display.h"
+#include "shared-bindings/displayio/FourWire.h"
+#include "shared-bindings/displayio/ParallelBus.h"
+
+typedef struct {
+    union {
+        displayio_fourwire_obj_t fourwire_bus;
+        displayio_parallelbus_obj_t parallel_bus;
+    };
+    mp_const_obj_t bus_type;
+    displayio_display_obj_t display;
+} primary_display_t;
+
+extern primary_display_t primary_display;
+
 void displayio_refresh_display(void);
+void reset_primary_display(void);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO___INIT___H
-- 
cgit v1.2.3


From 84292ad89070f1994ed09b59c8a693216a40cd89 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 17 Jan 2019 00:20:16 -0800
Subject: External fourwire works and blinka splash after

---
 main.c                                             |   2 +-
 ports/atmel-samd/background.c                      |   2 +-
 .../boards/grandcentral_m4_express/mpconfigboard.h |   2 +
 .../boards/grandcentral_m4_express/pins.c          |   2 +-
 ports/atmel-samd/boards/pyportal/mpconfigboard.h   |   2 +-
 ports/atmel-samd/boards/pyportal/pins.c            |   4 +-
 ports/atmel-samd/common-hal/busio/SPI.c            |  13 ++
 ports/atmel-samd/common-hal/displayio/FourWire.c   |  10 +
 ports/atmel-samd/common-hal/displayio/FourWire.h   |   1 +
 ports/atmel-samd/common-hal/microcontroller/Pin.c  |   2 +
 shared-bindings/displayio/Display.c                |  23 ++-
 shared-bindings/displayio/FourWire.c               |  23 ++-
 shared-bindings/displayio/FourWire.h               |   2 +
 shared-bindings/displayio/ParallelBus.h            |   2 +
 shared-bindings/displayio/__init__.c               |  16 ++
 shared-bindings/displayio/__init__.h               |   4 +-
 shared-module/displayio/__init__.c                 | 220 ++++++++++++++++-----
 shared-module/displayio/__init__.h                 |   7 +-
 18 files changed, 255 insertions(+), 82 deletions(-)

(limited to 'shared-module')

diff --git a/main.c b/main.c
index d328fcaa4..02c832e67 100755
--- a/main.c
+++ b/main.c
@@ -201,7 +201,7 @@ bool run_code_py(safe_mode_t safe_mode) {
             }
         }
         // Turn off the display before the heap disappears.
-        reset_primary_display();
+        reset_displays();
         stop_mp();
         free_memory(heap);
 
diff --git a/ports/atmel-samd/background.c b/ports/atmel-samd/background.c
index 439877d2e..59e03008a 100644
--- a/ports/atmel-samd/background.c
+++ b/ports/atmel-samd/background.c
@@ -44,7 +44,7 @@ void run_background_tasks(void) {
     audio_dma_background();
     #endif
     #ifdef CIRCUITPY_DISPLAYIO
-    displayio_refresh_display();
+    displayio_refresh_displays();
     #endif
 
     #if MICROPY_PY_NETWORK
diff --git a/ports/atmel-samd/boards/grandcentral_m4_express/mpconfigboard.h b/ports/atmel-samd/boards/grandcentral_m4_express/mpconfigboard.h
index e1bef0019..465c51b4a 100644
--- a/ports/atmel-samd/boards/grandcentral_m4_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/grandcentral_m4_express/mpconfigboard.h
@@ -46,3 +46,5 @@
 #define IGNORE_PIN_PA25     1
 
 #define CIRCUITPY_I2CSLAVE
+#define CIRCUITPY_DISPLAYIO (1)
+#define CIRCUITPY_DISPLAY_LIMIT (3)
diff --git a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
index 081bb701e..0d19a63ef 100644
--- a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
+++ b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
diff --git a/ports/atmel-samd/boards/pyportal/mpconfigboard.h b/ports/atmel-samd/boards/pyportal/mpconfigboard.h
index 847e2ba76..f02d4a372 100644
--- a/ports/atmel-samd/boards/pyportal/mpconfigboard.h
+++ b/ports/atmel-samd/boards/pyportal/mpconfigboard.h
@@ -13,7 +13,7 @@
 // QSPI Data pins
 #define MICROPY_PORT_A ( PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 )
 // QSPI CS, and QSPI SCK
-#define MICROPY_PORT_B ( PORT_PB10 | PORT_PB11 )
+#define MICROPY_PORT_B ( PORT_PB10 | PORT_PB11 | PORT_PB22 )
 #define MICROPY_PORT_C ( 0 )
 #define MICROPY_PORT_D (0)
 
diff --git a/ports/atmel-samd/boards/pyportal/pins.c b/ports/atmel-samd/boards/pyportal/pins.c
index ddb8fa08a..4ddc10e52 100644
--- a/ports/atmel-samd/boards/pyportal/pins.c
+++ b/ports/atmel-samd/boards/pyportal/pins.c
@@ -1,7 +1,7 @@
 #include "shared-bindings/board/__init__.h"
 
 #include "boards/board.h"
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
@@ -72,7 +72,5 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&board_display_obj)}
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/common-hal/busio/SPI.c b/ports/atmel-samd/common-hal/busio/SPI.c
index 68382d405..8fb831a69 100644
--- a/ports/atmel-samd/common-hal/busio/SPI.c
+++ b/ports/atmel-samd/common-hal/busio/SPI.c
@@ -54,6 +54,17 @@ void never_reset_sercom(Sercom* sercom) {
     }
 }
 
+void allow_reset_sercom(Sercom* sercom) {
+    // Reset all SERCOMs except the ones being used by on-board devices.
+    Sercom *sercom_instances[SERCOM_INST_NUM] = SERCOM_INSTS;
+    for (int i = 0; i < SERCOM_INST_NUM; i++) {
+        if (sercom_instances[i] == sercom) {
+            never_reset_sercoms[i] = false;
+            break;
+        }
+    }
+}
+
 void reset_sercoms(void) {
     // Reset all SERCOMs except the ones being used by on-board devices.
     Sercom *sercom_instances[SERCOM_INST_NUM] = SERCOM_INSTS;
@@ -235,6 +246,8 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     if (common_hal_busio_spi_deinited(self)) {
         return;
     }
+    allow_reset_sercom(self->spi_desc.dev.prvt);
+
     spi_m_sync_disable(&self->spi_desc);
     spi_m_sync_deinit(&self->spi_desc);
     reset_pin_number(self->clock_pin);
diff --git a/ports/atmel-samd/common-hal/displayio/FourWire.c b/ports/atmel-samd/common-hal/displayio/FourWire.c
index 7a0bdd0c1..ab01e2609 100644
--- a/ports/atmel-samd/common-hal/displayio/FourWire.c
+++ b/ports/atmel-samd/common-hal/displayio/FourWire.c
@@ -53,6 +53,16 @@ void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self,
     never_reset_pin_number(reset->number);
 }
 
+void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self) {
+    if (self->bus == &self->inline_bus) {
+        common_hal_busio_spi_deinit(self->bus);
+    }
+
+    reset_pin_number(self->command.pin->number);
+    reset_pin_number(self->chip_select.pin->number);
+    reset_pin_number(self->reset.pin->number);
+}
+
 bool common_hal_displayio_fourwire_begin_transaction(mp_obj_t obj) {
     displayio_fourwire_obj_t* self = MP_OBJ_TO_PTR(obj);
     if (!common_hal_busio_spi_try_lock(self->bus)) {
diff --git a/ports/atmel-samd/common-hal/displayio/FourWire.h b/ports/atmel-samd/common-hal/displayio/FourWire.h
index e3ae5781b..234bcf794 100644
--- a/ports/atmel-samd/common-hal/displayio/FourWire.h
+++ b/ports/atmel-samd/common-hal/displayio/FourWire.h
@@ -34,6 +34,7 @@
 typedef struct {
     mp_obj_base_t base;
     busio_spi_obj_t* bus;
+    busio_spi_obj_t inline_bus;
     digitalio_digitalinout_obj_t command;
     digitalio_digitalinout_obj_t chip_select;
     digitalio_digitalinout_obj_t reset;
diff --git a/ports/atmel-samd/common-hal/microcontroller/Pin.c b/ports/atmel-samd/common-hal/microcontroller/Pin.c
index 7d0d97758..b7d527d04 100644
--- a/ports/atmel-samd/common-hal/microcontroller/Pin.c
+++ b/ports/atmel-samd/common-hal/microcontroller/Pin.c
@@ -100,6 +100,8 @@ void never_reset_pin_number(uint8_t pin_number) {
 }
 
 void reset_pin_number(uint8_t pin_number) {
+    never_reset_pins[GPIO_PORT(pin_number)] &= ~(1 << GPIO_PIN(pin_number));
+
     if (pin_number >= PORT_BITS) {
         return;
     }
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 5db470417..21f44965e 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -40,18 +40,19 @@
 
 //| .. currentmodule:: displayio
 //|
-//| :class:`FourWire` -- Manage updating a display over SPI four wire protocol
+//| :class:`Display` -- Manage updating a display over a display bus
 //| ==========================================================================
 //|
-//| Manage updating a display over SPI four wire protocol in the background while Python code runs.
-//| It doesn't handle display initialization.
+//| This initializes a display and connects it into CircuitPython. Unlike other
+//| objects in CircuitPython, Display objects live until `displayio.release_displays()`
+//| is called. This is done so that CircuitPython can use the display itself.
 //|
 //| .. warning:: This will be changed before 4.0.0. Consider it very experimental.
 //|
 //| .. class:: Display(display_bus, *, width, height, colstart=0, rowstart=0, color_depth=16,
 //|                    set_column_command=0x2a set_row_command=0x2b, write_ram_command=0x2c)
 //|
-//|   Create a FourWire object associated with the given pins.
+//|   Create a Display object.
 //|
 STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_color_depth, ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command };
@@ -80,11 +81,15 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_init_sequence].u_obj, &bufinfo, MP_BUFFER_READ);
 
-    displayio_display_obj_t *self;
-    if (display_bus == &primary_display.fourwire_bus) {
-        self = &primary_display.display;
-    } else {
-        self = m_new_obj(displayio_display_obj_t);
+    displayio_display_obj_t *self = NULL;
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        if (displays[i].display.base.type == NULL) {
+            self = &displays[i].display;
+            break;
+        }
+    }
+    if (self == NULL) {
+        mp_raise_RuntimeError(translate("Display limit reached"));
     }
     self->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(self,
diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c
index 674d1c900..9833fbc64 100644
--- a/shared-bindings/displayio/FourWire.c
+++ b/shared-bindings/displayio/FourWire.c
@@ -69,18 +69,21 @@ STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_
     if (command == mp_const_none || chip_select == mp_const_none) {
         mp_raise_ValueError(translate("Command and chip_select required"));
     }
+    assert_pin_free(command);
+    assert_pin_free(chip_select);
+    assert_pin_free(reset);
 
-    displayio_fourwire_obj_t* self;
+    displayio_fourwire_obj_t* self = NULL;
     mp_obj_t spi = args[ARG_spi_bus].u_obj;
-    if (board_spi() == spi && primary_display.bus_type == NULL) {
-        self = &primary_display.fourwire_bus;
-        primary_display.bus_type = &displayio_fourwire_type;
-    } else {
-        // TODO(tannewt): Always check pin free. For now we ignore the primary display.
-        assert_pin_free(command);
-        assert_pin_free(chip_select);
-        assert_pin_free(reset);
-        self = m_new_obj(displayio_fourwire_obj_t);
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        if (displays[i].fourwire_bus.base.type== NULL) {
+            self = &displays[i].fourwire_bus;
+            self->base.type = &displayio_fourwire_type;
+            break;
+        }
+    }
+    if (self == NULL) {
+        mp_raise_RuntimeError(translate("Display bus limit reached"));
     }
 
     common_hal_displayio_fourwire_construct(self,
diff --git a/shared-bindings/displayio/FourWire.h b/shared-bindings/displayio/FourWire.h
index a9e1bf566..3a9f66d4c 100644
--- a/shared-bindings/displayio/FourWire.h
+++ b/shared-bindings/displayio/FourWire.h
@@ -39,6 +39,8 @@ void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self,
     busio_spi_obj_t* spi, const mcu_pin_obj_t* command,
     const mcu_pin_obj_t* chip_select, const mcu_pin_obj_t* reset);
 
+void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self);
+
 bool common_hal_displayio_fourwire_begin_transaction(mp_obj_t self);
 
 void common_hal_displayio_fourwire_send(mp_obj_t self, bool command, uint8_t *data, uint32_t data_length);
diff --git a/shared-bindings/displayio/ParallelBus.h b/shared-bindings/displayio/ParallelBus.h
index f1d1656b1..c73934838 100644
--- a/shared-bindings/displayio/ParallelBus.h
+++ b/shared-bindings/displayio/ParallelBus.h
@@ -38,6 +38,8 @@ void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t* sel
     const mcu_pin_obj_t* data0, const mcu_pin_obj_t* command,
     const mcu_pin_obj_t* chip_select, const mcu_pin_obj_t* reset, const mcu_pin_obj_t* write);
 
+void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t* self);
+
 bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t self);
 
 void common_hal_displayio_parallelbus_send(mp_obj_t self, bool command, uint8_t *data, uint32_t data_length);
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index d485d8095..66cf4d63d 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -32,6 +32,7 @@
 #include "shared-bindings/displayio/__init__.h"
 #include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/ColorConverter.h"
+#include "shared-bindings/displayio/Display.h"
 #include "shared-bindings/displayio/FourWire.h"
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/displayio/OnDiskBitmap.h"
@@ -61,6 +62,7 @@
 //|
 //|     Bitmap
 //|     ColorConverter
+//|     Display
 //|     FourWire
 //|     Group
 //|     OnDiskBitmap
@@ -71,10 +73,22 @@
 //| All libraries change hardware state but are never deinit
 //|
 
+
+//| .. method:: release_displays()
+//|
+//|   Releases any actively used displays so theis pins can be used again.
+//|
+STATIC mp_obj_t displayio_release_displays(void) {
+    common_hal_displayio_release_displays();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(displayio_release_displays_obj, displayio_release_displays);
+
 STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_displayio) },
     { MP_ROM_QSTR(MP_QSTR_Bitmap), MP_ROM_PTR(&displayio_bitmap_type) },
     { MP_ROM_QSTR(MP_QSTR_ColorConverter), MP_ROM_PTR(&displayio_colorconverter_type) },
+    { MP_ROM_QSTR(MP_QSTR_Display), MP_ROM_PTR(&displayio_display_type) },
     { MP_ROM_QSTR(MP_QSTR_Group), MP_ROM_PTR(&displayio_group_type) },
     { MP_ROM_QSTR(MP_QSTR_OnDiskBitmap), MP_ROM_PTR(&displayio_ondiskbitmap_type) },
     { MP_ROM_QSTR(MP_QSTR_Palette), MP_ROM_PTR(&displayio_palette_type) },
@@ -82,6 +96,8 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Sprite), MP_ROM_PTR(&displayio_sprite_type) },
 
     { MP_ROM_QSTR(MP_QSTR_FourWire), MP_ROM_PTR(&displayio_fourwire_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_release_displays), MP_ROM_PTR(&displayio_release_displays_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table);
diff --git a/shared-bindings/displayio/__init__.h b/shared-bindings/displayio/__init__.h
index a6663bf57..427ddb47d 100644
--- a/shared-bindings/displayio/__init__.h
+++ b/shared-bindings/displayio/__init__.h
@@ -27,8 +27,6 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO___INIT___H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO___INIT___H
 
-#include "py/obj.h"
-
-// Nothing now.
+void common_hal_displayio_release_displays(void);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO___INIT___H
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index b528c3289..48194f63f 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -1,68 +1,190 @@
 
+#include <string.h>
 #include "shared-module/displayio/__init__.h"
 
+#include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/Display.h"
+#include "shared-bindings/displayio/Group.h"
+#include "shared-bindings/displayio/Palette.h"
+#include "shared-bindings/displayio/Sprite.h"
 
-primary_display_t primary_display;
+primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
 
-void displayio_refresh_display(void) {
-    displayio_display_obj_t* display = &primary_display.display;
+void displayio_refresh_displays(void) {
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        if (displays[i].display.base.type == NULL) {
+            continue;
+        }
+        displayio_display_obj_t* display = &displays[i].display;
 
-    if (!displayio_display_frame_queued(display)) {
-        return;
-    }
-    if (displayio_display_refresh_queued(display)) {
-        PORT->Group[1].DIRSET.reg = 1 << 22;
-
-        // We compute the pixels
-        uint16_t x0 = 0;
-        uint16_t y0 = 0;
-        uint16_t x1 = display->width;
-        uint16_t y1 = display->height;
-        size_t index = 0;
-        //size_t row_size = (x1 - x0);
-        uint16_t buffer_size = 256;
-        uint32_t buffer[buffer_size / 2];
-        displayio_display_start_region_update(display, x0, y0, x1, y1);
-        for (uint16_t y = y0; y < y1; ++y) {
-            for (uint16_t x = x0; x < x1; ++x) {
-                uint16_t* pixel = &(((uint16_t*)buffer)[index]);
-                *pixel = 0;
-
-                PORT->Group[1].OUTTGL.reg = 1 << 22;
-
-                //if (index == 0) {
-                    if (display->current_group != NULL) {
-                        displayio_group_get_pixel(display->current_group, x, y, pixel);
-                    }
-                // } else {
-                //     *pixel = (((uint16_t*)buffer)[0]);
-                // }
+        if (!displayio_display_frame_queued(display)) {
+            return;
+        }
+        if (displayio_display_refresh_queued(display)) {
+            PORT->Group[1].DIRSET.reg = 1 << 22;
+
+            // We compute the pixels
+            uint16_t x0 = 0;
+            uint16_t y0 = 0;
+            uint16_t x1 = display->width;
+            uint16_t y1 = display->height;
+            size_t index = 0;
+            //size_t row_size = (x1 - x0);
+            uint16_t buffer_size = 256;
+            uint32_t buffer[buffer_size / 2];
+            displayio_display_start_region_update(display, x0, y0, x1, y1);
+            for (uint16_t y = y0; y < y1; ++y) {
+                for (uint16_t x = x0; x < x1; ++x) {
+                    uint16_t* pixel = &(((uint16_t*)buffer)[index]);
+                    *pixel = 0;
+
+                    PORT->Group[1].OUTTGL.reg = 1 << 22;
+
+                    //if (index == 0) {
+                        if (display->current_group != NULL) {
+                            displayio_group_get_pixel(display->current_group, x, y, pixel);
+                        }
+                    // } else {
+                    //     *pixel = (((uint16_t*)buffer)[0]);
+                    // }
 
 
-                PORT->Group[1].OUTTGL.reg = 1 << 22;
+                    PORT->Group[1].OUTTGL.reg = 1 << 22;
 
-                index += 1;
-                // The buffer is full, send it.
-                if (index >= buffer_size) {
-                    if (!displayio_display_send_pixels(display, buffer, buffer_size / 2)) {
-                        displayio_display_finish_region_update(display);
-                        return;
+                    index += 1;
+                    // The buffer is full, send it.
+                    if (index >= buffer_size) {
+                        if (!displayio_display_send_pixels(display, buffer, buffer_size / 2)) {
+                            displayio_display_finish_region_update(display);
+                            return;
+                        }
+                        index = 0;
                     }
-                    index = 0;
                 }
             }
-        }
-        // Send the remaining data.
-        if (index && !displayio_display_send_pixels(display, buffer, index * 2)) {
+            // Send the remaining data.
+            if (index && !displayio_display_send_pixels(display, buffer, index * 2)) {
+                displayio_display_finish_region_update(display);
+                return;
+            }
             displayio_display_finish_region_update(display);
-            return;
         }
-        displayio_display_finish_region_update(display);
+        displayio_display_finish_refresh(display);
     }
-    displayio_display_finish_refresh(display);
 }
 
-void reset_primary_display(void) {
-    common_hal_displayio_display_show(&primary_display.display, NULL);
+uint32_t blinka_bitmap_data[32] = {
+    0x00000011, 0x11000000,
+    0x00000111, 0x53100000,
+    0x00000111, 0x56110000,
+    0x00000111, 0x11140000,
+    0x00000111, 0x20002000,
+    0x00000011, 0x13000000,
+    0x00000001, 0x11200000,
+    0x00000000, 0x11330000,
+    0x00000000, 0x01122000,
+    0x00001111, 0x44133000,
+    0x00032323, 0x24112200,
+    0x00111114, 0x44113300,
+    0x00323232, 0x34112200,
+    0x11111144, 0x44443300,
+    0x11111111, 0x11144401,
+    0x23232323, 0x21111110
+};
+
+displayio_bitmap_t blinka_bitmap = {
+    .base = {.type = &displayio_bitmap_type },
+    .width = 16,
+    .height = 16,
+    .data = blinka_bitmap_data,
+    .stride = 2,
+    .bits_per_value = 4,
+    .x_shift = 3,
+    .x_mask = 0x7,
+    .bitmask = 0xf
+};
+
+uint32_t blinka_transparency[1] = {0x80000000};
+uint32_t blinka_colors[8] = {0x1e910000, 0x72dc722b, 0xffffb05a, 0x00000000,
+                             0x80000000, 0x00000000, 0x00000000, 0x00000000};
+
+displayio_palette_t blinka_palette = {
+    .base = {.type = &displayio_palette_type },
+    .opaque = blinka_transparency,
+    .colors = blinka_colors,
+    .color_count = 16,
+    .needs_refresh = false
+};
+
+displayio_sprite_t blinka_sprite = {
+    .base = {.type = &displayio_sprite_type },
+    .bitmap = &blinka_bitmap,
+    .pixel_shader = &blinka_palette,
+    .x = 0,
+    .y = 0,
+    .width = 16,
+    .height = 16,
+    .needs_refresh = false
+};
+
+mp_obj_t splash_children[1] = {
+    &blinka_sprite,
+};
+
+displayio_group_t splash = {
+    .base = {.type = &displayio_group_type },
+    .x = 0,
+    .y = 0,
+    .size = 1,
+    .max_size = 1,
+    .children = splash_children,
+    .needs_refresh = true
+};
+
+void reset_displays(void) {
+    // The SPI buses used by FourWires may be allocated on the heap so we need to move them inline.
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        if (displays[i].fourwire_bus.base.type != &displayio_fourwire_type) {
+            continue;
+        }
+        displayio_fourwire_obj_t* fourwire = &displays[i].fourwire_bus;
+        if (((uint32_t) fourwire->bus) < ((uint32_t) &displays) ||
+            ((uint32_t) fourwire->bus) > ((uint32_t) &displays + CIRCUITPY_DISPLAY_LIMIT)) {
+            busio_spi_obj_t* original_spi = fourwire->bus;
+            memcpy(&fourwire->inline_bus, original_spi, sizeof(busio_spi_obj_t));
+            fourwire->bus = &fourwire->inline_bus;
+            // Check for other displays that use the same spi bus and swap them too.
+            for (uint8_t j = i + 1; j < CIRCUITPY_DISPLAY_LIMIT; j++) {
+                if (displays[i].fourwire_bus.bus == original_spi) {
+                    displays[i].fourwire_bus.bus = &fourwire->inline_bus;
+                }
+            }
+        }
+    }
+
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        if (displays[i].display.base.type == NULL) {
+            continue;
+        }
+        displayio_display_obj_t* display = &displays[i].display;
+        common_hal_displayio_display_show(display, &splash);
+    }
+}
+
+void common_hal_displayio_release_displays(void) {
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        mp_const_obj_t bus_type = displays[i].fourwire_bus.base.type;
+        if (bus_type == NULL) {
+            continue;
+        } else if (bus_type == &displayio_fourwire_type) {
+            common_hal_displayio_fourwire_deinit(&displays[i].fourwire_bus);
+        } else if (bus_type == &displayio_parallelbus_type) {
+            //common_hal_displayio_parallelbus_deinit(&displays[i].parallel_bus);
+        }
+        displays[i].fourwire_bus.base.type = NULL;
+    }
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        displays[i].display.base.type = NULL;
+    }
+    // TODO(tannewt): Clear the display datastructures and release everything used.
 }
diff --git a/shared-module/displayio/__init__.h b/shared-module/displayio/__init__.h
index 84db98fcc..fdabd4ec4 100644
--- a/shared-module/displayio/__init__.h
+++ b/shared-module/displayio/__init__.h
@@ -36,13 +36,12 @@ typedef struct {
         displayio_fourwire_obj_t fourwire_bus;
         displayio_parallelbus_obj_t parallel_bus;
     };
-    mp_const_obj_t bus_type;
     displayio_display_obj_t display;
 } primary_display_t;
 
-extern primary_display_t primary_display;
+extern primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
 
-void displayio_refresh_display(void);
-void reset_primary_display(void);
+void displayio_refresh_displays(void);
+void reset_displays(void);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO___INIT___H
-- 
cgit v1.2.3


From 5277138c992b860cfbdb767f18e034c42e31b6a1 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 17 Jan 2019 10:57:05 -0800
Subject: pyportal compiles and tweak blinka colors

---
 ports/atmel-samd/boards/pyportal/board.c | 57 ++++++++++++++++++++++++++++++--
 ports/atmel-samd/mpconfigport.h          |  1 +
 shared-module/displayio/Group.c          |  3 ++
 shared-module/displayio/Group.h          |  1 +
 shared-module/displayio/__init__.c       |  7 ++--
 5 files changed, 64 insertions(+), 5 deletions(-)

(limited to 'shared-module')

diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c
index 8ec498e8c..cf03bb28a 100644
--- a/ports/atmel-samd/boards/pyportal/board.c
+++ b/ports/atmel-samd/boards/pyportal/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +25,67 @@
  */
 
 #include "boards/board.h"
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 #include "mpconfigboard.h"
 #include "hal/include/hal_gpio.h"
 
 #include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
 
 #include "tick.h"
 
+#define DELAY 0x80
+
+uint8_t display_init_sequence[] = {
+    0xEF, 3, 0x03, 0x80, 0x02,
+    0xCF, 3, 0x00, 0xC1, 0x30,
+    0xED, 4, 0x64, 0x03, 0x12, 0x81,
+    0xE8, 3, 0x85, 0x00, 0x78,
+    0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
+    0xF7, 1, 0x20,
+    0xEA, 2, 0x00, 0x00,
+    0xc0, 1, 0x23,             // Power control VRH[5:0]
+    0xc1, 1, 0x10,             // Power control SAP[2:0];BT[3:0]
+    0xc5, 2, 0x3e, 0x28,       // VCM control
+    0xc7, 1, 0x86,             // VCM control2
+    0x36, 1, 0x38,             // Memory Access Control
+    0x37, 1, 0x00,             // Vertical scroll zero
+    0x3a, 1, 0x55,             // COLMOD: Pixel Format Set
+    0xb1, 2, 0x00, 0x18,       // Frame Rate Control (In Normal Mode/Full Colors)
+    0xb6, 3, 0x08, 0x82, 0x27, // Display Function Control
+    0xF2, 1, 0x00,                         // 3Gamma Function Disable
+    0x26, 1, 0x01,             // Gamma curve selected
+    0xe0, 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
+      0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00,
+    0xe1, 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
+      0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F,
+    0x11, DELAY, 120,                // Exit Sleep
+    0x29, DELAY, 120, // Display on
+};
+
 void board_init(void) {
+    displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+    common_hal_displayio_fourwire_construct(bus,
+        board_spi(),
+        &pin_PB09, // Command or data
+        &pin_PB06, // Chip select
+        &pin_PA00); // Reset
+
+    displayio_display_obj_t* display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+    common_hal_displayio_display_construct(display,
+        bus,
+        320, // Width
+        240, // Height
+        0, // column start
+        0, // row start
+        16, // Color depth
+        MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
+        MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
+        MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
+        display_init_sequence,
+        sizeof(display_init_sequence));
 }
 
 bool board_requests_safe_mode(void) {
@@ -41,5 +93,4 @@ bool board_requests_safe_mode(void) {
 }
 
 void reset_board(void) {
-    common_hal_displayio_display_show(&primary_display_obj, NULL);
 }
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index 65b8c94c5..77881fefd 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -192,6 +192,7 @@ typedef long mp_off_t;
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS          (1)
 #define MICROPY_PY_SYS_EXC_INFO                     (1)
 //      MICROPY_PY_UERRNO_LIST - Use the default
+#define CIRCUITPY_DISPLAY_LIMIT (3)
 #endif
 
 #ifdef LONGINT_IMPL_NONE
diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
index b9923128a..255349d7c 100644
--- a/shared-module/displayio/Group.c
+++ b/shared-module/displayio/Group.c
@@ -67,11 +67,14 @@ void displayio_group_construct(displayio_group_t* self, mp_obj_t* child_array, u
     self->children = child_array;
     self->max_size = max_size;
     self->needs_refresh = false;
+    self->scale = 1;
 }
 
 bool displayio_group_get_pixel(displayio_group_t *self, int16_t x, int16_t y, uint16_t* pixel) {
     x -= self->x;
     y -= self->y;
+    x /= self->scale;
+    y /= self->scale;
     for (int32_t i = self->size - 1; i >= 0 ; i--) {
         mp_obj_t layer = self->children[i];
         if (MP_OBJ_IS_TYPE(layer, &displayio_sprite_type)) {
diff --git a/shared-module/displayio/Group.h b/shared-module/displayio/Group.h
index 272f3114c..60f573ff6 100644
--- a/shared-module/displayio/Group.h
+++ b/shared-module/displayio/Group.h
@@ -36,6 +36,7 @@ typedef struct {
     mp_obj_base_t base;
     int16_t x;
     int16_t y;
+    uint16_t scale;
     uint16_t size;
     uint16_t max_size;
     mp_obj_t* children;
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 48194f63f..dc5957c23 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -105,8 +105,10 @@ displayio_bitmap_t blinka_bitmap = {
 };
 
 uint32_t blinka_transparency[1] = {0x80000000};
-uint32_t blinka_colors[8] = {0x1e910000, 0x72dc722b, 0xffffb05a, 0x00000000,
-                             0x80000000, 0x00000000, 0x00000000, 0x00000000};
+
+// TODO(tannewt): Fix these colors
+uint32_t blinka_colors[8] = {0x91780000, 0x879FFC98, 0xffff0000, 0x0000f501,
+                             0x00000000, 0x00000000, 0x00000000, 0x00000000};
 
 displayio_palette_t blinka_palette = {
     .base = {.type = &displayio_palette_type },
@@ -135,6 +137,7 @@ displayio_group_t splash = {
     .base = {.type = &displayio_group_type },
     .x = 0,
     .y = 0,
+    .scale = 2,
     .size = 1,
     .max_size = 1,
     .children = splash_children,
-- 
cgit v1.2.3


From 2d136d58bf288f0be945ed5cd3efe9113d0acce3 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 17 Jan 2019 14:45:29 -0800
Subject: Fix other builds and hallowing

---
 ports/atmel-samd/boards/arduino_mkr1300/pins.c     |  2 +-
 ports/atmel-samd/boards/arduino_mkrzero/pins.c     |  4 +-
 ports/atmel-samd/boards/arduino_zero/pins.c        |  2 +-
 ports/atmel-samd/boards/catwan_usbstick/pins.c     |  2 +-
 .../boards/circuitplayground_express/pins.c        |  2 +-
 .../circuitplayground_express_crickit/pins.c       |  2 +-
 ports/atmel-samd/boards/cp32-m4/pins.c             |  2 +-
 ports/atmel-samd/boards/datalore_ip_m4/pins.c      |  2 +-
 .../atmel-samd/boards/feather_m0_adalogger/pins.c  |  2 +-
 ports/atmel-samd/boards/feather_m0_basic/pins.c    |  2 +-
 ports/atmel-samd/boards/feather_m0_express/pins.c  |  2 +-
 .../boards/feather_m0_express_crickit/pins.c       |  2 +-
 ports/atmel-samd/boards/feather_m0_rfm69/pins.c    |  2 +-
 ports/atmel-samd/boards/feather_m0_rfm9x/pins.c    |  2 +-
 .../atmel-samd/boards/feather_m0_supersized/pins.c |  2 +-
 .../boards/feather_radiofruit_zigbee/pins.c        |  2 +-
 ports/atmel-samd/boards/gemma_m0/pins.c            |  2 +-
 .../atmel-samd/boards/hallowing_m0_express/board.c | 47 ++++++--------------
 .../atmel-samd/boards/hallowing_m0_express/pins.c  |  5 ++-
 .../atmel-samd/boards/itsybitsy_m0_express/pins.c  |  2 +-
 .../atmel-samd/boards/itsybitsy_m4_express/pins.c  |  2 +-
 ports/atmel-samd/boards/meowmeow/pins.c            |  2 +-
 ports/atmel-samd/boards/metro_m0_express/pins.c    |  2 +-
 ports/atmel-samd/boards/metro_m4_express/pins.c    |  2 +-
 ports/atmel-samd/boards/mini_sam_m4/pins.c         |  2 +-
 ports/atmel-samd/boards/pirkey_m0/pins.c           |  2 +-
 ports/atmel-samd/boards/pyportal/board.c           | 12 +++---
 ports/atmel-samd/boards/pyportal/pins.c            |  3 ++
 .../atmel-samd/boards/sparkfun_samd21_mini/pins.c  | 16 +++----
 ports/atmel-samd/boards/trellis_m4_express/pins.c  |  2 +-
 ports/atmel-samd/boards/trinket_m0/pins.c          |  2 +-
 ports/atmel-samd/boards/trinket_m0_haxpress/pins.c |  2 +-
 ports/atmel-samd/boards/ugame10/pins.c             |  2 +-
 .../atmel-samd/common-hal/displayio/ParallelBus.c  | 38 +++++++++++++---
 .../atmel-samd/common-hal/displayio/ParallelBus.h  |  4 ++
 ports/atmel-samd/mpconfigport.h                    |  1 +
 shared-bindings/displayio/ParallelBus.c            | 50 ++++++++++++++++++++--
 shared-bindings/displayio/ParallelBus.h            |  4 +-
 shared-bindings/displayio/__init__.c               |  3 ++
 shared-module/displayio/Display.c                  |  4 +-
 shared-module/displayio/__init__.c                 | 17 +++-----
 41 files changed, 160 insertions(+), 102 deletions(-)

(limited to 'shared-module')

diff --git a/ports/atmel-samd/boards/arduino_mkr1300/pins.c b/ports/atmel-samd/boards/arduino_mkr1300/pins.c
index de9f9769c..a5a058ace 100644
--- a/ports/atmel-samd/boards/arduino_mkr1300/pins.c
+++ b/ports/atmel-samd/boards/arduino_mkr1300/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/pins.c b/ports/atmel-samd/boards/arduino_mkrzero/pins.c
index 3ffd37fa6..654c0d6da 100644
--- a/ports/atmel-samd/boards/arduino_mkrzero/pins.c
+++ b/ports/atmel-samd/boards/arduino_mkrzero/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
@@ -31,7 +31,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PB23) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB23) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PB22) },
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB22) },    
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB22) },
     { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_PA13) },
     { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_PA12) },
     { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_PA15) },
diff --git a/ports/atmel-samd/boards/arduino_zero/pins.c b/ports/atmel-samd/boards/arduino_zero/pins.c
index 8a7ff70e6..f9403bb9a 100644
--- a/ports/atmel-samd/boards/arduino_zero/pins.c
+++ b/ports/atmel-samd/boards/arduino_zero/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/catwan_usbstick/pins.c b/ports/atmel-samd/boards/catwan_usbstick/pins.c
index 8997b653f..87ee84c0b 100644
--- a/ports/atmel-samd/boards/catwan_usbstick/pins.c
+++ b/ports/atmel-samd/boards/catwan_usbstick/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA30) },
diff --git a/ports/atmel-samd/boards/circuitplayground_express/pins.c b/ports/atmel-samd/boards/circuitplayground_express/pins.c
index 14ae89c55..70743366e 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/pins.c
+++ b/ports/atmel-samd/boards/circuitplayground_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c b/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c
index 14ae89c55..70743366e 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/cp32-m4/pins.c b/ports/atmel-samd/boards/cp32-m4/pins.c
index 93c169c8b..9da67dfb4 100644
--- a/ports/atmel-samd/boards/cp32-m4/pins.c
+++ b/ports/atmel-samd/boards/cp32-m4/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
diff --git a/ports/atmel-samd/boards/datalore_ip_m4/pins.c b/ports/atmel-samd/boards/datalore_ip_m4/pins.c
index 460fd6fef..468a09a47 100644
--- a/ports/atmel-samd/boards/datalore_ip_m4/pins.c
+++ b/ports/atmel-samd/boards/datalore_ip_m4/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/pins.c b/ports/atmel-samd/boards/feather_m0_adalogger/pins.c
index 0029bba1a..d99e62c95 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/pins.c
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/feather_m0_basic/pins.c b/ports/atmel-samd/boards/feather_m0_basic/pins.c
index 4400a253d..f9b6db63b 100644
--- a/ports/atmel-samd/boards/feather_m0_basic/pins.c
+++ b/ports/atmel-samd/boards/feather_m0_basic/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/feather_m0_express/pins.c b/ports/atmel-samd/boards/feather_m0_express/pins.c
index cd6c351d4..1eaa98a58 100644
--- a/ports/atmel-samd/boards/feather_m0_express/pins.c
+++ b/ports/atmel-samd/boards/feather_m0_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c b/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c
index cd6c351d4..1eaa98a58 100644
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/pins.c b/ports/atmel-samd/boards/feather_m0_rfm69/pins.c
index 7e14b3f25..ba59cb69b 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/pins.c
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c b/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c
index 4e77b7fb9..29a01d405 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/feather_m0_supersized/pins.c b/ports/atmel-samd/boards/feather_m0_supersized/pins.c
index cd6c351d4..1eaa98a58 100644
--- a/ports/atmel-samd/boards/feather_m0_supersized/pins.c
+++ b/ports/atmel-samd/boards/feather_m0_supersized/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/feather_radiofruit_zigbee/pins.c b/ports/atmel-samd/boards/feather_radiofruit_zigbee/pins.c
index cd111e174..211596f78 100755
--- a/ports/atmel-samd/boards/feather_radiofruit_zigbee/pins.c
+++ b/ports/atmel-samd/boards/feather_radiofruit_zigbee/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PB02) },
diff --git a/ports/atmel-samd/boards/gemma_m0/pins.c b/ports/atmel-samd/boards/gemma_m0/pins.c
index c9c7ea555..b24b45838 100644
--- a/ports/atmel-samd/boards/gemma_m0/pins.c
+++ b/ports/atmel-samd/boards/gemma_m0/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A1),  MP_ROM_PTR(&pin_PA05) }, // pad 1
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c
index b47c5fbb2..2b12ae464 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m0_express/board.c
@@ -27,6 +27,7 @@
 #include "boards/board.h"
 
 #include "shared-bindings/displayio/FourWire.h"
+#include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 
 #include "tick.h"
@@ -68,13 +69,18 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    board_display_obj.base.type = &displayio_fourwire_type;
-    common_hal_displayio_fourwire_construct(&board_display_obj,
-        &pin_PB23, // Clock
-        &pin_PB22, // Data
+    displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
+    bus->base.type = &displayio_fourwire_type;
+    common_hal_displayio_fourwire_construct(bus,
+        board_spi(),
         &pin_PA28, // Command or data
         &pin_PA01, // Chip select
-        &pin_PA27, // Reset
+        &pin_PA27); // Reset
+
+    displayio_display_obj_t* display = &displays[0].display;
+    display->base.type = &displayio_display_type;
+    common_hal_displayio_display_construct(display,
+        bus,
         128, // Width
         128, // Height
         2, // column start
@@ -82,33 +88,9 @@ void board_init(void) {
         16, // Color depth
         MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
         MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
-        MIPI_COMMAND_WRITE_MEMORY_START); // Write memory command
-
-    uint32_t i = 0;
-    common_hal_displayio_fourwire_begin_transaction(&board_display_obj);
-    while (i < sizeof(display_init_sequence)) {
-        uint8_t *cmd = display_init_sequence + i;
-        uint8_t data_size = *(cmd + 1);
-        bool delay = (data_size & DELAY) != 0;
-        data_size &= ~DELAY;
-        uint8_t *data = cmd + 2;
-        common_hal_displayio_fourwire_send(&board_display_obj, true, cmd, 1);
-        common_hal_displayio_fourwire_send(&board_display_obj, false, data, data_size);
-        if (delay) {
-            data_size++;
-            uint16_t delay_length_ms = *(cmd + 1 + data_size);
-            if (delay_length_ms == 255) {
-                delay_length_ms = 500;
-            }
-            uint64_t start = ticks_ms;
-            while (ticks_ms - start < delay_length_ms) {}
-        } else {
-            uint64_t start = ticks_ms;
-            while (ticks_ms - start < 10) {}
-        }
-        i += 2 + data_size;
-    }
-    common_hal_displayio_fourwire_end_transaction(&board_display_obj);
+        MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
+        display_init_sequence,
+        sizeof(display_init_sequence));
 }
 
 bool board_requests_safe_mode(void) {
@@ -116,5 +98,4 @@ bool board_requests_safe_mode(void) {
 }
 
 void reset_board(void) {
-    common_hal_displayio_fourwire_show(&board_display_obj, NULL);
 }
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/pins.c b/ports/atmel-samd/boards/hallowing_m0_express/pins.c
index d1f8609ff..3db1b1752 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/pins.c
+++ b/ports/atmel-samd/boards/hallowing_m0_express/pins.c
@@ -1,7 +1,8 @@
 #include "shared-bindings/board/__init__.h"
 
 #include "boards/board.h"
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
+#include "shared-module/displayio/__init__.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
@@ -62,6 +63,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&board_display_obj)}
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c b/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c
index 25407bc14..912fba4ed 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) },
diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c b/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c
index 2a89c3037..ed91c88ee 100644
--- a/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c
+++ b/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
diff --git a/ports/atmel-samd/boards/meowmeow/pins.c b/ports/atmel-samd/boards/meowmeow/pins.c
index 59c51f4eb..089baad32 100644
--- a/ports/atmel-samd/boards/meowmeow/pins.c
+++ b/ports/atmel-samd/boards/meowmeow/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/metro_m0_express/pins.c b/ports/atmel-samd/boards/metro_m0_express/pins.c
index 13f0eb0ba..0707a3581 100644
--- a/ports/atmel-samd/boards/metro_m0_express/pins.c
+++ b/ports/atmel-samd/boards/metro_m0_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
diff --git a/ports/atmel-samd/boards/metro_m4_express/pins.c b/ports/atmel-samd/boards/metro_m4_express/pins.c
index 0e66817f7..dd419aec6 100644
--- a/ports/atmel-samd/boards/metro_m4_express/pins.c
+++ b/ports/atmel-samd/boards/metro_m4_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
diff --git a/ports/atmel-samd/boards/mini_sam_m4/pins.c b/ports/atmel-samd/boards/mini_sam_m4/pins.c
index 87e210381..f78fe1bc8 100644
--- a/ports/atmel-samd/boards/mini_sam_m4/pins.c
+++ b/ports/atmel-samd/boards/mini_sam_m4/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
diff --git a/ports/atmel-samd/boards/pirkey_m0/pins.c b/ports/atmel-samd/boards/pirkey_m0/pins.c
index e08302f14..a6dbcefe3 100644
--- a/ports/atmel-samd/boards/pirkey_m0/pins.c
+++ b/ports/atmel-samd/boards/pirkey_m0/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_REMOTEIN),   MP_ROM_PTR(&pin_PA28) },
diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c
index cf03bb28a..6e5b37dd2 100644
--- a/ports/atmel-samd/boards/pyportal/board.c
+++ b/ports/atmel-samd/boards/pyportal/board.c
@@ -64,12 +64,14 @@ uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
-    displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
-    bus->base.type = &displayio_fourwire_type;
-    common_hal_displayio_fourwire_construct(bus,
-        board_spi(),
-        &pin_PB09, // Command or data
+    displayio_parallelbus_obj_t* bus = &displays[0].parallel_bus;
+    bus->base.type = &displayio_parallelbus_type;
+    common_hal_displayio_parallelbus_construct(bus,
+        &pin_PA16, // Data0
+        &pin_PB05, // Command or data
         &pin_PB06, // Chip select
+        &pin_PB09, // Write
+        &pin_PB04, // Read
         &pin_PA00); // Reset
 
     displayio_display_obj_t* display = &displays[0].display;
diff --git a/ports/atmel-samd/boards/pyportal/pins.c b/ports/atmel-samd/boards/pyportal/pins.c
index 4ddc10e52..6b1254dfc 100644
--- a/ports/atmel-samd/boards/pyportal/pins.c
+++ b/ports/atmel-samd/boards/pyportal/pins.c
@@ -1,6 +1,7 @@
 #include "shared-bindings/board/__init__.h"
 
 #include "boards/board.h"
+#include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
@@ -72,5 +73,7 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c b/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c
index abe63d064..42cd3736b 100644
--- a/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c
+++ b/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c
@@ -1,15 +1,15 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
-    
+
     // Analog pins
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) },
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },
-    
+
     // Digital pins
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) },
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) },
@@ -25,16 +25,16 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) },
-    
+
     // UART pins
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) },  
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) },
-    
+
     // SPI pins
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA16) },
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA19) },
-    
+
     // I2C pins
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
@@ -44,7 +44,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BLUE_LED),   MP_ROM_PTR(&pin_PA17) },
     { MP_ROM_QSTR(MP_QSTR_GREEN_LED),   MP_ROM_PTR(&pin_PA27) },
     { MP_ROM_QSTR(MP_QSTR_YELLOW_LED),   MP_ROM_PTR(&pin_PB03) },
-    
+
     // Comm objects
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
diff --git a/ports/atmel-samd/boards/trellis_m4_express/pins.c b/ports/atmel-samd/boards/trellis_m4_express/pins.c
index 9626f525f..a9f204318 100644
--- a/ports/atmel-samd/boards/trellis_m4_express/pins.c
+++ b/ports/atmel-samd/boards/trellis_m4_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
diff --git a/ports/atmel-samd/boards/trinket_m0/pins.c b/ports/atmel-samd/boards/trinket_m0/pins.c
index 633017024..b3637bd5b 100644
--- a/ports/atmel-samd/boards/trinket_m0/pins.c
+++ b/ports/atmel-samd/boards/trinket_m0/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) },
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c b/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c
index 633017024..b3637bd5b 100644
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) },
diff --git a/ports/atmel-samd/boards/ugame10/pins.c b/ports/atmel-samd/boards/ugame10/pins.c
index 87ace5e96..71db52752 100644
--- a/ports/atmel-samd/boards/ugame10/pins.c
+++ b/ports/atmel-samd/boards/ugame10/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_X), MP_ROM_PTR(&pin_PA00) },
diff --git a/ports/atmel-samd/common-hal/displayio/ParallelBus.c b/ports/atmel-samd/common-hal/displayio/ParallelBus.c
index f852647a4..3c287eccd 100644
--- a/ports/atmel-samd/common-hal/displayio/ParallelBus.c
+++ b/ports/atmel-samd/common-hal/displayio/ParallelBus.c
@@ -35,8 +35,8 @@
 #include "tick.h"
 
 void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t* self,
-    const mcu_pin_obj_t* data0, const mcu_pin_obj_t* command,
-    const mcu_pin_obj_t* chip_select, const mcu_pin_obj_t* reset, const mcu_pin_obj_t* write) {
+    const mcu_pin_obj_t* data0, const mcu_pin_obj_t* command, const mcu_pin_obj_t* chip_select,
+    const mcu_pin_obj_t* write, const mcu_pin_obj_t* read, const mcu_pin_obj_t* reset) {
 
     uint8_t data_pin = data0->number;
     if (data_pin % 8 != 0 || data_pin % 32 >= 24) {
@@ -47,8 +47,8 @@ void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t* sel
             mp_raise_ValueError_varg(translate("Bus pin %d is already in use"), i);
         }
     }
-    PortGroup *const g = &PORT->Group[data0->number % 32];
-    g->DIRSET.reg = 0xff << data_pin;
+    PortGroup *const g = &PORT->Group[data0->number / 32];
+    g->DIRSET.reg = 0xff << (data_pin % 32);
     self->bus = ((uint8_t*) &g->OUT.reg) + (data0->number % 32 / 8);
 
     self->command.base.type = &digitalio_digitalinout_type;
@@ -67,15 +67,36 @@ void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t* sel
     common_hal_digitalio_digitalinout_construct(&self->write, write);
     common_hal_digitalio_digitalinout_switch_to_output(&self->write, true, DRIVE_MODE_PUSH_PULL);
 
+    self->read.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&self->read, read);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->read, true, DRIVE_MODE_PUSH_PULL);
+
+    self->data0_pin = data_pin;
+    self->write_group = &PORT->Group[write->number / 32];
+    self->write_mask = 1 << (write->number % 32);
+
     never_reset_pin_number(command->number);
     never_reset_pin_number(chip_select->number);
-    never_reset_pin_number(reset->number);
     never_reset_pin_number(write->number);
+    never_reset_pin_number(read->number);
+    never_reset_pin_number(reset->number);
     for (uint8_t i = 0; i < 8; i++) {
         never_reset_pin_number(data_pin + i);
     }
 }
 
+void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t* self) {
+    for (uint8_t i = 0; i < 8; i++) {
+        reset_pin_number(self->data0_pin + i);
+    }
+
+    reset_pin_number(self->command.pin->number);
+    reset_pin_number(self->chip_select.pin->number);
+    reset_pin_number(self->write.pin->number);
+    reset_pin_number(self->read.pin->number);
+    reset_pin_number(self->reset.pin->number);
+}
+
 bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
     displayio_parallelbus_obj_t* self = MP_OBJ_TO_PTR(obj);
     common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
@@ -85,10 +106,13 @@ bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
 void common_hal_displayio_parallelbus_send(mp_obj_t obj, bool command, uint8_t *data, uint32_t data_length) {
     displayio_parallelbus_obj_t* self = MP_OBJ_TO_PTR(obj);
     common_hal_digitalio_digitalinout_set_value(&self->command, !command);
+    uint32_t* clear_write = (uint32_t*) &self->write_group->OUTCLR.reg;
+    uint32_t* set_write = (uint32_t*) &self->write_group->OUTSET.reg;
+    uint32_t mask = self->write_mask;
     for (uint32_t i = 0; i < data_length; i++) {
-        common_hal_digitalio_digitalinout_set_value(&self->write, false);
+        *clear_write = mask;
         *self->bus = data[i];
-        common_hal_digitalio_digitalinout_set_value(&self->write, true);
+        *set_write = mask;
     }
 }
 
diff --git a/ports/atmel-samd/common-hal/displayio/ParallelBus.h b/ports/atmel-samd/common-hal/displayio/ParallelBus.h
index cc45598c5..630bec351 100644
--- a/ports/atmel-samd/common-hal/displayio/ParallelBus.h
+++ b/ports/atmel-samd/common-hal/displayio/ParallelBus.h
@@ -36,6 +36,10 @@ typedef struct {
     digitalio_digitalinout_obj_t chip_select;
     digitalio_digitalinout_obj_t reset;
     digitalio_digitalinout_obj_t write;
+    digitalio_digitalinout_obj_t read;
+    uint8_t data0_pin;
+    PortGroup* write_group;
+    uint32_t write_mask;
 } displayio_parallelbus_obj_t;
 
 #endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_PARALLELBUS_H
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index 77881fefd..a2e4075c4 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -282,6 +282,7 @@ extern const struct _mp_obj_module_t wiznet_module;
     #endif
 
     #ifdef CIRCUITPY_DISPLAYIO
+    #define CIRCUITPY_DISPLAY_LIMIT (3)
 	#define DISPLAYIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_displayio), (mp_obj_t)&displayio_module },
     #else
 	#define DISPLAYIO_MODULE
diff --git a/shared-bindings/displayio/ParallelBus.c b/shared-bindings/displayio/ParallelBus.c
index dddb4ce8a..aa861bb81 100644
--- a/shared-bindings/displayio/ParallelBus.c
+++ b/shared-bindings/displayio/ParallelBus.c
@@ -34,6 +34,7 @@
 #include "py/runtime.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/util.h"
+#include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/translate.h"
 
 //| .. currentmodule:: displayio
@@ -46,13 +47,54 @@
 //|
 //| .. warning:: This will be changed before 4.0.0. Consider it very experimental.
 //|
-//| .. class:: ParallelBus(*, data0, command, chip_select, reset, write, bus_width=8)
+//| .. class:: ParallelBus(*, data0, command, chip_select, write, read, reset)
 //|
-//|   Create a ParallelBus object associated with the given pins.
+//|   Create a ParallelBus object associated with the given pins. The bus is inferred from data0
+//|   by implying the next 7 additional pins on a given GPIO port.
 //|
 STATIC mp_obj_t displayio_parallelbus_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    mp_raise_NotImplementedError(translate("displayio is a work in progress"));
-    return mp_const_none;
+    enum { ARG_data0, ARG_command, ARG_chip_select, ARG_write, ARG_read, ARG_reset };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_data0, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
+        { MP_QSTR_command, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
+        { MP_QSTR_chip_select, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
+        { MP_QSTR_write, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
+        { MP_QSTR_read, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
+        { MP_QSTR_reset, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_obj_t data0 = args[ARG_data0].u_obj;
+    mp_obj_t command = args[ARG_command].u_obj;
+    mp_obj_t chip_select = args[ARG_chip_select].u_obj;
+    mp_obj_t write = args[ARG_write].u_obj;
+    mp_obj_t read = args[ARG_read].u_obj;
+    mp_obj_t reset = args[ARG_reset].u_obj;
+    if (data0 == mp_const_none || command == mp_const_none || chip_select == mp_const_none || write == mp_const_none || read == mp_const_none) {
+        mp_raise_ValueError(translate("Data0, command, chip_select, write and read required"));
+    }
+    assert_pin_free(data0);
+    assert_pin_free(command);
+    assert_pin_free(chip_select);
+    assert_pin_free(write);
+    assert_pin_free(read);
+    assert_pin_free(reset);
+
+    displayio_parallelbus_obj_t* self = NULL;
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        if (displays[i].parallel_bus.base.type== NULL) {
+            self = &displays[i].parallel_bus;
+            self->base.type = &displayio_parallelbus_type;
+            break;
+        }
+    }
+    if (self == NULL) {
+        mp_raise_RuntimeError(translate("Display bus limit reached"));
+    }
+
+    common_hal_displayio_parallelbus_construct(self, data0, command, chip_select, write, read, reset);
+    return self;
 }
 
 
diff --git a/shared-bindings/displayio/ParallelBus.h b/shared-bindings/displayio/ParallelBus.h
index c73934838..c4cde5ff5 100644
--- a/shared-bindings/displayio/ParallelBus.h
+++ b/shared-bindings/displayio/ParallelBus.h
@@ -35,8 +35,8 @@
 extern const mp_obj_type_t displayio_parallelbus_type;
 
 void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t* self,
-    const mcu_pin_obj_t* data0, const mcu_pin_obj_t* command,
-    const mcu_pin_obj_t* chip_select, const mcu_pin_obj_t* reset, const mcu_pin_obj_t* write);
+    const mcu_pin_obj_t* data0, const mcu_pin_obj_t* command, const mcu_pin_obj_t* chip_select,
+    const mcu_pin_obj_t* write, const mcu_pin_obj_t* read, const mcu_pin_obj_t* reset);
 
 void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t* self);
 
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 66cf4d63d..306f8c08b 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -37,6 +37,7 @@
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/displayio/OnDiskBitmap.h"
 #include "shared-bindings/displayio/Palette.h"
+#include "shared-bindings/displayio/ParallelBus.h"
 #include "shared-bindings/displayio/Shape.h"
 #include "shared-bindings/displayio/Sprite.h"
 
@@ -67,6 +68,7 @@
 //|     Group
 //|     OnDiskBitmap
 //|     Palette
+//|     ParallelBus
 //|     Shape
 //|     Sprite
 //|
@@ -96,6 +98,7 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Sprite), MP_ROM_PTR(&displayio_sprite_type) },
 
     { MP_ROM_QSTR(MP_QSTR_FourWire), MP_ROM_PTR(&displayio_fourwire_type) },
+    { MP_ROM_QSTR(MP_QSTR_ParallelBus), MP_ROM_PTR(&displayio_parallelbus_type) },
 
     { MP_ROM_QSTR(MP_QSTR_release_displays), MP_ROM_PTR(&displayio_release_displays_obj) },
 };
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 0a14e74bb..f75f0392f 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -113,10 +113,10 @@ void displayio_display_start_region_update(displayio_display_obj_t* self, uint16
     uint16_t data[2];
     self->send(self->bus, true, &self->set_column_command, 1);
     data[0] = __builtin_bswap16(x0 + self->colstart);
-    data[1] = __builtin_bswap16(x1 + self->colstart);
+    data[1] = __builtin_bswap16(x1 - 1 + self->colstart);
     self->send(self->bus, false, (uint8_t*) data, 4);
     self->send(self->bus, true, &self->set_row_command, 1);
-    data[0] = __builtin_bswap16(y0 + self->rowstart);
+    data[0] = __builtin_bswap16(y0 + 1 + self->rowstart);
     data[1] = __builtin_bswap16(y1 + self->rowstart);
     self->send(self->bus, false, (uint8_t*) data, 4);
     self->send(self->bus, true, &self->write_ram_command, 1);
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index dc5957c23..92d97a6ef 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -7,6 +7,7 @@
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/displayio/Palette.h"
 #include "shared-bindings/displayio/Sprite.h"
+#include "supervisor/usb.h"
 
 primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
 
@@ -21,8 +22,6 @@ void displayio_refresh_displays(void) {
             return;
         }
         if (displayio_display_refresh_queued(display)) {
-            PORT->Group[1].DIRSET.reg = 1 << 22;
-
             // We compute the pixels
             uint16_t x0 = 0;
             uint16_t y0 = 0;
@@ -38,8 +37,6 @@ void displayio_refresh_displays(void) {
                     uint16_t* pixel = &(((uint16_t*)buffer)[index]);
                     *pixel = 0;
 
-                    PORT->Group[1].OUTTGL.reg = 1 << 22;
-
                     //if (index == 0) {
                         if (display->current_group != NULL) {
                             displayio_group_get_pixel(display->current_group, x, y, pixel);
@@ -48,9 +45,6 @@ void displayio_refresh_displays(void) {
                     //     *pixel = (((uint16_t*)buffer)[0]);
                     // }
 
-
-                    PORT->Group[1].OUTTGL.reg = 1 << 22;
-
                     index += 1;
                     // The buffer is full, send it.
                     if (index >= buffer_size) {
@@ -58,6 +52,9 @@ void displayio_refresh_displays(void) {
                             displayio_display_finish_region_update(display);
                             return;
                         }
+                        // TODO(tannewt): Make refresh displays faster so we don't starve other
+                        // background tasks.
+                        usb_background();
                         index = 0;
                     }
                 }
@@ -182,12 +179,12 @@ void common_hal_displayio_release_displays(void) {
         } else if (bus_type == &displayio_fourwire_type) {
             common_hal_displayio_fourwire_deinit(&displays[i].fourwire_bus);
         } else if (bus_type == &displayio_parallelbus_type) {
-            //common_hal_displayio_parallelbus_deinit(&displays[i].parallel_bus);
+            common_hal_displayio_parallelbus_deinit(&displays[i].parallel_bus);
         }
-        displays[i].fourwire_bus.base.type = NULL;
+        displays[i].fourwire_bus.base.type = &mp_type_NoneType;
     }
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        displays[i].display.base.type = NULL;
+        displays[i].display.base.type = &mp_type_NoneType;
     }
     // TODO(tannewt): Clear the display datastructures and release everything used.
 }
-- 
cgit v1.2.3


From 760bd8d8a4f0aa0ed8651e89596fb2e6effbc14f Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 17 Jan 2019 15:15:59 -0800
Subject: share fourwire and make nrf compile

---
 ports/atmel-samd/Makefile                          |   2 +-
 ports/atmel-samd/common-hal/displayio/FourWire.c   |  87 -------------
 ports/atmel-samd/common-hal/displayio/FourWire.h   |  43 -------
 ports/nrf/Makefile                                 |  12 +-
 ports/nrf/board_busses.c                           | 114 -----------------
 ports/nrf/board_busses.h                           |  39 ------
 ports/nrf/boards/feather_nrf52840_express/pins.c   |   4 +-
 ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c    |   2 +-
 .../makerdiary_nrf52840_mdk_usb_dongle/pins.c      |   2 +-
 ports/nrf/boards/particle_argon/pins.c             |   2 +-
 ports/nrf/boards/particle_boron/pins.c             |   2 +-
 ports/nrf/boards/particle_xenon/pins.c             |   2 +-
 ports/nrf/boards/pca10056/pins.c                   |   2 +-
 ports/nrf/boards/pca10059/pins.c                   |   2 +-
 ports/nrf/boards/sparkfun_nrf52840_mini/pins.c     |   2 +-
 ports/nrf/common-hal/displayio/ParallelBus.c       | 137 +++++++++++++++++++++
 ports/nrf/common-hal/displayio/ParallelBus.h       |  45 +++++++
 ports/nrf/common-hal/microcontroller/Pin.h         |   1 +
 ports/nrf/mpconfigport.h                           |   2 +
 shared-bindings/displayio/FourWire.h               |   2 +-
 shared-module/displayio/FourWire.c                 |  87 +++++++++++++
 shared-module/displayio/FourWire.h                 |  43 +++++++
 supervisor/shared/board_busses.c                   |   1 -
 23 files changed, 338 insertions(+), 297 deletions(-)
 delete mode 100644 ports/atmel-samd/common-hal/displayio/FourWire.c
 delete mode 100644 ports/atmel-samd/common-hal/displayio/FourWire.h
 delete mode 100644 ports/nrf/board_busses.c
 delete mode 100644 ports/nrf/board_busses.h
 create mode 100644 ports/nrf/common-hal/displayio/ParallelBus.c
 create mode 100644 ports/nrf/common-hal/displayio/ParallelBus.h
 create mode 100644 shared-module/displayio/FourWire.c
 create mode 100644 shared-module/displayio/FourWire.h

(limited to 'shared-module')

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 088288fbd..c8d197b3e 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -305,7 +305,6 @@ SRC_COMMON_HAL = \
 	busio/UART.c \
 	digitalio/__init__.c \
 	digitalio/DigitalInOut.c \
-	displayio/FourWire.c \
 	displayio/ParallelBus.c \
 	i2cslave/__init__.c \
 	i2cslave/I2CSlave.c \
@@ -380,6 +379,7 @@ SRC_SHARED_MODULE = \
 	displayio/Bitmap.c \
 	displayio/ColorConverter.c \
 	displayio/Display.c \
+	displayio/FourWire.c \
 	displayio/Group.c \
 	displayio/OnDiskBitmap.c \
 	displayio/Palette.c \
diff --git a/ports/atmel-samd/common-hal/displayio/FourWire.c b/ports/atmel-samd/common-hal/displayio/FourWire.c
deleted file mode 100644
index ab01e2609..000000000
--- a/ports/atmel-samd/common-hal/displayio/FourWire.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "shared-bindings/displayio/FourWire.h"
-
-#include <stdint.h>
-
-#include "shared-bindings/busio/SPI.h"
-#include "shared-bindings/digitalio/DigitalInOut.h"
-
-#include "tick.h"
-
-void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self,
-    busio_spi_obj_t* spi, const mcu_pin_obj_t* command,
-    const mcu_pin_obj_t* chip_select, const mcu_pin_obj_t* reset) {
-
-    self->bus = spi;
-    common_hal_busio_spi_never_reset(self->bus);
-
-    common_hal_digitalio_digitalinout_construct(&self->command, command);
-    common_hal_digitalio_digitalinout_switch_to_output(&self->command, true, DRIVE_MODE_PUSH_PULL);
-    common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select);
-    common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL);
-
-    common_hal_digitalio_digitalinout_construct(&self->reset, reset);
-    common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
-
-    never_reset_pin_number(command->number);
-    never_reset_pin_number(chip_select->number);
-    never_reset_pin_number(reset->number);
-}
-
-void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self) {
-    if (self->bus == &self->inline_bus) {
-        common_hal_busio_spi_deinit(self->bus);
-    }
-
-    reset_pin_number(self->command.pin->number);
-    reset_pin_number(self->chip_select.pin->number);
-    reset_pin_number(self->reset.pin->number);
-}
-
-bool common_hal_displayio_fourwire_begin_transaction(mp_obj_t obj) {
-    displayio_fourwire_obj_t* self = MP_OBJ_TO_PTR(obj);
-    if (!common_hal_busio_spi_try_lock(self->bus)) {
-        return false;
-    }
-    // TODO(tannewt): Stop hardcoding SPI frequency, polarity and phase.
-    common_hal_busio_spi_configure(self->bus, 12000000, 0, 0, 8);
-    common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
-    return true;
-}
-
-void common_hal_displayio_fourwire_send(mp_obj_t obj, bool command, uint8_t *data, uint32_t data_length) {
-    displayio_fourwire_obj_t* self = MP_OBJ_TO_PTR(obj);
-    common_hal_digitalio_digitalinout_set_value(&self->command, !command);
-    common_hal_busio_spi_write(self->bus, data, data_length);
-}
-
-void common_hal_displayio_fourwire_end_transaction(mp_obj_t obj) {
-    displayio_fourwire_obj_t* self = MP_OBJ_TO_PTR(obj);
-    common_hal_digitalio_digitalinout_set_value(&self->chip_select, true);
-    common_hal_busio_spi_unlock(self->bus);
-}
diff --git a/ports/atmel-samd/common-hal/displayio/FourWire.h b/ports/atmel-samd/common-hal/displayio/FourWire.h
deleted file mode 100644
index 234bcf794..000000000
--- a/ports/atmel-samd/common-hal/displayio/FourWire.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_FOURWIRE_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_FOURWIRE_H
-
-#include "common-hal/busio/SPI.h"
-#include "common-hal/digitalio/DigitalInOut.h"
-#include "shared-module/displayio/Group.h"
-
-typedef struct {
-    mp_obj_base_t base;
-    busio_spi_obj_t* bus;
-    busio_spi_obj_t inline_bus;
-    digitalio_digitalinout_obj_t command;
-    digitalio_digitalinout_obj_t chip_select;
-    digitalio_digitalinout_obj_t reset;
-} displayio_fourwire_obj_t;
-
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_FOURWIRE_H
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 2bc508475..85e6346a1 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -118,7 +118,6 @@ SRC_C += \
 	fatfs_port.c \
 	mphalport.c \
 	tick.c \
-	board_busses.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
 	device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \
@@ -156,6 +155,7 @@ SRC_COMMON_HAL += \
 	busio/__init__.c\
 	digitalio/DigitalInOut.c \
 	digitalio/__init__.c \
+	displayio/ParallelBus.c \
 	microcontroller/Pin.c \
 	microcontroller/Processor.c \
 	microcontroller/__init__.c \
@@ -214,6 +214,16 @@ SRC_SHARED_MODULE = \
 	bitbangio/OneWire.c \
 	bitbangio/SPI.c \
 	busio/OneWire.c \
+	displayio/__init__.c \
+	displayio/Bitmap.c \
+	displayio/ColorConverter.c \
+	displayio/Display.c \
+	displayio/FourWire.c \
+	displayio/Group.c \
+	displayio/OnDiskBitmap.c \
+	displayio/Palette.c \
+	displayio/Shape.c \
+	displayio/Sprite.c \
 	storage/__init__.c
 
 #	uheap/__init__.c \
diff --git a/ports/nrf/board_busses.c b/ports/nrf/board_busses.c
deleted file mode 100644
index 6d5cbd041..000000000
--- a/ports/nrf/board_busses.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "shared-bindings/busio/I2C.h"
-#include "shared-bindings/busio/SPI.h"
-#include "shared-bindings/busio/UART.h"
-
-#include "shared-bindings/microcontroller/Pin.h"
-#include "supervisor/shared/translate.h"
-#include "nrf/pins.h"
-#include "py/mpconfig.h"
-#include "py/runtime.h"
-
-#if !defined(DEFAULT_I2C_BUS_SDA) || !defined(DEFAULT_I2C_BUS_SCL)
-    STATIC mp_obj_t board_i2c(void) {
-        mp_raise_NotImplementedError(translate("No default I2C bus"));
-        return NULL;
-    }
-#else
-    STATIC mp_obj_t i2c_singleton = NULL;
-
-    STATIC mp_obj_t board_i2c(void) {
-
-        if (i2c_singleton == NULL) {
-            busio_i2c_obj_t *self = m_new_obj(busio_i2c_obj_t);
-            self->base.type = &busio_i2c_type;
-
-            assert_pin_free(DEFAULT_I2C_BUS_SDA);
-            assert_pin_free(DEFAULT_I2C_BUS_SCL);
-            common_hal_busio_i2c_construct(self, DEFAULT_I2C_BUS_SCL, DEFAULT_I2C_BUS_SDA, 400000, 0);
-            i2c_singleton = (mp_obj_t)self;
-        }
-        return i2c_singleton;
-
-    }
-#endif
-MP_DEFINE_CONST_FUN_OBJ_0(board_i2c_obj, board_i2c);
-
-#if !defined(DEFAULT_SPI_BUS_SCK) || !defined(DEFAULT_SPI_BUS_MISO) || !defined(DEFAULT_SPI_BUS_MOSI)
-    STATIC mp_obj_t board_spi(void) {
-        mp_raise_NotImplementedError(translate("No default SPI bus"));
-        return NULL;
-    }
-#else
-    STATIC mp_obj_t spi_singleton = NULL;
-
-    STATIC mp_obj_t board_spi(void) {
-
-        if (spi_singleton == NULL) {
-            busio_spi_obj_t *self = m_new_obj(busio_spi_obj_t);
-            self->base.type = &busio_spi_type;
-            assert_pin_free(DEFAULT_SPI_BUS_SCK);
-            assert_pin_free(DEFAULT_SPI_BUS_MOSI);
-            assert_pin_free(DEFAULT_SPI_BUS_MISO);
-            const mcu_pin_obj_t* clock = MP_OBJ_TO_PTR(DEFAULT_SPI_BUS_SCK);
-            const mcu_pin_obj_t* mosi = MP_OBJ_TO_PTR(DEFAULT_SPI_BUS_MOSI);
-            const mcu_pin_obj_t* miso = MP_OBJ_TO_PTR(DEFAULT_SPI_BUS_MISO);
-            common_hal_busio_spi_construct(self, clock, mosi, miso);
-            spi_singleton = (mp_obj_t)self;
-        }
-        return spi_singleton;
-    }
-#endif
-MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi);
-
-#if !defined(DEFAULT_UART_BUS_RX) || !defined(DEFAULT_UART_BUS_TX)
-    STATIC mp_obj_t board_uart(void) {
-        mp_raise_NotImplementedError(translate("No default UART bus"));
-        return NULL;
-    }
-#else
-    STATIC mp_obj_t uart_singleton = NULL;
-
-    STATIC mp_obj_t board_uart(void) {
-        if (uart_singleton == NULL) {
-            busio_uart_obj_t *self = m_new_obj(busio_uart_obj_t);
-            self->base.type = &busio_uart_type;
-
-            assert_pin_free(DEFAULT_UART_BUS_RX);
-            assert_pin_free(DEFAULT_UART_BUS_TX);
-
-            const mcu_pin_obj_t* rx = MP_OBJ_TO_PTR(DEFAULT_UART_BUS_RX);
-            const mcu_pin_obj_t* tx = MP_OBJ_TO_PTR(DEFAULT_UART_BUS_TX);
-
-            common_hal_busio_uart_construct(self, tx, rx, 9600, 8, PARITY_NONE, 1, 1000, 64);
-            uart_singleton = (mp_obj_t)self;
-        }
-        return uart_singleton;
-    }
-#endif
-MP_DEFINE_CONST_FUN_OBJ_0(board_uart_obj, board_uart);
diff --git a/ports/nrf/board_busses.h b/ports/nrf/board_busses.h
deleted file mode 100644
index 2a4bfc3d4..000000000
--- a/ports/nrf/board_busses.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef MICROPY_INCLUDED_NRF_BOARD_BUSSES_H
-#define MICROPY_INCLUDED_NRF_BOARD_BUSSES_H
-
-void board_i2c(void);
-extern mp_obj_fun_builtin_fixed_t board_i2c_obj;
-
-void board_spi(void);
-extern mp_obj_fun_builtin_fixed_t board_spi_obj;
-
-void board_uart(void);
-extern mp_obj_fun_builtin_fixed_t board_uart_obj;
-
-#endif  // MICROPY_INCLUDED_NRF_BOARD_BUSSES_H
diff --git a/ports/nrf/boards/feather_nrf52840_express/pins.c b/ports/nrf/boards/feather_nrf52840_express/pins.c
index 2f8ac0259..dfb0be6df 100644
--- a/ports/nrf/boards/feather_nrf52840_express/pins.c
+++ b/ports/nrf/boards/feather_nrf52840_express/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
@@ -44,7 +44,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P1_15) },
   { MP_ROM_QSTR(MP_QSTR_RED_LED), MP_ROM_PTR(&pin_P1_15) },
   { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P1_15) },
-  
+
   { MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P1_10) },
 };
 
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c b/ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c
index 27f0c6797..2d24e8597 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) },
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c
index 6049ac053..10490c8cb 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) },
diff --git a/ports/nrf/boards/particle_argon/pins.c b/ports/nrf/boards/particle_argon/pins.c
index 0457f0aa8..8c2fb38e6 100644
--- a/ports/nrf/boards/particle_argon/pins.c
+++ b/ports/nrf/boards/particle_argon/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) },
diff --git a/ports/nrf/boards/particle_boron/pins.c b/ports/nrf/boards/particle_boron/pins.c
index 2bff0a2ce..5981212bf 100644
--- a/ports/nrf/boards/particle_boron/pins.c
+++ b/ports/nrf/boards/particle_boron/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) },
diff --git a/ports/nrf/boards/particle_xenon/pins.c b/ports/nrf/boards/particle_xenon/pins.c
index 11a29e927..cdd5b5306 100644
--- a/ports/nrf/boards/particle_xenon/pins.c
+++ b/ports/nrf/boards/particle_xenon/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) },
diff --git a/ports/nrf/boards/pca10056/pins.c b/ports/nrf/boards/pca10056/pins.c
index a57c9d1c9..510b6100e 100644
--- a/ports/nrf/boards/pca10056/pins.c
+++ b/ports/nrf/boards/pca10056/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_P0_00), MP_ROM_PTR(&pin_P0_00) },
diff --git a/ports/nrf/boards/pca10059/pins.c b/ports/nrf/boards/pca10059/pins.c
index a1916bd04..c43d3a9eb 100644
--- a/ports/nrf/boards/pca10059/pins.c
+++ b/ports/nrf/boards/pca10059/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) },
diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/pins.c b/ports/nrf/boards/sparkfun_nrf52840_mini/pins.c
index 5c50f55c7..f826ac771 100644
--- a/ports/nrf/boards/sparkfun_nrf52840_mini/pins.c
+++ b/ports/nrf/boards/sparkfun_nrf52840_mini/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P1_15) },      // D1/TX
diff --git a/ports/nrf/common-hal/displayio/ParallelBus.c b/ports/nrf/common-hal/displayio/ParallelBus.c
new file mode 100644
index 000000000..3afedf736
--- /dev/null
+++ b/ports/nrf/common-hal/displayio/ParallelBus.c
@@ -0,0 +1,137 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/displayio/ParallelBus.h"
+
+#include <stdint.h>
+
+#include "common-hal/microcontroller/Pin.h"
+#include "py/runtime.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+
+#include "tick.h"
+
+void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t* self,
+    const mcu_pin_obj_t* data0, const mcu_pin_obj_t* command, const mcu_pin_obj_t* chip_select,
+    const mcu_pin_obj_t* write, const mcu_pin_obj_t* read, const mcu_pin_obj_t* reset) {
+
+    uint8_t data_pin = data0->number;
+    if (data_pin % 8 != 0 || data_pin % 32 >= 24) {
+        mp_raise_ValueError(translate("Data 0 pin must be byte aligned"));
+    }
+    for (uint8_t i = 0; i < 8; i++) {
+        if (!pin_number_is_free(data_pin + i)) {
+            mp_raise_ValueError_varg(translate("Bus pin %d is already in use"), i);
+        }
+    }
+    NRF_GPIO_Type *g;
+    uint8_t num_pins_in_port;
+    if (data0->number < P0_PIN_NUM) {
+        g = NRF_P0;
+        num_pins_in_port = P0_PIN_NUM;
+    } else {
+        g = NRF_P1;
+        num_pins_in_port = P1_PIN_NUM;
+    }
+    g->DIRSET = 0xff << (data_pin % num_pins_in_port);
+    self->bus = ((uint8_t*) &g->OUT) + (data0->number % num_pins_in_port / 8);
+
+    self->command.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&self->command, command);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->command, true, DRIVE_MODE_PUSH_PULL);
+
+    self->chip_select.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL);
+
+    self->reset.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&self->reset, reset);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
+
+    self->write.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&self->write, write);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->write, true, DRIVE_MODE_PUSH_PULL);
+
+    self->read.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&self->read, read);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->read, true, DRIVE_MODE_PUSH_PULL);
+
+    self->data0_pin = data_pin;
+    uint8_t num_pins_in_write_port;
+    if (data0->number < P0_PIN_NUM) {
+        self->write_group = NRF_P0;
+        num_pins_in_write_port = P0_PIN_NUM;
+    } else {
+        self->write_group = NRF_P1;
+        num_pins_in_write_port = P1_PIN_NUM;
+    }
+    self->write_mask = 1 << (write->number % num_pins_in_write_port);
+
+    never_reset_pin_number(command->number);
+    never_reset_pin_number(chip_select->number);
+    never_reset_pin_number(write->number);
+    never_reset_pin_number(read->number);
+    never_reset_pin_number(reset->number);
+    for (uint8_t i = 0; i < 8; i++) {
+        never_reset_pin_number(data_pin + i);
+    }
+}
+
+void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t* self) {
+    for (uint8_t i = 0; i < 8; i++) {
+        reset_pin_number(self->data0_pin + i);
+    }
+
+    reset_pin_number(self->command.pin->number);
+    reset_pin_number(self->chip_select.pin->number);
+    reset_pin_number(self->write.pin->number);
+    reset_pin_number(self->read.pin->number);
+    reset_pin_number(self->reset.pin->number);
+}
+
+bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
+    displayio_parallelbus_obj_t* self = MP_OBJ_TO_PTR(obj);
+    common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
+    return true;
+}
+
+void common_hal_displayio_parallelbus_send(mp_obj_t obj, bool command, uint8_t *data, uint32_t data_length) {
+    displayio_parallelbus_obj_t* self = MP_OBJ_TO_PTR(obj);
+    common_hal_digitalio_digitalinout_set_value(&self->command, !command);
+    uint32_t* clear_write = (uint32_t*) &self->write_group->OUTCLR;
+    uint32_t* set_write = (uint32_t*) &self->write_group->OUTSET;
+    uint32_t mask = self->write_mask;
+    for (uint32_t i = 0; i < data_length; i++) {
+        *clear_write = mask;
+        *self->bus = data[i];
+        *set_write = mask;
+    }
+}
+
+void common_hal_displayio_parallelbus_end_transaction(mp_obj_t obj) {
+    displayio_parallelbus_obj_t* self = MP_OBJ_TO_PTR(obj);
+    common_hal_digitalio_digitalinout_set_value(&self->chip_select, true);
+}
diff --git a/ports/nrf/common-hal/displayio/ParallelBus.h b/ports/nrf/common-hal/displayio/ParallelBus.h
new file mode 100644
index 000000000..5c10d3d42
--- /dev/null
+++ b/ports/nrf/common-hal/displayio/ParallelBus.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_DISPLAYIO_PARALLELBUS_H
+#define MICROPY_INCLUDED_NRF_COMMON_HAL_DISPLAYIO_PARALLELBUS_H
+
+#include "common-hal/digitalio/DigitalInOut.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t* bus;
+    digitalio_digitalinout_obj_t command;
+    digitalio_digitalinout_obj_t chip_select;
+    digitalio_digitalinout_obj_t reset;
+    digitalio_digitalinout_obj_t write;
+    digitalio_digitalinout_obj_t read;
+    uint8_t data0_pin;
+    NRF_GPIO_Type* write_group;
+    uint32_t write_mask;
+} displayio_parallelbus_obj_t;
+
+#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_DISPLAYIO_PARALLELBUS_H
diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nrf/common-hal/microcontroller/Pin.h
index 61be8bc35..735ed90cc 100644
--- a/ports/nrf/common-hal/microcontroller/Pin.h
+++ b/ports/nrf/common-hal/microcontroller/Pin.h
@@ -44,6 +44,7 @@ void reset_all_pins(void);
 // need to store a full pointer.
 void reset_pin_number(uint8_t pin);
 void claim_pin(const mcu_pin_obj_t* pin);
+bool pin_number_is_free(uint8_t pin_number);
 void never_reset_pin_number(uint8_t pin_number);
 
 // Lower 5 bits of a pin number are the pin number in a port.
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index d38b14578..b6e5f9fdf 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -235,5 +235,7 @@ void run_background_tasks(void);
 
 //#define CIRCUITPY_BOOT_OUTPUT_FILE "/boot_out.txt"
 #define CIRCUITPY_DEFAULT_STACK_SIZE 4096
+#define CIRCUITPY_DISPLAYIO (1)
+#define CIRCUITPY_DISPLAY_LIMIT (3)
 
 #endif
diff --git a/shared-bindings/displayio/FourWire.h b/shared-bindings/displayio/FourWire.h
index 3a9f66d4c..b8b00372c 100644
--- a/shared-bindings/displayio/FourWire.h
+++ b/shared-bindings/displayio/FourWire.h
@@ -27,7 +27,7 @@
 #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYBUSIO_FOURWIRE_H
 #define MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYBUSIO_FOURWIRE_H
 
-#include "common-hal/displayio/FourWire.h"
+#include "shared-module/displayio/FourWire.h"
 #include "common-hal/microcontroller/Pin.h"
 
 #include "shared-module/displayio/Group.h"
diff --git a/shared-module/displayio/FourWire.c b/shared-module/displayio/FourWire.c
new file mode 100644
index 000000000..ab01e2609
--- /dev/null
+++ b/shared-module/displayio/FourWire.c
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/displayio/FourWire.h"
+
+#include <stdint.h>
+
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+
+#include "tick.h"
+
+void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self,
+    busio_spi_obj_t* spi, const mcu_pin_obj_t* command,
+    const mcu_pin_obj_t* chip_select, const mcu_pin_obj_t* reset) {
+
+    self->bus = spi;
+    common_hal_busio_spi_never_reset(self->bus);
+
+    common_hal_digitalio_digitalinout_construct(&self->command, command);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->command, true, DRIVE_MODE_PUSH_PULL);
+    common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL);
+
+    common_hal_digitalio_digitalinout_construct(&self->reset, reset);
+    common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
+
+    never_reset_pin_number(command->number);
+    never_reset_pin_number(chip_select->number);
+    never_reset_pin_number(reset->number);
+}
+
+void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self) {
+    if (self->bus == &self->inline_bus) {
+        common_hal_busio_spi_deinit(self->bus);
+    }
+
+    reset_pin_number(self->command.pin->number);
+    reset_pin_number(self->chip_select.pin->number);
+    reset_pin_number(self->reset.pin->number);
+}
+
+bool common_hal_displayio_fourwire_begin_transaction(mp_obj_t obj) {
+    displayio_fourwire_obj_t* self = MP_OBJ_TO_PTR(obj);
+    if (!common_hal_busio_spi_try_lock(self->bus)) {
+        return false;
+    }
+    // TODO(tannewt): Stop hardcoding SPI frequency, polarity and phase.
+    common_hal_busio_spi_configure(self->bus, 12000000, 0, 0, 8);
+    common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
+    return true;
+}
+
+void common_hal_displayio_fourwire_send(mp_obj_t obj, bool command, uint8_t *data, uint32_t data_length) {
+    displayio_fourwire_obj_t* self = MP_OBJ_TO_PTR(obj);
+    common_hal_digitalio_digitalinout_set_value(&self->command, !command);
+    common_hal_busio_spi_write(self->bus, data, data_length);
+}
+
+void common_hal_displayio_fourwire_end_transaction(mp_obj_t obj) {
+    displayio_fourwire_obj_t* self = MP_OBJ_TO_PTR(obj);
+    common_hal_digitalio_digitalinout_set_value(&self->chip_select, true);
+    common_hal_busio_spi_unlock(self->bus);
+}
diff --git a/shared-module/displayio/FourWire.h b/shared-module/displayio/FourWire.h
new file mode 100644
index 000000000..234bcf794
--- /dev/null
+++ b/shared-module/displayio/FourWire.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_FOURWIRE_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_FOURWIRE_H
+
+#include "common-hal/busio/SPI.h"
+#include "common-hal/digitalio/DigitalInOut.h"
+#include "shared-module/displayio/Group.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    busio_spi_obj_t* bus;
+    busio_spi_obj_t inline_bus;
+    digitalio_digitalinout_obj_t command;
+    digitalio_digitalinout_obj_t chip_select;
+    digitalio_digitalinout_obj_t reset;
+} displayio_fourwire_obj_t;
+
+#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_FOURWIRE_H
diff --git a/supervisor/shared/board_busses.c b/supervisor/shared/board_busses.c
index 84919ebff..38308ccee 100644
--- a/supervisor/shared/board_busses.c
+++ b/supervisor/shared/board_busses.c
@@ -31,7 +31,6 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/shared/translate.h"
 #include "mpconfigboard.h"
-#include "samd/pins.h"
 #include "py/runtime.h"
 
 #define BOARD_I2C (defined(DEFAULT_I2C_BUS_SDA) && defined(DEFAULT_I2C_BUS_SCL))
-- 
cgit v1.2.3


From 6404aaf411d7fe5fd96f3a8cbf7a1cb7580a09e7 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 17 Jan 2019 18:19:07 -0800
Subject: Fix up nrf and using board.SPI in FourWire

---
 main.c                                           |  7 ++-
 ports/atmel-samd/background.c                    |  5 +-
 ports/atmel-samd/mpconfigport.h                  |  2 +
 ports/nrf/background.c                           | 15 ++++--
 ports/nrf/boards/feather_nrf52840_express/pins.c | 68 +++++++++++++-----------
 ports/nrf/common-hal/microcontroller/Pin.c       |  7 ++-
 ports/nrf/mpconfigport.h                         |  2 +
 shared-bindings/displayio/Display.c              |  3 +-
 shared-bindings/displayio/FourWire.c             | 11 ++--
 shared-bindings/displayio/ParallelBus.c          |  3 +-
 shared-module/displayio/FourWire.c               |  8 +--
 shared-module/displayio/__init__.c               |  3 ++
 supervisor/shared/board_busses.c                 | 25 +++++++--
 supervisor/shared/board_busses.h                 |  6 +--
 14 files changed, 109 insertions(+), 56 deletions(-)

(limited to 'shared-module')

diff --git a/main.c b/main.c
index 02c832e67..e137f7d47 100755
--- a/main.c
+++ b/main.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "shared-module/displayio/__init__.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 
@@ -62,6 +61,10 @@
 #include "shared-module/network/__init__.h"
 #endif
 
+#ifdef CIRCUITPY_DISPLAYIO
+#include "shared-module/displayio/__init__.h"
+#endif
+
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
     if (lex == NULL) {
@@ -200,8 +203,10 @@ bool run_code_py(safe_mode_t safe_mode) {
                 serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
             }
         }
+        #ifdef CIRCUITPY_DISPLAYIO
         // Turn off the display before the heap disappears.
         reset_displays();
+        #endif
         stop_mp();
         free_memory(heap);
 
diff --git a/ports/atmel-samd/background.c b/ports/atmel-samd/background.c
index 59e03008a..4f3257f3f 100644
--- a/ports/atmel-samd/background.c
+++ b/ports/atmel-samd/background.c
@@ -30,10 +30,13 @@
 #include "supervisor/usb.h"
 
 #include "py/runtime.h"
-#include "shared-module/displayio/__init__.h"
 #include "shared-module/network/__init__.h"
 #include "supervisor/shared/stack.h"
 
+#ifdef CIRCUITPY_DISPLAYIO
+#include "shared-module/displayio/__init__.h"
+#endif
+
 volatile uint64_t last_finished_tick = 0;
 
 bool stack_ok_so_far = true;
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index a2e4075c4..12410b0be 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -285,6 +285,7 @@ extern const struct _mp_obj_module_t wiznet_module;
     #define CIRCUITPY_DISPLAY_LIMIT (3)
 	#define DISPLAYIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_displayio), (mp_obj_t)&displayio_module },
     #else
+    #define CIRCUITPY_DISPLAY_LIMIT (0)
 	#define DISPLAYIO_MODULE
     #endif
 
@@ -338,6 +339,7 @@ extern const struct _mp_obj_module_t wiznet_module;
     #define MICROPY_PY_BUILTINS_COMPLEX (0)
 
     #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
+    #define CIRCUITPY_DISPLAY_LIMIT (0)
 #endif
 
 // Disabled for now.
diff --git a/ports/nrf/background.c b/ports/nrf/background.c
index f022b5bc9..69c76fd06 100644
--- a/ports/nrf/background.c
+++ b/ports/nrf/background.c
@@ -24,15 +24,20 @@
  * THE SOFTWARE.
  */
 
-#ifdef NRF52840
+#include "py/runtime.h"
 #include "supervisor/usb.h"
-#endif
-
 #include "supervisor/shared/stack.h"
 
+#ifdef CIRCUITPY_DISPLAYIO
+#include "shared-module/displayio/__init__.h"
+#endif
+
 void run_background_tasks(void) {
-    #ifdef NRF52840
-        usb_background();
+    usb_background();
+
+    #ifdef CIRCUITPY_DISPLAYIO
+    displayio_refresh_displays();
     #endif
+
     assert_heap_ok();
 }
diff --git a/ports/nrf/boards/feather_nrf52840_express/pins.c b/ports/nrf/boards/feather_nrf52840_express/pins.c
index dfb0be6df..c6f643761 100644
--- a/ports/nrf/boards/feather_nrf52840_express/pins.c
+++ b/ports/nrf/boards/feather_nrf52840_express/pins.c
@@ -3,49 +3,53 @@
 #include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
-  { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
-  { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_05) },
-  { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_30) },
-  { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_28) },
-  { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_02) },
-  { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_03) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_05) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_30) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_28) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_02) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_03) },
 
-  { MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_P0_31) },
+    { MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_P0_31) },
 
-  { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_29) },
-  { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_29) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_29) },
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_29) },
 
-  { MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_P1_02) },
+    { MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_P1_02) },
 
-  { MP_ROM_QSTR(MP_QSTR_NFC1), MP_ROM_PTR(&pin_P0_09) },
-  { MP_ROM_QSTR(MP_QSTR_NFC2), MP_ROM_PTR(&pin_P0_10) },
+    { MP_ROM_QSTR(MP_QSTR_NFC1), MP_ROM_PTR(&pin_P0_09) },
+    { MP_ROM_QSTR(MP_QSTR_NFC2), MP_ROM_PTR(&pin_P0_10) },
 
-  { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P0_10) },
-  { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_08) },
-  { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P0_07) },
-  { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_26) },
-  { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P0_27) },
-  { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_P0_06) },
-  { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_08) },
-  { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P1_09) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P0_10) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_08) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P0_07) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_26) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P0_27) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_P0_06) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_08) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P1_09) },
 
-  { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_16) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_16) },
 
-  { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_14) },
-  { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_13) },
-  { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_15) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_14) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_13) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_15) },
 
-  { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_25) },
-  { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_24) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_25) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_24) },
 
-  { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_11) },
-  { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_12) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_11) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_12) },
 
-  { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P1_15) },
-  { MP_ROM_QSTR(MP_QSTR_RED_LED), MP_ROM_PTR(&pin_P1_15) },
-  { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P1_15) },
+    { MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P1_15) },
+    { MP_ROM_QSTR(MP_QSTR_RED_LED), MP_ROM_PTR(&pin_P1_15) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P1_15) },
 
-  { MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P1_10) },
+    { MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P1_10) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
 };
 
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/nrf/common-hal/microcontroller/Pin.c b/ports/nrf/common-hal/microcontroller/Pin.c
index 02847e150..268e2f75d 100644
--- a/ports/nrf/common-hal/microcontroller/Pin.c
+++ b/ports/nrf/common-hal/microcontroller/Pin.c
@@ -142,6 +142,11 @@ void claim_pin(const mcu_pin_obj_t* pin) {
     #endif
 }
 
+
+bool pin_number_is_free(uint8_t pin_number) {
+    return !(claimed_pins[nrf_pin_port(pin_number)] & (1 << nrf_relative_pin_number(pin_number)));
+}
+
 bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
     #ifdef MICROPY_HW_NEOPIXEL
     if (pin == MICROPY_HW_NEOPIXEL) {
@@ -163,5 +168,5 @@ bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
     }
     #endif
 
-    return !(claimed_pins[nrf_pin_port(pin->number)] & (1 << nrf_relative_pin_number(pin->number)));
+    return pin_number_is_free(pin->number);
 }
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index b6e5f9fdf..3ec37960b 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -163,6 +163,7 @@ extern const struct _mp_obj_module_t microcontroller_module;
 extern const struct _mp_obj_module_t bitbangio_module;
 extern const struct _mp_obj_module_t analogio_module;
 extern const struct _mp_obj_module_t digitalio_module;
+extern const struct _mp_obj_module_t displayio_module;
 extern const struct _mp_obj_module_t pulseio_module;
 extern const struct _mp_obj_module_t busio_module;
 extern const struct _mp_obj_module_t board_module;
@@ -195,6 +196,7 @@ extern const struct _mp_obj_module_t bleio_module;
     { MP_OBJ_NEW_QSTR (MP_QSTR_busio           ), (mp_obj_t)&busio_module           }, \
     { MP_OBJ_NEW_QSTR (MP_QSTR_analogio        ), (mp_obj_t)&analogio_module        }, \
     { MP_OBJ_NEW_QSTR (MP_QSTR_digitalio       ), (mp_obj_t)&digitalio_module       }, \
+    { MP_OBJ_NEW_QSTR (MP_QSTR_displayio       ), (mp_obj_t)&displayio_module       }, \
     { MP_OBJ_NEW_QSTR (MP_QSTR_pulseio         ), (mp_obj_t)&pulseio_module         }, \
     { MP_OBJ_NEW_QSTR (MP_QSTR_microcontroller ), (mp_obj_t)&microcontroller_module }, \
     { MP_OBJ_NEW_QSTR (MP_QSTR_neopixel_write  ), (mp_obj_t)&neopixel_write_module  }, \
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 21f44965e..9028c2865 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -83,7 +83,8 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
 
     displayio_display_obj_t *self = NULL;
     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) {
             self = &displays[i].display;
             break;
         }
diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c
index 9833fbc64..530eafb51 100644
--- a/shared-bindings/displayio/FourWire.c
+++ b/shared-bindings/displayio/FourWire.c
@@ -65,18 +65,23 @@ STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_
 
     mp_obj_t command = args[ARG_command].u_obj;
     mp_obj_t chip_select = args[ARG_chip_select].u_obj;
-    mp_obj_t reset = args[ARG_reset].u_obj;
     if (command == mp_const_none || chip_select == mp_const_none) {
         mp_raise_ValueError(translate("Command and chip_select required"));
     }
     assert_pin_free(command);
     assert_pin_free(chip_select);
-    assert_pin_free(reset);
+    mp_obj_t reset = args[ARG_reset].u_obj;
+    if (reset != mp_const_none) {
+        assert_pin_free(reset);
+    } else {
+        reset = NULL;
+    }
 
     displayio_fourwire_obj_t* self = NULL;
     mp_obj_t spi = args[ARG_spi_bus].u_obj;
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        if (displays[i].fourwire_bus.base.type== NULL) {
+        if (displays[i].fourwire_bus.base.type == NULL ||
+            displays[i].fourwire_bus.base.type == &mp_type_NoneType) {
             self = &displays[i].fourwire_bus;
             self->base.type = &displayio_fourwire_type;
             break;
diff --git a/shared-bindings/displayio/ParallelBus.c b/shared-bindings/displayio/ParallelBus.c
index aa861bb81..e1079acb5 100644
--- a/shared-bindings/displayio/ParallelBus.c
+++ b/shared-bindings/displayio/ParallelBus.c
@@ -83,7 +83,8 @@ STATIC mp_obj_t displayio_parallelbus_make_new(const mp_obj_type_t *type, size_t
 
     displayio_parallelbus_obj_t* self = NULL;
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        if (displays[i].parallel_bus.base.type== NULL) {
+        if (displays[i].parallel_bus.base.type== NULL ||
+            displays[i].parallel_bus.base.type == &mp_type_NoneType) {
             self = &displays[i].parallel_bus;
             self->base.type = &displayio_parallelbus_type;
             break;
diff --git a/shared-module/displayio/FourWire.c b/shared-module/displayio/FourWire.c
index ab01e2609..9da5c0701 100644
--- a/shared-module/displayio/FourWire.c
+++ b/shared-module/displayio/FourWire.c
@@ -45,12 +45,14 @@ void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self,
     common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select);
     common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL);
 
-    common_hal_digitalio_digitalinout_construct(&self->reset, reset);
-    common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
+    if (reset != NULL) {
+        common_hal_digitalio_digitalinout_construct(&self->reset, reset);
+        common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
+        never_reset_pin_number(reset->number);
+    }
 
     never_reset_pin_number(command->number);
     never_reset_pin_number(chip_select->number);
-    never_reset_pin_number(reset->number);
 }
 
 void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self) {
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 92d97a6ef..ccabe9c9d 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -151,6 +151,9 @@ void reset_displays(void) {
         if (((uint32_t) fourwire->bus) < ((uint32_t) &displays) ||
             ((uint32_t) fourwire->bus) > ((uint32_t) &displays + CIRCUITPY_DISPLAY_LIMIT)) {
             busio_spi_obj_t* original_spi = fourwire->bus;
+            if (original_spi == board_spi()) {
+                continue;
+            }
             memcpy(&fourwire->inline_bus, original_spi, sizeof(busio_spi_obj_t));
             fourwire->bus = &fourwire->inline_bus;
             // Check for other displays that use the same spi bus and swap them too.
diff --git a/supervisor/shared/board_busses.c b/supervisor/shared/board_busses.c
index 38308ccee..ed1f98a58 100644
--- a/supervisor/shared/board_busses.c
+++ b/supervisor/shared/board_busses.c
@@ -33,6 +33,10 @@
 #include "mpconfigboard.h"
 #include "py/runtime.h"
 
+#ifdef CIRCUITPY_DISPLAYIO
+#include "shared-module/displayio/__init__.h"
+#endif
+
 #define BOARD_I2C (defined(DEFAULT_I2C_BUS_SDA) && defined(DEFAULT_I2C_BUS_SCL))
 #define BOARD_SPI (defined(DEFAULT_SPI_BUS_SCK) && defined(DEFAULT_SPI_BUS_MISO) && defined(DEFAULT_SPI_BUS_MOSI))
 #define BOARD_UART (defined(DEFAULT_UART_BUS_RX) && defined(DEFAULT_UART_BUS_TX))
@@ -40,7 +44,7 @@
 #if BOARD_I2C
 STATIC mp_obj_t i2c_singleton = NULL;
 
-STATIC mp_obj_t board_i2c(void) {
+mp_obj_t board_i2c(void) {
 
     if (i2c_singleton == NULL) {
         busio_i2c_obj_t *self = m_new_obj(busio_i2c_obj_t);
@@ -54,7 +58,7 @@ STATIC mp_obj_t board_i2c(void) {
     return i2c_singleton;
 }
 #else
-STATIC mp_obj_t board_i2c(void) {
+mp_obj_t board_i2c(void) {
     mp_raise_NotImplementedError(translate("No default I2C bus"));
     return NULL;
 }
@@ -91,7 +95,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi);
 #if BOARD_UART
 STATIC mp_obj_t uart_singleton = NULL;
 
-STATIC mp_obj_t board_uart(void) {
+mp_obj_t board_uart(void) {
     if (uart_singleton == NULL) {
         busio_uart_obj_t *self = m_new_obj(busio_uart_obj_t);
         self->base.type = &busio_uart_type;
@@ -108,7 +112,7 @@ STATIC mp_obj_t board_uart(void) {
     return uart_singleton;
 }
 #else
-STATIC mp_obj_t board_uart(void) {
+mp_obj_t board_uart(void) {
     mp_raise_NotImplementedError(translate("No default UART bus"));
     return NULL;
 }
@@ -121,7 +125,18 @@ void reset_board_busses(void) {
     i2c_singleton = NULL;
 #endif
 #if BOARD_SPI
-    spi_singleton = NULL;
+    bool display_using_spi = false;
+    #ifdef CIRCUITPY_DISPLAYIO
+    for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
+        if (displays[i].fourwire_bus.bus == spi_singleton) {
+            display_using_spi = true;
+            break;
+        }
+    }
+    #endif
+    if (!display_using_spi) {
+        spi_singleton = NULL;
+    }
 #endif
 #if BOARD_UART
     uart_singleton = NULL;
diff --git a/supervisor/shared/board_busses.h b/supervisor/shared/board_busses.h
index f6a8a4296..0ccb3ba6a 100644
--- a/supervisor/shared/board_busses.h
+++ b/supervisor/shared/board_busses.h
@@ -30,13 +30,13 @@
 #include "py/obj.h"
 
 mp_obj_t board_i2c(void);
-extern mp_obj_fun_builtin_fixed_t board_i2c_obj;
+MP_DECLARE_CONST_FUN_OBJ_0(board_i2c_obj);
 
 mp_obj_t board_spi(void);
-extern mp_obj_fun_builtin_fixed_t board_spi_obj;
+MP_DECLARE_CONST_FUN_OBJ_0(board_spi_obj);
 
 mp_obj_t board_uart(void);
-extern mp_obj_fun_builtin_fixed_t board_uart_obj;
+MP_DECLARE_CONST_FUN_OBJ_0(board_uart_obj);
 
 void reset_board_busses(void);
 
-- 
cgit v1.2.3


From fddc98858afb19b87a2ed65b4d2b301b3e1ce667 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 17 Jan 2019 18:51:40 -0800
Subject: fix nonetype handling and nrf never reset

---
 ports/nrf/common-hal/microcontroller/Pin.c | 2 +-
 shared-module/displayio/__init__.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared-module')

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;
-- 
cgit v1.2.3


From ae52c964c2cdb91643b05f180353d95895260245 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Fri, 18 Jan 2019 13:47:40 -0800
Subject: Cleanup display rework for PR.

Fixes #1465. Fixes #1337. Fixes #1168
---
 ports/atmel-samd/boards/feather_m4_express/board.c |  9 +--------
 ports/atmel-samd/boards/feather_m4_express/pins.c  |  1 -
 shared-module/displayio/__init__.c                 | 11 +++--------
 3 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'shared-module')

diff --git a/ports/atmel-samd/boards/feather_m4_express/board.c b/ports/atmel-samd/boards/feather_m4_express/board.c
index 85e9959c9..8096b9b8e 100644
--- a/ports/atmel-samd/boards/feather_m4_express/board.c
+++ b/ports/atmel-samd/boards/feather_m4_express/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,13 +26,6 @@
 
 #include "boards/board.h"
 #include "mpconfigboard.h"
-#include "hal/include/hal_gpio.h"
-
-#include "shared-bindings/displayio/Display.h"
-#include "shared-bindings/displayio/FourWire.h"
-#include "shared-module/displayio/mipi_constants.h"
-
-#include "tick.h"
 
 void board_init(void) {
 }
diff --git a/ports/atmel-samd/boards/feather_m4_express/pins.c b/ports/atmel-samd/boards/feather_m4_express/pins.c
index 23b55e957..cec9fe37f 100644
--- a/ports/atmel-samd/boards/feather_m4_express/pins.c
+++ b/ports/atmel-samd/boards/feather_m4_express/pins.c
@@ -1,6 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "boards/board.h"
 #include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index c8132e2f9..59a5cf398 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -37,13 +37,9 @@ void displayio_refresh_displays(void) {
                     uint16_t* pixel = &(((uint16_t*)buffer)[index]);
                     *pixel = 0;
 
-                    //if (index == 0) {
-                        if (display->current_group != NULL) {
-                            displayio_group_get_pixel(display->current_group, x, y, pixel);
-                        }
-                    // } else {
-                    //     *pixel = (((uint16_t*)buffer)[0]);
-                    // }
+                    if (display->current_group != NULL) {
+                        displayio_group_get_pixel(display->current_group, x, y, pixel);
+                    }
 
                     index += 1;
                     // The buffer is full, send it.
@@ -189,5 +185,4 @@ void common_hal_displayio_release_displays(void) {
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
         displays[i].display.base.type = &mp_type_NoneType;
     }
-    // TODO(tannewt): Clear the display datastructures and release everything used.
 }
-- 
cgit v1.2.3


From 7a09af73ec7f4a11a1404dff6276e09072d06983 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Sun, 20 Jan 2019 15:10:09 -0500
Subject: Improve struct compatibility with CPython

---
 py/binary.c                       |   7 ++-
 py/modstruct.c                    |  16 +++++-
 shared-bindings/struct/__init__.c |  63 +++++++++++++--------
 shared-bindings/struct/__init__.h |   2 +-
 shared-module/struct/__init__.c   | 113 ++++++++++++++++++++++----------------
 5 files changed, 126 insertions(+), 75 deletions(-)

(limited to 'shared-module')

diff --git a/py/binary.c b/py/binary.c
index ca851c936..9c3a49e8f 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -49,7 +49,7 @@ size_t mp_binary_get_size(char struct_type, char val_type, mp_uint_t *palign) {
     switch (struct_type) {
         case '<': case '>':
             switch (val_type) {
-                case 'b': case 'B':
+                case 'b': case 'B': case 'x':
                     size = 1; break;
                 case 'h': case 'H':
                     size = 2; break;
@@ -79,7 +79,7 @@ size_t mp_binary_get_size(char struct_type, char val_type, mp_uint_t *palign) {
             // particular (or any) ABI.
             switch (val_type) {
                 case BYTEARRAY_TYPECODE:
-                case 'b': case 'B':
+                case 'b': case 'B': case 'x':
                     align = size = 1; break;
                 case 'h': case 'H':
                     align = alignof(short);
@@ -126,6 +126,7 @@ mp_obj_t mp_binary_get_val_array(char typecode, void *p, mp_uint_t index) {
             break;
         case BYTEARRAY_TYPECODE:
         case 'B':
+        case 'x':   // value will be discarded
             val = ((unsigned char*)p)[index];
             break;
         case 'h':
@@ -364,6 +365,8 @@ void mp_binary_set_val_array_from_int(char typecode, void *p, mp_uint_t index, m
         case 'B':
             ((unsigned char*)p)[index] = val;
             break;
+        case 'x':
+            ((unsigned char*)p)[index] = 0;
         case 'h':
             ((short*)p)[index] = val;
             break;
diff --git a/py/modstruct.c b/py/modstruct.c
index 3f1b2f8b8..a238d3935 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -97,7 +97,10 @@ STATIC size_t calc_size_items(const char *fmt, size_t *total_sz) {
             total_cnt += 1;
             size += cnt;
         } else {
-            total_cnt += cnt;
+            // Pad bytes are skipped and don't get included in the item count.
+            if (*fmt != 'x') {
+                total_cnt += cnt;
+            }
             mp_uint_t align;
             size_t sz = mp_binary_get_size(fmt_type, *fmt, &align);
             while (cnt--) {
@@ -166,7 +169,10 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
         } else {
             while (cnt--) {
                 item = mp_binary_get_val(fmt_type, *fmt, &p);
-                res->items[i++] = item;
+                // Pad bytes ('x') are just skipped.
+                if (*fmt != 'x') {
+                    res->items[i++] = item;
+                }
             }
         }
         fmt++;
@@ -204,7 +210,11 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, c
         } else {
             // If we run out of args then we just finish; CPython would raise struct.error
             while (cnt-- && i < n_args) {
-                mp_binary_set_val(fmt_type, *fmt, args[i++], &p);
+                mp_binary_set_val(fmt_type, *fmt, args[i], &p);
+                // Pad bytes don't have a corresponding argument.
+                if (*fmt != 'x') {
+                    i++;
+                }
             }
         }
         fmt++;
diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c
index 093597785..9240a15bb 100644
--- a/shared-bindings/struct/__init__.c
+++ b/shared-bindings/struct/__init__.c
@@ -51,7 +51,7 @@
 //|
 //| Supported size/byte order prefixes: *@*, *<*, *>*, *!*.
 //|
-//| Supported format codes: *b*, *B*, *h*, *H*, *i*, *I*, *l*, *L*, *q*, *Q*,
+//| Supported format codes: *b*, *B*, *x*, *h*, *H*, *i*, *I*, *l*, *L*, *q*, *Q*,
 //| *s*, *P*, *f*, *d* (the latter 2 depending on the floating-point support).
 //|
 
@@ -74,7 +74,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(struct_calcsize_obj, struct_calcsize);
 //|
 
 STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
-    // TODO: "The arguments must match the values required by the format exactly."
     mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
     vstr_t vstr;
     vstr_init_len(&vstr, size);
@@ -115,49 +114,67 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX
 //| .. function:: unpack(fmt, data)
 //|
 //|   Unpack from the data according to the format string fmt. The return value
-//|   is a tuple of the unpacked values.
+//|   is a tuple of the unpacked values. The buffer size must match the size
+//|   required by the format.
 //|
 
-//| .. function:: unpack_from(fmt, data, offset)
+STATIC mp_obj_t struct_unpack(size_t n_args, const mp_obj_t *args) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
+    byte *p = bufinfo.buf;
+    byte *end_p = &p[bufinfo.len];
+
+    // true means check the size must be exactly right.
+    return MP_OBJ_FROM_PTR(shared_modules_struct_unpack_from(args[0] , p, end_p, true));
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_unpack_obj, 2, 3, struct_unpack);
+
+//| .. function:: unpack_from(fmt, data, offset=0)
 //|
 //|   Unpack from the data starting at offset according to the format string fmt.
 //|   offset may be negative to count from the end of buffer. The return value is
-//|   a tuple of the unpacked values.
+//|   a tuple of the unpacked values. The buffer size must be at least as big
+//|   as the size required by the form.
 //|
 
-STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
-    // unpack requires that the buffer be exactly the right size.
-    // unpack_from requires that the buffer be "big enough".
-    // Since we implement unpack and unpack_from using the same function
-    // we relax the "exact" requirement, and only implement "big enough".
+STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_format, ARG_buffer, ARG_offset };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_format, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_offset, MP_ARG_INT, {.u_int = 0} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
+    mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
     byte *p = bufinfo.buf;
     byte *end_p = &p[bufinfo.len];
 
-    if (n_args > 2) {
-        mp_int_t offset = mp_obj_get_int(args[2]);
-        // offset arg provided
+    mp_int_t offset = args[ARG_offset].u_int;
+    if (offset < 0) {
+        // negative offsets are relative to the end of the buffer
+        offset = bufinfo.len + offset;
         if (offset < 0) {
-            // negative offsets are relative to the end of the buffer
-            offset = bufinfo.len + offset;
-            if (offset < 0) {
-                mp_raise_RuntimeError(translate("buffer too small"));
-            }
+            mp_raise_RuntimeError(translate("buffer too small"));
         }
-        p += offset;
     }
+    p += offset;
 
-    return MP_OBJ_FROM_PTR(shared_modules_struct_unpack_from(args[0] , p, end_p));
+    // false means the size doesn't have to be exact. struct.unpack_from() only requires
+    // that be buffer be big enough.
+    return MP_OBJ_FROM_PTR(shared_modules_struct_unpack_from(args[ARG_format].u_obj, p, end_p, false));
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_unpack_from_obj, 2, 3, struct_unpack_from);
+MP_DEFINE_CONST_FUN_OBJ_KW(struct_unpack_from_obj, 0, struct_unpack_from);
 
 STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_struct) },
     { MP_ROM_QSTR(MP_QSTR_calcsize), MP_ROM_PTR(&struct_calcsize_obj) },
     { MP_ROM_QSTR(MP_QSTR_pack), MP_ROM_PTR(&struct_pack_obj) },
     { MP_ROM_QSTR(MP_QSTR_pack_into), MP_ROM_PTR(&struct_pack_into_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unpack), MP_ROM_PTR(&struct_unpack_from_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unpack), MP_ROM_PTR(&struct_unpack_obj) },
     { MP_ROM_QSTR(MP_QSTR_unpack_from), MP_ROM_PTR(&struct_unpack_from_obj) },
 };
 
diff --git a/shared-bindings/struct/__init__.h b/shared-bindings/struct/__init__.h
index c4e867aaa..a7e72b11c 100644
--- a/shared-bindings/struct/__init__.h
+++ b/shared-bindings/struct/__init__.h
@@ -29,6 +29,6 @@
 
 void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size_t n_args, const mp_obj_t *args);
 mp_uint_t shared_modules_struct_calcsize(mp_obj_t fmt_in);
-mp_obj_tuple_t * shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byte *end_p);
+mp_obj_tuple_t * shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byte *end_p, bool exact_size);
 
 #endif  // MICROPY_INCLUDED_SHARED_BINDINGS_RANDOM___INIT___H
diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c
index 78c04f07b..28e7c0c3f 100644
--- a/shared-module/struct/__init__.c
+++ b/shared-module/struct/__init__.c
@@ -71,45 +71,6 @@ mp_uint_t get_fmt_num(const char **p) {
     return val;
 }
 
-void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size_t n_args, const mp_obj_t *args) {
-    const char *fmt = mp_obj_str_get_str(fmt_in);
-    char fmt_type = get_fmt_type(&fmt);
-
-    size_t i;
-    for (i = 0; i < n_args;) {
-        mp_uint_t sz = 1;
-        if (*fmt == '\0') {
-            // more arguments given than used by format string; CPython raises struct.error here
-            mp_raise_RuntimeError(translate("too many arguments provided with the given format"));
-        }
-        struct_validate_format(*fmt);
-
-        if (unichar_isdigit(*fmt)) {
-            sz = get_fmt_num(&fmt);
-        }
-        if (p + sz > end_p) {
-            mp_raise_RuntimeError(translate("buffer too small"));
-        }
-
-        if (*fmt == 's') {
-            mp_buffer_info_t bufinfo;
-            mp_get_buffer_raise(args[i++], &bufinfo, MP_BUFFER_READ);
-            mp_uint_t to_copy = sz;
-            if (bufinfo.len < to_copy) {
-                to_copy = bufinfo.len;
-            }
-            memcpy(p, bufinfo.buf, to_copy);
-            memset(p + to_copy, 0, sz - to_copy);
-            p += sz;
-        } else {
-            while (sz--) {
-                mp_binary_set_val(fmt_type, *fmt, args[i++], &p);
-            }
-        }
-        fmt++;
-    }
-}
-
 mp_uint_t calcsize_items(const char *fmt) {
     mp_uint_t cnt = 0;
     while (*fmt) {
@@ -120,7 +81,10 @@ mp_uint_t calcsize_items(const char *fmt) {
                 num = 1;
             }
         }
-        cnt += num;
+        // Pad bytes are skipped and don't get included in the item count.
+        if (*fmt != 'x') {
+            cnt += num;
+        }
         fmt++;
     }
     return cnt;
@@ -155,14 +119,71 @@ mp_uint_t shared_modules_struct_calcsize(mp_obj_t fmt_in) {
     return size;
 }
 
+void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size_t n_args, const mp_obj_t *args) {
+    const char *fmt = mp_obj_str_get_str(fmt_in);
+    char fmt_type = get_fmt_type(&fmt);
+    const mp_uint_t total_sz = shared_modules_struct_calcsize(fmt_in);
+
+    if (p + total_sz != end_p) {
+        mp_raise_msg_varg(&mp_type_RuntimeError, translate("unpack requires a buffer of %d bytes"), total_sz);
+    }
+
+    size_t i;
+    for (i = 0; i < n_args;) {
+        mp_uint_t sz = 1;
+        if (*fmt == '\0') {
+            // more arguments given than used by format string; CPython raises struct.error here
+            mp_raise_RuntimeError(translate("too many arguments provided with the given format"));
+        }
+        struct_validate_format(*fmt);
+
+        if (unichar_isdigit(*fmt)) {
+            sz = get_fmt_num(&fmt);
+        }
+
+        if (*fmt == 's') {
+            mp_buffer_info_t bufinfo;
+            mp_get_buffer_raise(args[i++], &bufinfo, MP_BUFFER_READ);
+            mp_uint_t to_copy = sz;
+            if (bufinfo.len < to_copy) {
+                to_copy = bufinfo.len;
+            }
+            memcpy(p, bufinfo.buf, to_copy);
+            memset(p + to_copy, 0, sz - to_copy);
+            p += sz;
+        } else {
+            while (sz--) {
+                mp_binary_set_val(fmt_type, *fmt, args[i], &p);
+                // Pad bytes don't have a corresponding argument.
+                if (*fmt != 'x') {
+                    i++;
+                }
+            }
+        }
+        fmt++;
+    }
+}
 
-mp_obj_tuple_t * shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byte *end_p) {
+mp_obj_tuple_t * shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byte *end_p, bool exact_size) {
 
   const char *fmt = mp_obj_str_get_str(fmt_in);
   char fmt_type = get_fmt_type(&fmt);
-  mp_uint_t num_items = calcsize_items(fmt);
+  const mp_uint_t num_items = calcsize_items(fmt);
+  const mp_uint_t total_sz = shared_modules_struct_calcsize(fmt_in);
   mp_obj_tuple_t *res = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_items, NULL));
 
+  // If exact_size, make sure the buffer is exactly the right size.
+  // Otherwise just make sure it's big enough.
+  if (exact_size) {
+      if (p + total_sz != end_p) {
+          mp_raise_RuntimeError(translate("buffer size must match format"));
+      }
+  } else {
+      if (p + total_sz > end_p) {
+          mp_raise_RuntimeError(translate("buffer too small"));
+      }
+  }
+
   for (uint i = 0; i < num_items;) {
       mp_uint_t sz = 1;
 
@@ -171,9 +192,6 @@ mp_obj_tuple_t * shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byt
       if (unichar_isdigit(*fmt)) {
           sz = get_fmt_num(&fmt);
       }
-      if (p + sz > end_p) {
-          mp_raise_RuntimeError(translate("buffer too small"));
-      }
       mp_obj_t item;
       if (*fmt == 's') {
           item = mp_obj_new_bytes(p, sz);
@@ -182,7 +200,10 @@ mp_obj_tuple_t * shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byt
       } else {
           while (sz--) {
               item = mp_binary_get_val(fmt_type, *fmt, &p);
-              res->items[i++] = item;
+              // Pad bytes are not stored.
+              if (*fmt != 'x') {
+                  res->items[i++] = item;
+              }
           }
       }
       fmt++;
-- 
cgit v1.2.3


From ab2ad7ba4542c2e133ced64ccb8e9d0b4065e86f Mon Sep 17 00:00:00 2001
From: Bryan Siepert <bsiepert@gmail.com>
Date: Sun, 20 Jan 2019 22:33:22 -0800
Subject: adding height and width to OnDiskBitmap for #1460

---
 shared-bindings/displayio/OnDiskBitmap.c | 44 ++++++++++++++++++++++++++++++++
 shared-bindings/displayio/OnDiskBitmap.h |  3 +++
 shared-module/displayio/OnDiskBitmap.c   |  8 ++++++
 3 files changed, 55 insertions(+)

(limited to 'shared-module')

diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c
index 46cb5913c..d6d3b9862 100644
--- a/shared-bindings/displayio/OnDiskBitmap.c
+++ b/shared-bindings/displayio/OnDiskBitmap.c
@@ -29,7 +29,9 @@
 #include <stdint.h>
 
 #include "py/runtime.h"
+#include "py/objproperty.h"
 #include "supervisor/shared/translate.h"
+#include "shared-bindings/displayio/OnDiskBitmap.h"
 
 //| .. currentmodule:: displayio
 //|
@@ -92,7 +94,49 @@ STATIC mp_obj_t displayio_ondiskbitmap_make_new(const mp_obj_type_t *type, size_
     return MP_OBJ_FROM_PTR(self);
 }
 
+//|   .. attribute:: width
+//|
+//|      Width of the bitmap. (read only)
+//|
+STATIC mp_obj_t displayio_ondiskbitmap_obj_get_width(mp_obj_t self_in) {
+    displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskbitmap_get_width(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskbitmap_get_width_obj, displayio_ondiskbitmap_obj_get_width);
+
+const mp_obj_property_t displayio_ondiskbitmap_width_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&displayio_ondiskbitmap_get_width_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+
+};
+
+//|   .. attribute:: height
+//|
+//|      Height of the bitmap. (read only)
+//|
+STATIC mp_obj_t displayio_ondiskbitmap_obj_get_height(mp_obj_t self_in) {
+    displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskbitmap_get_height(self));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskbitmap_get_height_obj, displayio_ondiskbitmap_obj_get_height);
+
+const mp_obj_property_t displayio_ondiskbitmap_height_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&displayio_ondiskbitmap_get_height_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+
+};
+
 STATIC const mp_rom_map_elem_t displayio_ondiskbitmap_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_ondiskbitmap_height_obj) },
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_ondiskbitmap_width_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_ondiskbitmap_locals_dict, displayio_ondiskbitmap_locals_dict_table);
 
diff --git a/shared-bindings/displayio/OnDiskBitmap.h b/shared-bindings/displayio/OnDiskBitmap.h
index ab8b8dcd8..9a6c81f8f 100644
--- a/shared-bindings/displayio/OnDiskBitmap.h
+++ b/shared-bindings/displayio/OnDiskBitmap.h
@@ -37,4 +37,7 @@ void common_hal_displayio_ondiskbitmap_construct(displayio_ondiskbitmap_t *self,
 uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *bitmap,
     int16_t x, int16_t y);
 
+uint16_t common_hal_displayio_ondiskbitmap_get_height(displayio_ondiskbitmap_t *self);
+
+uint16_t common_hal_displayio_ondiskbitmap_get_width(displayio_ondiskbitmap_t *self);
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_ONDISKBITMAP_H
diff --git a/shared-module/displayio/OnDiskBitmap.c b/shared-module/displayio/OnDiskBitmap.c
index 6e4a4c6f0..aa2ca3e10 100644
--- a/shared-module/displayio/OnDiskBitmap.c
+++ b/shared-module/displayio/OnDiskBitmap.c
@@ -91,3 +91,11 @@ uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *s
     }
     return 0;
 }
+
+uint16_t common_hal_displayio_ondiskbitmap_get_height(displayio_ondiskbitmap_t *self) {
+    return self->height;
+}
+
+uint16_t common_hal_displayio_ondiskbitmap_get_width(displayio_ondiskbitmap_t *self) {
+    return self->width;
+}
-- 
cgit v1.2.3


From 777408ff8d45b9a73dbf0bcf8c083ade0b5152e5 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 21 Jan 2019 11:45:38 -0500
Subject: struct.pack_into incorrect buffer size check

---
 shared-module/struct/__init__.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared-module')

diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c
index 28e7c0c3f..245dbbda9 100644
--- a/shared-module/struct/__init__.c
+++ b/shared-module/struct/__init__.c
@@ -124,8 +124,8 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size
     char fmt_type = get_fmt_type(&fmt);
     const mp_uint_t total_sz = shared_modules_struct_calcsize(fmt_in);
 
-    if (p + total_sz != end_p) {
-        mp_raise_msg_varg(&mp_type_RuntimeError, translate("unpack requires a buffer of %d bytes"), total_sz);
+    if (p + total_sz > end_p) {
+        mp_raise_RuntimeError(translate("buffer too small"));
     }
 
     size_t i;
-- 
cgit v1.2.3