summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
authorScott Shawcroft <scott@adafruit.com>2020-01-29 16:32:35 -0800
committerGitHub <noreply@github.com>2020-01-29 16:32:35 -0800
commit0b761f60ea8c798ad816a2b93a82824ed57ed987 (patch)
tree01b4940b6f12fed8902a17b6a20a76f27fbb6f29 /shared-module
parent5b6b4eb326ce2f7beca20ccdc81fdef422e45848 (diff)
parent1a25d3ca83e1c50c44d8d6179e4fe092fe96a401 (diff)
Merge pull request #2404 from hierophect/stm32-meowbit
STM32: Meowbit support
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/displayio/__init__.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index af22cb0df..efa61265e 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -16,6 +16,9 @@
#include "supervisor/shared/display.h"
#include "supervisor/memory.h"
+#include "supervisor/spi_flash_api.h"
+#include "py/mpconfig.h"
+
primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
// Check for recursive calls to displayio_background.
@@ -100,6 +103,11 @@ void reset_displays(void) {
continue;
}
#endif
+ #ifdef BOARD_USE_INTERNAL_SPI
+ if (original_spi == (mp_obj_t)(&supervisor_flash_spi_bus)) {
+ 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.