Skip to content

Commit

Permalink
refactor(core): remove fonts and no longer used drawing functions from C
Browse files Browse the repository at this point in the history 
[no changelog]
  • Loading branch information
@TychoVrahe
TychoVrahe committed Feb 11, 2025
1 parent c3981cd commit 57789c7
Show file tree
Hide file tree
Showing 42 changed files with 14 additions and 2,765 deletions.
1 change: 0 additions & 1 deletion core/SConscript.boardloader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/bitblt/gfx_bitblt_mono8.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
Expand Down
3 changes: 1 addition & 2 deletions core/SConscript.bootloader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgb565.c',
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
Expand All @@ -89,7 +88,7 @@ SOURCE_NANOPB = [
'vendor/nanopb/pb_encode.c',
]

ui.init_ui(TREZOR_MODEL, "bootloader", CPPDEFINES_MOD, SOURCE_MOD, RUST_UI_FEATURES)
ui.init_ui(TREZOR_MODEL, "bootloader", RUST_UI_FEATURES)

env = Environment(
ENV=os.environ,
Expand Down
3 changes: 1 addition & 2 deletions core/SConscript.bootloader_ci
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgb565.c',
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
Expand All @@ -83,7 +82,7 @@ SOURCE_NANOPB = [
'vendor/nanopb/pb_encode.c',
]

ui.init_ui(TREZOR_MODEL, "bootloader_ci", CPPDEFINES_MOD, SOURCE_MOD, RUST_UI_FEATURES)
ui.init_ui(TREZOR_MODEL, "bootloader", RUST_UI_FEATURES)

env = Environment(
ENV=os.environ,
Expand Down
3 changes: 1 addition & 2 deletions core/SConscript.bootloader_emu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgb565.c',
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
Expand Down Expand Up @@ -127,7 +126,7 @@ SOURCE_UNIX = [
'embed/projects/unix/profile.c',
]

ui.init_ui(TREZOR_MODEL, "bootloader", CPPDEFINES_MOD, SOURCE_MOD, RUST_UI_FEATURES)
ui.init_ui(TREZOR_MODEL, "bootloader", RUST_UI_FEATURES)

env = Environment(
ENV=os.environ,
Expand Down
3 changes: 1 addition & 2 deletions core/SConscript.firmware
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/bitblt/gfx_bitblt_mono8.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
Expand Down Expand Up @@ -383,7 +382,7 @@ if THP:
if STORAGE_INSECURE_TESTING_MODE:
CPPDEFINES_MOD += ['STORAGE_INSECURE_TESTING_MODE']

ui.init_ui(TREZOR_MODEL, "firmware", CPPDEFINES_MOD, SOURCE_MOD, RUST_UI_FEATURES)
ui.init_ui(TREZOR_MODEL, "firmware", RUST_UI_FEATURES)

SOURCE_QSTR = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_MICROPYTHON_SPEED

Expand Down
4 changes: 1 addition & 3 deletions core/SConscript.prodtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,9 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/bitblt/gfx_bitblt_mono8.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
'embed/gfx/qrcode/qrcodegen.c',
'embed/io/display/display_utils.c',
'embed/util/image/image.c',
'embed/util/rsod/rsod.c',
Expand All @@ -85,7 +83,7 @@ SOURCE_MOD += [
'vendor/micropython/lib/uzlib/tinflate.c',
]

ui.init_ui(TREZOR_MODEL, "prodtest", CPPDEFINES_MOD, SOURCE_MOD, RUST_UI_FEATURES)
ui.init_ui(TREZOR_MODEL, "prodtest", RUST_UI_FEATURES)

env = Environment(
ENV=os.environ,
Expand Down
3 changes: 1 addition & 2 deletions core/SConscript.reflash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgb565.c',
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
Expand All @@ -69,7 +68,7 @@ SOURCE_MOD += [
'vendor/trezor-storage/flash_area.c',
]

ui.init_ui(TREZOR_MODEL, "prodtest", CPPDEFINES_MOD, SOURCE_MOD, RUST_UI_FEATURES)
ui.init_ui(TREZOR_MODEL, "prodtest", RUST_UI_FEATURES)

env = Environment(
ENV=os.environ,
Expand Down
3 changes: 1 addition & 2 deletions core/SConscript.unix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ SOURCE_MOD += [
'embed/gfx/bitblt/gfx_bitblt_rgba8888.c',
'embed/gfx/bitblt/gfx_bitblt_mono8.c',
'embed/gfx/fonts/font_bitmap.c',
'embed/gfx/fonts/fonts.c',
'embed/gfx/gfx_color.c',
'embed/gfx/gfx_draw.c',
'embed/gfx/terminal.c',
Expand Down Expand Up @@ -409,7 +408,7 @@ TRANSLATION_DATA = [
"translations/order.json",
]

ui.init_ui(TREZOR_MODEL, "firmware", CPPDEFINES_MOD, SOURCE_MOD, RUST_UI_FEATURES)
ui.init_ui(TREZOR_MODEL, "firmware", RUST_UI_FEATURES)

SOURCE_QSTR = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_UNIX

Expand Down
322 changes: 0 additions & 322 deletions core/embed/gfx/fonts/font_pixeloperator_bold_8.c
View file

This file was deleted.

11 changes: 0 additions & 11 deletions core/embed/gfx/fonts/font_pixeloperator_bold_8.h
View file

This file was deleted.

Loading

0 comments on commit 57789c7

Please sign in to comment.