Hook up the terminal based on the first display.

3 files changed, 12 insertions, 8 deletions

diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index d61732f6f..1838228af 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -133,11 +133,15 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
 //|
 STATIC mp_obj_t displayio_display_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
     displayio_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_t native_layer = mp_instance_cast_to_native_base(group_in, &displayio_group_type);
-    if (native_layer == MP_OBJ_NULL) {
-        mp_raise_ValueError(translate("Must be a Group subclass."));
+    displayio_group_t* group = NULL;
+    if (group_in != mp_const_none) {
+        mp_obj_t native_layer = mp_instance_cast_to_native_base(group_in, &displayio_group_type);
+        if (native_layer == MP_OBJ_NULL) {
+            mp_raise_ValueError(translate("Must be a Group subclass."));
+        }
+        group = MP_OBJ_TO_PTR(native_layer);
     }
-    displayio_group_t* group = MP_OBJ_TO_PTR(native_layer);
+
     common_hal_displayio_display_show(self, group);
     return mp_const_none;
 }
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index b8531a923..0026cd62f 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -138,9 +138,9 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
 
     displayio_tilegrid_t *self = m_new_obj(displayio_tilegrid_t);
     self->base.type = &displayio_tilegrid_type;
-    common_hal_displayio_tilegrid_construct(self, native, args[ARG_pixel_shader].u_obj,
-        args[ARG_width].u_int, args[ARG_height].u_int, tile_width, tile_height, x, y,
-        args[ARG_default_tile].u_int);
+    common_hal_displayio_tilegrid_construct(self, native, bitmap_width / tile_width,
+        args[ARG_pixel_shader].u_obj, args[ARG_width].u_int, args[ARG_height].u_int,
+        tile_width, tile_height, x, y, args[ARG_default_tile].u_int);
     return MP_OBJ_FROM_PTR(self);
 }
 
diff --git a/shared-bindings/displayio/TileGrid.h b/shared-bindings/displayio/TileGrid.h
index f553be423..a74fa4d39 100644
--- a/shared-bindings/displayio/TileGrid.h
+++ b/shared-bindings/displayio/TileGrid.h
@@ -32,7 +32,7 @@
 extern const mp_obj_type_t displayio_tilegrid_type;
 
 void common_hal_displayio_tilegrid_construct(displayio_tilegrid_t *self, mp_obj_t bitmap,
-        mp_obj_t pixel_shader, uint16_t width, uint16_t height,
+        uint16_t bitmap_width_in_tiles, mp_obj_t pixel_shader, uint16_t width, uint16_t height,
         uint16_t tile_width, uint16_t tile_height, uint16_t x, uint16_t y, uint8_t default_tile);
 
 void common_hal_displayio_tilegrid_get_position(displayio_tilegrid_t *self, int16_t* x, int16_t* y);