diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-02-13 00:35:14 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-02-13 15:31:06 -0800 |
| commit | 473bdf48f61998ee9c51aa16c159bbc4df1d15b6 (patch) | |
| tree | 29a5b62c3c5abd25de64d4477d5356fbd595a438 /shared-module | |
| parent | 78f51792a7da468413b94c714f39bd4750412671 (diff) | |
A safe mode fix and displayio fixes
* Fixes safe mode on the SAMD51. The "preserved" value was being
clobbered by the bootloader.
* Fixes auto-reload loop when in safe mode.
* Fixes reading Group children with [].
* Check that a TileGrid actually moves before queueing a refresh.
Diffstat (limited to 'shared-module')
| -rw-r--r-- | shared-module/displayio/Group.c | 2 | ||||
| -rw-r--r-- | shared-module/displayio/TileGrid.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index adaad1505..b48057d1b 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -98,7 +98,7 @@ size_t common_hal_displayio_group_get_len(displayio_group_t* self) { } mp_obj_t common_hal_displayio_group_get(displayio_group_t* self, size_t index) { - return self->children[index]; + return MP_OBJ_FROM_PTR(self->children[index]); } void common_hal_displayio_group_set(displayio_group_t* self, size_t index, mp_obj_t layer) { diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index e4f40a5f7..c2aa9b144 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -72,9 +72,9 @@ void common_hal_displayio_tilegrid_get_position(displayio_tilegrid_t *self, int1 } void common_hal_displayio_tilegrid_set_position(displayio_tilegrid_t *self, int16_t x, int16_t y) { + self->needs_refresh = self->x != x || self->y != y; self->x = x; self->y = y; - self->needs_refresh = true; } mp_obj_t common_hal_displayio_tilegrid_get_pixel_shader(displayio_tilegrid_t *self) { |
