fix for adafruit usb issue and rpi5

Author: CamDavidsonPilon

pioreactor/utils/pwm.py

@@ -28,7 +28,6 @@
     from pioreactor.utils.mock import MockHardwarePWM as HardwarePWM
 else:
     from rpi_hardware_pwm import HardwarePWM  # type: ignore
-    from rpi_hardware_pwm import HardwarePWMException  # type: ignore
 
 
 class HardwarePWMOutputDevice(HardwarePWM):
@@ -41,12 +40,14 @@ def __init__(self, pin: GpioPin, frequency: float = 100) -> None:
 
         pwm_channel = self.HARDWARE_PWM_CHANNELS[pin]
 
-        try:
-            super().__init__(
-                pwm_channel, hz=frequency
-            )  # default is chip=0 for all except RPi5 on Kernel 6.6 (which is 2)
-        except HardwarePWMException:
+        import platform
+        from pioreactor.version import rpi_version_info
+
+        if rpi_version_info.startswith("Raspberry Pi 5") and "6.6" in platform.platform():
+            # default is chip=0 for all except RPi5 on Kernel 6.6 (which is 2)
             super().__init__(pwm_channel, hz=frequency, chip=2)
+        else:
+            super().__init__(pwm_channel, hz=frequency, chip=0)
 
     def start(self, initial_dc: pt.FloatBetween0and100) -> None:
         self._started = True

requirements/requirements_worker.txt

@@ -1,5 +1,5 @@
 -r requirements.txt
-Adafruit-Blinka==8.57.0
+Adafruit-Blinka==8.58.1
 adafruit-circuitpython-ads1x15==2.2.23
 adafruit-circuitpython-busdevice==5.2.9
 adafruit-circuitpython-connectionmanager==3.1.1

setup.py

@@ -32,7 +32,7 @@
 
 
 WORKER_REQUIREMENTS = [
-    "Adafruit-Blinka==8.57.0",
+    "Adafruit-Blinka==8.58.1",
     "adafruit-circuitpython-ads1x15==2.2.23",
     "adafruit-circuitpython-busdevice==5.2.9",
     "adafruit-circuitpython-connectionmanager==3.1.1",