diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2020-01-07 12:08:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 12:08:59 -0800 |
| commit | 866ac13405e96cfcdb474b06668babdcb7e09966 (patch) | |
| tree | faee2633f2f79206216c937ab6bac0ae73f87e99 | |
| parent | 5b127bd78cfeb1d6cc13d22d300a99a0870f9941 (diff) | |
| parent | 3ad3d49959271b4b33950d9d68daf1b9a722c95f (diff) | |
Merge pull request #2450 from Marius-450/marius-display-limit-2
CIRCUITPY_DISPLAY_LIMIT = 2 for monster m4sk
| -rw-r--r-- | ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h | 7 | ||||
| -rw-r--r-- | py/circuitpy_mpconfig.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h b/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h index 42fb4548e..4bd01706d 100644 --- a/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h +++ b/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h @@ -19,3 +19,10 @@ // USB is always used internally so skip the pin objects for it. #define IGNORE_PIN_PA24 1 #define IGNORE_PIN_PA25 1 + +// Enable the use of 2 displays + +#define CIRCUITPY_DISPLAY_LIMIT (2) + + + diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 932d4f855..8c7454cf2 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -328,7 +328,9 @@ extern const struct _mp_obj_module_t terminalio_module; #define DISPLAYIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_displayio), (mp_obj_t)&displayio_module }, #define FONTIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_fontio), (mp_obj_t)&fontio_module }, #define TERMINALIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_terminalio), (mp_obj_t)&terminalio_module }, +#ifndef CIRCUITPY_DISPLAY_LIMIT #define CIRCUITPY_DISPLAY_LIMIT (1) +#endif #else #define DISPLAYIO_MODULE #define FONTIO_MODULE |