Merge branch 'master' of https://github.com/binhollc/Adafruit_Blinka

diff --git a/src/adafruit_blinka/board/binho_nova.py b/src/adafruit_blinka/board/binho_nova.py
index 4d735563084944896bd09b34db946947a312b4b0..0dfe4a4291c6483ee3c8edfd3a06244f2ae53d56 100644 (file)
--- a/src/adafruit_blinka/board/binho_nova.py
+++ b/src/adafruit_blinka/board/binho_nova.py
@@ -16,5 +16,5 @@ SCK = pin.SCK
 SCLK = pin.SCLK
 MOSI = pin.MOSI
 MISO = pin.MISO
-SS0  = pin.SS0
-SS1  = pin.SS1
\ No newline at end of file
+SS0 = pin.SS0
+SS1 = pin.SS1

diff --git a/src/adafruit_blinka/board/raspi_40pin.py b/src/adafruit_blinka/board/raspi_40pin.py
index 47582918d8134e01e26420e05a235c642b5e8891..acfa5d14396b015cfb66c7312e5b87bcc2dc8c3b 100644 (file)
--- 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 10835dc05741c66f5e0f9d7110770d7b29ea81ec..3db76dfec133425357f34ada784f2c8d0f2a676e 100644 (file)
--- 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/adafruit_blinka/microcontroller/nova/pin.py b/src/adafruit_blinka/microcontroller/nova/pin.py
index 015a27f01661a1e9c5dc8811a046315014027791..235e4ec749bd84cbf11b777864f37de15795510a 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/pin.py
+++ b/src/adafruit_blinka/microcontroller/nova/pin.py
@@ -48,7 +48,6 @@ IO2 = Pin(2)
 IO3 = Pin(3)
 IO4 = Pin(4)
 
-# create None type pins for I2C and SPI since they are expected to be defined
 SCL = IO2
 SDA = IO0
 SCK = SCLK = IO3
@@ -70,4 +69,4 @@ UART1_TX = IO4
 UART1_RX = IO3
 
 # ordered as uartId, txId, rxId
-uartPorts = ((0, UART1_TX, UART1_RX), )
\ No newline at end of file
+uartPorts = ((0, UART1_TX, UART1_RX), )

diff --git a/src/board.py b/src/board.py
index e0079008f2b686b9865036eadd5590c9239618b8..ef2f086c26c40f65d4dfccef3007aa430193b3b3 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -57,6 +57,9 @@ elif detector.board.RASPBERRY_PI_B_REV2:
 
 elif board_id == ap_board.BEAGLEBONE_BLACK:
     from adafruit_blinka.board.beaglebone_black import *
+       
+elif board_id == ap_board.BEAGLEBONE_BLACK_INDUSTRIAL:
+    from adafruit_blinka.board.beaglebone_black import *
 
 elif board_id == ap_board.BEAGLEBONE_GREEN_WIRELESS:
     from adafruit_blinka.board.beaglebone_black import *

diff --git a/src/busio.py b/src/busio.py
index b478ec06c6a37cdef99720b71712607e1f0d0253..74cfa89eb75d2dabe4bc68bedeae80aab87701ea 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -33,9 +33,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)