Merge pull request adafruit#1487 from tannewt/enable_displayio

dhalbert · web-flow · commit 07a4cc0c48cc · 2019-01-22T22:46:11.000-05:00
Enable displayio on all Express boards.
diff --git 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
@@ -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
@@ -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
@@ -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
