Skip to content

Matrix initialization improvement and max_glyphs bugfix #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 19, 2020
Merged

Matrix initialization improvement and max_glyphs bugfix #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a40d77
Matrix initialization improvement
makermelissa Sep 18, 2020
e110da7
Black formatted
makermelissa Sep 18, 2020
da9feb8
Fix a max_glyphs issue when setting text longer
makermelissa Sep 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions adafruit_matrixportal/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
7 changes: 1 addition & 6 deletions adafruit_matrixportal/matrixportal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down