From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Wed, 22 Jan 2020 18:13:33 +0000 (-0800)
Subject: Merged master
X-Git-Tag: 3.7.0^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/a2a3e0abcbd42560b7ea167735d833dc3a4f4168?hp=-c

Merged master
---

a2a3e0abcbd42560b7ea167735d833dc3a4f4168
diff --combined src/board.py
index 06f95ef,99a1fb3..5f66cf8
--- a/src/board.py
+++ b/src/board.py
@@@ -30,7 -30,7 +30,7 @@@ See `CircuitPython:board` in CircuitPyt
  import sys
  
  from adafruit_blinka.agnostic import board_id, detector
- import adafruit_platformdetect.board as ap_board
+ import adafruit_platformdetect.constants.boards as ap_board
  
  # pylint: disable=wildcard-import,unused-wildcard-import,ungrouped-imports
  
@@@ -44,61 -44,73 +44,73 @@@ elif board_id == ap_board.PYBOARD
      from adafruit_blinka.board.pyboard import *
  
  elif detector.board.any_raspberry_pi_40_pin:
-     from adafruit_blinka.board.raspi_40pin import *
+     from adafruit_blinka.board.raspberrypi.raspi_40pin import *
  
  elif detector.board.any_raspberry_pi_cm:
-     from adafruit_blinka.board.raspi_cm import *
+     from adafruit_blinka.board.raspberrypi.raspi_cm import *
  
  elif detector.board.RASPBERRY_PI_A or detector.board.RASPBERRY_PI_B_REV1:
-     from adafruit_blinka.board.raspi_1b_rev1 import *
+     from adafruit_blinka.board.raspberrypi.raspi_1b_rev1 import *
  
  elif detector.board.RASPBERRY_PI_B_REV2:
-     from adafruit_blinka.board.raspi_1b_rev2 import *
+     from adafruit_blinka.board.raspberrypi.raspi_1b_rev2 import *
  
  elif board_id == ap_board.BEAGLEBONE_BLACK:
-     from adafruit_blinka.board.beaglebone_black import *
+     from adafruit_blinka.board.beagleboard.beaglebone_black import *
  
  elif board_id == ap_board.BEAGLEBONE_BLACK_INDUSTRIAL:
-     from adafruit_blinka.board.beaglebone_black import *
+     from adafruit_blinka.board.beagleboard.beaglebone_black import *
  
  elif board_id == ap_board.BEAGLEBONE_GREEN_WIRELESS:
-     from adafruit_blinka.board.beaglebone_black import *
+     from adafruit_blinka.board.beagleboard.beaglebone_black import *
  
  elif board_id == ap_board.BEAGLEBONE_POCKETBEAGLE:
-     from adafruit_blinka.board.beaglebone_pocketbeagle import *
+     from adafruit_blinka.board.beagleboard.beaglebone_pocketbeagle import *
  
  elif board_id == ap_board.ORANGE_PI_PC:
-     from adafruit_blinka.board.orangepipc import *
+     from adafruit_blinka.board.orangepi.orangepipc import *
  
  elif board_id == ap_board.ORANGE_PI_R1:
-     from adafruit_blinka.board.orangepir1 import *
+     from adafruit_blinka.board.orangepi.orangepir1 import *
  
  elif board_id == ap_board.ORANGE_PI_ZERO:
-     from adafruit_blinka.board.orangepizero import *
+     from adafruit_blinka.board.orangepi.orangepizero import *
+ 
+ elif board_id == ap_board.ORANGE_PI_ONE:
+     from adafruit_blinka.board.orangepi.orangepipc import *
+ 
+ elif board_id == ap_board.ORANGE_PI_PC_PLUS:
+     from adafruit_blinka.board.orangepi.orangepipc import *
+ 
+ elif board_id == ap_board.ORANGE_PI_LITE:
+     from adafruit_blinka.board.orangepi.orangepipc import *
+ 
+ elif board_id == ap_board.ORANGE_PI_PLUS_2E:
+     from adafruit_blinka.board.orangepi.orangepipc import *
  
  elif board_id == ap_board.GIANT_BOARD:
      from adafruit_blinka.board.giantboard import *
  
  elif board_id == ap_board.JETSON_TX1:
-     from adafruit_blinka.board.jetson_tx1 import *
+     from adafruit_blinka.board.nvidia.jetson_tx1 import *
  
  elif board_id == ap_board.JETSON_TX2:
-     from adafruit_blinka.board.jetson_tx2 import *
+     from adafruit_blinka.board.nvidia.jetson_tx2 import *
  
  elif board_id == ap_board.JETSON_XAVIER:
-     from adafruit_blinka.board.jetson_xavier import *
+     from adafruit_blinka.board.nvidia.jetson_xavier import *
  
  elif board_id == ap_board.JETSON_NANO:
-     from adafruit_blinka.board.jetson_nano import *
+     from adafruit_blinka.board.nvidia.jetson_nano import *
  
  elif board_id == ap_board.CORAL_EDGE_TPU_DEV:
      from adafruit_blinka.board.coral_edge_tpu import *
  
  elif board_id == ap_board.ODROID_C2:
-     from adafruit_blinka.board.odroidc2 import *
+     from adafruit_blinka.board.hardkernel.odroidc2 import *
  
  elif board_id == ap_board.ODROID_N2:
-     from adafruit_blinka.board.odroidn2 import *
+     from adafruit_blinka.board.hardkernel.odroidn2 import *
  
  elif board_id == ap_board.DRAGONBOARD_410C:
      from adafruit_blinka.board.dragonboard_410c import *
@@@ -112,9 -124,6 +124,9 @@@ elif board_id == ap_board.BINHO_NOVA
  elif board_id == ap_board.MICROCHIP_MCP2221:
      from adafruit_blinka.board.microchip_mcp2221 import *
  
 +elif board_id == ap_board.SIFIVE_UNLEASHED:
 +    from adafruit_blinka.board.hifive_unleashed import *
 +
  elif board_id == ap_board.PINE64:
      from adafruit_blinka.board.pine64 import *
  
diff --combined src/busio.py
index 1053504,4708e78..79e9882
--- a/src/busio.py
+++ b/src/busio.py
@@@ -11,7 -11,7 +11,7 @@@ import threadin
  
  from adafruit_blinka import Enum, Lockable, agnostic
  from adafruit_blinka.agnostic import board_id, detector
- import adafruit_platformdetect.board as ap_board
+ import adafruit_platformdetect.constants.boards as ap_board
  
  class I2C(Lockable):
      def __init__(self, scl, sda, frequency=400000):
@@@ -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 detector.board.SIFIVE_UNLEASHED:
 +            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
 +            from adafruit_blinka.microcontroller.hfu540.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.ftdi_ft232h:
              from adafruit_blinka.microcontroller.ft232h.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.ft232h.pin import Pin
@@@ -171,6 -165,7 +168,7 @@@
          elif board_id == ap_board.PINE64 or board_id == ap_board.PINEBOOK or board_id == ap_board.PINEPHONE:
              from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+ 
          else:
              from machine import SPI as _SPI
              from machine import Pin
diff --combined src/microcontroller/__init__.py
index f471f7f,538f66c..108d527
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -1,6 -1,6 +1,6 @@@
  """Microcontroller pins"""
  
- from adafruit_platformdetect import chip as ap_chip
+ from adafruit_platformdetect.constants import chips as ap_chip
  from adafruit_blinka import Enum
  from adafruit_blinka.agnostic import board_id, chip_id
  
@@@ -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)
diff --combined src/microcontroller/pin.py
index 7e05247,6c1fe7d..e71dd2a
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -1,6 -1,6 +1,6 @@@
  """Pins named after their chip name."""
  
- import adafruit_platformdetect.chip as ap_chip
+ from adafruit_platformdetect.constants import chips as ap_chip
  from adafruit_blinka.agnostic import chip_id
  
  # We intentionally are patching into this namespace so skip the wildcard check.
@@@ -32,8 -32,6 +32,8 @@@ elif chip_id == ap_chip.APQ8016
      from adafruit_blinka.microcontroller.snapdragon.apq8016.pin import *
  elif chip_id == ap_chip.IMX8MX:
      from adafruit_blinka.microcontroller.nxp_imx8m.pin import *
 +elif chip_id == ap_chip.HFU540:
 +    from adafruit_blinka.microcontroller.hfu540.pin import *
  elif chip_id == ap_chip.FT232H:
      from adafruit_blinka.microcontroller.ft232h.pin import *
  elif chip_id == ap_chip.BINHO:
@@@ -42,5 -40,7 +42,7 @@@ elif chip_id == ap_chip.MCP2221
      from adafruit_blinka.microcontroller.mcp2221.pin import *
  elif chip_id == ap_chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64.pin import *
+ elif chip_id == ap_chip.MIPS24KC:
+     from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
  else:
      raise NotImplementedError("Microcontroller not supported: ", chip_id)