diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2020-04-20 18:25:13 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2020-04-20 18:25:13 -0700 |
| commit | bebf27e73315386bfd862da46251a5efae56de75 (patch) | |
| tree | 4bfac7c3b6b0779962cdd637d020a139419a6357 /shared-module/displayio/__init__.h | |
| parent | abd340a8e465fedd2b5d74989440532c767ccf9e (diff) | |
| parent | a4d86b96fd1e60b807258a30cd765b48f0372b6d (diff) | |
Merge remote-tracking branch 'adafruit/master' into lower_power
This isn't perfect and needs a bit more testing.
Diffstat (limited to 'shared-module/displayio/__init__.h')
| -rw-r--r-- | shared-module/displayio/__init__.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-module/displayio/__init__.h b/shared-module/displayio/__init__.h index 278a5e78f..9eb10c28b 100644 --- a/shared-module/displayio/__init__.h +++ b/shared-module/displayio/__init__.h @@ -36,15 +36,15 @@ #include "shared-bindings/displayio/Group.h" #include "shared-bindings/displayio/I2CDisplay.h" #include "shared-bindings/displayio/ParallelBus.h" -#include "shared-bindings/_protomatter/Protomatter.h" +#include "shared-bindings/rgbmatrix/RGBMatrix.h" typedef struct { union { displayio_fourwire_obj_t fourwire_bus; displayio_i2cdisplay_obj_t i2cdisplay_bus; displayio_parallelbus_obj_t parallel_bus; -#if CIRCUITPY_PROTOMATTER - protomatter_protomatter_obj_t protomatter; +#if CIRCUITPY_RGBMATRIX + rgbmatrix_rgbmatrix_obj_t rgbmatrix; #endif }; union { |