From 27c6c5c3f5baa9eae2dab96a58c7104ed95552aa Mon Sep 17 00:00:00 2001 From: willem Date: Thu, 7 Jan 2021 15:56:49 +0100 Subject: [PATCH] repaired merger conflict --- ledmatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ledmatrix.py b/ledmatrix.py index 75e49ab..3f61810 100755 --- a/ledmatrix.py +++ b/ledmatrix.py @@ -76,7 +76,7 @@ class LedMatrix: # one step to the east, and then south to north, before thxy e cycle # starts over. stride = self.stride - phys_addr = ((x)%self.panelcolumn) + ((y)*self.panelcolumn) + (self.round_down((x)/self.panelcolumn) * self.panelcolumn * self.panelcolumn) + phys_addr = int(((x)%self.panelcolumn) + ((y)*self.panelcolumn) + (self.round_down((x)/self.panelcolumn) * self.panelcolumn * self.panelcolumn)) # if x & 1: # phys_addr += stride - 1 - y