Merge pull request #256 from swarren/jetson-nx

Add support for NVIDIA Jetson NX

diff --git a/setup.py b/setup.py
index a33cfc778c37b0f52be5b7c8650ce08c1ba5c96a..073fd1897dce079dcf7fbb47178d902a40ece2c8 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
     packages=find_packages("src"),
     # py_modules lists top-level single file packages to include.
     # find_packages only finds packages in directories with __init__.py files.
-    py_modules=['_bleio', 'analogio', 'bitbangio', 'board', 'busio', 'digitalio', 'micropython', 'pulseio', 'neopixel_write'],
+    py_modules=['analogio', 'bitbangio', 'board', 'busio', 'digitalio', 'micropython', 'pulseio', 'neopixel_write'],
     package_data={'adafruit_blinka.microcontroller.bcm283x.pulseio': ['libgpiod_pulsein']},
     install_requires=[
         "Adafruit-PlatformDetect",

diff --git a/src/_bleio.py b/src/_bleio.py
deleted file mode 100755 (executable)
index d6c1426..0000000
--- a/src/_bleio.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""This is a stub of _bleio for use in GitHub Actions CI. It is NOT meant to provide _bleio
-   functionality in CPython."""
-
-adapter = None
-
-class Attribute:
-    NO_ACCESS = 0
-    OPEN = 0
-    ENCRYPT_NO_MITM = 0
-    ENCRYPT_WITH_MITM = 0
-    LESC_ENCRYPT_WITH_MITM = 0
-    SIGNED_NO_MITM = 0
-    SIGNED_WITH_MITM = 0
-
-class UUID:
-    def __init__(self, uuid):
-        pass
-
-class Descriptor:
-    @staticmethod
-    def add_to_characteristic(characteristic, uuid, *, read_perm=Attribute.OPEN,
-                              write_perm=Attribute.OPEN, max_length=20, fixed_length=False,
-                              initial_value=b''):
-        pass
-
-class CharacteristicBuffer:
-    pass
-
-class PacketBuffer:
-    pass
-
-class Characteristic:
-    BROADCAST = 0
-    READ = 0
-    WRITE = 0
-    NOTIFY = 0
-    INDICATE = 0
-    WRITE_NO_RESPONSE = 0
-
-    @staticmethod
-    def add_to_service(service, uuid, *, properties=0, read_perm=Attribute.OPEN,
-                       write_perm=Attribute.OPEN, max_length=20, fixed_length=False,
-                       initial_value=None):
-        raise NotImplementedError()
-
-

diff --git a/src/adafruit_blinka/board/orangepi/orangepipc.py b/src/adafruit_blinka/board/orangepi/orangepipc.py
index 7f32cdfeb48e308260682f7b41c03a903bbc9246..e7c4fdacd0dd8ce47f8b9a1cb25d5e210452f865 100644 (file)
--- a/src/adafruit_blinka/board/orangepi/orangepipc.py
+++ b/src/adafruit_blinka/board/orangepi/orangepipc.py
@@ -12,10 +12,12 @@ PA0 = pin.PA0
 PA3 = pin.PA3
 PC0 = pin.PC0
 MOSI = pin.PC0
+MOSI1 = pin.SPI1_MOSI
 PC1 = pin.PC1
 MISO = pin.PC1
 PC2 = pin.PC2
 SCK = pin.PC2
+SCK1 = pin.SPI1_SCLK
 SCLK = pin.PC2
 PA19 = pin.PA19
 PA7 = pin.PA7

diff --git a/src/board.py b/src/board.py
index 7fb99ae231748762b77e83b667868843f98e61ce..6608ab4ec2e33bddbf46a272e0ad14a76b5c0729 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -66,7 +66,8 @@ elif board_id == ap_board.BEAGLEBONE_BLACK_INDUSTRIAL:
 
 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 *
 

diff --git a/src/busio.py b/src/busio.py
index 649ba86f3bda557720c339d9a373f7f72184fb1f..21cf7ef47dfab5e4787052d19eb48332e8119b16 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -12,6 +12,7 @@ import threading
 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):
@@ -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: