X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/blobdiff_plain/a126c589b809c7a48fa39c585e1f66e3b79eb8bc..701655ace19cad12a315d91df4762c9f0b678ef9:/src/busio.py diff --git a/src/busio.py b/src/busio.py index 302eb88..d3bdbf5 100755 --- a/src/busio.py +++ b/src/busio.py @@ -9,6 +9,15 @@ See `CircuitPython:busio` in CircuitPython for more details. from adafruit_blinka import Enum, Lockable, agnostic from adafruit_blinka.agnostic import board_id +import adafruit_platformdetect.board as ap_board + +EMBEDDED_LINUX_BOARDS = ( + ap_board.RASPBERRY_PI_2B, + ap_board.RASPBERRY_PI_3B, + ap_board.RASPBERRY_PI_3B_PLUS, + ap_board.BEAGLEBONE_BLACK, + ap_board.ORANGEPI_PC, +) class I2C(Lockable): def __init__(self, scl, sda, frequency=400000): @@ -16,8 +25,8 @@ class I2C(Lockable): 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 in EMBEDDED_LINUX_BOARDS: + from adafruit_blinka.microcontroller.generic_linux.i2c import I2C as _I2C else: from machine import I2C as _I2C from microcontroller.pin import i2cPorts @@ -26,8 +35,9 @@ class I2C(Lockable): self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency) break else: - raise NotImplementedError("No Hardware I2C on (scl,sda)={}\nValid UART ports".format( - (scl, sda), i2cPorts)) + raise NotImplementedError( + "No Hardware I2C on (scl,sda)={}\nValid UART ports: {}".format((scl, sda), i2cPorts) + ) def deinit(self): try: @@ -44,33 +54,41 @@ class I2C(Lockable): def scan(self): return self._i2c.scan() - def readfrom_into(self, address, buffer, start=0, end=None): + def readfrom_into(self, address, buffer, *, start=0, end=None): if start is not 0 or end is not None: if end is None: 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): + 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: - 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): + 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): 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 in EMBEDDED_LINUX_BOARDS: + from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI else: from machine import SPI as _SPI from microcontroller.pin import spiPorts for portId, portSck, portMosi, portMiso in spiPorts: - if clock == portSck and MOSI == portMosi and MISO == 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 self._spi = _SPI(portId) self._pins = (portSck, portMosi, portMiso) break @@ -80,9 +98,15 @@ class SPI(Lockable): format((clock, MOSI, MISO), spiPorts)) 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 + if board_id in ap_board.ANY_RASPBERRY_PI_2_OR_3: + from adafruit_blinka.microcontroller.bcm283x.pin import Pin + from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI + elif board_id == ap_board.BEAGLEBONE_BLACK: + from adafruit_blinka.microcontroller.am335x.pin import Pin + from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI + elif board_id == ap_board.ORANGEPI_PC: + 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 @@ -106,14 +130,14 @@ class SPI(Lockable): self._spi = None self._pinIds = None - def write(self, buf): - return self._spi.write(buf) + def write(self, buf, start=0, end=None): + return self._spi.write(buf, start, end) - def readinto(self, buf): - return self._spi.readinto(buf) + def readinto(self, buf, start=0, end=None, write_value=0): + return self._spi.readinto(buf, start, end) - def write_readinto(self, buffer_out, buffer_in): - return self._spi.write_readinto(buffer_out, buffer_in) + def write_readinto(self, buffer_out, buffer_in, out_start=0, out_end=None, in_start=0, in_end=None): + return self._spi.write_readinto(buffer_out, buffer_in, out_start, out_end, in_start, in_end) class UART(Lockable): @@ -141,7 +165,7 @@ class UART(Lockable): if flow is not None: # default 0 raise NotImplementedError( "Parameter '{}' unsupported on {}".format( - "flow", agnostic.board)) + "flow", agnostic.board_id)) # translate parity flag for Micropython if parity is UART.Parity.ODD: @@ -168,8 +192,8 @@ class UART(Lockable): break else: raise NotImplementedError( - "No Hardware UART on (tx,rx)={}\nValid UART ports".format( - (tx, rx), uartPorts)) + "No Hardware UART on (tx,rx)={}\nValid UART ports: {}".format((tx, rx), uartPorts) + ) def deinit(self): self._uart = None