Merge https://github.com/adafruit/Adafruit_Blinka into module_refactor

diff --git a/src/adafruit_blinka/board/onion_omega.py b/src/adafruit_blinka/board/onion_omega.py
new file mode 100644 (file)
index 0000000..8b60c81
--- /dev/null
+++ b/src/adafruit_blinka/board/onion_omega.py
@@ -0,0 +1,42 @@
+"""Pin definitions for the Pine64."""
+
+from adafruit_blinka.microcontroller.atheros.ar9331 import pin
+
+GPIO_2 = pin.GPIO_2
+GPIO_3 = pin.GPIO_3
+GPIO_4 = pin.GPIO_4
+GPIO_5 = pin.GPIO_5
+GPIO_6 = pin.GPIO_6
+GPIO_7 = pin.GPIO_7
+GPIO_8 = pin.GPIO_8
+GPIO_9 = pin.GPIO_9
+GPIO_10 = pin.GPIO_10
+GPIO_11 = pin.GPIO_11
+GPIO_12 = pin.GPIO_12
+GPIO_13 = pin.GPIO_13
+GPIO_14 = pin.GPIO_14
+GPIO_15 = pin.GPIO_15
+GPIO_16 = pin.GPIO_16
+GPIO_17 = pin.GPIO_17
+GPIO_18 = pin.GPIO_18
+GPIO_19 = pin.GPIO_19
+GPIO_20 = pin.GPIO_20
+GPIO_21 = pin.GPIO_21
+GPIO_22 = pin.GPIO_22
+GPIO_23 = pin.GPIO_23
+GPIO_24 = pin.GPIO_24
+GPIO_25 = pin.GPIO_25
+GPIO_26 = pin.GPIO_26
+GPIO_27 = pin.GPIO_27
+GPIO_28 = pin.GPIO_28
+
+SDA = GPIO_21
+SCL = GPIO_20
+
+SCLK = GPIO_3
+MOSI = GPIO_4
+MISO = GPIO_5
+CS = GPIO_2
+
+UART_TX = GPIO_10
+UART_RX = GPIO_9

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..3ead989dac6c156d1b5979b7ce218696f31cf092 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
 
@@ -127,6 +127,9 @@ elif board_id == ap_board.MICROCHIP_MCP2221:
 elif board_id == ap_board.PINE64:
     from adafruit_blinka.board.pine64 import *
 
+elif board_id == ap_board.ONION_OMEGA:
+    from adafruit_blinka.board.onion_omega import *
+
 elif "sphinx" in sys.modules:
     pass
 

diff --git a/src/busio.py b/src/busio.py
index 5439745416251218d89af32d0384e1443e13ff35..025a6cfd815a43ec6fc960d67d1396a29aee7f42 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,9 @@ 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
+        elif board_id == ap_board.ONION_OMEGA:
+            from adafruit_blinka.microcontroller.atheros.ar9331.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..48536a80a7f6a2bd0e5835724e380dff7243793b 100755 (executable)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -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)