Merge pull request #366 from johnnohj/main

Include Waveshare RP2040 One (3 of 3)

Author: makermelissa

adafruit_platformdetect/board.py

@@ -832,6 +832,8 @@ def _rp2040_u2if_id(self) -> Optional[str]:
                 # KB2040 Kee Board
                 if product == 0x0105:
                     return boards.KB2040_U2IF
+            if vendor == 0x2E8A and product == 0x103A:
+                return boards.RP2040_ONE_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.")
 
@@ -1082,6 +1084,7 @@ def lazily_generate_conditions():
             yield self.board.QTPY_U2IF
             yield self.board.QT2040_TRINKEY_U2IF
             yield self.board.KB2040_U2IF
+            yield self.board.RP2040_ONE_U2IF
             yield self.board.OS_AGNOSTIC_BOARD
 
         return any(condition for condition in lazily_generate_conditions())
@@ -1209,6 +1212,11 @@ def kb2040_u2if(self) -> bool:
         """Check whether the current board is a KB2040 w/ u2if."""
         return self.id == boards.KB2040_U2IF
 
+    @property
+    def rp2040_one_u2if(self) -> bool:
+        """Check whether the current board is an RP2040 One w/ u2if."""
+        return self.id == boards.RP2040_ONE_U2IF
+
     @property
     def binho_nova(self) -> bool:
         """Check whether the current board is an BINHO NOVA."""

adafruit_platformdetect/chip.py

@@ -109,31 +109,40 @@ def id(
                     product = dev["product_id"]
                     # NOTE: If any products are added here, they need added
                     # to _rp2040_u2if_id() in board.py as well.
+                    # pylint: disable=too-many-boolean-expressions
                     if (
-                        # Raspberry Pi Pico
-                        vendor == 0xCAFE
-                        and product == 0x4005
-                    ) or (
-                        # Feather RP2040
-                        # Itsy Bitsy RP2040
-                        # QT Py RP2040
-                        # QT2040 Trinkey
-                        # MacroPad RP2040
-                        # Feather RP2040 ThinkInk
-                        # Feather RP2040 RFM
-                        # Feather RP2040 CAN Bus
-                        vendor == 0x239A
-                        and product
-                        in (
-                            0x00F1,
-                            0x00FD,
-                            0x00F7,
-                            0x0109,
-                            0x0107,
-                            0x812C,
-                            0x812E,
-                            0x8130,
-                            0x0105,
+                        (
+                            # Raspberry Pi Pico
+                            vendor == 0xCAFE
+                            and product == 0x4005
+                        )
+                        or (
+                            # Waveshare RP2040 One
+                            vendor == 0x2E8A
+                            and product == 0x103A
+                        )
+                        or (
+                            # Feather RP2040
+                            # Itsy Bitsy RP2040
+                            # QT Py RP2040
+                            # QT2040 Trinkey
+                            # MacroPad RP2040
+                            # Feather RP2040 ThinkInk
+                            # Feather RP2040 RFM
+                            # Feather RP2040 CAN Bus
+                            vendor == 0x239A
+                            and product
+                            in (
+                                0x00F1,
+                                0x00FD,
+                                0x00F7,
+                                0x0109,
+                                0x0107,
+                                0x812C,
+                                0x812E,
+                                0x8130,
+                                0x0105,
+                            )
                         )
                     ):
                         self._chip_id = chips.RP2040_U2IF

adafruit_platformdetect/constants/boards.py

@@ -183,6 +183,8 @@
 QT2040_TRINKEY_U2IF = "QT2040_TRINKEY_U2IF"
 KB2040_U2IF = "KB2040_U2IF"
 
+RP2040_ONE_U2IF = "RP2040_ONE_U2IF"
+
 BINHO_NOVA = "BINHO_NOVA"
 
 ONION_OMEGA = "ONION_OMEGA"