For U2IF have a single value of RP2040_U2IF in chips and a value for each board in boards.

Note: This will need a matching update to Adafruit_Blinka if this is merged.

Author: lesamouraipourpre

adafruit_platformdetect/board.py

@@ -39,7 +39,7 @@
 # imports
 import os
 import re
-from adafruit_platformdetect.constants import boards, chips, u2if
+from adafruit_platformdetect.constants import boards, chips
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PlatformDetect.git"
@@ -159,16 +159,8 @@ def id(self):
             board_id = self._stm32mp1_id()
         elif chip_id == chips.MT8167:
             board_id = boards.CORAL_EDGE_TPU_DEV_MINI
-        elif chip_id == u2if.PICO_U2IF:
-            board_id = u2if.PICO_U2IF
-        elif chip_id == u2if.FEATHER_U2IF:
-            board_id = u2if.FEATHER_U2IF
-        elif chip_id == u2if.ITSYBITSY_U2IF:
-            board_id = u2if.ITSYBITSY_U2IF
-        elif chip_id ==u2if.QTPY_U2IF:
-            board_id = u2if.QTPY_U2IF
-        elif chip_id == u2if.QT2040_TRINKEY_U2IF:
-            board_id = u2if.QT2040_TRINKEY_U2IF
+        elif chip_id == chips.RP2040_U2IF:
+            board_id = self._rp2040_u2if_id()
         self._board_id = board_id
         return board_id
 
@@ -468,6 +460,32 @@ def _allwinner_variants_id(self):
             # TODO: Add other specifc board contexts here
         return board
 
+    def _rp2040_u2if_id(self):
+        import hid
+
+        # look for it based on PID/VID
+        for dev in hid.enumerate():
+            # Raspberry Pi Pico
+            vendor = dev["vendor_id"]
+            product = dev["product_id"]
+            if vendor == 0xCAFE and product == 0x4005:
+                return boards.PICO_U2IF
+            if vendor == 0x239A:
+                # Feather RP2040
+                if product == 0x00F1:
+                    return boards.FEATHER_U2IF
+                # Itsy Bitsy RP2040
+                if product == 0x00FD:
+                    return boards.ITSYBITSY_U2IF
+                # QT Py RP2040
+                if product == 0x00F7:
+                    return boards.QTPY_U2IF
+                # QT2040 Trinkey
+                if product == 0x0109:
+                    return boards.QT2040_TRINKEY_U2IF
+        # Will only reach here if a device was added in chip.py but here.
+        raise RuntimeError("RP2040_U2IF device was added to chip but not board.")
+
     @property
     def any_nanopi(self):
         """Check whether the current board is any defined Nano Pi."""
@@ -618,27 +636,27 @@ def microchip_mcp2221(self):
     @property
     def pico_u2if(self):
         """Check whether the current board is a RPi Pico w/ u2if."""
-        return self.id == u2if.PICO_U2IF
+        return self.id == boards.PICO_U2IF
 
     @property
     def feather_u2if(self):
         """Check whether the current board is a Feather RP2040 w/ u2if."""
-        return self.id == u2if.FEATHER_U2IF
+        return self.id == boards.FEATHER_U2IF
 
     @property
     def itsybitsy_u2if(self):
         """Check whether the current board is a Itsy Bitsy w/ u2if."""
-        return self.id == u2if.ITSYBITSY_U2IF
+        return self.id == boards.ITSYBITSY_U2IF
 
     @property
     def qtpy_u2if(self):
         """Check whether the current board is a QT Py w/ u2if."""
-        return self.id == u2if.QTPY_U2IF
+        return self.id == boards.QTPY_U2IF
 
     @property
     def qt2040_trinkey_u2if(self):
         """Check whether the current board is a QT Py w/ u2if."""
-        return self.id == u2if.QT2040_TRINKEY_U2IF
+        return self.id == boards.QT2040_TRINKEY_U2IF
 
     @property
     def binho_nova(self):

adafruit_platformdetect/chip.py

@@ -110,29 +110,26 @@ def id(
                 )
             if os.environ.get("BLINKA_U2IF"):
                 import hid
-                from adafruit_platformdetect.constants import u2if
 
                 # look for it based on PID/VID
                 for dev in hid.enumerate():
-                    # Raspberry Pi Pico
-                    if dev["vendor_id"] == 0xCAFE and dev["product_id"] == 0x4005:
-                        self._chip_id = u2if.PICO_U2IF
-                        return self._chip_id
-                    # Feather RP2040
-                    if dev["vendor_id"] == 0x239A and dev["product_id"] == 0x00F1:
-                        self._chip_id = u2if.FEATHER_U2IF
-                        return self._chip_id
-                    # Itsy Bitsy RP2040
-                    if dev["vendor_id"] == 0x239A and dev["product_id"] == 0x00FD:
-                        self._chip_id = u2if.ITSYBITSY_U2IF
-                        return self._chip_id
-                    # QT Py RP2040
-                    if dev["vendor_id"] == 0x239A and dev["product_id"] == 0x00F7:
-                        self._chip_id = u2if.QTPY_U2IF
-                        return self._chip_id
-                    # QT2040 Trinkey
-                    if dev["vendor_id"] == 0x239A and dev["product_id"] == 0x0109:
-                        self._chip_id = u2if.QT2040_TRINKEY_U2IF
+                    vendor = dev["vendor_id"]
+                    product = dev["product_id"]
+                    # NOTE: If any products are added here, they need added
+                    # to _rp2040_u2if_id() in board.py as well.
+                    if (
+                        # Raspberry Pi Pico
+                        vendor == 0xCAFE
+                        and product == 0x4005
+                    ) or (
+                        # Feather RP2040
+                        # Itsy Bitsy RP2040
+                        # QT Py RP2040
+                        # QT2040 Trinkey
+                        vendor == 0x239A
+                        and product in (0x00F1, 0x00FD, 0x00F7, 0x0109)
+                    ):
+                        self._chip_id = chips.RP2040_U2IF
                         return self._chip_id
                 raise RuntimeError(
                     "BLINKA_U2IF environment variable "

adafruit_platformdetect/constants/boards.py

@@ -115,6 +115,14 @@
 
 MICROCHIP_MCP2221 = "MICROCHIP_MCP2221"
 
+# Boards with u2if firmware
+# https://github.com/execuc/u2if
+PICO_U2IF = "PICO_U2IF"
+FEATHER_U2IF = "FEATHER_U2IF"
+ITSYBITSY_U2IF = "ITSYBITSY_U2IF"
+QTPY_U2IF = "QTPY_U2IF"
+QT2040_TRINKEY_U2IF = "QT2040_TRINKEY_U2IF"
+
 BINHO_NOVA = "BINHO_NOVA"
 
 ONION_OMEGA = "ONION_OMEGA"

adafruit_platformdetect/constants/chips.py

@@ -46,6 +46,7 @@
 STM32MP157 = "STM32MP157"
 MT8167 = "MT8167"
 ATOM_X5_Z8350 = "X5-Z8350"
+RP2040_U2IF = "RP2040_U2IF"
 
 
 BCM_RANGE = {"BCM2708", "BCM2709", "BCM2711", "BCM2835", "BCM2837"}