From: Limor "Ladyada" Fried Date: Mon, 16 Dec 2024 18:57:47 +0000 (-0500) Subject: Merge pull request #917 from adafruit/use-pi5-pio-neopixel X-Git-Tag: 8.51.0~1 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/11261351deabed66120e5a93e5db54cd30c92e91?hp=b91d3fc70bd1599ea50517a390d18a3fc455fc85 Merge pull request #917 from adafruit/use-pi5-pio-neopixel neopixel_write: Use new pio-based code on pi5 --- diff --git a/setup.py b/setup.py index 4ed24be..5ec4231 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,11 @@ if os.path.exists("/proc/device-tree/compatible"): board_reqs = ["RPi.GPIO", "rpi_ws281x>=4.0.0"] # Pi 5 if b"brcm,bcm2712" in compat: - board_reqs = ["rpi_ws281x>=4.0.0", "rpi-lgpio"] + board_reqs = [ + "rpi_ws281x>=4.0.0", + "rpi-lgpio", + "Adafruit-Blinka-Raspberry-Pi5-Neopixel", + ] if ( b"ti,am335x" in compat ): # BeagleBone Black, Green, PocketBeagle, BeagleBone AI, etc. diff --git a/src/neopixel_write.py b/src/neopixel_write.py index 77e5776..641a202 100644 --- a/src/neopixel_write.py +++ b/src/neopixel_write.py @@ -10,13 +10,16 @@ Currently supported on Raspberry Pi only. * Author(s): ladyada """ -# pylint: disable=too-many-boolean-expressions +# pylint: disable=too-many-boolean-expressions, ungrouped-imports import sys -from adafruit_blinka.agnostic import detector +from adafruit_blinka.agnostic import detector, board_id if detector.board.any_raspberry_pi: - from adafruit_blinka.microcontroller.bcm283x import neopixel as _neopixel + if board_id == "RASPBERRY_PI_5": + import adafruit_raspberry_pi5_neopixel_write as _neopixel + else: + from adafruit_blinka.microcontroller.bcm283x import neopixel as _neopixel elif detector.board.pico_u2if: from adafruit_blinka.microcontroller.rp2040_u2if import neopixel as _neopixel elif detector.board.OS_AGNOSTIC_BOARD: