arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 23:48:12 +00:00
Code Issues Releases Wiki Activity

layout2: Disable oledSwipeLeft with DEBUG_LINK (#239)

Browse Source 
This greatly reduces time for device tests
This commit is contained in:
Saleem Rashid 2017-11-03 17:54:02 +00:00 committed by Pavol Rusnak
parent 6edb97133b
commit eebd53fd09
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/layout2.c
View File

@ -38,10 +38,19 @@
void *layoutLast = layoutHome; void *layoutLast = layoutHome;
void layoutSwipe(void) {
#if DEBUG_LINK
oledClear();
#else
oledSwipeLeft();
#endif
}
void layoutDialogSwipe(const BITMAP *icon, const char *btnNo, const char *btnYes, const char *desc, const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6) void layoutDialogSwipe(const BITMAP *icon, const char *btnNo, const char *btnYes, const char *desc, const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6)
{ {
layoutLast = layoutDialogSwipe; layoutLast = layoutDialogSwipe;
oledSwipeLeft(); layoutSwipe();
layoutDialog(icon, btnNo, btnYes, desc, line1, line2, line3, line4, line5, line6); layoutDialog(icon, btnNo, btnYes, desc, line1, line2, line3, line4, line5, line6);
} }
@ -51,7 +60,7 @@ void layoutProgressSwipe(const char *desc, int permil)
oledClear(); oledClear();
} else { } else {
layoutLast = layoutProgressSwipe; layoutLast = layoutProgressSwipe;
oledSwipeLeft(); layoutSwipe();
} }
layoutProgress(desc, permil); layoutProgress(desc, permil);
} }
@ -68,7 +77,7 @@ void layoutHome(void)
if (layoutLast == layoutHome || layoutLast == layoutScreensaver) { if (layoutLast == layoutHome || layoutLast == layoutScreensaver) {
oledClear(); oledClear();
} else { } else {
oledSwipeLeft(); layoutSwipe();
} }
layoutLast = layoutHome; layoutLast = layoutHome;
const char *label = storage_isInitialized() ? storage_getLabel() : _("Go to trezor.io/start"); const char *label = storage_isInitialized() ? storage_getLabel() : _("Go to trezor.io/start");
@ -225,7 +234,7 @@ void layoutDecryptMessage(const uint8_t *msg, uint32_t len, const char *address)
void layoutResetWord(const char *word, int pass, int word_pos, bool last) void layoutResetWord(const char *word, int pass, int word_pos, bool last)
{ {
layoutLast = layoutResetWord; layoutLast = layoutResetWord;
oledSwipeLeft(); layoutSwipe();
const char *btnYes; const char *btnYes;
if (last) { if (last) {
@ -280,7 +289,7 @@ void layoutResetWord(const char *word, int pass, int word_pos, bool last)
void layoutAddress(const char *address, const char *desc, bool qrcode) void layoutAddress(const char *address, const char *desc, bool qrcode)
{ {
if (layoutLast != layoutAddress) { if (layoutLast != layoutAddress) {
oledSwipeLeft(); layoutSwipe();
} else { } else {
oledClear(); oledClear();
} }

3
firmware/layout2.h
View File

@ -24,9 +24,12 @@
#include "types.pb.h" #include "types.pb.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "bignum.h" #include "bignum.h"
#include "trezor.h"
extern void *layoutLast; extern void *layoutLast;
void layoutSwipe(void);
void layoutDialogSwipe(const BITMAP *icon, const char *btnNo, const char *btnYes, const char *desc, const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6); void layoutDialogSwipe(const BITMAP *icon, const char *btnNo, const char *btnYes, const char *desc, const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6);
void layoutProgressSwipe(const char *desc, int permil); void layoutProgressSwipe(const char *desc, int permil);

3
firmware/pinmatrix.c
View File

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include "pinmatrix.h" #include "pinmatrix.h"
#include "layout2.h"
#include "oled.h" #include "oled.h"
#include "rng.h" #include "rng.h"
@ -31,7 +32,7 @@ void pinmatrix_draw(const char *text)
&bmp_digit0, &bmp_digit1, &bmp_digit2, &bmp_digit3, &bmp_digit4, &bmp_digit0, &bmp_digit1, &bmp_digit2, &bmp_digit3, &bmp_digit4,
&bmp_digit5, &bmp_digit6, &bmp_digit7, &bmp_digit8, &bmp_digit9, &bmp_digit5, &bmp_digit6, &bmp_digit7, &bmp_digit8, &bmp_digit9,
}; };
oledSwipeLeft(); layoutSwipe();
const int w = bmp_digit0.width, h = bmp_digit0.height, pad = 2; const int w = bmp_digit0.width, h = bmp_digit0.height, pad = 2;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {