From: Drew Fustini <drew@pdp7.com>
Date: Tue, 20 Nov 2018 06:27:02 +0000 (-0600)
Subject: Merge pull request #42 from pdp7/master
X-Git-Tag: 0.3.0~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/a39d034521be3a4751b326155ff0754cfe79c601?hp=5726b6f83a991f3c957f4b6800bf1ee6d44c9845

Merge pull request #42 from pdp7/master

add preliminary I2C bus support for the BeagleBone Black
---

diff --git a/src/adafruit_blinka/board/beaglebone_black.py b/src/adafruit_blinka/board/beaglebone_black.py
index c744965..337270d 100644
--- a/src/adafruit_blinka/board/beaglebone_black.py
+++ b/src/adafruit_blinka/board/beaglebone_black.py
@@ -73,3 +73,23 @@ LED_USR0 = pin.USR0
 LED_USR1 = pin.USR1
 LED_USR2 = pin.USR2
 LED_USR3 = pin.USR3
+
+# I2C and SPI pins from:
+# src/adafruit_blinka/board/raspi_23.py
+# SDA = pin.SDA
+# SCL = pin.SCL
+# CE1 = pin.D7
+# CE0 = pin.D8
+# MISO = pin.D9
+# MOSI = pin.D10
+# SCLK = pin.D11
+# SCK = pin.D11
+# TXD = pin.D14
+# RXD = pin.D15
+# MISO_1 = pin.D19
+# MOSI_1 = pin.D20
+# SCLK_1 = pin.D21
+# SCK_1 = pin.D21
+
+SDA = pin.SDA
+SCL = pin.SCL
diff --git a/src/adafruit_blinka/microcontroller/beaglebone_black/pin.py b/src/adafruit_blinka/microcontroller/beaglebone_black/pin.py
index 2344c75..ac20f95 100644
--- a/src/adafruit_blinka/microcontroller/beaglebone_black/pin.py
+++ b/src/adafruit_blinka/microcontroller/beaglebone_black/pin.py
@@ -129,6 +129,9 @@ USR1 = Pin('USR1')
 USR2 = Pin('USR2')
 USR3 = Pin('USR3')
 
+SCL = Pin('P9_19')
+SDA = Pin('P9_20')
+
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = ()
 
@@ -138,6 +141,6 @@ uartPorts = (
 )
 
 i2cPorts = (
-    (),
+    (2, SCL, SDA),
 )
 
diff --git a/src/busio.py b/src/busio.py
index 142dcdd..206635d 100755
--- a/src/busio.py
+++ b/src/busio.py
@@ -18,6 +18,8 @@ class I2C(Lockable):
         self.deinit()
         if board_id == "raspi_3" or board_id == "raspi_2":
             from adafruit_blinka.microcontroller.raspi_23.i2c import I2C as _I2C
+        if board_id == "beaglebone_black":
+            from adafruit_blinka.microcontroller.raspi_23.i2c import I2C as _I2C
         else:
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts
@@ -72,6 +74,8 @@ class SPI(Lockable):
         self.deinit()
         if board_id == "raspi_3" or board_id == "raspi_2":
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
+        elif board_id == "beaglebone_black":
+            from adafruit_blinka.microcontroller.beaglebone_black.spi import SPI as _SPI
         else:
             from machine import SPI as _SPI
         from microcontroller.pin import spiPorts
@@ -91,6 +95,9 @@ class SPI(Lockable):
         if board_id == "raspi_3" or board_id == "raspi_2":
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.raspi_23.pin import Pin
+        elif board_id == "beaglebone_black":
+            from adafruit_blinka.microcontroller.beaglebone_black.spi import SPI as _SPI
+            from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin
         else:
             from machine import SPI as _SPI
             from machine import Pin
diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 3973148..e6e6c54 100755
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -30,6 +30,8 @@ elif platform == "stm32":
 elif platform == "linux":
     if board_id == "raspi_3" or board_id == "raspi_2":
         from adafruit_blinka.microcontroller.raspi_23 import *
+    elif board_id == "beaglebone_black":
+        from adafruit_blinka.microcontroller.beaglebone_black import *
     else:
         raise NotImplementedError("Board not supported:", board_id)
 else:
diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 05660a5..d1f0d8b 100755
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -12,6 +12,8 @@ elif agnostic.platform == "stm32":
 elif agnostic.platform == "linux":
     if agnostic.board_id == "raspi_3" or agnostic.board_id == "raspi_2":
         from adafruit_blinka.microcontroller.raspi_23.pin import *
+    elif agnostic.board_id == "beaglebone_black":
+        from adafruit_blinka.microcontroller.beaglebone_black.pin import *
     else:
         raise NotImplementedError("Board not supported: ", agnostic.board_id)
 else: