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=3375e0d4fe77ea274990275403fa242459343ac2

Merged master
---

diff --git a/setup.py b/setup.py
index 0bd1560..9f1e8ef 100755
--- 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=['analogio', 'bitbangio', 'board', 'busio', 'digitalio', 'micropython', 'pulseio', 'neopixel_write'],
+    py_modules=['_bleio', '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
new file mode 100755
index 0000000..d6c1426
--- /dev/null
+++ b/src/_bleio.py
@@ -0,0 +1,46 @@
+"""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/beagleboard/__init__.py b/src/adafruit_blinka/board/beagleboard/__init__.py
new file mode 100644
index 0000000..139ec8d
--- /dev/null
+++ b/src/adafruit_blinka/board/beagleboard/__init__.py
@@ -0,0 +1 @@
+"""Boards definition from BeagleBoard"""
diff --git a/src/adafruit_blinka/board/beaglebone_black.py b/src/adafruit_blinka/board/beagleboard/beaglebone_black.py
similarity index 100%
rename from src/adafruit_blinka/board/beaglebone_black.py
rename to src/adafruit_blinka/board/beagleboard/beaglebone_black.py
diff --git a/src/adafruit_blinka/board/beaglebone_pocketbeagle.py b/src/adafruit_blinka/board/beagleboard/beaglebone_pocketbeagle.py
similarity index 100%
rename from src/adafruit_blinka/board/beaglebone_pocketbeagle.py
rename to src/adafruit_blinka/board/beagleboard/beaglebone_pocketbeagle.py
diff --git a/src/adafruit_blinka/board/hardkernel/__init__.py b/src/adafruit_blinka/board/hardkernel/__init__.py
new file mode 100644
index 0000000..4828ef7
--- /dev/null
+++ b/src/adafruit_blinka/board/hardkernel/__init__.py
@@ -0,0 +1 @@
+"""Boards definition from HardKernel"""
diff --git a/src/adafruit_blinka/board/odroidc2.py b/src/adafruit_blinka/board/hardkernel/odroidc2.py
similarity index 100%
rename from src/adafruit_blinka/board/odroidc2.py
rename to src/adafruit_blinka/board/hardkernel/odroidc2.py
diff --git a/src/adafruit_blinka/board/odroidn2.py b/src/adafruit_blinka/board/hardkernel/odroidn2.py
similarity index 100%
rename from src/adafruit_blinka/board/odroidn2.py
rename to src/adafruit_blinka/board/hardkernel/odroidn2.py
diff --git a/src/adafruit_blinka/board/nvidia/__init__.py b/src/adafruit_blinka/board/nvidia/__init__.py
new file mode 100644
index 0000000..69cb70e
--- /dev/null
+++ b/src/adafruit_blinka/board/nvidia/__init__.py
@@ -0,0 +1 @@
+"""Boards definition from NVIDIA"""
diff --git a/src/adafruit_blinka/board/jetson_nano.py b/src/adafruit_blinka/board/nvidia/jetson_nano.py
similarity index 100%
rename from src/adafruit_blinka/board/jetson_nano.py
rename to src/adafruit_blinka/board/nvidia/jetson_nano.py
diff --git a/src/adafruit_blinka/board/jetson_tx1.py b/src/adafruit_blinka/board/nvidia/jetson_tx1.py
similarity index 100%
rename from src/adafruit_blinka/board/jetson_tx1.py
rename to src/adafruit_blinka/board/nvidia/jetson_tx1.py
diff --git a/src/adafruit_blinka/board/jetson_tx2.py b/src/adafruit_blinka/board/nvidia/jetson_tx2.py
similarity index 100%
rename from src/adafruit_blinka/board/jetson_tx2.py
rename to src/adafruit_blinka/board/nvidia/jetson_tx2.py
diff --git a/src/adafruit_blinka/board/jetson_xavier.py b/src/adafruit_blinka/board/nvidia/jetson_xavier.py
similarity index 100%
rename from src/adafruit_blinka/board/jetson_xavier.py
rename to src/adafruit_blinka/board/nvidia/jetson_xavier.py
diff --git a/src/adafruit_blinka/board/orangepi/__init__.py b/src/adafruit_blinka/board/orangepi/__init__.py
new file mode 100644
index 0000000..640a5b3
--- /dev/null
+++ b/src/adafruit_blinka/board/orangepi/__init__.py
@@ -0,0 +1 @@
+"""Boards definition from Xunlong Orange Pi"""
diff --git a/src/adafruit_blinka/board/orangepipc.py b/src/adafruit_blinka/board/orangepi/orangepipc.py
similarity index 100%
rename from src/adafruit_blinka/board/orangepipc.py
rename to src/adafruit_blinka/board/orangepi/orangepipc.py
diff --git a/src/adafruit_blinka/board/orangepir1.py b/src/adafruit_blinka/board/orangepi/orangepir1.py
similarity index 100%
rename from src/adafruit_blinka/board/orangepir1.py
rename to src/adafruit_blinka/board/orangepi/orangepir1.py
diff --git a/src/adafruit_blinka/board/orangepizero.py b/src/adafruit_blinka/board/orangepi/orangepizero.py
similarity index 100%
rename from src/adafruit_blinka/board/orangepizero.py
rename to src/adafruit_blinka/board/orangepi/orangepizero.py
diff --git a/src/adafruit_blinka/board/raspberrypi/__init__.py b/src/adafruit_blinka/board/raspberrypi/__init__.py
new file mode 100644
index 0000000..0969dbf
--- /dev/null
+++ b/src/adafruit_blinka/board/raspberrypi/__init__.py
@@ -0,0 +1 @@
+"""Boards definition from Raspberry Pi"""
diff --git a/src/adafruit_blinka/board/raspi_1b_rev1.py b/src/adafruit_blinka/board/raspberrypi/raspi_1b_rev1.py
similarity index 100%
rename from src/adafruit_blinka/board/raspi_1b_rev1.py
rename to src/adafruit_blinka/board/raspberrypi/raspi_1b_rev1.py
diff --git a/src/adafruit_blinka/board/raspi_1b_rev2.py b/src/adafruit_blinka/board/raspberrypi/raspi_1b_rev2.py
similarity index 100%
rename from src/adafruit_blinka/board/raspi_1b_rev2.py
rename to src/adafruit_blinka/board/raspberrypi/raspi_1b_rev2.py
diff --git a/src/adafruit_blinka/board/raspi_40pin.py b/src/adafruit_blinka/board/raspberrypi/raspi_40pin.py
similarity index 100%
rename from src/adafruit_blinka/board/raspi_40pin.py
rename to src/adafruit_blinka/board/raspberrypi/raspi_40pin.py
diff --git a/src/adafruit_blinka/board/raspi_cm.py b/src/adafruit_blinka/board/raspberrypi/raspi_cm.py
similarity index 100%
rename from src/adafruit_blinka/board/raspi_cm.py
rename to src/adafruit_blinka/board/raspberrypi/raspi_cm.py
diff --git a/src/adafruit_blinka/microcontroller/atheros/ar9331/pin.py b/src/adafruit_blinka/microcontroller/atheros/ar9331/pin.py
index 96a7aab..df72ee2 100644
--- a/src/adafruit_blinka/microcontroller/atheros/ar9331/pin.py
+++ b/src/adafruit_blinka/microcontroller/atheros/ar9331/pin.py
@@ -45,7 +45,7 @@ i2cPorts = (
 
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = (
-    (1, SPI_CLK, SPI_MISO, SPI_MISO),
+    (1, SPI_CLK, SPI_MOSI, SPI_MISO),
 )
 
 # ordered as uartId, txId, rxId
diff --git a/src/adafruit_blinka/microcontroller/ft232h/i2c.py b/src/adafruit_blinka/microcontroller/ft232h/i2c.py
index 7f733c1..16f9598 100644
--- a/src/adafruit_blinka/microcontroller/ft232h/i2c.py
+++ b/src/adafruit_blinka/microcontroller/ft232h/i2c.py
@@ -6,7 +6,7 @@ class I2C:
         # change GPIO controller to I2C
         from pyftdi.i2c import I2cController
         self._i2c = I2cController()
-        self._i2c.configure('ftdi:///1', frequency=frequency)
+        self._i2c.configure('ftdi://ftdi:ft232h/1', frequency=frequency)
         Pin.ft232h_gpio = self._i2c.get_gpio()
 
     def scan(self):
diff --git a/src/adafruit_blinka/microcontroller/ft232h/pin.py b/src/adafruit_blinka/microcontroller/ft232h/pin.py
index 30dbc66..c768ffd 100644
--- a/src/adafruit_blinka/microcontroller/ft232h/pin.py
+++ b/src/adafruit_blinka/microcontroller/ft232h/pin.py
@@ -14,7 +14,7 @@ class Pin:
         if not Pin.ft232h_gpio:
             from pyftdi.i2c import I2cController
             i2c = I2cController()
-            i2c.configure("ftdi:///1")
+            i2c.configure("ftdi://ftdi:ft232h/1")
             Pin.ft232h_gpio = i2c.get_gpio()
         # check if pin is valid
         if pin_id:
diff --git a/src/adafruit_blinka/microcontroller/ft232h/spi.py b/src/adafruit_blinka/microcontroller/ft232h/spi.py
index a260e72..e48f2df 100644
--- a/src/adafruit_blinka/microcontroller/ft232h/spi.py
+++ b/src/adafruit_blinka/microcontroller/ft232h/spi.py
@@ -6,7 +6,7 @@ class SPI:
     def __init__(self):
         from pyftdi.spi import SpiController
         self._spi = SpiController(cs_count=1)
-        self._spi.configure('ftdi:///1')
+        self._spi.configure('ftdi://ftdi:ft232h/1')
         self._port = self._spi.get_port(0)
         self._port.set_frequency(100000)
         self._port._cpol = 0
diff --git a/src/bitbangio.py b/src/bitbangio.py
index c4ffcfb..2fefe60 100755
--- a/src/bitbangio.py
+++ b/src/bitbangio.py
@@ -8,7 +8,7 @@ See `CircuitPython:bitbangio` in CircuitPython for more details.
 """
 
 from adafruit_blinka import Lockable, agnostic
-import adafruit_platformdetect.board as ap_board
+import adafruit_platformdetect.constants.boards as ap_board
 
 
 class I2C(Lockable):
diff --git a/src/board.py b/src/board.py
index 06f95ef..5f66cf8 100755
--- a/src/board.py
+++ b/src/board.py
@@ -30,7 +30,7 @@ See `CircuitPython:board` in CircuitPython for more details.
 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 @@ 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 *
diff --git a/src/busio.py b/src/busio.py
index 1053504..79e9882 100755
--- a/src/busio.py
+++ b/src/busio.py
@@ -11,7 +11,7 @@ import threading
 
 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):
@@ -159,9 +159,6 @@ class SPI(Lockable):
         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 +168,7 @@ class SPI(Lockable):
         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 --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index f471f7f..108d527 100755
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -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
 
@@ -56,5 +56,7 @@ 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 --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 7e05247..e71dd2a 100755
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -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.
@@ -42,5 +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)