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 /tools | |
| parent | 19c6b8aa0c572acb2212014e0a2e7e324efbb35d (diff) | |
| parent | 5015036c06e12c158ca0b36a23fade8da6fbbf07 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gen_display_resources.py | 2 | ||||
| m--------- | tools/usb_descriptor | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py index 82676ef07..ebea9dccc 100644 --- a/tools/gen_display_resources.py +++ b/tools/gen_display_resources.py @@ -153,7 +153,7 @@ const displayio_bitmap_t supervisor_terminal_font_bitmap = {{ .base = {{.type = &displayio_bitmap_type }}, .width = {}, .height = {}, - .data = (uint32_t*) font_bitmap_data, + .data = (size_t*) font_bitmap_data, .stride = {}, .bits_per_value = 1, .x_shift = 5, diff --git a/tools/usb_descriptor b/tools/usb_descriptor -Subproject e2e79566a807b7230dddbc53a103c19b2f65e2c +Subproject dac9689e274844294bbe4fd1b78defff9ff2753 |