Merge origin/main (BeaglePlay adafruit#1115) into future-proof

Author: makermelissa-ai-assistant

docs/examples.rst

@@ -35,3 +35,7 @@ See the `CircuitPython docs <https://circuitpython.readthedocs.io/>`_ for extens
 .. literalinclude:: ../examples/piblinka.py
     :caption: examples/piblinka.py
     :linenos:
+
+.. literalinclude:: ../examples/usb_hid_keyboard.py
+    :caption: examples/usb_hid_keyboard.py
+    :linenos:

examples/usb_hid_keyboard.py

@@ -0,0 +1,103 @@
+# SPDX-FileCopyrightText: 2023 Björn Bösel for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+"""
+USB HID Keyboard Example for Raspberry Pi Zero (W)
+===================================================
+
+Demonstrates how to use Blinka's ``usb_hid`` module to turn a
+Raspberry Pi Zero into a USB HID keyboard.
+
+Prerequisites
+-------------
+1. Enable the dwc2 overlay (once, then reboot)::
+
+       sudo bash -c "echo 'dtoverlay=dwc2' >> /boot/config.txt"
+       sudo reboot
+
+2. Load the libcomposite kernel module::
+
+       sudo modprobe libcomposite
+
+   To make it persistent across reboots::
+
+       sudo bash -c "echo 'libcomposite' >> /etc/modules"
+
+3. Install the CircuitPython HID library::
+
+       pip3 install adafruit-circuitpython-hid
+
+Wiring
+------
+- Wire a button between GP20 and GND (types Shift+A).
+- Wire a button between GP21 and GND (types "Hello World!").
+- Wire an LED + 1k resistor between GP16 and GND.
+- Connect the Pi Zero to the host computer via USB.
+
+Run with::
+
+    sudo -E python3 usb_hid_keyboard.py
+
+The ``-E`` flag preserves the user environment so pip-installed
+packages are found when running as root.
+"""
+
+import time
+
+from adafruit_hid.keyboard import Keyboard
+from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
+from adafruit_hid.keycode import Keycode
+
+import board
+import digitalio
+import usb_hid
+from usb_hid import Device
+
+# Button pins (activate internal pull-ups)
+keypress_pins = [board.D20, board.D21]
+
+# What each button sends: a Keycode or a string
+keys_pressed = [Keycode.A, "Hello World!\n"]
+control_key = Keycode.SHIFT
+
+# Set up button inputs with pull-ups
+key_pin_array = []
+for pin in keypress_pins:
+    key_pin = digitalio.DigitalInOut(pin)
+    key_pin.direction = digitalio.Direction.INPUT
+    key_pin.pull = digitalio.Pull.UP
+    key_pin_array.append(key_pin)
+
+# Set up LED output
+led = digitalio.DigitalInOut(board.D16)
+led.direction = digitalio.Direction.OUTPUT
+
+# Create the USB HID keyboard
+usb_hid.enable([Device.KEYBOARD], boot_device=0)
+keyboard = Keyboard(usb_hid.devices)
+keyboard_layout = KeyboardLayoutUS(keyboard)
+
+print("Waiting for key press...")
+
+while True:
+    for key_pin in key_pin_array:
+        if not key_pin.value:  # Button pressed (grounded)
+            i = key_pin_array.index(key_pin)
+            print("Pin #%d is grounded." % i)
+
+            led.value = True
+
+            while not key_pin.value:
+                pass  # Wait for release
+
+            key = keys_pressed[i]
+            if isinstance(key, str):
+                keyboard_layout.write(key)
+            else:
+                keyboard.press(control_key, key)
+                keyboard.release_all()
+
+            led.value = False
+
+    time.sleep(0.01)

setup.py

@@ -21,12 +21,48 @@
 with io.open(os.path.join(here, "README.rst"), encoding="utf-8") as f:
     long_description = "\n" + f.read()
 
-with io.open(os.path.join(here, "requirements.txt"), encoding="utf-8") as f:
-    requirements = [
-        line.strip()
-        for line in f.readlines()
-        if line.strip() and not line.startswith("#")
-    ]
+if not glob.glob("//usr//include//python3.*//Python.h"):
+    raise RuntimeError(
+        "This package requires a Python development environment. "
+        "Please install the python3-dev package for your distribution."
+    )
+
+board_reqs = []
+if os.path.exists("/proc/device-tree/compatible"):
+    with open("/proc/device-tree/compatible", "rb") as f:
+        compat = f.read()
+    # Jetson Nano, TX2, Xavier, etc
+    if b"nvidia,tegra" in compat:
+        board_reqs = ["Jetson.GPIO"]
+    # Pi 5 and Earlier
+    elif (
+        b"brcm,bcm2835" in compat
+        or b"brcm,bcm2836" in compat
+        or b"brcm,bcm2837" in compat
+        or b"brcm,bcm2838" in compat
+        or b"brcm,bcm2711" in compat
+        or b"brcm,bcm2712" in compat
+    ):
+        lgpio_req = "lgpio>=0.2.2.0"
+        try:
+            import lgpio
+        except ImportError:
+            print(
+                "\n*** lgpio is not installed. On Raspberry Pi OS, install it with:\n"
+                "    sudo apt-get install -y python3-lgpio\n"
+                "  Then recreate your virtual environment with --system-site-packages\n"
+                "  or install the wheel from:\n"
+                "    https://github.com/adafruit/lgpio-python-wheels\n"
+            )
+        board_reqs = [
+            "rpi_ws281x>=4.0.0",
+            lgpio_req,
+            "RPi.GPIO",
+            "Adafruit-Blinka-Raspberry-Pi5-Neopixel",
+        ]
+    # BeagleBone Black, Green, PocketBeagle, BeagleBone AI, etc.
+    elif b"ti,am335x" in compat:
+        board_reqs = ["Adafruit_BBIO"]
 
 setup(
     name="Adafruit-Blinka",
@@ -76,7 +112,16 @@
         "micropython-stubs": ["*.pyi"],
     },
     include_package_data=True,
-    install_requires=requirements,
+    install_requires=[
+        "Adafruit-PlatformDetect>=3.89.1",
+        "Adafruit-PureIO>=1.1.7",
+        "binho-host-adapter>=0.1.6",
+        "pyftdi>=0.40.0",
+        "adafruit-circuitpython-typing",
+        "sysv_ipc>=1.1.0;sys_platform=='linux' and platform_machine!='mips'",
+        "toml>=0.10.2;python_version<'3.11'",
+    ]
+    + board_reqs,
     license="MIT",
     classifiers=[
         # Trove classifiers

src/adafruit_blinka/board/beagleboard/beagle_play.py

@@ -0,0 +1,51 @@
+# SPDX-FileCopyrightText: 2026 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the BeaglePlay."""
+from adafruit_blinka.microcontroller.am625x import pin
+
+# MIKROBUS connector I2C (i2c-3, /dev/play/mikrobus/i2c)
+SCL = pin.MIKROBUS_SCL
+SDA = pin.MIKROBUS_SDA
+
+# QWIIC / STEMMA QT connector (i2c-5, /dev/play/qwiic/i2c)
+QWIIC_SCL = pin.QWIIC_SCL
+QWIIC_SDA = pin.QWIIC_SDA
+
+# Grove connector I2C (i2c-1, /dev/play/grove/i2c)
+GROVE_SCL = pin.GROVE_SCL
+GROVE_SDA = pin.GROVE_SDA
+
+# MIKROBUS general-purpose GPIO
+MIKROBUS_GPIO1_7 = pin.MIKROBUS_GPIO1_7
+MIKROBUS_GPIO1_8 = pin.MIKROBUS_GPIO1_8
+MIKROBUS_GPIO1_9 = pin.MIKROBUS_GPIO1_9
+MIKROBUS_GPIO1_10 = pin.MIKROBUS_GPIO1_10
+MIKROBUS_GPIO1_11 = pin.MIKROBUS_GPIO1_11
+MIKROBUS_GPIO1_12 = pin.MIKROBUS_GPIO1_12
+MIKROBUS_W1 = pin.MIKROBUS_W1
+MIKROBUS_GPIO1_14 = pin.MIKROBUS_GPIO1_14
+MIKROBUS_GPIO1_15 = pin.MIKROBUS_GPIO1_15
+MIKROBUS_GPIO1_16 = pin.MIKROBUS_GPIO1_16
+MIKROBUS_GPIO1_17 = pin.MIKROBUS_GPIO1_17
+MIKROBUS_GPIO1_18 = pin.MIKROBUS_GPIO1_18
+MIKROBUS_GPIO1_20 = pin.MIKROBUS_GPIO1_20
+MIKROBUS_GPIO1_21 = pin.MIKROBUS_GPIO1_21
+MIKROBUS_GPIO1_22 = pin.MIKROBUS_GPIO1_22
+MIKROBUS_GPIO1_23 = pin.MIKROBUS_GPIO1_23
+MIKROBUS_GPIO1_24 = pin.MIKROBUS_GPIO1_24
+MIKROBUS_GPIO1_25 = pin.MIKROBUS_GPIO1_25
+
+# MIKROBUS UART (/dev/ttyS0)
+TX = pin.UART_TX
+RX = pin.UART_RX
+
+# User LEDs (gpiochip2)
+LED_USR0 = pin.USR0
+LED_USR1 = pin.USR1
+LED_USR2 = pin.USR2
+LED_USR3 = pin.USR3
+LED_USR4 = pin.USR4
+
+# User button
+USR_BUTTON = pin.USR_BUTTON

src/adafruit_blinka/board/particle/tachyon.py

@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: MIT
 """Pin definitions for the Tachyon."""
 
+import re as _re
+
 from adafruit_blinka.microcontroller.quectel.qcm6490 import pin
 
 for it in pin.i2cPorts:
@@ -51,3 +53,16 @@
 UART_RX = D15
 
 PWM1 = D13
+
+# Expose raw GPIO line-number names (GPIO_6, GPIO_24, GPIO_44, …) so that
+# scripts and demo files can use them directly instead of the D-number aliases.
+
+
+def _export_gpio_names():
+    for name in dir(pin):
+        if _re.match(r"^GPIO_\d+$", name):
+            globals()[name] = getattr(pin, name)
+
+
+_export_gpio_names()
+del _export_gpio_names, _re

src/adafruit_blinka/microcontroller/am625x/__init__.py

@@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: 2026 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""TI AM625X pin names (BeaglePlay)"""
+from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+
+# gpiochip1 (4201000.gpio) – MCU domain GPIO
+QWIIC_SCL = Pin((1, 17))  # MCU_I2C0_SCL
+QWIIC_SDA = Pin((1, 18))  # MCU_I2C0_SDA
+
+# gpiochip2 (600000.gpio) – main_gpio0
+USR0 = Pin((2, 3))  # USR0 LED
+USR1 = Pin((2, 4))  # USR1 LED
+USR2 = Pin((2, 5))  # USR2 LED
+USR3 = Pin((2, 6))  # USR3 LED
+USR4 = Pin((2, 9))  # USR4 LED
+USR_BUTTON = Pin((2, 18))
+
+# gpiochip3 (601000.gpio) – main_gpio1
+# MIKROBUS I2C (i2c-3)
+MIKROBUS_SCL = Pin((3, 22))  # MIKROBUS_GPIO1_22 / main_i2c3_scl
+MIKROBUS_SDA = Pin((3, 23))  # MIKROBUS_GPIO1_23 / main_i2c3_sda
+
+# Grove I2C (i2c-1)
+GROVE_SCL = Pin((3, 28))  # main_i2c1_scl
+GROVE_SDA = Pin((3, 29))  # main_i2c1_sda
+
+# MIKROBUS general-purpose GPIO lines (gpiochip3)
+MIKROBUS_GPIO1_7 = Pin((3, 7))
+MIKROBUS_GPIO1_8 = Pin((3, 8))
+MIKROBUS_GPIO1_9 = Pin((3, 9))
+MIKROBUS_GPIO1_10 = Pin((3, 10))
+MIKROBUS_GPIO1_11 = Pin((3, 11))
+MIKROBUS_GPIO1_12 = Pin((3, 12))
+MIKROBUS_W1 = Pin((3, 13))  # 1-Wire GPIO
+MIKROBUS_GPIO1_14 = Pin((3, 14))
+MIKROBUS_GPIO1_15 = Pin((3, 15))
+MIKROBUS_GPIO1_16 = Pin((3, 16))
+MIKROBUS_GPIO1_17 = Pin((3, 17))
+MIKROBUS_GPIO1_18 = Pin((3, 18))
+# line 19 is VDD_3V3_SD (regulator control – not a user GPIO)
+MIKROBUS_GPIO1_20 = Pin((3, 20))
+MIKROBUS_GPIO1_21 = Pin((3, 21))
+MIKROBUS_GPIO1_22 = MIKROBUS_SCL  # dual-use: I2C SCL or GPIO
+MIKROBUS_GPIO1_23 = MIKROBUS_SDA  # dual-use: I2C SDA or GPIO
+# lines 24/25 are dual-use: MIKROBUS UART TX/RX or GPIO
+MIKROBUS_GPIO1_24 = Pin((3, 24))
+MIKROBUS_GPIO1_25 = Pin((3, 25))
+
+# MIKROBUS UART TX/RX aliases (/dev/ttyS0)
+UART_TX = MIKROBUS_GPIO1_24
+UART_RX = MIKROBUS_GPIO1_25
+
+# ordered as (i2cId, SCL, SDA)
+i2cPorts = (
+    (3, MIKROBUS_SCL, MIKROBUS_SDA),  # MIKROBUS I2C → /dev/play/mikrobus/i2c
+    (1, GROVE_SCL, GROVE_SDA),  # Grove I2C    → /dev/play/grove/i2c
+    (5, QWIIC_SCL, QWIIC_SDA),  # QWIIC        → /dev/play/qwiic/i2c
+)
+
+# ordered as (spiId, sckId, mosiId, misoId)
+# MIKROBUS SPI is managed by the Greybus/CC1352P7 coprocessor;
+# no spidev is exposed by default on stock images.
+spiPorts = ()
+
+# ordered as (uartId, txId, rxId)
+# MIKROBUS UART → /dev/ttyS0
+uartPorts = ((0, UART_TX, UART_RX),)

src/adafruit_blinka/microcontroller/am625x/pin.py

@@ -7,6 +7,7 @@
 import os
 import atexit
 import random
+import signal
 import struct
 import sysv_ipc
 
@@ -31,6 +32,18 @@ def final():
 atexit.register(final)
 
 
+def _signal_handler(signum, frame):  # pylint: disable=unused-argument
+    """Handle SIGTERM/SIGINT to ensure cleanup runs"""
+    final()
+    raise SystemExit(1)
+
+
+try:
+    signal.signal(signal.SIGTERM, _signal_handler)
+except (OSError, ValueError):
+    pass  # Not all environments allow signal handling
+
+
 # pylint: disable=c-extension-no-member
 class PulseIn:
     """PulseIn Class to read PWM signals"""
@@ -108,14 +121,26 @@ def _wait_receive_msg(self, timeout=0, type=2):
 
     # pylint: enable=redefined-builtin
 
+    def __del__(self):
+        self.deinit()
+
     def deinit(self):
         """Deinitialises the PulseIn and releases any hardware and software
         resources for reuse."""
         # Clean up after ourselves
-        self._process.terminate()
-        procs.remove(self._process)
-        self._mq.remove()
-        queues.remove(self._mq)
+        if self._process is not None:
+            self._process.terminate()
+            if self._process in procs:
+                procs.remove(self._process)
+            self._process = None
+        if self._mq is not None:
+            try:
+                self._mq.remove()
+            except sysv_ipc.ExistentialError:
+                pass  # Already removed
+            if self._mq in queues:
+                queues.remove(self._mq)
+            self._mq = None
 
     def __enter__(self):
         """No-op used by Context Managers."""