From 2afca4e942df2f4aa656f6c8a6aa84de581682c9 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Fri, 24 Jan 2020 14:25:36 -0500
Subject: Fix flash-display conflict error

---
 shared-module/displayio/__init__.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'shared-module/displayio')

diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index af22cb0df..795de7b87 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -100,6 +100,11 @@ void reset_displays(void) {
                         continue;
                     }
                 #endif
+                #if BOARD_INTERNAL_SPI
+                    if (original_spi == common_hal_board_get_internal_spi()) {
+                        continue;
+                    }
+                #endif
                 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.
-- 
cgit v1.2.3