use generic pi / 40pin pi

diff --git a/src/board.py b/src/board.py
index 6c0803ed115ae8743b4e990b3403b559b79634db..d90e5de500dfa5d77e961f23db8d38de21853deb 100755 (executable)
--- 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 == 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:
     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 f5a93af68fb1ed80de83f04185a7e29961f2ed85..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 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 = (
 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):
                 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.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 9bee175fd3835c538d7c71aa7005b1a6ad105bcc..2d3f0b588d0bc091eff58855e32335882dd9588b 100644 (file)
--- a/src/pulseio.py
+++ b/src/pulseio.py
@@ -1,4 +1,4 @@
 from adafruit_blinka.agnostic import detector
 
 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
     from adafruit_blinka.microcontroller.bcm283x.pulseio.PulseIn import PulseIn