mypy fixes

Author: georgeharker

adafruit_neotrellis/multitrellis.py

@@ -31,7 +31,8 @@
 
 from typing import List, Sequence
 
-from adafruit_neotrellis.neotrellis import NeoTrellis
+from adafruit_neotrellis.neotrellis import CallbackType, NeoTrellis
+from adafruit_seesaw.neopixel import PixelType
 
 
 class MultiTrellis:
@@ -42,7 +43,7 @@ class MultiTrellis:
     _cols: int
     _key_pads: List[List[NeoTrellis]]
 
-    def __init__(self, neotrellis_array):
+    def __init__(self, neotrellis_array: List[List[NeoTrellis]]):
         self._trelli = neotrellis_array
         self._rows = len(neotrellis_array)
         self._cols = len(neotrellis_array[0])
@@ -107,7 +108,7 @@ def __getitem__(self, subscript: int) -> Sequence[NeoTrellis]:
     def get_keypad(self, x: int, y: int) -> NeoTrellis:
         return self._key_pads[y][x]
 
-    def activate_key(self, x, y, edge, enable=True):
+    def activate_key(self, x: int, y: int, edge: int, enable: bool = True):
         """Activate or deactivate a key on the trellis. x and y are the index
         of the key measured from the top lefthand corner. Edge specifies what
         edge to register an event on and can be NeoTrellis.EDGE_FALLING or
@@ -116,13 +117,13 @@ def activate_key(self, x, y, edge, enable=True):
         pad = self._key_pads[y][x]
         pad.activate_key(pad.key_index(x, y), enable)
 
-    def set_callback(self, x, y, function):
+    def set_callback(self, x: int, y: int, function: CallbackType):
         """Set a callback function for when an event for the key at index x, y
         (measured from the top lefthand corner) is detected."""
         pad = self._key_pads[y][x]
         pad.callbacks[pad.key_index(x, y)] = function
 
-    def color(self, x, y, color):
+    def color(self, x: int, y: int, color: PixelType):
         """Set the color of the pixel at index x, y measured from the top
         lefthand corner of the matrix"""
         pad = self._key_pads[y][x]
@@ -137,7 +138,7 @@ def data_pending(self) -> bool:
                     return True
         return False
 
-    def sync(self):
+    def sync(self) -> None:
         """Read all trellis boards in the matrix and call any callbacks"""
         for py in range(self._rows):
             for px in range(self._cols):

adafruit_neotrellis/neotrellis.py

@@ -63,6 +63,9 @@
 _NEO_TRELLIS_NUM_KEYS = const(64)
 
 
+CallbackType = Callable[[KeyEvent], None]
+
+
 class NeoTrellis(Keypad):
     """Driver for the Adafruit NeoTrellis."""
 
@@ -71,7 +74,7 @@ class NeoTrellis(Keypad):
     x_base: int
     y_base: int
     interrupt_enabled: bool
-    callbacks: List[Optional[Callable[[KeyEvent], None]]]
+    callbacks: List[Optional[CallbackType]]
     pixels: NeoPixel
 
     def __init__(self, i2c_bus, interrupt=False,