diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-04-09 14:40:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 14:40:36 -0700 |
| commit | 129e7255995b258c71d06227ac265c2746eac3af (patch) | |
| tree | e4cc247ba93ce0fcca75c614120d8c46c514f46e /supervisor/shared/display.c | |
| parent | 19c6b8aa0c572acb2212014e0a2e7e324efbb35d (diff) | |
| parent | 5015036c06e12c158ca0b36a23fade8da6fbbf07 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'supervisor/shared/display.c')
| -rw-r--r-- | supervisor/shared/display.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index e1400426e..0b3fbe178 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -34,7 +34,7 @@ #include "shared-bindings/displayio/TileGrid.h" #include "supervisor/memory.h" -extern uint32_t blinka_bitmap_data[]; +extern size_t blinka_bitmap_data[]; extern displayio_bitmap_t blinka_bitmap; extern displayio_group_t circuitpython_splash; @@ -81,6 +81,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { void supervisor_stop_terminal(void) { if (tilegrid_tiles != NULL) { free_memory(tilegrid_tiles); + tilegrid_tiles = NULL; supervisor_terminal_text_grid.inline_tiles = false; supervisor_terminal_text_grid.tiles = NULL; } @@ -106,7 +107,7 @@ void supervisor_display_move_memory(void) { #endif } -uint32_t blinka_bitmap_data[32] = { +size_t blinka_bitmap_data[32] = { 0x00000011, 0x11000000, 0x00000111, 0x53100000, 0x00000111, 0x56110000, |