branch switch

2021-07-26 19:42:53 +01:00 · 2021-07-26 19:42:53 +01:00 · 848fa2f5ac
commit 848fa2f5ac
parent 6c25a56d9e
12 changed files with 31 additions and 40 deletions
--- a/csv/crypto.csv
+++ b/csv/crypto.csv
@ -1,4 +1,4 @@
 symbol,name,base,current,24hr change
-BTC,bitcoin,usd,32447,0.6525124102349
-ETH,ethereum,gbp,1474.35,2.7079711942798514
-DOGE,dogecoin,usd,0.192086,-4.859820003305688
+BTC,bitcoin,usd,39839,15.522273899016485
+ETH,ethereum,gbp,1723.02,10.088368027141781
+DOGE,dogecoin,usd,0.224764,13.954280560872759
--- a/csv/current_weather.json
+++ b/csv/current_weather.json
@ -1 +1 @@
-[{"main_weather": "Clouds", "description": "broken clouds", "temp": 28.1, "min_temp": 27.71, "max_temp": 30.98, "feels_like": 32.51, "humidity": 81, "clouds": 68, "wind_speed": 2.24, "wind_direction": 230, "visibility": 10000, "uv": 0, "rain_chance": 0}, {"main_weather": "Clear", "description": "clear sky", "temp": 26.13, "min_temp": 18.22, "max_temp": 27.53, "feels_like": 26.13, "humidity": 56, "clouds": 7, "wind_speed": 5.66, "wind_direction": 90, "visibility": 10000, "uv": 0.51, "rain_chance": 0.1}]
+[{"main_weather": "Clouds", "description": "overcast clouds", "temp": 30.03, "min_temp": 29.58, "max_temp": 32.17, "feels_like": 37.03, "humidity": 83, "clouds": 100, "wind_speed": 0.45, "wind_direction": 265, "visibility": 10000, "uv": 0, "rain_chance": 0.33}, {"main_weather": "Clouds", "description": "overcast clouds", "temp": 22.64, "min_temp": 14.98, "max_temp": 24.62, "feels_like": 22.76, "humidity": 69, "clouds": 97, "wind_speed": 3.6, "wind_direction": 220, "visibility": 10000, "uv": 0.08, "rain_chance": 0.42}]
--- a/csv/daily_weather.json
+++ b/csv/daily_weather.json
@ -1 +1 @@
-[[{"main_weather": "Clouds", "description": "few clouds", "min_temp": 27.71, "max_temp": 30.98}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.2, "max_temp": 30.81}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.39, "max_temp": 31.18}, {"main_weather": "Rain", "description": "light rain", "min_temp": 29, "max_temp": 31.48}, {"main_weather": "Rain", "description": "light rain", "min_temp": 29.33, "max_temp": 31.54}, {"main_weather": "Rain", "description": "light rain", "min_temp": 29.2, "max_temp": 31.51}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.92, "max_temp": 30.58}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.59, "max_temp": 30.84}], [{"main_weather": "Clear", "description": "clear sky", "min_temp": 18.22, "max_temp": 27.53}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 15.65, "max_temp": 23.16}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 15.7, "max_temp": 21.11}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 16.07, "max_temp": 19.15}, {"main_weather": "Rain", "description": "light rain", "min_temp": 14.87, "max_temp": 25.12}, {"main_weather": "Rain", "description": "light rain", "min_temp": 15.54, "max_temp": 22.73}, {"main_weather": "Rain", "description": "light rain", "min_temp": 14.28, "max_temp": 21.54}, {"main_weather": "Rain", "description": "light rain", "min_temp": 14.13, "max_temp": 21.82}]]
+[[{"main_weather": "Rain", "description": "light rain", "min_temp": 29.58, "max_temp": 32.17}, {"main_weather": "Rain", "description": "light rain", "min_temp": 29.38, "max_temp": 31.23}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 28.89, "max_temp": 30.71}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 28.9, "max_temp": 29.81}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.43, "max_temp": 29.1}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 26.71, "max_temp": 28.93}, {"main_weather": "Rain", "description": "light rain", "min_temp": 26.72, "max_temp": 30.09}, {"main_weather": "Rain", "description": "light rain", "min_temp": 29.03, "max_temp": 31.86}], [{"main_weather": "Rain", "description": "light rain", "min_temp": 14.98, "max_temp": 24.62}, {"main_weather": "Rain", "description": "light rain", "min_temp": 16.14, "max_temp": 19.83}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.35, "max_temp": 20.32}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 12.58, "max_temp": 21.95}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.63, "max_temp": 17.52}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.42, "max_temp": 19.67}, {"main_weather": "Rain", "description": "light rain", "min_temp": 12.38, "max_temp": 17.85}, {"main_weather": "Rain", "description": "light rain", "min_temp": 12.59, "max_temp": 21.36}]]
--- a/csv/last_updates.json
+++ b/csv/last_updates.json
@ -1 +1 @@
-{"stocks": "22/07/2021 14:07:18", "crypto": "22/07/2021 13:59:46", "news": "22/07/2021 13:59:47", "weather": "22/07/2021 13:59:46", "forex": "22/07/2021 19:59:50", "sports": "22/07/2021 13:59:48"}
+{"stocks": "26/07/2021 14:35:34", "crypto": "26/07/2021 14:31:37", "news": "26/07/2021 14:31:39", "weather": "26/07/2021 14:31:38", "forex": "26/07/2021 20:31:42", "sports": "26/07/2021 14:31:40"}
--- a/csv/news.csv
+++ b/csv/news.csv
@ -1,21 +1,21 @@
 headline,source,date,time
-Websites go down in internet outage - live updates - Telegraph.co.uk,Telegraph.co.uk,2021-07-22,16:37:40Z
-Realme is working on its own MagSafe charging tech called MagDart - Pocket-lint,Pocket-lint,2021-07-22,16:23:06Z
-Police Federation of England and Wales no longer has confidence in home secretary^ calling pay freeze 'final straw' - Sky News,Sky.com,2021-07-22,16:18:45Z
-Untwisting DNA Reveals New Force That Shapes Genomes - Newswise,Newswise,2021-07-22,16:15:00Z
-‘It’s too late’: US doctor says dying patients begging for Covid vaccine - The Guardian,The Guardian,2021-07-22,16:05:00Z
-Merkel: Germany has not done enough to hit Paris climate targets - The Guardian,The Guardian,2021-07-22,16:03:00Z
-Old Review - IGN,IGN,2021-07-22,16:02:43Z
-RTE star Joe Duffy asked if he's 'a big fat s***e' by Liveline caller in mad row - Irish Mirror,Irish Mirror,2021-07-22,16:02:01Z
-Covid-19: Nine in 10 need to be vaccinated to reach herd immunity – HSE - The Irish Times,The Irish Times,2021-07-22,15:58:28Z
-Staff should name and shame employers making it difficult to get vaccinated – Varadkar - The Irish Times,The Irish Times,2021-07-22,15:56:15Z
-Eric Clapton refuses to play venues requiring vaccines for concertgoers - BBC News,BBC News,2021-07-22,15:55:34Z
-AI breakthrough will 'transform' biology - Yahoo News Australia,Yahoo Entertainment,2021-07-22,15:54:55Z
-BREAKING: Lagos announces restriction for council poll - The Nation Newspaper ,The Nation Newspaper ,2021-07-22,15:52:54Z
-Labour MP ordered to leave Commons for saying Boris Johnson has ‘lied over and over again’ - The Independent,Independent,2021-07-22,15:48:43Z
-Cleanup begins in flood-ravaged Chinese city of Zhengzhou - CBC.ca,CBC News,2021-07-22,15:47:52Z
-DeepMind puts the entire human proteome online^ as folded by AlphaFold - Yahoo Finance Australia,Yahoo Entertainment,2021-07-22,15:46:22Z
-Young Co Cavan mother who died while trying to save son from drowning named as Natasha Core - Sunday World,Sundayworld.com,2021-07-22,15:44:41Z
-Samsung Galaxy Z Flip 3^ Fold 3 tipped to feature IPX8 water resistance - MobileSyrup,MobileSyrup,2021-07-22,15:43:00Z
-UK tech giant founder Mike Lynch can be extradited to US - BBC News,BBC News,2021-07-22,15:38:22Z
-EU has shipped tiny percentage of planned COVID-19 shot donations - Rappler,Rappler,2021-07-22,15:34:00Z
+Niuean hepatitis figures 'amazing' - Otago Daily Times,Otago Daily Times,2021-07-26,16:30:00Z
+Mimi movie review and release LIVE UPDATES: Kriti Sanon movie is now streaming on Netflix^ Jio Cinema - The Indian Express,The Indian Express,2021-07-26,16:26:05Z
+Theatres^ concert halls in Northern Ireland to reopen as mask requirement dropped in places of worship - Irish Examiner,Irish Examiner,2021-07-26,16:25:00Z
+Coffee prices surge as freezing temperatures destroy Brazil’s crops - Fortune,Fortune,2021-07-26,16:16:33Z
+Texas Longhorns^ Oklahoma Sooners tell Big 12 they will not renew grant of media rights - ESPN,ESPN,2021-07-26,16:15:48Z
+Loch Lomond: calls for safety measures after four people drown - The Guardian,The Guardian,2021-07-26,16:13:00Z
+After Covid jab^ BioNTech sets sights on malaria vaccine - Jacaranda FM,Jacarandafm.com,2021-07-26,16:08:00Z
+COVID-19 live updates: Quebec registers 298 cases^ 1 death since Friday - Montreal Gazette,Montreal Gazette,2021-07-26,16:07:25Z
+Duterte’s final SONA: Triumphs^ wishlist^ ad libs - INQUIRER.net,Inquirer.net,2021-07-26,16:06:00Z
+UnionBank profit surges to P8.3 billion in first half - Philstar.com,Philippine Star,2021-07-26,16:00:00Z
+Dev Patel and David Lowery give Arthurian legend a new coat of A24 dread in The Green Knight - The A.V. Club,The A.V. Club,2021-07-26,16:00:00Z
+BREAKING: Biafra: Nnamdi Kanu will soon be free – Lawyer - Daily Post Nigeria,Daily Post Nigeria,2021-07-26,15:58:24Z
+COVID-19: UK reports 24^950 new coronavirus cases - sixth consecutive daily fall - Sky News,Sky.com,2021-07-26,15:53:49Z
+PIERS MORGAN: America's anti-vaxxers are snatching covid defeat from the jaws of vaccinated victory - Daily Mail,Daily Mail,2021-07-26,15:53:09Z
+Reading stabbing: Two guilty of Olly Stephens murder - BBC News,BBC News,2021-07-26,15:40:42Z
+Tesco Bank to close all current accounts from end of November - The Guardian,The Guardian,2021-07-26,15:40:00Z
+Americans are 'mixing and matching' Covid vaccines over concerns about the delta variant - CNBC,CNBC,2021-07-26,15:38:00Z
+NASA's Hubble Space Telescope has discovered water vapor on Jupiter's ocean moon Ganymede for the first time - Business Insider,Business Insider,2021-07-26,15:37:06Z
+More air quality alerts issued as smoke^ over 140 forest fires plague northwestern Ontario - CBC.ca,CBC News,2021-07-26,15:36:44Z
+Watch highlights from Day 3 of the Tokyo 2020 Olympics: Swimming^ softball^ gymnastics - KCRA Sacramento,KCRA Sacramento,2021-07-26,15:28:00Z
--- a/csv/tickers.csv
+++ b/csv/tickers.csv
@ -1,4 +1,4 @@
 name,current,opening
-MSFT,285.04,283.84
-NFLX,508.93,510.58
-GOOG,2663.775,2654
+MSFT,289.115,289
+NFLX,514.99,514.85
+GOOG,2774.34,2764.03
--- a/display_images/crypto.ppm
+++ b/display_images/crypto.ppm
--- a/display_images/daily_weather.ppm
+++ b/display_images/daily_weather.ppm
--- a/display_images/news.ppm
+++ b/display_images/news.ppm
--- a/display_images/stocks.ppm
+++ b/display_images/stocks.ppm
--- a/display_images/today_weather.ppm
+++ b/display_images/today_weather.ppm
--- a/stockTicker.py
+++ b/stockTicker.py
@ -363,7 +363,6 @@ class StockTicker():
                if kill: break
                while pause_frames > 0:
                    if pause_frames%frames == 0:
-                  
                        try:
                            
                            image.seek(frame)
@ -391,9 +390,6 @@ class StockTicker():
                
                # for animation in gifs
                if offset_x%frames == 0:
-                    
-                    
-            
                    try:
                        print(frame)
                        image.seek(frame)
@ -404,8 +400,7 @@ class StockTicker():
                        
                        image.seek(frame)
                    frame +=1
-                    
-                    
+
                #image = image.convert('RGB')
                offset_x -= 1

@ -416,12 +411,8 @@ class StockTicker():
                    
                    double_buffer.SetImage(image.convert('RGB'), offset_x, offset_y)
                
-          
-                
                buff = 0
-                
-                    
-                
+
                # remove the ppixels behind the image, to stop trailing    
                double_buffer = self.matrix.SwapOnVSync(double_buffer)
                for y in range(self.matrix.height):