From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 2 Jul 2024 15:19:04 +0000 (-0700)
Subject: Merge pull request #864 from brentru/fix-mcp-nack
X-Git-Tag: 8.45.2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/322e03f883e36912f9ee6fa7c6559d622f9e7db0?hp=e0e95bad7142e07f0151a99a32b1d327776ec0b5

Merge pull request #864 from brentru/fix-mcp-nack

Fix MCP2221 I2C NACK Error
---

diff --git a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
index 90ed49e..2dcc539 100644
--- a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
+++ b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
@@ -248,7 +248,7 @@ class MCP2221:
         for _ in range(MCP2221_RETRY_MAX):
             status = self._i2c_status()
             if status[20] & MASK_ADDR_NACK:
-                raise RuntimeError("I2C slave address was NACK'd")
+                raise OSError("I2C slave address was NACK'd")
             usb_cmd_status = status[8]
             if usb_cmd_status == 0:
                 break
@@ -360,7 +360,8 @@ class MCP2221:
             # try a write
             try:
                 self.i2c_writeto(addr, b"\x00")
-            except RuntimeError:  # no reply!
+            except OSError:  # no reply!
+                # We got a NACK, which could be correct
                 continue
             # store if success
             found.append(addr)