From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 29 Dec 2023 16:30:28 +0000 (-0800)
Subject: Merge pull request #764 from makermelissa/main
X-Git-Tag: 8.29.0
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/90a96ca6db451ebad7639a8091167d0da2b180c9?hp=eafdc240d946105bb4d65a22320957357ef70570

Merge pull request #764 from makermelissa/main

Fix pulsein for the Pi 5 and make lockable silent
---

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)