From: Brennen Bearnes <brennen@adafruit.com>
Date: Thu, 20 Dec 2018 19:56:31 +0000 (-0700)
Subject: use generic pi / 40pin pi
X-Git-Tag: 1.0.2~1^2~8
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/f00d819e500ca5d334db378170b384ddc121b496

use generic pi / 40pin pi
---

diff --git a/src/board.py b/src/board.py
index 6c0803e..d90e5de 100755
--- a/src/board.py
+++ b/src/board.py
@@ -43,7 +43,7 @@ elif board_id == ap_board.NODEMCU:
 elif board_id == ap_board.PYBOARD:
     from adafruit_blinka.board.pyboard import *
 
-elif board_id in ap_board.ANY_RASPBERRY_PI_2_OR_3:
+elif board_id in ap_board.ANY_RASPBERRY_PI_40PIN:
     from adafruit_blinka.board.raspi_23 import *
 
 elif board_id == ap_board.BEAGLEBONE_BLACK:
diff --git a/src/busio.py b/src/busio.py
index f5a93af..b920140 100755
--- 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 = (
@@ -98,7 +98,7 @@ 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:
diff --git a/src/pulseio.py b/src/pulseio.py
index 9bee175..2d3f0b5 100644
--- a/src/pulseio.py
+++ b/src/pulseio.py
@@ -1,4 +1,4 @@
 from adafruit_blinka.agnostic import detector
 
-if detector.board.any_raspberry_pi_2_or_3:
+if detector.board.any_raspberry_pi:
     from adafruit_blinka.microcontroller.bcm283x.pulseio.PulseIn import PulseIn