From e4003700cdfae10da40d144aeb7cd4db4b57c0af Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 24 Oct 2017 17:19:38 +0200 Subject: [PATCH] bootloader, firmware: update visuals --- assets/{bootloader.png => icon_tools.png} | Bin assets/{reset.png => icon_update.png} | Bin assets/{wipe.png => icon_wipe.png} | Bin assets/trezor.png | Bin 2498 -> 0 bytes assets/trezor_lock.png | Bin 0 -> 1248 bytes assets/trezor_logo.png | Bin 1482 -> 2760 bytes assets/vendor_devel.png | Bin 10752 -> 0 bytes embed/bootloader/icon_cross.h | 2 +- embed/bootloader/icon_lock.h | 12 ++++ embed/bootloader/icon_tick.h | 2 +- embed/bootloader/icon_tools.h | 2 +- embed/bootloader/icon_update.h | 12 ++++ embed/bootloader/icon_wipe.h | 12 ++++ embed/bootloader/main.c | 69 +++++++++++++++------- src/apps/homescreen/homescreen.py | 6 +- src/apps/homescreen/res/trezor.toig | Bin 1395 -> 0 bytes src/apps/homescreen/res/trezor_lock.toig | Bin 0 -> 750 bytes src/apps/homescreen/res/trezor_logo.toig | Bin 760 -> 0 bytes 18 files changed, 89 insertions(+), 28 deletions(-) rename assets/{bootloader.png => icon_tools.png} (100%) rename assets/{reset.png => icon_update.png} (100%) rename assets/{wipe.png => icon_wipe.png} (100%) delete mode 100644 assets/trezor.png create mode 100644 assets/trezor_lock.png delete mode 100644 assets/vendor_devel.png create mode 100644 embed/bootloader/icon_lock.h create mode 100644 embed/bootloader/icon_update.h create mode 100644 embed/bootloader/icon_wipe.h delete mode 100644 src/apps/homescreen/res/trezor.toig create mode 100644 src/apps/homescreen/res/trezor_lock.toig delete mode 100644 src/apps/homescreen/res/trezor_logo.toig diff --git a/assets/bootloader.png b/assets/icon_tools.png similarity index 100% rename from assets/bootloader.png rename to assets/icon_tools.png diff --git a/assets/reset.png b/assets/icon_update.png similarity index 100% rename from assets/reset.png rename to assets/icon_update.png diff --git a/assets/wipe.png b/assets/icon_wipe.png similarity index 100% rename from assets/wipe.png rename to assets/icon_wipe.png diff --git a/assets/trezor.png b/assets/trezor.png deleted file mode 100644 index 39bccd2c157823c45eba043ce0ede9a7fb74a0ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2498 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 KMNUMnLSTY$ZF716 literal 0 HcmV?d00001 diff --git a/assets/trezor_logo.png b/assets/trezor_logo.png index 31fb9f05c3664b1a4f543ea5bb7e7aac44fb2e6c..06a5b3ca15bda6de950f25a6abfea9c80e26695d 100644 GIT binary patch literal 2760 zcmaJ@XHb)i7W}Bvy8#1830=CNKoF%$M~D(oN)QAhgpM>RQp}TbxfFp%LX#$-(m@f3 zp$CL00Rto=s33v~pek5de5{Z7fW$$1c#y5~9RrrAL#`ACJ-fcVyWExrDamkfn}fP9by^R@UpH|S4E$dv)*7)eYmjA#RG~PV_`vMh??1`$jP(FaW|)@_ZB4D zGu>7fq3!3}CFeXbgv}i%`XZScND(k3e)O?&nLut*S8C75BRn>)=;yhc>-HIC@-$-Y?6chFB^y%u4I8ZCV9M@AN zhfQO*t1)LLn#`kWW0W8?WL9911lj(1vBa*z%aXOmc>w_Rs>OzgvfC#j?4 zcZt9n~!ddebCCmXBpiAP610l9D;RM z911#L2WCnIa01%phNN&_;${XEapRQcwC1QZd&KSPj8tcB9xHsAdy9^OQ+SVFnPK}B zJJjUBY{zi9iSJ0{hY>^2AtvDu(}3u?8k*F@9MEsKiUdbBLM;2gr~k8jYDFx+z(UIr zi=&*3*t98jjMp54Et)(;72I=f1$FA&Is+C+@}7qm@9ArfeAm8j@bS&+Ha;_W(@o}P;xBjUXdqucF#&zhYI*OoNn&W(zGgWY+J-<6bk%eP zOsGvG@+Nju^lQi4)`=<<_}85ErCEbR z^6;#HkKRanP)qKBJfTkTp1PN* zuXtQyW-62}+5V#}z>ub_+@Ao@9mKfCO3rB<$|b?+Sq`eqXi*u8UQLwtC(E}c>AvmKFY z-;H?KOu56iZ2rd!-EMP+r?zj5*_+Scm&#WOMj=d|%bIP8NueIr?1N)8Pc|`9u89pi zoUj1egvK60o#ll227gJE#ELNI;j^^7$<}^|#N{%`P8WV+@fLK7!0du)|W%+qZ1q46cTk<=B zm*?0@oTRDQx}~)YK*-5sQUdkmf5qHl?0Kh6DwMg^y!oLPF_yVCIqUTI* zU*BofB6d$T)w=6pCWe`QMz+SxlG7fjouAmNXXMZg6EL)_k zr0$?7ZApz$ZzLOKsuFoP$`KXRG4Y;MwA$c%JU7m?yjpIGs%=8vToBie zIERWTgN3kO5&O9`8aeH=mBpd344J*>{wWNpsDMa)Wim9Ufb_!L&v+|sKbghk2edOg z9K30NP8zS34-Y9kJ`mx{xrm>)+)-BZg8MLp|p!@)EWvQA|v)aMhbcur*_L>4Q$Wc0WYxftLw}=&e&ZE7L zE645UpFL=VhZ%iy)YH9quYPm+QYx(BiRkkO;!@`aC?U6CPWRR4*x;tmU z*fV9#TZ*JX+?Fdz7Q8Gqm83oppf{jY9WE%*&{s-kzE1Bm+iw4H1(!)Lt%r}4d|PxpJe{nw(`j||<#Ixa^) zxS7nq$P0vb|7&MmcGkxUZNN-?Z-64P9PZxsY6^A;A}RuN1}TK4>@EA^ad>c`#)+R2 zw_g0WD$h}^PRm_8qSWBY4oF4e>&>Yqzq3F0wbF_Qg={|Q-x!Z{3w->(kh{&!!NU<$ zCCge_|J6D!5*0l=X+*fCMBEQqu`_Pi9eB`=Zx}qgzP6?oQcHaw?CLfoIrYJQ@eQjn zaDB?Jy2WBRiY9^wjYOY`iK&vVF{u@p7WxM^eKtTp6zBU>8U`AwzlLaVcQzsT^s)%#jod)ILi za<7q-VlUcO1J_m-Y!7VjojWTreC~W>p>6-M^@&XmA`;o@CS#9R4Ela|;wv!OE1=N7 z(#IEb(p??YVOFMOw>CV$?FuGSKg16!j@NFmE9qg)kVXG zDQubY9OXGP+d*rL%{(%%aL>JebnZF#pZopwo$veSJKrC_9>qSXM;ge(1x}Fjo(Wh1 z%QalVOGRS26wmYskC$rl9%{a+^V_{~Zx1ui!#U1&hmzla5OY_~o%x)dY3pKnGONq@ z{Fe%dRl)10ZaESf;!fcx5A$N2ns?2iGmo_dCc0J3M&CHmT;)B3h>*CDQ1&0Bwe8(0 zU~0tnZXAgSHflA(h#x>6_#x_i<$l-Wfy-glfk99J&t@%to?->M0`euyhUDTpzkNPzb8W)9pkts**b0d?(O{1 zy>|X9efKK^3 zu|%KfmAHpY`b@z$WAY~FXvJ4{l@JaR!a>?T_R=>*F{o{(@^e)XR00rN4O!G zaA!-NaRMba97wCTgf@6y)GWI|@=-=A`d?FRzAkyRgriIu2eCK8Fe)11d+4^*b8m)* zH(8N|s|_?c$|$_gs2~lMPvliZR>TyS$yeQn(o6X^iKWJ$T(;fsIHx%?B>G2m;;xoS z?Y~69ghoR)%O<(0Vje&f%?m|b_`cOhuU% ztV^xQw6?|llDp2GV8h&CHzZrh2|H@jb(@WeQR8bLgr#3w(?c8N+*-!k%w|)$FB1)w zEVE1QQggW<<=LU24B_$ekIuFMT&OTuXf!vFZ8vClM2n`$kO46Ubydj$4kw z1XZoGW~XSLXG$<9C?E@rEWxHn2DX{?-9}FzwvJjp8b7^ngXM@!!?pJ`M!-8DpV|2k z?qXJOe6*;`m`*^FXvay?1|*x!0F3Pi%vF=p_p zu+7>oS&DqvrKLBTk~Pv9URl&?`+%{ZZ4TIG25_RyG4D*u$c9DbJ_ZCvZDseDs+EL9 z^@5A1s%zE@3k$tZw5--1c@F02}{%(k0&HII_7}+)61Ul!XWpa`XKTs^TTA z8~M7wE)l80dX_5RX!yO?^;ElZ>zxR3=)q$#y#c2s_w}Kb^$Y*{=*O1-87FFSYwV@8 zQyPt?kq&HAWanv=8DHW9FM3CkvY50CSft;|{w_9~J&0J1iYTiV6|*+7G~Az}^3ExI zD|6JSA`N6&o5O8mX~DGJj@&x|>f0M4xVMRP0%hFk zft37^TNX|;2{paSl1vC z*GWuaieitvb+dH!)iw27fiDYCQ+;zxpH}96woJxeEHCQP2NHNfRE68uFyehI+kMEh#sC6-w5#}?oBuC@5Nyk@_%V~Ez*;hneC)wdf1 tc-Xft2rvP`Ydri9_&`7K_aF1wSb$_$Kk$_aGe`VgIyqc{;O%at{{<7n>Oamo_uW^iDhxx&Q1|zKRqy-0 z_wIXl-+lL9d+oK)1&(eeDMODWh6@_*vOTvq+!Jrz$+vz$ zAN_(KHS{;L^(y@Ai}|Vxz$ILNVQ;XCS_Dam00Dy{`Zj;R-}9-(xV!nIPve*0t6@B9 z=!d!e!&}1Cz>j;*#N^5VdHJ?%p9la*nTO$l`+3J-9oV;D=e;Q&HT1*Su6uJ>vmBeR zo-~L6VC64X;xSo_E;(_zTTZLx1CMBjWFVIjmcQW3HSI)(9cnlqeCS z`^`uH3Ut}+AKH2EJS+>05Cnic$iB(P*?B^zC`h>F z|7_oNKu>>@H;<<57#>xIe#

#<4i*RkIXHOTNq;H)>I21+Rdf03eVAExn2|B7kAV z8LRevb@!U3{F^W9sG$$BU3&>$cZsdPYNpq(0b_R6P#&?_c{2BI)`7J;unq^->%iI= zEez(M00z)t0Wbnn$4qY6yLb1zzIgl5(D9J%hTpWM$4{)kV1QWVUx^?A#`zgMcmhKp z6YvlqNpc7aVZ|*7ARI6d5@~k#b=!B}yyvtxK3c+uJxadE2mYN|!1@bj;Qivl6&S=i z&M)JGr&(3ODw@&A5MY6!wyHAg$NNq}6U0g~s3IyC*I&FLRN(_Z9gZ4$w5^)K)>T-4 z>GJ3XH_(6zFfgF0xc4N~fCVE!0|Q`Wpb-QuSY`3Pli`7^!2kpzsIiUDI%dlXU$gY6 zq04stFI#UCGn*!ZSF+;ERzsB@IE$4TjWAh>#p#jFZ8WnQ!|j_91XN%})I>G4VR3RFVVFoB=}fkrb6*7H5fp#T}Y z0xC4N<@u+3W9Muk`NTG~ggAP0#%AIg4L7#-ipaTdYwspLL2(^&#qYcaaU~wNmWEeRYVQe+P9ijLl{V9u)$>E z%z4N%<3SPz%8YT(3a|nzr~(32AM?U%(l18!lN7)Fm{BoaOef zpbc57zJD3s7wKewVfz#qz)Glvim2B=+qN{yUNTcNPN`Ig%2GJL*6j%s@R~ll?)6Y72gJuR#JVSr{=c-WIvJ+Q{ zfU5j}DF*IeE{YUTEDH#p|Cf(UKeBfVW1M8OBZ@WE18T4W!txW33w3z!Pudg9(5Gy` z>RCVT#V0ZbsDdnKHr8=>Una7cl7c!;owrh0QxqX(q7+V&1ZlocV4_NlsHAZ0i=MfD zSvYya6UorO{k@^8dlS>MU?6H(4OT)=i{yc6QWcmJ3@Aq-96n)7Yb3T?UiEPy}-q@YpLLVTbv8)om7a=S_b z90KHk7h5|=o-RO0SyKSrEm{c8_Ps)oDxd;_JZyd0mHi&CIsdy*zC6-~7Vz53G+48| zvLIIJ(gp%#aliQ-EM5C>L4*SmA|%L*N!7`U4ylB1Pwtl;Dl3715ER`-Yn}u zsh$j!tvTyyb->B&B?ymIL6i+D6(cC0Djf(r@zI|X1ET@*?xXZ3OVNF;$^LRA$|NgO1g)p^# zm8nkjW@6}LgN5x6gkWR>$dW|4+yTiQPC-o^x?&T(iB03)crvy}ZzRRoND<2UP)Mc+ ziJn#ScYGCACz=VUAe-5Eg0cUOfBnb>km`~7m}j15$F7K5UUoUG%90owL|ACH-BZ^_ z#-iL11yKe?MGF7xeRq7~ANJ7L#fTjU2+H5`##2|Xu!LU~FMoHW7B zZK2UuZkhYT58id;{lDdnC%HpGDTX8fnD}aAj8*XMH)-w3hzm?W%fRVgJ-zA;SKj~e z8=J>T==jO!;lx$(*cV)y!3Js|NJgvY@3_nQG)pW|A~Z_G$R_jIsUuzBBmmZx(~;wb z91=6ucB54Wv6;K&GeA}3PF3aMxU0VJ_*KnMK97$RL%-lD)so{+sCpAEY8C=Qui3jl z&hHBZO_sQ+ge_2 z0Gs+%RxjLhhxN!{R#eVX%W|gHYf^*B$fYyYk@>)oMbt`%!^7mvlpwUQeg3|$6V}T6 z0;?@o{pe+<*crz>HVyp~&k3rgrq-;5hf*vAF<_yYyY+@pks-0p9naIqyOkX~E}1$K z^CihFbzRtTYC>$EfJl^}k?8jqZu>N<0boc1RB*87_{Dnq-#*tKdxn0+d3NsRxcMbl zOFiV4Yn4jDeYbt7njD}enIz3fV<|~akZrB3+@Nvkbnl2B&8iByy@gR@1^{7cZ?44u zkrnDn@?HCH`Lr|0a)BDituOhh^N#UXp3ldap?~0+oLIlPo}NNW2O|I>9$1L?Z)270 zs!oV*TUDiwq78mM=T!{CaYB zl!ItcHQc)gi~AU0K_Jlq2CWvUi~t#vx(8ePDBa@0O|K1E$ zT`lbRr`XI9RH9vodUAHf*;oCm3qu_q3x@vL7cn$gbLP__q{e7^IQigbKVXAkRg&dH ztuJ@nSs-a3#5^$(0_*CqUS>ouBv73C==nT(?&!9UHZmCk7*y5O-WxuM&=-nG%C++B z@2SxI*cJ9@H}o+p@XGVF<#{haZ;*5vxh2SIxcv?r3_{L5RCcuV9Y|X1cUdMNkQ5EX zpkE!yqeGIXgAA$SCc7qP8PT9%IdTWHn(@J}E$+J05ZgwV)stJE{kk8y6vwQ1bQ}5& z&*nm$m^tordP?Y(SP2##d%yD645H91Hz!*_qD%3JvrK!V`|IU&9MLa=h&my&=;J@E6>2zD_>zWFp07Z zs$diQzy6Q)j^$|R}-|G<+N!Unt3KMPYLdo;C z%<|JVPYb%ON)#HyxEyPv-7q-n?r=U1GcmlIH%eOK~)G1_RZb+VaK3N z7=Um2o*y}7P4j}Y_^31VFT8*gCqHFkc7q{dfC>nZ77y%?d+%jUvzFFifdJOd&O;+B z=TXk&h87xOFfgV!9?GSc&eX>At`vEwVswsBjg>+&rvcK8fySz~xoy`$iz=Ekh`kk? zrcS!>XI^NJE<<1aR8G)0JncDZhN43uOJ-5;{`+@@L2c$V@nAfMwz5Dcwt6-PL6YXs z)S%YkHPTCFddfod4j5+=t6L`zrj&rL;F_ioz+Tw%l@BmZ2-v#yVRp9f*uVB!F2BCT!~@A`j>d+sKj4$8%*H??%l1=swC7h(A{ z9~FlF{);URwem^l!yO6`lMGjGJ3swS)s=-bhEiNOIaL|;?xJ1hLN1qcY3?56pl3%| ztYB&~gW!TF0&~RA`6FP<-Mo}U<3pjW3%G4ix(I9gO@%E z41L-L{_w@|xXWK{)c_2MN=T_}-)*1aKpaky@ zceu-ECk>SH`B4WxXTl`m9Hl5vABB%pHz61+^Tpja9oY88BE*THhpOIu#rOa4MSjBC z@3x`e@NCZ2D`!tW526&H00kmM$DSKL)DNP;tfR^3mLw%^B=rH%##1ZK9RNty>#@sL zAGFO(8=V0`o`FoQU$xyAf`MUTa_?8)k802|+fZD3{L}YWtA6HNrmDZC z_n*3smu&G(mtBitLnQEIfQj|4&%LKNF`-&!Ryu&}uDMZId5qZO7J+0Jx7-E*|@gYcD$9PuuX_ zGxTp$|n@L9BG=8Imz}EML|i zHLOO17{&PFL3{3A9W0V20t~c4z4yisL3AdCNfdqh*i&uYssH&E{O%a~(v!GpGOoYy zC2C@xk1w0=?-pTtMn(1RLpe+`$MdCA0zO_{(? zc?Q+u{DVHfgB570mXiR=+mP4|5o&q~*hN=#`Z~TimzZXdv43L^wv3|)J7r*^AoajBWhQ8)$oFDqyr@a`%VdfYU zvtf4cM}Dp9(F|P{Sh-u;&PJdW+M**Y@-dCTXg#pWi3A=F?bk~t6R1(QV|&nvQQ11U zBmqsejmkWfQF|ElcHj6>grwe!P@}~IYtOx`S;Wh~+4|+1G4zrN{Ot3%@%)!o6VqjE zm>``vaQBU@h75`1@vJuVEGKWnbBWj4p6x`TbxhoK#+k{wJCAj+N6+-Lg0y4Y_U)~K z)kcr}fFjgLFke`C=EY6yzv=mWBn-WJ z30{6qv+3e%!I}*0ptSq{>BCjeEx-bR=$*0RV#Cpa`N-9hHI&qLt)64_uQWLbIDBcy zU}XkT?bMLe@#*eo6=Ai?|K-DxCXLdS#o+Vz-E!dWuL4nMsG;CeTzAoPUwXE-uKvy& z`oF!#7G^drJN+4B3(-*?`ulGDOREf3<}EC%>5A#vHz<2q0Uat{?BjE7P|?LqA6`RK z1w#-K;od6#%YIynY|plr$d!fx99^85FTOG-PzBhafB*G=CZ+W%8X}q&m!Ec4Gr9I{ z*M#q^p-|$%)bK=-91n70Fuk)?r=FI&*eZHMkp`Q zT!>Mf&<=TSWgY60tt-Oh@(kP3yF5zilO*>xq$o`mTs5xoTw0;%Gz~}=2tM1qkBg;ndR+cUuLAJ zWd2G7V6d9o|L%io4nUD=z{WJ3-f+xd%gJwl6(5!=;b9p1nJ06mj_WVH+J{3!Q&OG5 z?2h;UlGhe0k%@H1C`OL*d-w`l>KZ`2kJg8AKx9+@)r$c<^$@c9xbicyy zy@t!qysSUFhCqwN44S*|P9NT1Rhb>i*M9*|Z3WmqLs=QHo2YVlZIKvU-Y|s%XnJti z_T5C^yoqVZkaDO=1)qDAr(yhTPx>hPb>fAq{YJ%`<;ZlcxmC9P^Pgz;?v^4v0ufSw zc520w&V0wKy;t$uZ0H}m)OHQ)jnBA7&9LM&P(W30`^axv?lr4*oKe_w6^F{6n)UGRB@_6eOSIvf=LUJItWsnK;(cHI zTf;nRqp4+#T#|DX6!X#q2LlX^4mi(fCR@XsoVDEH5sH(&fW!0*LtVimwOBxl!y`PI zHJ!8kDXu6_BhAQTpx*t)Ic>YQ#)c#Y$+-L0uP*G~!8lCOgNO#LeDYa8c(E^?_?Kn4 zf60q}^=dBmR<3^9i`6txlbG~~5bA38XaBewSQR2H2M$Rlih>i&F($!nNe(wB406wG zpNZ}=g9MMDV1eGqsx+oWvElsn@4ldstE?80I6~5vOxgV6uws>BE%M~7CtE^M0zBsE z?4qnt|+yXwlMlFwjjVmkiDjGPFoS05wvO zWu{YRL_-A8MOfr%$M@lE8(}FE6Cz=9M?CUh2>S%tN{v3(`9U zX37`l!8F{vXYckqrdO^e61yPG57#{PtmiCT_vRVw-1{wuj`zOKeA(vZXI?@%z}96v zaNq5JA1X_W0xCxiwD=7pbUF&$XoI&q(E448i(bZzJtDf)z$0CR8)W8{c^y=n*X9)w za;r75$1#U{j~-nyM}Nealbz=n?a{kTK#SRxA!P}7o*74iG+K|hfAr(hBD4raqLKNE zQ?~fb^7sB|;I|l~pSl&xs<`peYcaRKT}nz4Xt(|GuLLxih;C_|L)dh*nn|`hltZVd zYh3Q-s!z|;WWAzdlt-zNH}nP`(Lf$!jPfCUNRM=fN43M@a>Xcjp(#*L9siA~FzTe@ zQBEx2I)|A=?q>XCvcRhH-FM#MjM5NlObeRdxACHLmJZ^%o4im|k`te@ z=E;|*Wib*(0mJaXuKPdtzR*_)m4#A=W3+||a%aWbzX`OYGe_=56P9MbJMNHRcxEM( za9*xCs2CSxY$9URFvjTVw0XfZ5pqRu4Vp287gX*s{Zx>9@!o@eEajW=ksxY1OWL1B8ywc{E$nPEMpZjyU4f`C=;2a+@&)k{Df8W!HaU_oqI)`!hE@ zc+;)>7Z!EQ+G=qzmo}+5WU_J>n0qSCqr0a>lJE>iMHAd*ZQ&Xd5$Nt>StOw?3*4ZE zIJ0p@f^fjyzDwUsGJM-h=^HMn`!(E0T?^Nq+de-(x1%>2u7{hG40HP#?#djhyXS>P4IzI@o**)VfzgGi7{!lWzw6pJ-Qp=v6n<)Y zz<0mp)CRPiWZg}g=J@5X9hwssEeQ8*~dg8=uf0}Wj1YjqGiOHM)^sQCxRw30X zHd3^WvzOU%VeIs-(rep^@7(2R8>pk9wdBhU+#CJm?`-?|-@ThzsMykmVHoj8AK5Xt zmlvKjNk$^oB{6}AQiyBBpSb6hKm?VtNZz3Vz)muUd*b;r*2&N?gt@zR&7QD|av*|{ z-pn4q;`YyO+q{AwyFm{l87`l~bDtE~p7U%j%q6xh9|q!GpZrrc2N;}2*@!S`5kJxG zU!(B2mhKZd82czU9fBStq?zsOz zT#QZQQiGV8DUYLlrsZm&)GV`t{c=hi6)EKlmoH0s%1g=RQ$H;}xO3;?gL6UyM0x`{ z7KW?O*!bMjeEHPFK^?z#O$bvf*PQ=sC=!u*?VZTFxBE+<3_YVUuf&ydp67mFmq~CR z6$k||wGEEcVeyvnflJ<~pb@#dM{i;i`OEKo;0TMrrkM4DH{2;U@hljKZ9{%YxBmI>1M{eg9y8Yna^)G}mVoZIE?VxFYJpwir4xr79Zlwd zit8yx#ptnVh6_7(504Rd7ZaSU(d>#Y4vVQr(F z7&Rwy#&##on|=507Kcy-8miI!;`;N}KXrqzUGgt8^k2Q9XUjIto^(0@Ahs1sjPnQX z{0b{;@2Hdl9a^AV(5fd&W*kSic29nca^*7D5$PNxAnfT1mdCH$vIyab9-VpQeRGY+ z#$z#Y%oU(}t_+I>69^FtwoBB91huSq?gF8NxKiu31G)wpzW(7GJuZSnX(%3rim}| z+{8+b6LX!0lDOpVv4Nt;s2CA_&wK<95;GmruZfsXjyF-UNz@V&SEpk749LrAc0u%* z!rG{&Re~8R3VCl+QBhS>q{0Mt-grOQfDO=45eti3pSiJdzx-4l$s1Y&pl>$&aRr$Y$uqM&sV#`UfWmmR;bVh!||SP5=I4XyM9|-jP#^F zZGfh~R7*BY{mM%j#(~(Fp>SSFnUTTLNp8J=&nr zRjYIZb*UsY;&i;2TO$nMZPs^(eC;w!OtiYw!?<&jI!@6f#HOvPGuViQiH<%Z`wOL7 zsF)O*Q^%GC??Ihjfm~w>O~R7aE?l zp+}HrI^?tv34|ZGa_LMzpC!3+plB@{U0&$&=q=Bs!gU}Mw5`c=++!=m@i940;;|AU zc;L1Nhs}a)nAe&_WHVg4wf76-O5f2B|Mgni0%?OSpVphMSu!l7 zb1|PYT`|#HT;WaBK_*82Tmug78+X5Lhc+AIWsFrXeC_@B&>N^B8=@iOv6oIi*w}Af z!$TPQ+|9o3+-GQUkKk0K8mcjmw|(S8np#zg000TQNklB>4*&A4vqC^fbKFUDPNM;~c9tLgwdHOH zLQ17E=2+Z#yJbg?K30-s76o!5Vx&v(+&<1_Krpo;YG9M+yS zdC3WAm%zwCr z>F+L9BRUf+-3mmhO80#GH*$8`Uw75y;=JvdZx$A0hJKAxkFCG&iox%`e#u0SJ>*qZ zsF8Lct=WB$dZ{h<%P+b&V@M61kwlH-8oqYVF0Ba&g}2mX#Pzvu%I#F;j!UROpvs5Rq*cTNE)KQ##XSsiL9M z?SVY?Ta?%0hG2Pkvn)Z77(Kx|XB1w^82qPRUj5>$m-c(00^kScG>n2`5T&9K?=rGK&+t5|4GwI($w1L_v!f$i%1Wkx5>)iW<{ z4rLEbsEH&!V{ztzwal@O=%+kK)Fi$2;!ul208P3ef@M|;8mXZ(o*BLc6a)~KKt9tF`{PM7l5IX?- z?rwa(fttkX5#FD6)OywV%*pVz&(QLdPX;2@&>Lt-MKTT_+?5yH=V+S8#>S(VBS}la zw5s~yO)nINzOe z5HLKj|DiRRTxBh!&X>pysN56D`OxzK>*$gr>3MW8y2|?fxvQ@nPM{K<(HVOwE|v)x z08&I*YqJ|qg@Z$FuKT+o*s~tKOWL)XVvVgHGMe`~2-J37OpqSv3$Z<3P>7g0rrCZQ zmQAr*GJwN-%O;QuBjj86$g4q}$txF(LJCRn60i#0pQ{0qIq-TMbpq6`&H#2#kFg|D zwEEr_y`)9EdGM-u55dtRIpauNa}e^CV4Xxbk~ebfOsG9og30ny;jT2BK0bRihDM72 zK`~Ulth*>8PfW}pLQ4m%QX&Zfz_7d`UyXy=X-_i!ya*Ciyj4;F9itypx@7waXq~lf zoD(W~1ZKtK5Yd+wWBJ|l0FOSb9h zue#!&{^tinCSlW37zIRkCi`;7w7Z}yH8OFL6_vl25L|*!j2%<5h0hu%H+ax-BFlM7 z$V^fcpBc%VYOit)}9kJR5#qwu-4KH{la@b0gqN2;iEgxck*Oe@2iuqa=F-+ zEt!L2(c-ZyA899sOLsiKWVB>pJKZ+20!tUV9oT5URJtPzk;GNqh*3`dD1a!A4C>boRBb$kFnM#V$L(jL+Q>J?&-FGQ9V-IQ^AZ^rrg+!I*DPRp^lD zzVoZw?)t=y(H#}TNL1G*I=0oyxD#^B0ZH#HXTXuk%fTn|z|tYvsIo5we>o64M4x4B zkaP4)cGs4bXp{?M9z0HXYorD0?6#C<9U!71Y}&V87^c=E$R8Tt7WV7Q@39xX!|&XM z3c!xNFyr0-c*Ew)&r&nwh;N1<#u%X0r>t3h>Y8T%d^2oH96ad0f-dB`xg3hD4-92}1fvEO2a;=+;m)h;sJTm9O2)C52 z2z^u&L`)n5dC&`M-Sv6W?7n@TxsHVf-}f%P^ObkbZdo;Z>`JJ;PQB!^JjYiJtm;?g z;6w5Hbij#dG{BR6g$n6DA7ewvDSQWvq%i4F{1Ab#{VT^OY6}J)ccL;yz}Put?>u1{ zVODoUY&384O>E70Ro*!ryKl7zzNR<6H_i_`?A`VUamxB?>8`t%9lxrc2)SR77(eEQ zaDLFiRHemEkKBa_ByB=_8$2fx)=3C1wl8iUiIik}-=+LqX5cSq!qP<$ zySLx#Shfx8-qxmh@eZX)`?NQGlU6=#2NQGq`OhEbb+_vGKdFP2N*}qw*Dm4g{o8w! z_0-A<>Z8WX`#8l3i?Yv1h|8@A#7yW16r$bA^{_oc?Rryx# z-f`oOda|C}Fo`6Vg@cWSN&o)=t|!2>$J33b;%7z^m5Vr*=w zi4vO~odUEd`nt)DW62F;zvCe|A{C~9oev$u+3c1sB*bPxi+j2MKJ2*@1L@;8>wX%$$$y`)D=8!9VUBRJ>!azd4#LRco95g zJ}9>WFe=$}2wF|8FnHX$01iF9pWGrZ)> 16) & 0xFF), (int)((fw_version >> 24) & 0xFF) ); - display_text_center(120, 215, ver_str, -1, FONT_BOLD, COLOR_GRAY128, COLOR_BLACK); + display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 25, ver_str, -1, FONT_BOLD, COLOR_GRAY128, COLOR_BLACK); display_refresh(); } @@ -196,7 +221,7 @@ bool bootloader_loop(void) case 5: // WipeDevice display_fade(BACKLIGHT_NORMAL, 0, 100); display_clear(); - display_header("Wiping Device"); + display_header(ICON_WIPE, "Wiping Device"); display_footer("In progress ...", COLOR_WHITE); display_fade(0, BACKLIGHT_NORMAL, 100); r = process_msg_WipeDevice(USB_IFACE_NUM, msg_size, buf); @@ -215,7 +240,7 @@ bool bootloader_loop(void) case 6: // FirmwareErase display_fade(BACKLIGHT_NORMAL, 0, 100); display_clear(); - display_header("Updating Firmware"); + display_header(ICON_UPDATE, "Updating Firmware"); display_footer("In progress ...", COLOR_WHITE); display_fade(0, BACKLIGHT_NORMAL, 100); process_msg_FirmwareErase(USB_IFACE_NUM, msg_size, buf); @@ -314,7 +339,7 @@ int main(void) display_vendor(vhdr.vimg, (const char *)vhdr.vstr, vhdr.vstr_len, hdr.version); display_fade(0, BACKLIGHT_NORMAL, 1000); if (vhdr.vtrust < 50) { - display_text_center(120, 238, "click to continue ...", -1, FONT_BOLD, COLOR_GRAY64, COLOR_BLACK); + display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 2, "click to continue ...", -1, FONT_BOLD, COLOR_GRAY64, COLOR_BLACK); touch_click(); } else { hal_delay(1000); diff --git a/src/apps/homescreen/homescreen.py b/src/apps/homescreen/homescreen.py index e2c8d395..78449b85 100644 --- a/src/apps/homescreen/homescreen.py +++ b/src/apps/homescreen/homescreen.py @@ -19,8 +19,8 @@ async def dim_screen(): def display_homescreen(): from apps.common import storage - image = res.load('apps/homescreen/res/trezor_logo.toig') - ui.display.icon(0, 0, image, ui.FG, ui.BG) + image = res.load('apps/homescreen/res/trezor_lock.toig') + ui.display.icon((ui.SCREEN - 124) // 2, (ui.SCREEN - 40 - 180) // 2, image, ui.FG, ui.BG) if not storage.is_initialized(): label = 'Go to trezor.io/start' @@ -28,7 +28,7 @@ def display_homescreen(): label = storage.get_label() if not label: label = 'My TREZOR' - ui.display.text_center(120, 210, label, ui.BOLD, ui.FG, ui.BG) + ui.display.text_center(ui.SCREEN // 2, ui.SCREEN - 20, label, ui.BOLD, ui.FG, ui.BG) @unimport diff --git a/src/apps/homescreen/res/trezor.toig b/src/apps/homescreen/res/trezor.toig deleted file mode 100644 index 8ab461e3b09a41c989b33ebe5850e64a7ba0a203..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1395 zcmV-(1&sPsPf2I+0Pp~31pol;(o1X`MHmP0vEw|NCb7!}p&q&l5?m_9NN__WmtHtD zsd$`#_(G*hNXZGf#T+Q&lyE}`NCZd-AvG08R8gcN#KT~#ssx9CD)o}zyWd8wzW>3V*_oZ+&dkRcg+ifFC=?2XLb+Ena_QR6_pfU)s}nzh$UnIl z)x`T?=cm}%R1wrPGBL4bfMb9Y*TI>39PS$QW*?uO2Djv~*%4P3+Su-*y9>Lx>=<}O zLv>d?UDOSaf_E_8c^|im==!kG!eghqoXh7fRn!L?Xzsd=w6&fKN2{!aZPcx2MeA7y z%bl`_hW#*UpLHI|U9^O(@^l=%qOG0X?s`1$atcubx-DRwT=+5{Q&!Qa5A(nG#$g!wg z&1G!L=Pbfz&gTwOi0+D5y5m>t81A-My5%}p!E=jZ>ALG+Sq$zWxN=K}er^rVt@#}W zh6@9@2jr4VF1h5^PCfSOr$1D{OlRkl%THzSUEds+TaOw|6=AS6v?$pX7(6$lW7lDr z{1z2E1;ZsDk-IpgTaCzFCYM}t$-PV6|8_oq`;C_`zWD6LSKfT*+OHLSxASq*r^Tyn`Jmt1nmC6`=s$t9Oua-(qn$oNki z*~W39eZgA=K3dHNeU&hGeZX>uZv~%nVpt_6h%R?D(-Nf@SOg>_f z<^IaRYIBK2nB@9^?AI*fJUNKkUS*MI^mH|ihP$-nUB*{k~3HoXglrXE+(2PN4s5YT?_^ac*{kvnGW;Toqkn88pn2>XwjZki< zk2`7gj-2ac!njcNca?6*u}(FV+wyhKIF6?1=m&Qp>*sdOEIHQ6hjPF4aZh&5JaVj4 z4dqrn-F>z!8vj=0i{0z&_IK}_ot<6Rr?!m-hmQ2dirAI$doatRCHUXGJV)-e7nuBj zE$%k;3FnP&oedO2Y4a9`^#6p>IAmgPYJ|s9_B9s8(QwyXq7~F-9`2;P0Dip<{%A%V zjpY`t#lpGmUwBH^OaM(_qI#0RMa!*(+3yqf{i-F(4deFG#{Y(RyUYvAbk7>SJ3(Bf zDxEIhCg@wA7e#EJL3cgxhjMTCxMFc8t609xzai7*RztZFt>=FCLb(~IJ1uXW$$FNjS?O`JVcad*t)1f0zhcuq!x_7J zMvP`dbxSOatI6)ZIg0~uz}u5xy^-Z|RM~ zSNi{yXcX++7*jgm^2wuL7~lJ$SmRy&@i+Sa$%1TPCh?%gC=?2XLZMJ76w1Al{{dwQ B;t~J= diff --git a/src/apps/homescreen/res/trezor_lock.toig b/src/apps/homescreen/res/trezor_lock.toig new file mode 100644 index 0000000000000000000000000000000000000000..dbed5ab3a285cac1695b080de5eb8a2883df01b6 GIT binary patch literal 750 zcmVi4WqM6VpUiP^#GwRVaO||ceP}xtQ)0b1vu*Hjyn3rTvwSGlTl}uZ zbp1ZRekRsUZqsMGxXWKh8%6le z$Ihf9(luto@oc%QdN1tZ668n~Bkw!wGClMKdM@ltcbxSlrrvheVWxiPtS>Wl%vt;B zm%gMJYK^?un&J=5*!_vK-5^`;*H4}8mfe0A>7}_eGu1QlUWX#RNX{j1w;vU{YqZhl zO5fT2lcwGFcLk~1{b;)OI)ihhW3w9!Tz zZS>#P9UYyQX>6(S1C(k!QsEpD8ha7S`ie+u?8gXPMuo;fT!#HsRB9Y1#5hnx4UMCe z2nXw^rP0bdaj1!!8m+=C4!2QTBbIm^74MR1tg!eBy41L5<5hI6aes=}(Sydu1Sipx z#?~08i4C3GNb?-k9}u_tm2Q!0-%=A*W%94Ac*7O?CDAD#K9SVSr7MPAd0W3gL@H>B&Wt*DF#TZa0{p;Y1{xh>lEGx zRaWJA57b$a;R@&^D#j(yOSmn-1<*~XIcu#f=qFg`@hAmu5~#6wm;iSPRBb$ngWLGa gQ{0b%`}m3z+>3yxLSm7|8(0?`Oy zYlU`KGU3isZ(ICqgk+_;S-+H}8n>H}yR^y6j*(Y3tDEw4Sq~f}?>OB_g}cG%Dp;!W zv5_uk;rOi6xp0%s&9sr4-SflQUY6B1O72?DU8{4sVV5Yk7k%x!PBXa)SBQ74?qPq? z?#VuMEl)~rL1zK?O?9vP+ynEt5&3b2h_wcDEbh41u>!n5INSXCmgi)X#ciGHspm~p zSl!-aBCQ z*~X`<(xJoW<{FOsJkpNJE%LcV)n#zFG=RGe7cN}5aEtqoUU~A`p;q<$ z&lIkfXsW+dA144c?kQHbcYoQ5PGg;Yw?A6GOTin%whn;lhRckGkLT z&u?G9G;`t1%;g(*mft)4Zv9bQzU9zeMt5Dg%UWb|SNrXY@wij{_Km}Z3l}b2xNzaZ zg$oxhT)1%I!i5VLE?gb%r>J_HKg;7%?UZWQVIn4%=!NGV>l`tQ-OG0>nsh^L!qq$&cJGAT4>Cd8IXM`G