From 66cf63e0487364a79dae16a6dca3052a4dae2a55 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Tue, 28 Sep 2021 03:40:07 +0200 Subject: [PATCH] jpg -> png | fixed value alignment for PD timeout (#1086) * Delete Development Resources/Images directory * jpg -> png * fix value alignment for PD timeout * Delete 001_TS80.png * replace TS80 logo --- Bootup Logo/Logos/001_TS80.png | Bin 15423 -> 231 bytes Development Resources/Images/Calibration.jpg | Bin 687 -> 0 bytes Development Resources/Images/Calibration.png | Bin 0 -> 168 bytes .../Images/Calibration_II.png | Bin 0 -> 2839 bytes Development Resources/Images/Power.jpg | Bin 1082 -> 0 bytes Development Resources/Images/Power.png | Bin 0 -> 204 bytes Development Resources/Images/Settings.jpg | Bin 704 -> 0 bytes Development Resources/Images/Settings.png | Bin 0 -> 168 bytes Development Resources/Images/Sleep.jpg | Bin 736 -> 0 bytes Development Resources/Images/Sleep.png | Bin 0 -> 168 bytes Development Resources/Images/Soldering.jpg | Bin 713 -> 0 bytes Development Resources/Images/Soldering.png | Bin 0 -> 174 bytes Development Resources/Images/UI.jpg | Bin 722 -> 0 bytes Development Resources/Images/UI.png | Bin 0 -> 144 bytes source/Core/Src/gui.cpp | 2 +- 15 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 Development Resources/Images/Calibration.jpg create mode 100644 Development Resources/Images/Calibration.png create mode 100644 Development Resources/Images/Calibration_II.png delete mode 100644 Development Resources/Images/Power.jpg create mode 100644 Development Resources/Images/Power.png delete mode 100644 Development Resources/Images/Settings.jpg create mode 100644 Development Resources/Images/Settings.png delete mode 100644 Development Resources/Images/Sleep.jpg create mode 100644 Development Resources/Images/Sleep.png delete mode 100644 Development Resources/Images/Soldering.jpg create mode 100644 Development Resources/Images/Soldering.png delete mode 100644 Development Resources/Images/UI.jpg create mode 100644 Development Resources/Images/UI.png diff --git a/Bootup Logo/Logos/001_TS80.png b/Bootup Logo/Logos/001_TS80.png index c33228125598f01ab9d4a7c1f1b9c2cc1ad1e96c..98bef1b80c12a196481ea24be35b733897f24fc1 100644 GIT binary patch delta 215 zcmdmA@tkpjL_G^L0|SHfl=M?Tim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|ATYyi9 zE0F&G|NqjP^X~##oCO|{#S9F5hd`K7RKu$QD46Bx;uvCadg`P=z5@yz&bOtn{Ejbc z(wmhSbIV`1wt;CvLg$x1W(;}{942^Xm|qRBG1KafI4qHO?5)`PeOom=H(LbVuSor4 zBT>imTSbHUsOh>(`=j{(`vthyapyGIH}71!YJd5PBKzyU2bez@b3J5dW&Z-Smci52 K&t;ucLK6Uf@=lWg literal 15423 zcmeI3Yitx%6o98nNNEBR6Ko>JOco7-%+6!GkD2UlZM&^4u(T-^+7tt`Gk3R>?(Qr* zv+TA+B^XG3U?NGu2T@}T`U8|i;sc`?Kodg*A^t)WjK&8l0S!`#2E4PgkJ;PpO%q7` zb0^uIJ@?#m&OP6`_w4+cr~1}BJiqDgCW@lw_jE`4;e8YQENq+$zb_mazXosfGTlQ4 zMJ+gCeHtboT(Fp;q~qGapg9;_Eh&1+EvtGAxC^NaoJ~=|)Y_C@YO?~;gV8>^L(c-*>-I4U?+MU;(an3sfY7pn7C7F=aw5yOFdQ#&qQvoZ z>2ige;ICj-jZ6KJu2MKCgP#fg#}5F0%_BLc6?pC%!qF4#)v*c$clQ#z_2FKXeD;t^`=sFLmOu27KosPw63Kw zFqQ#qKQQ!MRso$`U@A-MWp8TnYH?~jS(+Kw4hq@~W|qb_D{ck5LP40T)R6_Usb>dt zJsGxlSzj3;-O*v~DnI?edM&N$d1G0SMNO*pu6hFz*#u!|8DMyh;XDJpR}un}$NL~B zNF3*IV$Vc;M0Hh*kD)#UPHN#Kui*6In2Gv;=SP)Ic~)MWa~*zEMT+a$lx&8zl$-!; zCY=bf)j`M1%C3?+^rW7J%K~9fkgYdd*D9hbIcrG6p>R~6hTyhDg;^U@In{WbyEPCDZG&i3>PZ`>4Abd}gyDc&gDZ;(F;P(i0R{-XpW(QcI1^LiF(%*vqR+!~UcoOG z_eQOGb!8>j<>=6L{lpbjRe4{4hlzV)GbV1Y)8TAdpx&$o+qs-{%&~G&tz5jS$O(eX za4P%~eJ~fXCE#bge2nKrS@d}P-f}K=+)NAAtyy&+L&{*)W-ZuUJ6f%KvGHc)tO2aH z5^|OMN~Kf7sg)~OY)_J`SS>rOSf?JSLAGYJx-8U8t5eQdA+Y^B%x8{~9|37x*RWj` zXU*)y(Bo!a&VsfCJWsP}Xtvi{Gt_n@)vhXpQtvp9h z>ywo(b}N5WGrE;t5nm(-0t7D-TzEc+mf%8w;6;K9&j-;GTnG@nNO0l#AX4T@FKy5=YwboE(8c(B)IT=5G}!l0Ktm{7oHEICAbhEc#+`3^Fg!(7Xkz? z5?pvbh?d|&fZ#=f3(p795?lxnyhw22`5;4|sVBgxMZ5S_3s?Jo z+`nPR-^UY;k;q<-`e5RhPwstr^yreupPzHjAI(d@n>hOUp*tI>L%S{?;MdXHcKrO| zUxgDJbGyZ^4T}yRxcdH>cahZ7J2}}ld1bQm&FAhI{(iXGzsfwhZ_lNzo#3%ohW4Fn z9{=j}Ten?me|^rC_rzu0=5LFy&l_HP>OT4#fCF)>{|HgH;v~{ zZvN?X>(@KGE?=Fv@TfYs;o#Kp)_``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTox{JFM0CW{lTm0R~29CT32AIZQzBum~}*iVBM;su&qN79P9^bpe|_Q`WSJi>el0 zZD9P|bgEOjZbiPW>uj03_gp6?Oi7p)$f>gTI0s|8+O4dwiD$3vFq^DtyX`+i-IvEe zmq-gRG622Ij0g!v20=x~z`~6%|Jf_Pn`*X?A!;4NIv>{-BgUOEG>={Yx- c(EP6FMTM*irJB9AT$!>J2fD02+yB1_0JqbFR{#J2 diff --git a/Development Resources/Images/Calibration.png b/Development Resources/Images/Calibration.png new file mode 100644 index 0000000000000000000000000000000000000000..6216d9132fd33654aa2877584eef6dd616e01894 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`d7dtgAr}5iCkKi(C~&Ym{MWv0 z`&8FPJ+1ra-n?=a6`b6Aan*r0X9HQwd?OnU&urmhP`r3J{nOnhu1!zWnp?Q4%Ja{* zHPz?F&$UzXmgA}_*rxZ8%edf1bL0=@h(`H?S~5~UWY_=G-{s-6Mc0C%oY$E#`I*5@ Qpv?@Pu6{1-oD!NC0F=Q!4gdfE literal 0 HcmV?d00001 diff --git a/Development Resources/Images/Calibration_II.png b/Development Resources/Images/Calibration_II.png new file mode 100644 index 0000000000000000000000000000000000000000..0456271d207b72a3a202b1a66b386d102cb8fb71 GIT binary patch literal 2839 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 literal 0 HcmV?d00001 diff --git a/Development Resources/Images/Power.jpg b/Development Resources/Images/Power.jpg deleted file mode 100644 index 340b2bce3da4a35568f69482495e18a3c009beec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1082 zcmex=O1eh6>7?=bZ znFSgDA7PMZU|?j0n9TqMj7-cdtZeKYoLt;M1zQCem>8LvnOK-vSy@`H|qMvW5}awt1(JSZA;@q>zSQc)8pmzcPOq?D?fx`w8fiK&^ng{76V zi>sTvho@I?NN8AiL}XNQN@`kqMrKxVNoiSmMP*fUOKV$uM`zch$y26In?7UatVN5L zEM2yI#mZHiHgDOwZTpU$yAB;ba`f2o6DLnyx_ss8wd*%--g@}x@sp>|p1*kc>f@)+ zU%r0({^RE_kiQrinBhSN@fe!F1cClyVqsxsVF&q(k*OSrnFU!`6%E;h90S=C3x$=8 z8aYIqCNA7~kW<+>=!0ld(M2vX6_bamA3 z`p17sh4qp7TmAd~$SM)bpf zhPRRr-pkbJeQ19h`nX;u{Cb`FkLKU8S@Gianf$_k0zT%yVf~%^qxu`$k6N>dA1;3@ z`nyQ4KB@oK=5Kp`tbF*NfuTn5T7B01j$8J}{LjE_pL(A^^PcHP|2KgL{_yaLi}fAIUyaPxQkkJlfCkHvHB)2%4-Z>Z;YYc7AdU-(bekGD(fF6`&8 ziC_4`bf10Qjr&`|yY@-fow?7u|G|P=HdZS0KX}gnq4u`@&EDT0brOxc z^`D`s?4Ls2)%vYUKc)Qkd5PShl>9UN9=|6=j^|=j-Tg0!y)d~|E~XM z5c&F_K}Npw*SVPwpVfJH z@P5kM11T;s%SFo>Ob;zxC|RODD`idkUfmf-?AOhk|2ryD=Qz-D44$rjF6*2Univ=W D{|8U_ literal 0 HcmV?d00001 diff --git a/Development Resources/Images/Settings.jpg b/Development Resources/Images/Settings.jpg deleted file mode 100644 index eca8e3eac353591491764799032206752783b087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 704 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTox{JFMz|O=56c+({01f=V#lXYN$iO7PEWp6P zc&gz@zdKN&xB$?vC~BG6SebxoIe?;!tW5LgAG<#@>5WMEhA1wc+@JG7W(%UI2U?>5 zR?p1HXwN8*M*$N|fxG|%6A%Dh0|P)di=YsLB5Pn#6V!4xd#0U1OOI|oJ%c$o_Ow8O ziCej#&9O%j^Jg46Ut_w3Gl%m^!(w6K*9}K!>NZ+)_B=|e{WN!X$-#Ls2d=#4OlWRg zWVlcu$z168^BsLZfv%DQ`IG_4P6l8=DjGTl!aQrQ_+w>YGK0iM#*PV-{f_c0SyY<_ zoMkHM-+iu4UVE|tmWmDP8{x4zKP`aOC>lO#bJ?aT! RK${snUHx3vIVChP008naIFtYY literal 0 HcmV?d00001 diff --git a/Development Resources/Images/Sleep.jpg b/Development Resources/Images/Sleep.jpg deleted file mode 100644 index 0ed234c4d7b6daf9930cd5f058ac2d625e8b6d4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 736 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vToxqg^l3Ro^&H-IcN&WV|4X z4xmj6U=2W%>>1_pC}4sqP!(WcWMN=sW`(+?KoGtrDLsIm%>=H>`g)KuHa%rp9zu< zA18L`E)96d%NxRNZ_U3mLb{^HY(ciJgJO2jy0cN2RuyeqlvB~SALvvm0iZuof&du8 ziiU}eupqEkth%qJ%zPoC`#ay=BaHp?)?E(Q*|5ecDMRQ(w`D8OxrZj}IXEK@+XFR# zLzsaX=qUjPe>~v;3Mc_W0R>hd4s;%B{D7PXcbkA}fr^O0-j+9uX7oE}q%GX=KsZ4) a@~CmEA4}9^nOs+{P$jt~tXH@HzX<>f`kZzE diff --git a/Development Resources/Images/Sleep.png b/Development Resources/Images/Sleep.png new file mode 100644 index 0000000000000000000000000000000000000000..4f6e3ac8fc8a752afdb70319b88415dede0132dc GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`d7dtgAr}5?C*9^dpupk$@W1`6 zrQRkLnoYCMe{=8-b@8#YVLi}e9P+Vse?7yz_uDOf+uz+?z_{uWV}bI!hMo#>6P;ijUTPFzWyUyYc%~N7HqrG|NJ|``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTox{JFMz|O)36c+({01f=V#lXYN$iO7PEWp6P zC~Cx#qzP0gA;7?ls+I}pMK+*f4xlh2E7S3edr~Z^Nl_WOq5fBnf{YeKH(CL#8fc6? zqdXo3OfUs10t`%yOf2jOa~Oe^3JNJI1v0P-D;pX)ZiL#;X3u1B)YIe6!JyaI0|XE8 zXFp-q*!wXf@r@yG&{u`1%>4AuVAk31=Fj}|=b=jPElYt%;lW9Ke@rf$+R7U(YftS| z4T))xe){C(&%>Kxyh4!=EcKqG)5k--6|100%Q(*zp)@%S4QFam@E2CP6_0GRL)p#pR! y$bE3f3D_2kT)w%pJw(JY&&G1o6Hbdvg{RMA)+lfY3M4)1=vt~~wv<`_|4jhWiH<-3 diff --git a/Development Resources/Images/Soldering.png b/Development Resources/Images/Soldering.png new file mode 100644 index 0000000000000000000000000000000000000000..4d71ef739509ddd572d154a4501f827ab73e97be GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`#hxyXAr}5iCp+>TP~c#B_`iSI zMYd*_ z$$tB2hYhk3Q_8d)Qll?QEn0slt@mA|#)&Actrr^Y4a*(|^(-%EOSU=qbasae|K#;? XjO|mee+OF6;OXk;vd$@?iGcwC4thTc literal 0 HcmV?d00001 diff --git a/Development Resources/Images/UI.jpg b/Development Resources/Images/UI.jpg deleted file mode 100644 index 658056210db57f042362271cf5e0a9e19d420306..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTox{JFMz{biB6c+({01f=V#lXYN$iO7PEWp6P zc>2_Vg)4yyB?N$eMN!Pk!oMM)C=xpdv${Bh2IWio4T&j+|_8 z6>7h9#F86AKth#am4Vjc6_i@`N&uBDoN`H`-Q`A9)_exTnMyVw`J4T3Gv$)Lr=cG s*RH!GY}@)Z3U38U3wR2aX76WIW-?*?v5vtNXaj?%tDnm{r-UX30G_Kdx&QzG literal 0 HcmV?d00001 diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp index c1d25689..9c023816 100644 --- a/source/Core/Src/gui.cpp +++ b/source/Core/Src/gui.cpp @@ -344,7 +344,7 @@ static void settings_displayPDNegTimeout(void) { if (value == 0) { OLED::print(translatedString(Tr->OffString), FontStyle::LARGE); } else { - OLED::printNumber(value, 2, FontStyle::LARGE); + OLED::printNumber(value, 3, FontStyle::LARGE); } } #endif