Merge branch 'main' into main

Author: makermelissa

src/adafruit_blinka/board/generic_agnostic_board.py

@@ -11,9 +11,11 @@
 Dx_INPUT_TRUE_PULL_DOWN = pin.D3
 Dx_OUTPUT = pin.D4
 Dx_INPUT_TOGGLE = pin.D7
-# Special "digital" pins
-NEOPIXEL = pin.D6
 
+# Special digital pins for pixels
+NEOPIXEL = pin.D6
+DOTSTAR_DATA = pin.D8
+DOTSTAR_CLK = pin.D9
 
 # Analog pins
 Ax_INPUT_RAND_INT = pin.A0
@@ -33,6 +35,9 @@
 MISO = pin.MISO
 CS = pin.D6
 
+# SPI port
+spiPorts = ((0, SCK, MOSI, MISO),)
+
 # UART pins
 UART_TX = pin.UART_TX
 UART_RX = pin.UART_RX

src/adafruit_blinka/board/radxa/radxazero3.py

@@ -0,0 +1,65 @@
+# SPDX-FileCopyrightText: 2024 Burberius
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Radxa ZERO 3 (3E and 3W)"""
+
+from adafruit_blinka.microcontroller.rockchip.rk3566 import pin
+
+# ZERO 3 IO pins
+
+D1_A0 = pin.GPIO1_A0
+D1_A1 = pin.GPIO1_A1
+D3_C4 = pin.GPIO3_C4
+D3_A1 = pin.GPIO3_A1
+D3_A2 = pin.GPIO3_A2
+D3_B0 = pin.GPIO3_B0
+D4_C3 = pin.GPIO4_C3
+D4_C5 = pin.GPIO4_C5
+D4_C2 = pin.GPIO4_C2
+D4_B2 = pin.GPIO4_B2
+D3_B3 = pin.GPIO3_B3
+D3_B4 = pin.GPIO3_B4
+D3_C3 = pin.GPIO3_C3
+D3_A4 = pin.GPIO3_A4
+D1_A4 = pin.GPIO1_A4
+D0_D1 = pin.GPIO0_D1
+D0_D0 = pin.GPIO0_D0
+D3_A3 = pin.GPIO3_A3
+D3_B1 = pin.GPIO3_B1
+D3_B2 = pin.GPIO3_B2
+D3_C1 = pin.GPIO3_C1
+D4_C6 = pin.GPIO4_C6
+D4_B3 = pin.GPIO4_B3
+D3_C2 = pin.GPIO3_C2
+D3_A7 = pin.GPIO3_A7
+D3_A6 = pin.GPIO3_A6
+D3_A5 = pin.GPIO3_A5
+
+
+# I2C
+SDA = D1_A0
+SCL = D1_A1
+
+# SPI
+CE0 = D4_C6
+SCLK = D4_C2
+MOSI = D4_C3
+MISO = D4_C5
+
+# UART aliases
+UART_TX = D0_D1
+UART_RX = D0_D0
+UART2_TX = UART_TX
+UART2_RX = UART_RX
+UART3_TX = D1_A1
+UART3_RX = D1_A0
+UART4_TX = D3_B2
+UART4_RX = D3_B1
+UART5_TX = D3_C2
+UART5_RX = D3_C3
+UART9_TX = D4_C5
+UART9_RX = D4_C6
+TXD = D0_D1
+RXD = D0_D0
+TX = D0_D1
+RX = D0_D0

src/adafruit_blinka/microcontroller/generic_agnostic_board/neopixel.py

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2024 Brent Rubell for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""NeoPixel write mocks for a generic board."""
+
+
+# pylint: disable=unused-argument
+def neopixel_write(gpio, buf):
+    """Mocks a neopixel_write function"""
+    # pad output buffer from 3 bpp to 4 bpp
+    buffer = []
+    for i in range(0, len(buf), 3):
+        buffer.append(0)
+        buffer.append(buf[i + 2])
+        buffer.append(buf[i + 1])
+        buffer.append(buf[i])
+
+    # then, do nothing

src/adafruit_blinka/microcontroller/generic_agnostic_board/pin.py

@@ -204,7 +204,10 @@ def value(self, val=None):
 A3 = Pin(10)
 A4 = Pin(12)
 
+# Special digital pins for pixels
 D7 = Pin(11)
+D8 = Pin(13)
+D9 = Pin(14)
 
 # I2C pins
 SDA = Pin()
@@ -217,6 +220,9 @@ def value(self, val=None):
 MISO = Pin()
 CS = Pin()
 
+spiPorts = ((0, SCK, MOSI, MISO),)
+
+
 # UART pins
 UART_TX = Pin()
 UART_RX = Pin()

src/adafruit_blinka/microcontroller/generic_agnostic_board/spi.py

@@ -0,0 +1,57 @@
+# SPDX-FileCopyrightText: 2024 Brent Rubell for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""SPI class for a generic agnostic board."""
+# from .rp2040_u2if import rp2040_u2if
+
+
+# pylint: disable=protected-access, no-self-use
+class SPI:
+    """SPI Base Class for a generic agnostic board."""
+
+    MSB = 0
+
+    def __init__(self, index, *, baudrate=100000):
+        self._index = index
+        self._frequency = baudrate
+
+    # pylint: disable=too-many-arguments,unused-argument
+    def init(
+        self,
+        baudrate=1000000,
+        polarity=0,
+        phase=0,
+        bits=8,
+        firstbit=MSB,
+        sck=None,
+        mosi=None,
+        miso=None,
+    ):
+        """Initialize the Port"""
+        self._frequency = baudrate
+
+    # pylint: enable=too-many-arguments
+
+    @property
+    def frequency(self):
+        """Return the current frequency"""
+        return self._frequency
+
+    # pylint: disable=unnecessary-pass
+    def write(self, buf, start=0, end=None):
+        """Write data from the buffer to SPI"""
+        pass
+
+    # pylint: disable=unnecessary-pass
+    def readinto(self, buf, start=0, end=None, write_value=0):
+        """Read data from SPI and into the buffer"""
+        pass
+
+    # pylint: disable=too-many-arguments, unnecessary-pass
+    def write_readinto(
+        self, buffer_out, buffer_in, out_start=0, out_end=None, in_start=0, in_end=None
+    ):
+        """Perform a half-duplex write from buffer_out and then
+        read data into buffer_in
+        """
+        pass

src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py

@@ -171,6 +171,7 @@
     (1, I2C1_SCL, I2C1_SDA),
     (2, I2C2_SCL_M0, I2C2_SDA_M0),
     (3, I2C3_SCL_M0, I2C3_SDA_M0),
+    (4, I2C4_SCL_M0, I2C4_SDA_M0),
     (5, I2C5_SCL_M0, I2C5_SDA_M0),
 ]
 

src/analogio.py

@@ -9,7 +9,6 @@
 
 * Author(s): Carter Nelson, Melissa LeBlanc-Williams
 """
-import os
 import sys
 
 from adafruit_blinka.agnostic import detector
@@ -63,10 +62,7 @@
     from adafruit_blinka.microcontroller.rp2040_u2if.analogio import (
         AnalogIn_ItsyBitsy as AnalogIn,
     )
-elif (
-    "BLINKA_FORCECHIP" in os.environ
-    and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD"
-):
+elif detector.board.OS_AGNOSTIC_BOARD:
     from adafruit_blinka.microcontroller.generic_agnostic_board.analogio import AnalogIn
     from adafruit_blinka.microcontroller.generic_agnostic_board.analogio import (
         AnalogOut,

src/board.py

@@ -17,7 +17,6 @@
 
 
 import sys
-import os
 import adafruit_platformdetect.constants.boards as ap_board
 from adafruit_blinka.agnostic import board_id, detector
 
@@ -268,6 +267,9 @@
 elif board_id == ap_board.RADXA_ZERO:
     from adafruit_blinka.board.radxa.radxazero import *
 
+elif board_id == ap_board.RADXA_ZERO3:
+    from adafruit_blinka.board.radxa.radxazero3 import *
+
 elif board_id == ap_board.ROCK_PI_S:
     from adafruit_blinka.board.radxa.rockpis import *
 
@@ -391,10 +393,7 @@
 elif board_id == ap_board.WALNUT_PI_1B:
     from adafruit_blinka.board.walnutpi.walnutpi1b import *
 
-elif (
-    "BLINKA_FORCECHIP" in os.environ
-    and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD"
-):
+elif board_id == ap_board.OS_AGNOSTIC_BOARD:
     from adafruit_blinka.board.generic_agnostic_board import *
 
 elif "sphinx" in sys.modules:

src/busio.py

@@ -9,8 +9,6 @@
 
 * Author(s): cefn
 """
-import os
-
 try:
     import threading
 except ImportError:
@@ -56,10 +54,7 @@ def init(self, scl, sda, frequency):
             self._i2c = _I2C(frequency=frequency)
             return
 
-        if (
-            "BLINKA_FORCECHIP" in os.environ
-            and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD"
-        ):
+        if detector.board.OS_AGNOSTIC_BOARD:
             from adafruit_blinka.microcontroller.generic_agnostic_board.i2c import (
                 I2C as _I2C,
             )
@@ -363,6 +358,10 @@ def __init__(self, clock, MOSI=None, MISO=None):
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif detector.board.ftdi_ft2232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import SPI as _SPI
+        elif detector.board.OS_AGNOSTIC_BOARD:
+            from adafruit_blinka.microcontroller.generic_agnostic_board.spi import (
+                SPI as _SPI,
+            )
         else:
             from adafruit_blinka.microcontroller.generic_micropython.spi import (
                 SPI as _SPI,

src/digitalio.py

@@ -9,7 +9,6 @@
 
 * Author(s): cefn
 """
-import os
 from adafruit_blinka.agnostic import board_id, detector
 
 # pylint: disable=ungrouped-imports,wrong-import-position,unused-wildcard-import,wildcard-import
@@ -137,10 +136,7 @@
     from machine import Pin
 elif detector.chip.CV1800B:
     from adafruit_blinka.microcontroller.cv1800b.pin import Pin
-elif (
-    "BLINKA_FORCECHIP" in os.environ
-    and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD"
-):
+elif detector.chip.OS_AGNOSTIC:
     from adafruit_blinka.microcontroller.generic_agnostic_board.pin import Pin
 
 from adafruit_blinka import Enum, ContextManaged