From 6f9edb349cbb14aad89254d7cff2a19e4021aa4a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 2 May 2016 17:08:56 +0200 Subject: [PATCH] add fingerprint layout --- extmod/modtrezorui/modtrezorui-unix.h | 1 + src/apps/playground_stick/fingerprint.toig | Bin 0 -> 1973 bytes src/apps/playground_stick/layout_homescreen.py | 12 ++++++++---- src/apps/playground_stick/trezor.toig | Bin 1395 -> 0 bytes src/trezor/ui.py | 10 ++++++++++ vendor/trezor-crypto | 2 +- 6 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/apps/playground_stick/fingerprint.toig delete mode 100644 src/apps/playground_stick/trezor.toig diff --git a/extmod/modtrezorui/modtrezorui-unix.h b/extmod/modtrezorui/modtrezorui-unix.h index 3667054e..1b9b514e 100644 --- a/extmod/modtrezorui/modtrezorui-unix.h +++ b/extmod/modtrezorui/modtrezorui-unix.h @@ -91,6 +91,7 @@ static void display_init(void) SDL_DestroyWindow(win); SDL_Quit(); } + SDL_SetRenderDrawColor(RENDERER, 255, 0, 0, 255); SDL_RenderClear(RENDERER); SCREEN = SDL_CreateRGBSurface(0, RESX, RESY, 16, 0xF800, 0x07E0, 0x001F, 0x0000); TEXTURE = SDL_CreateTexture(RENDERER, SDL_PIXELFORMAT_RGB565, SDL_TEXTUREACCESS_STREAMING, RESX, RESY); diff --git a/src/apps/playground_stick/fingerprint.toig b/src/apps/playground_stick/fingerprint.toig new file mode 100644 index 0000000000000000000000000000000000000000..4ab4a0b5a9cc2bd4696230b208284d1a6676b301 GIT binary patch literal 1973 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 B;t~J= diff --git a/src/trezor/ui.py b/src/trezor/ui.py index 2a2aeed9..8f5e7867 100644 --- a/src/trezor/ui.py +++ b/src/trezor/ui.py @@ -36,6 +36,16 @@ MONO = const(0) NORMAL = const(1) BOLD = const(2) +def text(x: int, y: int, text: bytes, font: int, fgcolor: int, bgcolor: int) -> None: + display.text(x, y, text, font, fgcolor, bgcolor) + +def text_right(x: int, y: int, text: bytes, font: int, fgcolor: int, bgcolor: int) -> None: + w = display.text_width(text, font) + display.text(x - w, y, text, font, fgcolor, bgcolor) + +def text_center(x: int, y: int, text: bytes, font: int, fgcolor: int, bgcolor: int) -> None: + w = display.text_width(text, font) + display.text(x - w // 2, y, text, font, fgcolor, bgcolor) def lerpi(a: int, b: int, t: float) -> int: return int(a + t * (b - a)) diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto index b8ec5567..242a5de2 160000 --- a/vendor/trezor-crypto +++ b/vendor/trezor-crypto @@ -1 +1 @@ -Subproject commit b8ec5567ba701c77379f2111774456eb18b98790 +Subproject commit 242a5de275d36e2df6792c921a9cd7d8c8e8933b