neopixel_write: Use new pio-based code on pi5

diff --git a/setup.py b/setup.py
index 4ed24be227545acca1b70b7a5f43beaf7b228e20..6178044d53a94978b186022fcd232e78d73b1c38 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ 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.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.
     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 77e577674498522bc1396ac44da3c7863185ca17..765d9c040287fa260422056256b0eae8af28ce04 100644 (file)
--- a/src/neopixel_write.py
+++ b/src/neopixel_write.py
@@ -13,10 +13,13 @@ Currently supported on Raspberry Pi only.
 # pylint: disable=too-many-boolean-expressions
 import sys
 
 # pylint: disable=too-many-boolean-expressions
 import sys
 

-from adafruit_blinka.agnostic import detector
+from adafruit_blinka.agnostic import detector, board_id

 
 if detector.board.any_raspberry_pi:
 
 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:
 elif detector.board.pico_u2if:
     from adafruit_blinka.microcontroller.rp2040_u2if import neopixel as _neopixel
 elif detector.board.OS_AGNOSTIC_BOARD: