summaryrefslogtreecommitdiff
path: root/shared-module/displayio
diff options
context:
space:
mode:
authorLucian Copeland <hierophect@gmail.com>2020-01-24 14:25:36 -0500
committerLucian Copeland <hierophect@gmail.com>2020-01-24 14:25:36 -0500
commit2afca4e942df2f4aa656f6c8a6aa84de581682c9 (patch)
tree741f3fe5aa57a2a4d2555f2c9f5b9fa3422a99cb /shared-module/displayio
parentd8bc57c1dc159e8493b615fe8091f2722c513cf1 (diff)
Fix flash-display conflict error
Diffstat (limited to 'shared-module/displayio')
-rw-r--r--shared-module/displayio/__init__.c5
1 files changed, 5 insertions, 0 deletions
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.