Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka into module_refactor

diff --git a/src/adafruit_blinka/board/beagleboard/__init__.py b/src/adafruit_blinka/board/beagleboard/__init__.py
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 96a7aab15761d0adf8144b4ab407b31bc0b39d65..df72ee2f2e9090c0e4de03a74d6ae321ca6d51e2 100644 (file)
--- 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/bitbangio.py b/src/bitbangio.py
index c4ffcfb10faa55cdac98d9c8307c00ca3661e431..2fefe60a4925e175ac148eabc1429f38ec7d16f6 100755 (executable)
--- 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 5f9ce3375478b085880695f46979af5d73ea1259..99a1fb3b6ee084ce4892fa35c0e1a6136b1779ef 100755 (executable)
--- 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,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.orangepipc import *
+    from adafruit_blinka.board.orangepi.orangepipc import *
 
 elif board_id == ap_board.ORANGE_PI_PC_PLUS:
-    from adafruit_blinka.board.orangepipc import *
+    from adafruit_blinka.board.orangepi.orangepipc import *
 
 elif board_id == ap_board.ORANGE_PI_LITE:
-    from adafruit_blinka.board.orangepipc import *
+    from adafruit_blinka.board.orangepi.orangepipc import *
 
 elif board_id == ap_board.ORANGE_PI_PLUS_2E:
-    from adafruit_blinka.board.orangepipc import *
+    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 5439745416251218d89af32d0384e1443e13ff35..4708e7899e8e8f70c55d848496696e016568f72d 100755 (executable)
--- 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):
@@ -165,6 +165,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 4f5973fc8be913bcbf37fb70c4e29300fb98700c..538f66c31c4996c007fca700088535494364fccc 100755 (executable)
--- 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
 
@@ -54,5 +54,7 @@ elif chip_id == ap_chip.IMX8MX:
     from adafruit_blinka.microcontroller.nxp_imx8m 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 3e4ca44800545b0136ac081a0a9fb03aacb3496d..6c1fe7d4cb1a4af0b10fec2de83f10de8c6557f8 100755 (executable)
--- 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.
@@ -40,5 +40,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)