Linting + Generic shift function

Author: makermelissa

adafruit_ht16k33/matrix.py

@@ -52,61 +52,75 @@ def __setitem__(self, key, value):
         x, y = key
         self.pixel(x, y, value)
 
-    def shift_right(self, rotate=False):
+    def shift(self, x, y, rotate=False):
         """
-        Shift all pixels right
+        Shift pixels by x and y
 
         :param rotate: (Optional) Rotate the shifted pixels to the left side (default=False)
         """
-        for y in range(0, self.rows):
-            last_pixel = self[self.columns - 1, y] if rotate else 0
-            for x in range(self.columns - 1, 0, -1):
-                self[x, y] = self[x - 1, y]
-            self[0, y] = last_pixel
+        if x > 0: # Shift Right
+            for _ in range(x):
+                for row in range(0, self.rows):
+                    last_pixel = self[self.columns - 1, row] if rotate else 0
+                    for col in range(self.columns - 1, 0, -1):
+                        self[col, row] = self[col - 1, row]
+                    self[0, row] = last_pixel
+        elif x < 0: # Shift Left
+            for _ in range(-x):
+                for row in range(0, self.rows):
+                    last_pixel = self[0, row] if rotate else 0
+                    for col in range(0, self.columns - 1):
+                        self[col, row] = self[col + 1, row]
+                    self[self.columns - 1, row] = last_pixel
+        if y > 0: # Shift Up
+            for _ in range(y):
+                for col in range(0, self.columns):
+                    last_pixel = self[col, self.rows - 1] if rotate else 0
+                    for row in range(self.rows - 1, 0, -1):
+                        self[col, row] = self[col, row - 1]
+                    self[col, 0] = last_pixel
+        elif y < 0: # Shift Down
+            for _ in range(-y):
+                for col in range(0, self.columns):
+                    last_pixel = self[col, 0] if rotate else 0
+                    for row in range(0, self.rows - 1):
+                        self[col, row] = self[col, row + 1]
+                    self[col, self.rows - 1] = last_pixel
         if self._auto_write:
             self.show()
 
+
+    def shift_right(self, rotate=False):
+        """
+        Shift all pixels right
+
+        :param rotate: (Optional) Rotate the shifted pixels to the left side (default=False)
+        """
+        self.shift(1, 0, rotate)
+
     def shift_left(self, rotate=False):
         """
         Shift all pixels left
 
         :param rotate: (Optional) Rotate the shifted pixels to the right side (default=False)
         """
-        for y in range(0, self.rows):
-            last_pixel = self[0, y] if rotate else 0
-            for x in range(0, self.columns - 1):
-                self[x, y] = self[x + 1, y]
-            self[self.columns - 1, y] = last_pixel
-        if self._auto_write:
-            self.show()
+        self.shift(-1, 0, rotate)
 
     def shift_up(self, rotate=False):
         """
         Shift all pixels up
 
         :param rotate: (Optional) Rotate the shifted pixels to bottom (default=False)
         """
-        for x in range(0, self.columns):
-            last_pixel = self[x, self.rows - 1] if rotate else 0
-            for y in range(self.rows - 1, 0, -1):
-                self[x, y] = self[x, y - 1]
-            self[x, 0] = last_pixel
-        if self._auto_write:
-            self.show()
+        self.shift(0, 1, rotate)
 
     def shift_down(self, rotate=False):
         """
         Shift all pixels down
 
         :param rotate: (Optional) Rotate the shifted pixels to top (default=False)
         """
-        for x in range(0, self.columns):
-            last_pixel = self[x, 0] if rotate else 0
-            for y in range(0, self.rows - 1):
-                self[x, y] = self[x, y + 1]
-            self[x, self.rows - 1] = last_pixel
-        if self._auto_write:
-            self.show()
+        self.shift(0, -1, rotate)
 
     @property
     def columns(self):

examples/ht16k33_matrix_simpletest.py

@@ -73,4 +73,3 @@
     for frame in range(0, 8):
         matrix.shift_up(True)
         time.sleep(0.05)
-