arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-02 02:41:28 +00:00
Code Issues Releases Wiki Activity

cosmetic changes to matrix recovery

Browse Source
This commit is contained in:
Pavol Rusnak 2017-01-10 14:58:28 +01:00
parent b1723fef5b
commit 1e297c68fa
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -91,7 +91,7 @@ flash2: $(NAME).hex
-c "shutdown" -c "shutdown"
upload: upload:
../../python-trezor/trezorctl firmware_update -f $(NAME).bin trezorctl firmware_update -f $(NAME).bin
sign: $(NAME).bin sign: $(NAME).bin
../bootloader/firmware_sign.py -f $(NAME).bin ../bootloader/firmware_sign.py -f $(NAME).bin

9
firmware/recovery.c
View File

@ -214,7 +214,7 @@ static void display_choices(bool twoColumn, char choices[9][12], int num)
format_number(desc, nr); format_number(desc, nr);
layoutDialogSwipe(&bmp_icon_info, NULL, NULL, NULL, "Please enter the", (nr < 10 ? desc + 1 : desc), "of your mnemonic", NULL, NULL, NULL); layoutDialogSwipe(&bmp_icon_info, NULL, NULL, NULL, "Please enter the", (nr < 10 ? desc + 1 : desc), "of your mnemonic", NULL, NULL, NULL);
} else { } else {
oledBox(0, 18, 127, 63, false); oledBox(0, 27, 127, 63, false);
} }
for (row = 0; row < 3; row ++) { for (row = 0; row < 3; row ++) {
@ -224,6 +224,11 @@ static void display_choices(bool twoColumn, char choices[9][12], int num)
int choice = word_matrix[nColumns*row + col]; int choice = word_matrix[nColumns*row + col];
const char *text = choice < num ? choices[choice] : "-"; const char *text = choice < num ? choices[choice] : "-";
oledDrawString(x - oledStringWidth(text)/2, y, text); oledDrawString(x - oledStringWidth(text)/2, y, text);
if (twoColumn) {
oledInvert(x - 32 + 1, y - 1, x - 32 + 63 - 1, y + 8);
} else {
oledInvert(x - 22 + 1, y - 1, x - 22 + 41 - 1, y + 8);
}
} }
} }
oledRefresh(); oledRefresh();
@ -324,7 +329,7 @@ static void recovery_digit(const char digit) {
/* received final word */ /* received final word */
int y = 54 - ((digit - '1')/3)*11; int y = 54 - ((digit - '1')/3)*11;
int x = 64 * (((digit - '1') % 3) > 0); int x = 64 * (((digit - '1') % 3) > 0);
oledInvert(x, y, x + 63, y + 9); oledInvert(x + 1, y, x + 62, y + 9);
oledRefresh(); oledRefresh();
usbSleep(250); usbSleep(250);