Merge pull request #59 from ladyada/orangepipc

[hackapet/Adafruit_Blinka.git] / src / busio.py

diff --git a/src/busio.py b/src/busio.py
index 206635d46df557560aab437b123bb217bdd3987e..f82e4c3c3ad941d429100b1e84d37a36aba7e66a 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -16,10 +16,8 @@ class I2C(Lockable):
 
     def init(self, scl, sda, frequency):
         self.deinit()
 
     def init(self, scl, sda, frequency):
         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
+        if board_id in ("raspi_3", "raspi_2", "beaglebone_black", "orangepipc"):
+            from adafruit_blinka.microcontroller.generic_linux.i2c import I2C as _I2C

         else:
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts
         else:
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts


@@ -72,10 +70,8 @@ class I2C(Lockable):
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
         self.deinit()
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
         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
+        if board_id in ("raspi_3", "raspi_2", "beaglebone_black", "orangepipc"):
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

         else:
             from machine import SPI as _SPI
         from microcontroller.pin import spiPorts
         else:
             from machine import SPI as _SPI
         from microcontroller.pin import spiPorts


@@ -93,11 +89,15 @@ class SPI(Lockable):
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
         if board_id == "raspi_3" or board_id == "raspi_2":
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
         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
             from adafruit_blinka.microcontroller.raspi_23.pin import Pin

+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

         elif board_id == "beaglebone_black":
         elif board_id == "beaglebone_black":

-            from adafruit_blinka.microcontroller.beaglebone_black.spi import SPI as _SPI
+            # reuse the raspberry pi class as both boards use Linux spidev

             from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin
             from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin

+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+        elif board_id == "orangepipc":
+            from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

         else:
             from machine import SPI as _SPI
             from machine import Pin
         else:
             from machine import SPI as _SPI
             from machine import Pin