Merge pull request #247 from yeyeto2788/busio_fix

Fix busio board detection for Orange Pi boards.

diff --git a/src/adafruit_blinka/board/orangepi/orangepipc.py b/src/adafruit_blinka/board/orangepi/orangepipc.py
index 7f32cdfeb48e308260682f7b41c03a903bbc9246..e7c4fdacd0dd8ce47f8b9a1cb25d5e210452f865 100644 (file)
--- a/src/adafruit_blinka/board/orangepi/orangepipc.py
+++ b/src/adafruit_blinka/board/orangepi/orangepipc.py
@@ -12,10 +12,12 @@ PA0 = pin.PA0
 PA3 = pin.PA3
 PC0 = pin.PC0
 MOSI = pin.PC0
+MOSI1 = pin.SPI1_MOSI
 PC1 = pin.PC1
 MISO = pin.PC1
 PC2 = pin.PC2
 SCK = pin.PC2
+SCK1 = pin.SPI1_SCLK
 SCLK = pin.PC2
 PA19 = pin.PA19
 PA7 = pin.PA7

diff --git a/src/busio.py b/src/busio.py
index 79e988227aae939d5066ed389da5abbc9703ca63..d4571c4c660e691538b25509eac147e135f7ac1f 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -12,6 +12,7 @@ import threading
 from adafruit_blinka import Enum, Lockable, agnostic
 from adafruit_blinka.agnostic import board_id, detector
 import adafruit_platformdetect.constants.boards as ap_board
+import adafruit_platformdetect.constants.chips as ap_chip
 
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):
@@ -129,7 +130,7 @@ class SPI(Lockable):
         elif detector.board.any_beaglebone:
             from adafruit_blinka.microcontroller.am335x.pin import Pin
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
-        elif board_id == ap_board.ORANGE_PI_PC or board_id == ap_board.ORANGE_PI_R1 or board_id == ap_board.ORANGE_PI_ZERO:
+        elif detector.board.any_orange_pi and detector.chip.id == ap_chip.SUN8I:
             from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif board_id == ap_board.GIANT_BOARD: