Merge pull request #19 from makermelissa/master

Matrix initialization improvement and max_glyphs bugfix

Author: ladyada

adafruit_matrixportal/matrix.py

@@ -53,23 +53,11 @@ def __init__(self, *, width=64, height=32, bit_depth=2, alt_addr_pins=None):
         if alt_addr_pins is not None:
             addr_pins = alt_addr_pins
         elif hasattr(board, "MTX_ADDRA"):
-            if height <= 16:
-                addr_pins = [board.MTX_ADDRA, board.MTX_ADDRB, board.MTX_ADDRC]
-            elif height <= 32:
-                addr_pins = [
-                    board.MTX_ADDRA,
-                    board.MTX_ADDRB,
-                    board.MTX_ADDRC,
-                    board.MTX_ADDRD,
-                ]
-            else:
-                addr_pins = [
-                    board.MTX_ADDRA,
-                    board.MTX_ADDRB,
-                    board.MTX_ADDRC,
-                    board.MTX_ADDRD,
-                    board.MTX_ADDRE,
-                ]
+            addr_pins = [board.MTX_ADDRA, board.MTX_ADDRB, board.MTX_ADDRC]
+            if height > 16:
+                addr_pins.append(board.MTX_ADDRD)
+            if height > 32:
+                addr_pins.append(board.MTX_ADDRE)
         else:
             addr_pins = [board.A0, board.A1, board.A2, board.A3]
 

adafruit_matrixportal/matrixportal.py

@@ -251,19 +251,14 @@ def set_text(self, val, index=0):
         if not self._text:
             self.add_text()
         string = str(val)
-        if not string:
-            max_glyphs = 50
-        else:
-            max_glyphs = len(string)
         if self._text_maxlen[index]:
             string = string[: self._text_maxlen[index]]
         print("text index", self._text[index])
         index_in_splash = None
         if self._text[index] is not None:
             print("Replacing text area with :", string)
-            self._text[index].text = string
             index_in_splash = self.splash.index(self._text[index])
-        self._text[index] = Label(self._text_font, text=string, max_glyphs=max_glyphs)
+        self._text[index] = Label(self._text_font, text=string)
         self._text[index].color = self._text_color[index]
         self._text[index].x = self._text_position[index][0]
         self._text[index].y = self._text_position[index][1]