diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-01-22 22:46:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 22:46:11 -0500 |
| commit | 07a4cc0c48cc7e530c3f90f83e7ea7888fa3e6cc (patch) | |
| tree | e35ecc44cfe35fe3566cca6f72caabb9621c7484 /ports | |
| parent | fb2d87bf4fb0651a7b0838781242caadb0ec3e93 (diff) | |
| parent | aaa644b223bcf86db6af14416916ea74311f7903 (diff) | |
Merge pull request #1487 from tannewt/enable_displayio4.0.0-beta.0
Enable displayio on all Express boards.
Diffstat (limited to 'ports')
4 files changed, 10 insertions, 2 deletions
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h index e6a7e0676..6d926778e 100644 --- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h +++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h @@ -46,3 +46,5 @@ // USB is always used internally so skip the pin objects for it. #define IGNORE_PIN_PA24 1 #define IGNORE_PIN_PA25 1 + +#define CIRCUITPY_DISPLAYIO (0) diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h index e66d9c40e..5c3be69dd 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h @@ -49,3 +49,5 @@ // USB is always used internally so skip the pin objects for it. #define IGNORE_PIN_PA24 1 #define IGNORE_PIN_PA25 1 + +#define CIRCUITPY_DISPLAYIO (0) diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h index abbf0b08c..4a5004b3a 100644 --- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h +++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h @@ -32,3 +32,5 @@ #define DEFAULT_UART_BUS_RX (&pin_PA11) #define DEFAULT_UART_BUS_TX (&pin_PA10) + +#define CIRCUITPY_DISPLAYIO (0) diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h index e9507e3cc..da3383f8e 100644 --- a/ports/atmel-samd/mpconfigport.h +++ b/ports/atmel-samd/mpconfigport.h @@ -283,12 +283,14 @@ extern const struct _mp_obj_module_t pixelbuf_module; #define I2CSLAVE_MODULE #endif - #ifdef CIRCUITPY_DISPLAYIO + #if !defined(CIRCUITPY_DISPLAYIO) || CIRCUITPY_DISPLAYIO + #define CIRCUITPY_DISPLAYIO (1) #define CIRCUITPY_DISPLAY_LIMIT (3) #define DISPLAYIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_displayio), (mp_obj_t)&displayio_module }, #else + #define CIRCUITPY_DISPLAYIO (0) #define CIRCUITPY_DISPLAY_LIMIT (0) - #define DISPLAYIO_MODULE + #define DISPLAYIO_MODULE #endif #if MICROPY_PY_NETWORK |