From 0aef83e28f1044b2775a02c265b13407a3466209 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Wed, 27 Dec 2023 13:01:47 -0800 Subject: [PATCH] Fix pulsein for the Pi 5 and make lockable silent --- src/adafruit_blinka/__init__.py | 2 -- .../microcontroller/bcm283x/pulseio/PulseIn.py | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/adafruit_blinka/__init__.py b/src/adafruit_blinka/__init__.py index 5bdb2a5..a4ef215 100755 --- a/src/adafruit_blinka/__init__.py +++ b/src/adafruit_blinka/__init__.py @@ -72,8 +72,6 @@ class Lockable(ContextManaged): """Release the lock so others may use the resource.""" if self._locked: self._locked = False - else: - raise ValueError("Not locked") def patch_system(): diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py index 4f7ae36..78d5761 100644 --- a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py +++ b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py @@ -71,8 +71,12 @@ class PulseIn: ] if idle_state: cmd.append("-i") - cmd.append("gpiochip0") - cmd.append(str(pin)) + if isinstance(pin.id, tuple): + cmd.append(f"gpiochip{pin.id[0]}") + cmd.append(str(pin.id[1])) + else: + cmd.append("gpiochip0") + cmd.append(str(pin)) if DEBUG: print(cmd) -- 2.49.0