Skip to content

Added support for RGB Matrix FeatherWing #23

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
Oct 2, 2020
Merged

Added support for RGB Matrix FeatherWing #23

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a13037
Added support for RGB Matrix Feather
makermelissa Oct 2, 2020
13711e4
Merge branch 'master' of https://github.com/adafruit/Adafruit_Circuit…
makermelissa Oct 2, 2020
e52041e
Refactored to use os.uname
makermelissa Oct 2, 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
44 changes: 25 additions & 19 deletions adafruit_matrixportal/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

"""

import os
import board
import displayio
import rgbmatrix
Expand All @@ -50,18 +51,13 @@ class Matrix:
# pylint: disable=too-few-public-methods,too-many-branches
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 "Matrix Portal M4" in os.uname().machine:
# MatrixPortal M4 Board
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]

if hasattr(board, "MTX_R1"):
rgb_pins = [
board.MTX_R1,
board.MTX_G1,
Expand All @@ -70,24 +66,34 @@ def __init__(self, *, width=64, height=32, bit_depth=2, alt_addr_pins=None):
board.MTX_G2,
board.MTX_B2,
]
else:
rgb_pins = [board.D2, board.D3, board.D4, board.D5, board.D6, board.D7]

if hasattr(board, "MTX_CLK"):
clock_pin = board.MTX_CLK
else:
clock_pin = board.A4

if hasattr(board, "MTX_CLK"):
latch_pin = board.MTX_LAT
else:
latch_pin = board.D10

if hasattr(board, "MTX_OE"):
oe_pin = board.MTX_OE
elif "Feather" in os.uname().machine:
print("Feather Detected")
# Feather Style Board
if height > 16:
addr_pins.append(board.A2)
rgb_pins = [board.D6, board.D5, board.D9, board.D11, board.D10, board.D12]
clock_pin = board.D13
latch_pin = board.D0
oe_pin = board.D1
else:
# Metro/Grand Central Style Board
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think maybe better to look in os.uname?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, I looked for something like that but didn't see it the first time. Thanks.

if alt_addr_pins is None and height <= 16:
raise RuntimeError(
"Pin A2 unavailable in this mode. Please specify alt_addr_pins."
)
addr_pins = [board.A0, board.A1, board.A2, board.A3]
rgb_pins = [board.D2, board.D3, board.D4, board.D5, board.D6, board.D7]
clock_pin = board.A4
latch_pin = board.D10
oe_pin = board.D9

# Alternate Address Pins
if alt_addr_pins is not None:
addr_pins = alt_addr_pins

try:
displayio.release_displays()
matrix = rgbmatrix.RGBMatrix(
Expand Down