From d737de33dcfb152520df8c4fc980c501cec7fbad Mon Sep 17 00:00:00 2001 From: Willem Date: Thu, 7 Jan 2021 14:53:50 +0100 Subject: [PATCH] cleaned up --- ledmatrix.py | 9 ++++----- weatherscene.py | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ledmatrix.py b/ledmatrix.py index 26fa538..75e49ab 100755 --- a/ledmatrix.py +++ b/ledmatrix.py @@ -55,7 +55,6 @@ class LedMatrix: return math.floor(n * multiplier) / multiplier - def xy_to_phys(self, x, y): """ Map x,y to physical LED address after accounting for display rotation @@ -74,16 +73,16 @@ class LedMatrix: x = y y = self.columns-1-tmp # The LEDs are laid out in a long string going from north to south, - # one step to the east, and then south to north, before the cycle + # one step to the east, and then south to north, before thxy e cycle # starts over. stride = self.stride - phys_addr = ((x-1)%self.panelcolumn) + ((y-1)*self.panelcolumn) + (self.round_down((x-1)/self.panelcolumn) * self.panelcolumn * self.panelcolumn) - #MOD(x-1;panelCol) + ((y-1)*panelCol) + (FLOOR.MATH((x-1)/panelCol;1)*panelCol*panelRow) + phys_addr = ((x)%self.panelcolumn) + ((y)*self.panelcolumn) + (self.round_down((x)/self.panelcolumn) * self.panelcolumn * self.panelcolumn) + # if x & 1: # phys_addr += stride - 1 - y # else: # phys_addr += y - # return phys_addr + return phys_addr def get_pixel(self, x, y): """ diff --git a/weatherscene.py b/weatherscene.py index 2c53bdd..7f2d0f0 100755 --- a/weatherscene.py +++ b/weatherscene.py @@ -29,8 +29,8 @@ class WeatherScene: self.icon = None self.debug = False self.intensity = 16 - self.lat = 59.3293 - self.lon = 18.0686 + self.lat = 51.666664 + self.lon = 5.3666652 self.api_url = 'https://opendata-download-metfcst.smhi.se' self.headers = { 'User-Agent':'weatherscene.py/1.0 (+https://github.com/noahwilliamsson/lamatrix)',