From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 24 Feb 2020 20:13:24 +0000 (-0800)
Subject: Merge pull request #256 from swarren/jetson-nx
X-Git-Tag: 4.1.0
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/dc7dc8d4946988a1f54fa4cadb5c6b5088fbb289?hp=-c

Merge pull request #256 from swarren/jetson-nx

Add support for NVIDIA Jetson NX
---

dc7dc8d4946988a1f54fa4cadb5c6b5088fbb289
diff --combined src/board.py
index c804bb8,7fb99ae..6608ab4
--- a/src/board.py
+++ b/src/board.py
@@@ -66,8 -66,7 +66,8 @@@ elif board_id == ap_board.BEAGLEBONE_BL
  
  elif board_id == ap_board.BEAGLEBONE_GREEN_WIRELESS:
      from adafruit_blinka.board.beagleboard.beaglebone_black import *
 -
 +elif board_id == ap_board.BEAGLEBONE_BLACK_WIRELESS:
 +    from adafruit_blinka.board.beagleboard.beaglebone_black import *
  elif board_id == ap_board.BEAGLEBONE_POCKETBEAGLE:
      from adafruit_blinka.board.beagleboard.beaglebone_pocketbeagle import *
  
@@@ -107,6 -106,9 +107,9 @@@ elif board_id == ap_board.JETSON_XAVIER
  elif board_id == ap_board.JETSON_NANO:
      from adafruit_blinka.board.nvidia.jetson_nano import *
  
+ elif board_id == ap_board.JETSON_NX:
+     from adafruit_blinka.board.nvidia.jetson_nx import *
+ 
  elif board_id == ap_board.CORAL_EDGE_TPU_DEV:
      from adafruit_blinka.board.coral_edge_tpu import *
  
diff --combined src/busio.py
index d4571c4,649ba86..21cf7ef
--- a/src/busio.py
+++ b/src/busio.py
@@@ -12,7 -12,6 +12,7 @@@ import threadin
  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):
@@@ -130,7 -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:
@@@ -157,6 -156,9 +157,9 @@@
          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.JETSON_NX:
+             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