Merge pull request #55 from adafruit/require-rpi-gpio

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

diff --git a/src/busio.py b/src/busio.py
index 72f3c7a66627e58f2c9eee4981112131fe4ddd73..1576ac9225607175e7034c74a568206cb32553ca 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -16,8 +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 == "raspi_3" or board_id == "raspi_2" or board_id == "beaglebone_black":
+            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


@@ -50,33 +50,42 @@ class I2C(Lockable):
                 end = len(buffer)
             buffer = memoryview(buffer)[start:end]
         stop = True  # remove for efficiency later
                 end = len(buffer)
             buffer = memoryview(buffer)[start:end]
         stop = True  # remove for efficiency later

-        return self._i2c.readfrom_into(address, buffer, stop)
+        return self._i2c.readfrom_into(address, buffer, stop=stop)

 
     def writeto(self, address, buffer, *, start=0, end=None, stop=True):
         if isinstance(buffer, str):
             buffer = bytes([ord(x) for x in buffer])
         if start is not 0 or end is not None:
             if end is None:
 
     def writeto(self, address, buffer, *, start=0, end=None, stop=True):
         if isinstance(buffer, str):
             buffer = bytes([ord(x) for x in buffer])
         if start is not 0 or end is not None:
             if end is None:

-                return self._i2c.writeto(address, memoryview(buffer)[start:], stop)
+                return self._i2c.writeto(address, memoryview(buffer)[start:], stop=stop)

             else:
             else:

-                return self._i2c.writeto(address, memoryview(buffer)[start:end], stop)
-        return self._i2c.writeto(address, buffer, stop)
+                return self._i2c.writeto(address, memoryview(buffer)[start:end], stop=stop)
+        return self._i2c.writeto(address, buffer, stop=stop)

 
     def writeto_then_readfrom(self, address, buffer_out, buffer_in, *, out_start=0, out_end=None, in_start=0, in_end=None, stop=False):
 
     def writeto_then_readfrom(self, address, buffer_out, buffer_in, *, out_start=0, out_end=None, in_start=0, in_end=None, stop=False):

-        return self._i2c.writeto_then_readfrom(address, buffer_out, buffer_in, out_start, out_end, in_start, in_end, stop)
+        return self._i2c.writeto_then_readfrom(address, buffer_out, buffer_in,
+                                               out_start=out_start, out_end=out_end,
+                                               in_start=in_start, in_end=in_end, stop=stop)

 
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
 
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):

+        print("SPI(): __init()")

         self.deinit()
         self.deinit()

-        if board_id == "raspi_3" or board_id == "raspi_2":
-            from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
+        if board_id == "raspi_3" or board_id == "raspi_2" or board_id == "beaglebone_black":
+            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

+        print("spiPorts: {0}".format(spiPorts))
+        print("for:")

         for portId, portSck, portMosi, portMiso in spiPorts:
         for portId, portSck, portMosi, portMiso in spiPorts:

+            print(portId, portSck, portMosi, portMiso)

             if ((clock == portSck) and                   # Clock is required!
                 (MOSI == portMosi or MOSI == None) and   # But can do with just output
                 (MISO == portMiso or MISO == None)):      # Or just input
             if ((clock == portSck) and                   # Clock is required!
                 (MOSI == portMosi or MOSI == None) and   # But can do with just output
                 (MISO == portMiso or MISO == None)):      # Or just input

+                print("Line 91")
+                print(_SPI)
+                print(_SPI(portId))

                 self._spi = _SPI(portId)
                 self._pins = (portSck, portMosi, portMiso)
                 break
                 self._spi = _SPI(portId)
                 self._pins = (portSck, portMosi, portMiso)
                 break


@@ -87,8 +96,12 @@ 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":
+            # reuse the raspberry pi class as both boards use Linux spidev
+            from adafruit_blinka.microcontroller.beaglebone_black.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