diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-08-05 17:53:08 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-08-05 17:53:08 -0700 |
| commit | 26f64dd8ecd488c3f9867362436825f55ae3def9 (patch) | |
| tree | 86084f007d218a9346d800aadb66f984941d98c6 /supervisor/shared | |
| parent | b675a27e165d5a5ca48b967a168e95161fb47d77 (diff) | |
| parent | dbab5380b22289d44429f8a8ad3daabe7ec1fa45 (diff) | |
Merge remote-tracking branch 'adafruit/4.1.x' into merge_in_410
Diffstat (limited to 'supervisor/shared')
| -rw-r--r-- | supervisor/shared/display.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h index d5faa7777..2a2ccf46d 100644 --- a/supervisor/shared/display.h +++ b/supervisor/shared/display.h @@ -35,11 +35,10 @@ // These are autogenerated resources. // This is fixed so it doesn't need to be in RAM. -extern const displayio_bitmap_t supervisor_terminal_font_bitmap; - extern const fontio_builtinfont_t supervisor_terminal_font; // These will change so they must live in RAM. +extern displayio_bitmap_t supervisor_terminal_font_bitmap; extern displayio_tilegrid_t supervisor_terminal_text_grid; extern terminalio_terminal_obj_t supervisor_terminal; |