From ded5b4efd457280c6f9bef76007c339a95a314e2 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Fri, 2 Oct 2020 21:36:04 -0600 Subject: [PATCH 1/2] Added support for nrf52840 RGB Matrix Featherwing --- adafruit_matrixportal/matrix.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/adafruit_matrixportal/matrix.py b/adafruit_matrixportal/matrix.py index 82e8750..6f3e043 100755 --- a/adafruit_matrixportal/matrix.py +++ b/adafruit_matrixportal/matrix.py @@ -70,12 +70,20 @@ def __init__(self, *, width=64, height=32, bit_depth=2, alt_addr_pins=None): latch_pin = board.MTX_LAT 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 + if "nrf52" in os.uname().sysname: + # nrf52840 Style Feather + addr_pins = [board.D11, board.D5, board.D13] + if height > 16: + addr_pins.append(board.D9) + rgb_pins = [board.D6, board.A5, board.A1, board.A0, board.A4, board.D11] + clock_pin = board.D12 + else: + addr_pins = [board.A5, board.A4, board.A3] + 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: From d993539ee79de549f6ea1720aa3d378f6921fe99 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Fri, 2 Oct 2020 21:41:15 -0600 Subject: [PATCH 2/2] Ran pre-commit hooks --- adafruit_matrixportal/matrix.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/adafruit_matrixportal/matrix.py b/adafruit_matrixportal/matrix.py index 6f3e043..d606e35 100755 --- a/adafruit_matrixportal/matrix.py +++ b/adafruit_matrixportal/matrix.py @@ -82,7 +82,14 @@ def __init__(self, *, width=64, height=32, bit_depth=2, alt_addr_pins=None): addr_pins = [board.A5, board.A4, board.A3] if height > 16: addr_pins.append(board.A2) - rgb_pins = [board.D6, board.D5, board.D9, board.D11, board.D10, board.D12] + 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