From 4470ca6685ab23786099b00a49180eb9fdefd631 Mon Sep 17 00:00:00 2001 From: Neythen Date: Tue, 8 Jun 2021 21:30:48 +0100 Subject: [PATCH] weather updates --- csv/crypto.csv | 4 ++-- csv/current_weather.json | 2 +- csv/last_update.csv | 2 +- final.ppm | Bin 113391 -> 113391 bytes final1.ppm | Bin 113391 -> 113391 bytes stockTicker.py | 6 +++--- weather.ppm | Bin 21614 -> 23534 bytes 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/csv/crypto.csv b/csv/crypto.csv index 8918976..333235c 100644 --- a/csv/crypto.csv +++ b/csv/crypto.csv @@ -1,3 +1,3 @@ symbol,name,base,current,24hr change -BTC,bitcoin,usd,32887,-7.6081007271389165 -ETH,ethereum,gbp,1768.04,-8.205044425803774 +BTC,bitcoin,usd,33188,-6.6714954489175025 +ETH,ethereum,gbp,1783.08,-7.158501133993698 diff --git a/csv/current_weather.json b/csv/current_weather.json index 93698e2..1691e50 100644 --- a/csv/current_weather.json +++ b/csv/current_weather.json @@ -1 +1 @@ -{"main_weather": "Clouds", "description": "overcast clouds", "temp": 19.73, "min_temp": 15.55, "max_temp": 21.01, "feels_like": 19.27, "humidity": 58, "clouds": 100, "wind_speed": 1.84, "wind_direction": 249, "visibility": 10000, "uv": 0, "rain_chance": 0} \ No newline at end of file +{"main_weather": "Clouds", "description": "overcast clouds", "temp": 19.26, "min_temp": 15.34, "max_temp": 20.86, "feels_like": 18.94, "humidity": 65, "clouds": 100, "wind_speed": 1.84, "wind_direction": 249, "visibility": 10000, "uv": 0, "rain_chance": 0} \ No newline at end of file diff --git a/csv/last_update.csv b/csv/last_update.csv index 1077c0c..e7b8766 100644 --- a/csv/last_update.csv +++ b/csv/last_update.csv @@ -1 +1 @@ -08/06/2021 16:13:48 +08/06/2021 16:30:26 diff --git a/final.ppm b/final.ppm index e78ff2e5b3bf8ae0dadddc9fa1846bf1934841f7..65c7bdfd7efa94c27f8aacfa2288b6a1efce6286 100755 GIT binary patch delta 1895 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 delta 3905 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 diff --git a/stockTicker.py b/stockTicker.py index 3ae36a9..eb58663 100644 --- a/stockTicker.py +++ b/stockTicker.py @@ -731,9 +731,9 @@ class StockTicker(): img.paste(weather_img, (0,12)) img.paste(temp_img, (30,9)) img.paste(deg_img, (50, 8)) - img.paste(min_img, (56, 10)) + img.paste(min_img, (55, 10)) img.paste(main_img, (30, 26)) - img.paste(max_img, (56, 20)) + img.paste(max_img, (55, 20)) img.paste(date_img, (location_img.size[0], 1)) @@ -912,7 +912,7 @@ class StockTicker(): sys.stdout.flush() pass - time.sleep(self.delay) + time.sleep(self.delay*1.1) diff --git a/weather.ppm b/weather.ppm index da0ff7f95690d26cb4f6616904d50a4ae58c0c85..7c7eab29529eb08149830e906f222f4017048121 100755 GIT binary patch literal 23534 zcmeHLL5>?a49t06kvGili+#s_ZeKM^H@izEl9H)zxq}SUFzjN9tP*L$6XfTQ zxA(t4zW??9_Wtql_H8|D0&4E=cU&d6V(R@?fR!-i6@VS9*$E4y@e{XQ7b3pM@cnmRZZ-% zZ`8WLD31#Rj4BM}Uvt^_R#u5#)*luCHe-vsr!bOK^$Il}By<3pslfq^QXK^XS!&Fv z)k}+~Tg)*c!4`y(BlOt~!jn`S2k1zSyh$*$~~i&KEwfvutgJ$-~wPx9&ySD3JUsR*)#i383X}T1}*?az91uO!jdNlItG}qswsh2_Dr$RIw%(zx(1Vky{u=7ky_v# zjsT==pqKSbY$QT(RMD;-WIZTXf^}&>+%Sbf!rAmx1YgYnn1T0|s194T>aJq{K zE~C>^y)?RC$8*~LT;b=x=jw*5#0an9;*kQl+|Zi*)^&gGM($0ypZ`#BBYe^5j@2%o zxAkEt7cBkN~5I3BjE%d}_@`;@K)^#*#bhT&|=|(G6Z}%_l#s9a$(?5+c5Ctr=UvC_p zFoHz}m@kDpQp}7^&KMjyws!lk6Yg%7kr=XW8Y=Imm1%qecS3VE>wKYdse7{Hguw`F$2 zL7}Ipwdn8+CpX6n^{sZ?ty6@`!iB{d!+i(;xkJy`nn&!7l!Z=2g~MwiAhP;7R%9}ejH)Gs$WY4OQUZ^wQTCz;LwPbxObZZm55zm7KR rJ>Tf-j&A;}LPZQPJe^41W;F56&!k?y-g<$rIJ#$}UFT~8V-xrvA&2DL literal 21614 zcmeHK%XJ$^5X6~LI0ov`A?WDm6qJh&3c?46qoWc~EO229TdeJ#8SG~kgo&Mp2UJ&A zchAh$1IWMse0hC+`{T>&%j?_Q%W1mK=V?4IT37Y+bk=Lm9E#^Cp~+$}tQDBqirpm6 zot5eZ&Xo%VUrS;1oNS}K*XH-`Q@NWPW7kz}w91V=4K6KeZq5xR^iZ_|#St6HhLLJ1 z@d9}djZ_vtER)R!MkKL9oFXs`dAg9wN9LpVXH7=R5Q5KQXH-bwDQ`u-mgN-B`dsk> zVQ80-UXr5((A;sDg;XQ!wURjy4s9PTbo&j5x^9rXvMa)T((sfS;#~kG3R%un=5upu zoUhetoCID)>?vTrvaApEB{s{@2xJw8- z=`|kb!U$(Tz4(Us+GYHZNk-y^OX(a|IaaxYAn=eKAa)>3K8IoegneQc9NfZ?MneA( zhKZq;de^8=Zk21j@W96n>~RBb$UXWWJ&zkWZs53q{x|Sz{FA7E>q1BVI`8xweg1yB zzVxSCVG9TKf4c!#^xxfG>dtiB_p;og*D2roPI&5WyZ%R0y;=B^uaY8ri43*CrJ^$D ztsDondI|(VJ1knX_`S+Kw7V6v+L%C5_W4NtyDf01Gs>c+FVgT76cU86wqeNHONEdD z`@2GE+MsPwcJ`iPifxNokpjiq2PgS`*!Wh=DLGT%9%uZ8YaYKvOF#FQ^suy<5P}Dz zY!R@e@vbVi@`jEjYk-*+RR^CKW_bwAg+c(93#i*p;M=%*^>_O@R)3N?l^K=n1#VeX zbNM**P%@Bm3#d(*-*b^g{S?4loCU0*&V#(_h7V~vg3*uP*i#`umnqq1f$`9Bm+6a} z48QW1$HAZb^jm*P4U3>1wx**$R|AY+P{moT=9X())P(O}h9GO_3VLk}fXfA4up6?7 zw@=Bg3yg=3E2GCJdr1R(IH}0Fs&rC!x|$QtN&ciTJc|%Y6S_{qhAovE3($Xr*U!uZ zfrmwlx`3Fc&{;G>z)K`nZ2&G_f!V)k$RfF7M7zX&=$KWRv2O0W_~1GQYc2WYM2a_Bw-`&@uaGW;!>RPT^EFMxJ&&=8w;h zzX3WB`+(Wx#u{)#X58g4!GR&fh|Emq%4iu(h3Ss~6-3<;f6xuoeAwpY%lXXO}MB;Z4`M!12;S8};&J1{*s!%60S502h^kuZ4jRt!PWUgLfQcp-Bj9;