]> Repositories - Adafruit_Blinka-hackapet.git/commitdiff
Merged master
authorMelissa LeBlanc-Williams <melissa@adafruit.com>
Wed, 22 Jan 2020 18:13:33 +0000 (10:13 -0800)
committerMelissa LeBlanc-Williams <melissa@adafruit.com>
Wed, 22 Jan 2020 18:13:33 +0000 (10:13 -0800)
1  2 
src/board.py
src/busio.py
src/microcontroller/__init__.py
src/microcontroller/pin.py

diff --cc src/board.py
Simple merge
diff --cc src/busio.py
index 10535043154397227b44d486e2df7a3e1df8b521,4708e7899e8e8f70c55d848496696e016568f72d..79e988227aae939d5066ed389da5abbc9703ca63
@@@ -156,12 -156,6 +156,9 @@@ class SPI(Lockable)
          elif board_id == ap_board.JETSON_XAVIER:
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.tegra.t194.pin import Pin
-         elif board_id == ap_board.PINE64:
-             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
-             from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
 +        elif detector.board.SIFIVE_UNLEASHED:
 +            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
 +            from adafruit_blinka.microcontroller.hfu540.pin import Pin
          elif detector.board.ftdi_ft232h:
              from adafruit_blinka.microcontroller.ft232h.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.ft232h.pin import Pin
index f471f7f9c8785114cbc0f556aa854a9227a10bc1,538f66c31c4996c007fca700088535494364fccc..108d527bca27a6e4619480e2bbc52c291587e5ba
@@@ -52,9 -52,9 +52,11 @@@ elif chip_id == ap_chip.A64
      from adafruit_blinka.microcontroller.allwinner.a64.pin import *
  elif chip_id == ap_chip.IMX8MX:
      from adafruit_blinka.microcontroller.nxp_imx8m import *
 +elif chip_id == ap_chip.HFU540:
 +    from adafruit_blinka.microcontroller.hfu540.pin import *
  elif chip_id == ap_chip.BINHO:
      from adafruit_blinka.microcontroller.nova import *
+ elif chip_id == ap_chip.MIPS24KC:
+     from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
  else:
      raise NotImplementedError("Microcontroller not supported:", chip_id)
Simple merge