summaryrefslogtreecommitdiff
path: root/shared-bindings/displayio/TileGrid.c
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2019-04-05 13:03:03 -0700
committerScott Shawcroft <scott@tannewt.org>2019-04-09 18:32:52 -0700
commit5028f87b0988775d37c59ac2f65035468936bb0c (patch)
treec372020ed51f8c5079d4a89d4d87781bff97a999 /shared-bindings/displayio/TileGrid.c
parent9026f13a25d60a2d39f4233f9213f3d49eb5855a (diff)
Tweak pybadge and fix display bugs
* Update pybadge pins and flash for rev D * TileGrid now validates the type of the pixel_shader. * Display actually handles incoming subclass objects. * MicroPython will inspect native parents to see if special accessors are used.
Diffstat (limited to 'shared-bindings/displayio/TileGrid.c')
-rw-r--r--shared-bindings/displayio/TileGrid.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index 7c2c0d4cc..2b41eb8fd 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -103,7 +103,12 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
bitmap_width = bmp->width;
bitmap_height = bmp->height;
} else {
- mp_raise_TypeError(translate("unsupported bitmap type"));
+ mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_bitmap);
+ }
+ mp_obj_t pixel_shader = args[ARG_pixel_shader].u_obj;
+ if (!MP_OBJ_IS_TYPE(pixel_shader, &displayio_colorconverter_type) &&
+ !MP_OBJ_IS_TYPE(pixel_shader, &displayio_palette_type)) {
+ mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_pixel_shader);
}
uint16_t tile_width = args[ARG_tile_width].u_int;
if (tile_width == 0) {
@@ -126,7 +131,7 @@ 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, bitmap_width / tile_width,
- args[ARG_pixel_shader].u_obj, args[ARG_width].u_int, args[ARG_height].u_int,
+ pixel_shader, 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);
}