use generic pi / 40pin pi

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

diff --git a/src/busio.py b/src/busio.py
index d3bdbf55b9c1542271f3e63e2b6be281d3a58084..b9201409fb50f9051504871121a884282c9d943b 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -8,7 +8,7 @@ See `CircuitPython:busio` in CircuitPython for more details.
 """
 
 from adafruit_blinka import Enum, Lockable, agnostic
-from adafruit_blinka.agnostic import board_id
+from adafruit_blinka.agnostic import board_id, detector
 import adafruit_platformdetect.board as ap_board
 
 EMBEDDED_LINUX_BOARDS = (
@@ -16,7 +16,7 @@ EMBEDDED_LINUX_BOARDS = (
     ap_board.RASPBERRY_PI_3B,
     ap_board.RASPBERRY_PI_3B_PLUS,
     ap_board.BEAGLEBONE_BLACK,
-    ap_board.ORANGEPI_PC,
+    ap_board.ORANGE_PI_PC,
 )
 
 class I2C(Lockable):
@@ -98,13 +98,13 @@ class SPI(Lockable):
                 format((clock, MOSI, MISO), spiPorts))
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
-        if board_id in ap_board.ANY_RASPBERRY_PI_2_OR_3:
+        if detector.board.any_raspberry_pi:
             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:
+        elif board_id == ap_board.ORANGE_PI_PC:
             from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         else: