From bdcb6487657f25478ca9804115b7b9518ad9b204 Mon Sep 17 00:00:00 2001
From: CiscoTheWolf <cisco@hostingwire.net>
Date: Tue, 23 May 2023 23:02:28 +0200
Subject: [PATCH] Fixed drawing mistakes in ProotScreen. Sped up ProotScreen
animation.
---
faces/ProotScreen1.png | Bin 1050 -> 1031 bytes
faces/ProotScreen2.png | Bin 1050 -> 1040 bytes
rpi/antRender.py | 6 +++---
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/faces/ProotScreen1.png b/faces/ProotScreen1.png
index 28677e8cadafb63de5ad67b941d0f47049380ddf..3dcfb933a0252dec732ca2fae438e968c3497d6f 100644
GIT binary patch
delta 603
zcmV-h0;K(#2!{xeK>>HMLOcPJgaI%UCE5;2;{$%<265yCW#j}?ebUvF%>fvH8A(Jz
zR9HvtlT~jXK@3H2%A7Jo%FK)@Gcz+Y^N;WKjJ@mKjaKUVp;DEj*yoOC94W~c{Cj$c
z#&+bPy)3gEwo|TDGbFTr3%$(pJt5H@o9LxqtiDgD>ZnR}N$g*z><4x7oxKp(UZ*2l
zkNjd%)(3XVV;v@27V;zc>a<RO@;iP>X|$2JIAtUh2V%D!*NKg^(yg;^LO$uwC9zs*
z>g=14PvttXgH9}$v$6?A&=g!J7Su^>X5XAij<t&<HnVTeq=>b<BsQ~e&Lqd$MG~9Y
zH)m4B`W>C3x!L`|<ej3q+5JGUR7{GGmv~5VA%E;<jIIwd2pKwT_y~=E12a-RFu`>)
ziZwdN24mDM1lP$}*0>xSj90f1TqhG)y}(3Fn#?q1>NFWnpD`1dHG9t7dBA*N0s0oo
z7>gDsIfCnC32P~^Y&li{D|uK2tftnm*0Qh;Sib?-$hZmEEF(v7oov~<Z9BCC*a_@n
z+70ZX_OkY|&=2gV4gd##sY5by1lP&otRtx(WgP>KQzuv_Wp)ZUO`QSGQs-pk2(FX!
zSr<~5|EP<=CF(Nkip;J8*Qo2j4eF+h9Km&RD@#61z-`tY;4XEKbzf!=fQQs0;4$#z
zDez3DMsS@x&w7#d^3`k6o44;o@1=bJK2o1ppTFQM@J*&haQ*Kx`L6CraGmf!Dnf7_
p_@VAdaQ)}6-<moRT>n1-{s1U?J|8Y|_67g|002ovPDHLkV1hIGAou_P
delta 623
zcmV-#0+9WO2$~3xK>>rYLOcNm4{(tROTCkR0WcX7fqo5Lt0meFN#g^4;|6i$1!d#}
z)Q}UrlfeNPe;`RjK~z{r?UPk+=0FTZZ<m>wnVFfHnVFfHfBIf~?8Hf`JY*hLTJ@;*
zx#JmEYWo%co*rVc9eL<4%N&O7lq=N?39aA4E|X$cB!*)XyNrv~_j;<1s#KT6@wMhS
zsFUveg}C-wk8C~ii_vTk{FKHvRC^ZEBl+sIPSQJme@R*Nk+?V|BoqhYw;k7skF4}I
zI5r`j?B|kLEu99(CZtojPW)gK&*iLaLJ=%wt`iSt6`MP@V3K0(LdE8eEtnLscBf)<
z#}-UdtX-(s+_43dBG&I{jqYZT16Q<0ceBTV;Hj7tA1`sg;zIt|&6vC1M<1mBfPsT7
z_Re5)fA3_jlOe33DK;2pZXt7>3}=l<vB5}l3z_R=6l*jv24lxDjh`@4hLa{w0j5ry
zK4T^@3z&^Lb7hQq^HqV&b+Ul95LmPrOMs<3ECZHPD_AR8SOu(J1FU6S2dtM-Aak8;
z*tlskwFTG;Y-8FE?4WkCcCoM<*hB3F_EGy~e-y}ECkK)aYCps}3>=}3vX05@IB<eG
z37n!%%P5e!PR=Bq)h_>0=YaFn1=dBGT>>ssSAeV3H5mmm*U9xH`7i-DST})N)NR%s
zncW5MQTKrdz{5wtW0^Xg)}H`R<xY8)^gQXs%U7b;Z{CXDNqY}`pgyubea08yt4y6v
zIqTnm?{e3LALfo^t`q)8<&e1!{4{qYbN$!vKbAU?x&D6w`~?zzKuz%Xe~$nF002ov
JPDHLkV1nX(C{_Rf
diff --git a/faces/ProotScreen2.png b/faces/ProotScreen2.png
index b6ea1493c74ba46c05b1d6d997fa548a984f36e3..d1dcaa9d77768dadfff2da3054f355803ec7450a 100644
GIT binary patch
delta 606
zcmV-k0-^ny2#^SnK>>ZSLO%hMgaI=XCE5;2;{$%<265yCW#k069i<zS%>fvH97#k$
zR9HvtlT~jXK@3H2%FN8n%$zbaGcz-{zrEKUd)K=gt<;@|N>z?xpF5s$q$FSP@97~H
z+mVO<vdm%FPPtOekkI-q>@q2KMPfKMvCFtveXpnLs7iH79A9gWgF5NXUx;h3^~lyE
zzZlK-z)xvxL$zliJ(90Z>m<E@<Cm00ABl@oLPBvMe%o=K_{d6cgJToY$$l=0)zWEj
zY(hGf>%<Q>@m$WzCKSO^<~s3UR<XHb3nnSnE>vvp*n&wBYj-L(cWl8V#oC36%^h1X
zDPsMO*642bIB-R4bT@k(2%d^b@$nK5C@$oW-Hf^G{q#cy4jMefV&4pZHTO;CIvK_q
zo??R$<`y#7$w=0y6dQ~-w~)C`#<0c$<1l^#)5J-WWjJN(G+_FSnX_gCbAY*+H($nB
zuuv7qTqlcIi-9Feu?$$w!wO&}wTiWxg*Cw1b-;SY4Zubj1v1ykrp;TnQrm#-zz(LJ
zz%FVxYYz*(z+P$}u%9}AAfrI$IysnhNc&;d5#T6wjCEXQCxDaGDd049Mn-|mb#gZ8
zoObz-IuBf+F0wAk>@skLx(ZyQuFEKpxlV2*$%hHJ$+`vHrtYxr%IqF+pLzg11RgyG
zo&ZnfLdjew&yt=ey?FUb^!m+P(K~7Hfe+M2)~C<-0(=F&$%T?Nx&HTjH+Lj+o$x;@
shs<^0hq)t}>py?}w$zEt_5Ty#54KG}6)}kT761SM07*qoM6N<$f}%hp)Bpeg
delta 636
zcmV-?0)zdK2$~3xK>>rYLO%fm3QN6{fdMmr4PC1x+73zM1AgNMapVPM<OI}^6TAQb
z010qNS#tmY4#WTe4#WYKD-Ig~00JOML_t(oN9~hUZ{|P@MQ@jxnVFfHnVFfHnSc6T
zd+fwXsyt*KR$BF__POI3S8Dqe|DGOVu^oBnFUuT;?UXCk3<<5@!Y-3yS0sjG6T6Im
zi`Dmfs*b8um&Eb4<~XR6?)-(g_F9i@J@SjuY!CdD#x_)Y7Sbd6>a<SMJAO%7^pUtY
zB_tFF;<p{wiI1%GHaIpRo$Tk5SS_6f$0npxxla6G6VK(WY(fz%Wv&wsW)+(|wqTNC
z?Lx)ojxCrJv393obH^4;QmkF5*xa#y1(PDy?`VzgW{(3`v_^Nc$ARFfm=qr`alhh1
z{@Bf!yWU41r2l|{gDm#WU~}(eu9G3Gp(!>PW^N&KoeXD<NU_04a|@a4WE5*OFa~4C
zF^!)vQHGNyPXVS*n?7SEFbkNCIdf%<dGl3)%yqJWwGdde7)yYqJS+p2Q!7}1D_K|t
ztX>1GWn2fWmr)>doov{+X*0D2*a~c8+79fXcCvP{up8Jz?FIHx`(+f!Tqg&T4r)Kd
zIt(14j<Sx)>^N|OItiSjPRl5exlYa`oz*V?QRjg3)CJZ>nOy=dQ&)hi)HN9eGS|uV
zB>6A_H&{1;ThwjV9huz)?osz=fd|0DN5Es?iCidM*PqIr@+|3j(u<d`M6chx6}^-8
z9{50gWPSRKFThven_MVe*T2hM7k-#KlDSU!AC*JqI`Grnk<9g9zyDb3MCSVc3Gf#)
Wvq3L}%;y*Y0000<MNUMnLSTY<T`L6u
diff --git a/rpi/antRender.py b/rpi/antRender.py
index f4e40da..4465776 100644
--- a/rpi/antRender.py
+++ b/rpi/antRender.py
@@ -78,7 +78,7 @@ class ProotState:
def set_ProotScreen(self, matrix):
self.loading_time += 1
- self.loading_time = self.loading_time % 90
+ self.loading_time = self.loading_time % 75
if not self.frame_canvas_prootScreen_1:
self.frame_canvas_prootScreen_1 = matrix.CreateFrameCanvas()
image_proot_screen_1 = Image.open("faces/ProotScreen1.png").convert('RGB')
@@ -96,9 +96,9 @@ class ProotState:
self.frame_canvas_prootScreen_3.SetImage(image_proot_screen_3, unsafe=False)
matrix.SwapOnVSync(self.frame_canvas_prootScreen_3)
- if self.loading_time < 30:
+ if self.loading_time < 25:
matrix.SwapOnVSync(self.frame_canvas_prootScreen_1)
- elif self.loading_time < 60:
+ elif self.loading_time < 50:
matrix.SwapOnVSync(self.frame_canvas_prootScreen_2)
else:
matrix.SwapOnVSync(self.frame_canvas_prootScreen_3)