Add files via upload

Author: twa127

adafruit_platformdetect/board.py

@@ -65,7 +65,7 @@ def id(self):
 
         try:
             return os.environ["BLINKA_FORCEBOARD"]
-        except KeyError:  # no forced board, continue with testing!
+        except (AttributeError, KeyError):  # no forced board, continue with testing!
             pass
 
         chip_id = self.detector.chip.id
@@ -80,7 +80,7 @@ def id(self):
         elif chip_id == chips.GENERIC_X86:
             board_id = boards.GENERIC_LINUX_PC
         elif chip_id == chips.SUN8I:
-            board_id = self._armbian_id()
+            board_id = self._armbian_id() or self._allwinner_variants_id()
         elif chip_id == chips.SAMA5:
             board_id = self._sama5_id()
         elif chip_id == chips.IMX8MX:
@@ -93,6 +93,8 @@ def id(self):
             board_id = boards.FEATHER_M0_EXPRESS
         elif chip_id == chips.STM32F405:
             board_id = boards.PYBOARD
+        elif chip_id == chips.RP2040:
+            board_id = boards.RASPBERRY_PI_PICO
         elif chip_id == chips.S805:
             board_id = boards.ODROID_C1
         elif chip_id == chips.S905:
@@ -134,9 +136,9 @@ def id(self):
         elif chip_id == chips.H6:
             board_id = self._pine64_id()
         elif chip_id == chips.H5:
-            board_id = self._armbian_id()
+            board_id = self._armbian_id() or self._allwinner_variants_id()
         elif chip_id == chips.H616:
-            board_id = self._armbian_id()
+            board_id = self._armbian_id() or self._allwinner_variants_id()
         elif chip_id == chips.A33:
             board_id = self._clockwork_pi_id()
         elif chip_id == chips.RK3308:
@@ -432,6 +434,27 @@ def _asus_tinker_board_id(self):
             board = boards._ASUS_TINKER_BOARD_IDS
         return board
 
+    def _allwinner_variants_id(self):
+        """Try to detect the id of allwinner based board. (orangepi, nanopi)"""
+        board_value = self.detector.get_device_model()
+        board = None
+        if not board_value:
+            return board
+        board_value = board_value.lower()
+        chip_id = self.detector.chip.id
+        if "nanopi" in board_value:
+            if "neo" in board_value and "SUN8I" in chip_id:
+                board = boards.NANOPI_NEO_AIR
+            # TODO: Add other specifc board contexts here
+        elif "orange pi" in board_value:
+            if "zero" in board_value:
+                if "H5" in chip_id:
+                    board = boards.ORANGE_PI_ZERO_PLUS_2H5
+                elif "H616" in chip_id:
+                    board = boards.ORANGE_PI_ZERO_2
+            # TODO: Add other specifc board contexts here
+        return board
+
     @property
     def any_nanopi(self):
         """Check whether the current board is any defined Nano Pi."""