From 7a6f6b9d59977645840607e52c1af9db4cd3fbc5 Mon Sep 17 00:00:00 2001 From: chren Date: Wed, 5 Oct 2016 20:17:32 +0200 Subject: [PATCH] added clear screen to bootloader mockups --- bootloader/ui-mockup/boot_info.py | 4 ++-- bootloader/ui-mockup/boot_init.py | 3 ++- bootloader/ui-mockup/boot_nofw.py | 3 ++- bootloader/ui-mockup/install_fail.py | 3 ++- bootloader/ui-mockup/install_fw.py | 3 ++- bootloader/ui-mockup/install_fw_really.py | 3 ++- bootloader/ui-mockup/install_ok.py | 3 ++- bootloader/ui-mockup/install_progress.py | 4 ++-- bootloader/ui-mockup/install_u_fw.py | 3 ++- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/bootloader/ui-mockup/boot_info.py b/bootloader/ui-mockup/boot_info.py index 093e40ec..3d387cf3 100755 --- a/bootloader/ui-mockup/boot_info.py +++ b/bootloader/ui-mockup/boot_info.py @@ -17,7 +17,7 @@ DEFAULT_BUTTON_ACTIVE = { 'text-style': ui.BOLD, 'border-color': ui.GREY, } - +ui.display.clear() ui.display.backlight(255) image = res.load('./res/sl_logo.toif') @@ -30,4 +30,4 @@ reboot = button.Button((0, 240 - 48, 240, 48), 'Reboot', normal_style=DEFAULT_BU reboot.render() while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file diff --git a/bootloader/ui-mockup/boot_init.py b/bootloader/ui-mockup/boot_init.py index f7a5286d..03806661 100755 --- a/bootloader/ui-mockup/boot_init.py +++ b/bootloader/ui-mockup/boot_init.py @@ -4,6 +4,7 @@ sys.path.append('../../src') from trezor import ui, res +ui.display.clear() ui.display.backlight(255) image = res.load('./res/monero_logo.toif') @@ -13,4 +14,4 @@ ui.display.text_center(120, 192, "MONERO", ui.BOLD, ui.WHITE, ui.BLACK) ui.display.text_center(120, 215, "v0.1.1", 1, ui.GREY, ui.BLACK) while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file diff --git a/bootloader/ui-mockup/boot_nofw.py b/bootloader/ui-mockup/boot_nofw.py index d3b89653..20983e22 100755 --- a/bootloader/ui-mockup/boot_nofw.py +++ b/bootloader/ui-mockup/boot_nofw.py @@ -4,6 +4,7 @@ sys.path.append('../../src') from trezor import ui, res +ui.display.clear() ui.display.backlight(255) image = res.load('../../src/apps/homescreen/res/trezor.toig') @@ -15,4 +16,4 @@ ui.display.text_center(120, 192 + 32, "Visit TREZOR.io/start", 1, ui.WHITE, ui.B while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file diff --git a/bootloader/ui-mockup/install_fail.py b/bootloader/ui-mockup/install_fail.py index 87fc1c0b..76620cda 100755 --- a/bootloader/ui-mockup/install_fail.py +++ b/bootloader/ui-mockup/install_fail.py @@ -18,6 +18,7 @@ DEFAULT_BUTTON_ACTIVE = { 'border-color': ui.GREY, } +ui.display.clear() ui.display.backlight(255) # background frame @@ -41,4 +42,4 @@ reboot = button.Button((0, 240 - 48, 240, 48), 'Reboot', normal_style=DEFAULT_BU reboot.render() while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file diff --git a/bootloader/ui-mockup/install_fw.py b/bootloader/ui-mockup/install_fw.py index 193f9a11..7c470cdb 100755 --- a/bootloader/ui-mockup/install_fw.py +++ b/bootloader/ui-mockup/install_fw.py @@ -30,6 +30,7 @@ CANCEL_BUTTON_ACTIVE = { 'border-color': ui.RED, } +ui.display.clear() ui.display.backlight(255) # header @@ -59,4 +60,4 @@ cancel = button.Button((0, 240 - 48, 119, 48), 'Cancel', normal_style=CANCEL_BUT cancel.render() while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file diff --git a/bootloader/ui-mockup/install_fw_really.py b/bootloader/ui-mockup/install_fw_really.py index 89fc0d46..dabd8317 100755 --- a/bootloader/ui-mockup/install_fw_really.py +++ b/bootloader/ui-mockup/install_fw_really.py @@ -18,6 +18,7 @@ CONFIRM_BUTTON_ACTIVE = { 'border-color': ui.BLACK, } +ui.display.clear() ui.display.backlight(255) # header @@ -41,4 +42,4 @@ confirm = button.Button((0, 240 - 48, 240, 48), 'Hold to confirm', normal_style= confirm.render() while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file diff --git a/bootloader/ui-mockup/install_ok.py b/bootloader/ui-mockup/install_ok.py index 9e8b6138..40adf208 100755 --- a/bootloader/ui-mockup/install_ok.py +++ b/bootloader/ui-mockup/install_ok.py @@ -18,6 +18,7 @@ DEFAULT_BUTTON_ACTIVE = { 'border-color': ui.GREY, } +ui.display.clear() ui.display.backlight(255) # header @@ -38,4 +39,4 @@ reboot = button.Button((0, 240 - 48, 240, 48), 'Reboot', normal_style=DEFAULT_BU reboot.render() while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file diff --git a/bootloader/ui-mockup/install_progress.py b/bootloader/ui-mockup/install_progress.py index 5455a605..fc873be1 100755 --- a/bootloader/ui-mockup/install_progress.py +++ b/bootloader/ui-mockup/install_progress.py @@ -4,9 +4,9 @@ sys.path.append('../../src') from trezor import ui, res +ui.display.clear() ui.display.backlight(255) - # header ui.display.bar(0, 0, 240, 32, ui.ORANGE, ui.BLACK, 4) ui.display.bar(0, 10, 240, 22, ui.ORANGE) @@ -24,6 +24,6 @@ while True: ui.display.loader(p, ui.BLUE, ui.BLACK) ui.display.text_center(120, 240 // 2 + 14 // 2, "%d%%" % (p // 10), 2, ui.WHITE, ui.BLACK) - ui.display.refresh() + if hasattr(ui.display, 'refresh'): ui.display.refresh() p = (p + 1) % 1000 diff --git a/bootloader/ui-mockup/install_u_fw.py b/bootloader/ui-mockup/install_u_fw.py index 509471eb..19c18ad6 100755 --- a/bootloader/ui-mockup/install_u_fw.py +++ b/bootloader/ui-mockup/install_u_fw.py @@ -30,6 +30,7 @@ CANCEL_BUTTON_ACTIVE = { 'border-color': ui.RED, } +ui.display.clear() ui.display.backlight(255) # background frame @@ -62,4 +63,4 @@ cancel = button.Button((0, 240 - 48, 119, 48), 'Cancel', normal_style=CANCEL_BUT cancel.render() while True: - ui.display.refresh() \ No newline at end of file + if hasattr(ui.display, 'refresh'): ui.display.refresh() \ No newline at end of file