From: Your Name Date: Mon, 26 Nov 2018 17:17:48 +0000 (+0000) Subject: renamed spi/i2c to generic linux since they're not platform specific X-Git-Tag: 0.3.1^2 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/6892349c68d92b78bd1d20c7c936f8df9478c114?ds=sidebyside renamed spi/i2c to generic linux since they're not platform specific and updated busio to include it when possible --- diff --git a/src/adafruit_blinka/microcontroller/raspi_23/i2c.py b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py similarity index 100% rename from src/adafruit_blinka/microcontroller/raspi_23/i2c.py rename to src/adafruit_blinka/microcontroller/generic_linux/i2c.py diff --git a/src/adafruit_blinka/microcontroller/raspi_23/spi.py b/src/adafruit_blinka/microcontroller/generic_linux/spi.py similarity index 100% rename from src/adafruit_blinka/microcontroller/raspi_23/spi.py rename to src/adafruit_blinka/microcontroller/generic_linux/spi.py diff --git a/src/busio.py b/src/busio.py index fb3ab10..1576ac9 100755 --- a/src/busio.py +++ b/src/busio.py @@ -16,10 +16,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 == "beaglebone_black": - 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 @@ -73,11 +71,8 @@ class SPI(Lockable): def __init__(self, clock, MOSI=None, MISO=None): print("SPI(): __init()") 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": - print("SPI(): beaglebone_black: from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI") - 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 @@ -101,12 +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": - from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI 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.raspi_23.spi import SPI as _SPI 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