Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Firmware font: change to docs and 2 fonts added to amigo-bold #12

Merged
merged 2 commits into from
Aug 15, 2023
Merged

Firmware font: change to docs and 2 fonts added to amigo-bold #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c702aa
`./bdftokff.sh` commands more intuitive per device
Aug 15, 2023
e95bbf0
u+20bd/u+20bf added to bold bdf, CHARS corrected in others
Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions firmware/font/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Krux uses a [custom fork](https://github.com/bachan/terminus-font-vietnamese) of
To rebuild the font for all devices, run:
```
./bdftokff.sh ter-u14n 8 14 > m5stickv.kff
./bdftokff.sh ter-u16n 8 16 > bit.kff
./bdftokff.sh ter-u24n 12 24 > amigo.kff
./bdftokff.sh ter-u16n 8 16 > bit_dock.kff
./bdftokff.sh ter-u24b 12 24 > amigo.kff
```

Once you have a `.kff` file, locate the project that you want to use the updated font under `firmware/MaixPy/projects/` (`maixpy_amigo_tft/` for ex.), open its `compile/overrides/components/micropython/port/src/omv/img/font.c` file and replace the array contents in the `unicode` variable with the byte array found within the `.kff` file, then rebuild the firmware.
Expand Down
2 changes: 1 addition & 1 deletion firmware/font/ter-u14n.bdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FONT_ASCENT 12
FONT_DESCENT 2
DEFAULT_CHAR 65533
ENDPROPERTIES
CHARS 1437
CHARS 1438
STARTCHAR char0
ENCODING 0
SWIDTH 571 0
Expand Down
2 changes: 1 addition & 1 deletion firmware/font/ter-u16n.bdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FONT_ASCENT 12
FONT_DESCENT 4
DEFAULT_CHAR 65533
ENDPROPERTIES
CHARS 1437
CHARS 1438
STARTCHAR char0
ENCODING 0
SWIDTH 500 0
Expand Down
57 changes: 56 additions & 1 deletion firmware/font/ter-u24b.bdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FONT_ASCENT 19
FONT_DESCENT 5
DEFAULT_CHAR 65533
ENDPROPERTIES
CHARS 1436
CHARS 1438
STARTCHAR char0
ENCODING 0
SWIDTH 500 0
Expand Down Expand Up @@ -44029,4 +44029,59 @@ C0C0
0180
7F00
ENDCHAR
STARTCHAR U+20BD
ENCODING 8381
SWIDTH 500 0
DWIDTH 12 0
BBX 12 19 -1 -3
BITMAP
3FC0
3FE0
3030
3030
3030
3030
3FE0
3FC0
3000
3000
FF80
FF80
3000
3000
FF80
FF80
3000
3000
3000
ENDCHAR
STARTCHAR U+20BF
ENCODING 8383
SWIDTH 500 0
DWIDTH 12 0
BBX 12 22 -1 -4
BITMAP
3300
3300
3F00
FF80
E1C0
60E0
60E0
60E0
61C0
7F80
7FC0
60E0
6070
6070
6070
6070
60F0
FFE0
FFC0
3300
3300
3300
ENDCHAR
ENDFONT
2 changes: 1 addition & 1 deletion firmware/font/ter-u24n.bdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FONT_ASCENT 19
FONT_DESCENT 5
DEFAULT_CHAR 65533
ENDPROPERTIES
CHARS 1437
CHARS 1438
STARTCHAR char0
ENCODING 0
SWIDTH 500 0
Expand Down