From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 3 Dec 2019 01:01:16 +0000 (-0800)
Subject: Merge pull request #190 from makermelissa/master
X-Git-Tag: 3.0.7
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/f3a89113466b63c41e62e6bc75eeb40c535c6f75?hp=c12a47fcd81c7d89dea171551cb81b25d2b935a1

Merge pull request #190 from makermelissa/master

Blinka will now work with i2c-3 automatically
---

diff --git a/src/adafruit_blinka/board/raspi_40pin.py b/src/adafruit_blinka/board/raspi_40pin.py
index 4758291..acfa5d1 100644
--- a/src/adafruit_blinka/board/raspi_40pin.py
+++ b/src/adafruit_blinka/board/raspi_40pin.py
@@ -2,6 +2,9 @@
 
 from adafruit_blinka.microcontroller.bcm283x import pin
 
+D0 = pin.D0
+D1 = pin.D1
+
 D2 = pin.D2
 SDA = pin.SDA
 D3 = pin.D3
diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pin.py b/src/adafruit_blinka/microcontroller/bcm283x/pin.py
index 10835dc..3db76df 100644
--- a/src/adafruit_blinka/microcontroller/bcm283x/pin.py
+++ b/src/adafruit_blinka/microcontroller/bcm283x/pin.py
@@ -139,6 +139,5 @@ uartPorts = (
 )
 
 i2cPorts = (
-    (1, SCL, SDA), (0, D1, D0),   # both pi 1 and pi 2 i2c ports!
+    (3, SCL, SDA), (1, SCL, SDA), (0, D1, D0),   # both pi 1 and pi 2 i2c ports!
 )
-
diff --git a/src/busio.py b/src/busio.py
index f71871b..ede1e6c 100755
--- a/src/busio.py
+++ b/src/busio.py
@@ -29,9 +29,12 @@ class I2C(Lockable):
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts
         for portId, portScl, portSda in i2cPorts:
-            if scl == portScl and sda == portSda:
-                self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency)
-                break
+            try:
+                if scl == portScl and sda == portSda:
+                    self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency)
+                    break
+            except RuntimeError:
+                pass
         else:
             raise ValueError(
                 "No Hardware I2C on (scl,sda)={}\nValid I2C ports: {}".format((scl, sda), i2cPorts)