Merge branch 'master' into master

Author: makermelissa

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
         source actions-ci/install.sh
     - name: Pip install pylint, black, & Sphinx
       run: |
-        pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
+        pip install --force-reinstall pylint black Sphinx sphinx-rtd-theme
     - name: Library version
       run: git describe --dirty --always --tags
     - name: Check formatting

adafruit_platformdetect/__init__.py

@@ -121,7 +121,7 @@ def get_device_compatible(self):
 
     def check_board_asset_tag_value(self):
         """
-        Search /proc/device-tree/model for the device model and return its value, if found,
+        Search /sys/devices/virtual/dmi/id for the device model and return its value, if found,
         otherwise None.
         """
         tag = None
@@ -133,3 +133,18 @@ def check_board_asset_tag_value(self):
             pass
 
         return tag
+
+    def check_board_name_value(self):
+        """
+        Search /sys/devices/virtual/dmi/id for the device model and return its value, if found,
+        otherwise None. Debian/ubuntu based
+        """
+        board_name = None
+
+        try:
+            with open("/sys/devices/virtual/dmi/id/board_name", "r") as board_name_file:
+                board_name = board_name_file.read().strip()
+        except FileNotFoundError:
+            pass
+
+        return board_name

adafruit_platformdetect/board.py

@@ -50,13 +50,19 @@ class Board:
 
     def __init__(self, detector):
         self.detector = detector
+        self._board_id = None
 
     # pylint: disable=invalid-name, protected-access
     @property
     def id(self):
         """Return a unique id for the detected board, if any."""
         # There are some times we want to trick the platform detection
         # say if a raspberry pi doesn't have the right ID, or for testing
+
+        # Caching
+        if self._board_id:
+            return self._board_id
+
         try:
             return os.environ["BLINKA_FORCEBOARD"]
         except KeyError:  # no forced board, continue with testing!
@@ -81,7 +87,7 @@ def id(self):
             board_id = boards.FEATHER_HUZZAH
         elif chip_id == chips.SAMD21:
             board_id = boards.FEATHER_M0_EXPRESS
-        elif chip_id == chips.STM32:
+        elif chip_id == chips.STM32F405:
             board_id = boards.PYBOARD
         elif chip_id == chips.S805:
             board_id = boards.ODROID_C1
@@ -117,6 +123,8 @@ def id(self):
             board_id = self._pine64_id()
         elif chip_id == chips.H6:
             board_id = self._pine64_id()
+        elif chip_id == chips.H5:
+            board_id = self._armbian_id()
         elif chip_id == chips.A33:
             board_id = self._clockwork_pi_id()
         elif chip_id == chips.RK3308:
@@ -125,7 +133,12 @@ def id(self):
             board_id = self._asus_tinker_board_id()
         elif chip_id == chips.RYZEN_V1605B:
             board_id = self._udoo_id()
+        elif chip_id == chips.PENTIUM_N3710:
+            board_id = self._udoo_id()
+        elif chip_id == chips.STM32MP157:
+            board_id = self._stm32mp1_id()
 
+        self._board_id = board_id
         return board_id
 
     # pylint: enable=invalid-name
@@ -239,6 +252,8 @@ def _armbian_id(self):
             board = boards.PINEH64
         if board_value == "orangepi2":
             board = boards.ORANGE_PI_2
+        if board_value == "bananapim2zero":
+            board = boards.BANANA_PI_M2_ZERO
 
         return board
 
@@ -253,6 +268,13 @@ def _sama5_id(self):
             return boards.GIANT_BOARD
         return None
 
+    def _stm32mp1_id(self):
+        """Check what type stm32mp1 board."""
+        board_value = self.detector.get_device_model()
+        if "STM32MP157C-DK2" in board_value:
+            return boards.STM32MP157C_DK2
+        return None
+
     def _imx8mx_id(self):
         """Check what type iMX8M board."""
         board_value = self.detector.get_device_model()
@@ -266,7 +288,7 @@ def _tegra_id(self):
         if not compatible:
             return None
         compats = compatible.split("\x00")
-        for board_id, board_compats in boards._JETSON_IDS.items():
+        for board_id, board_compats in boards._JETSON_IDS:
             if any(v in compats for v in board_compats):
                 return board_id
         return None
@@ -330,6 +352,10 @@ def _udoo_id(self):
         for board_id, board_tags in boards._UDOO_BOARD_IDS.items():
             if any(v == board_asset_tag for v in board_tags):
                 return board_id
+
+        if self.detector.check_board_name_value() == "UDOO x86":
+            return boards.UDOO_X86
+
         return None
 
     def _asus_tinker_board_id(self):
@@ -393,7 +419,7 @@ def any_odroid_40_pin(self):
     @property
     def any_jetson_board(self):
         """Check whether the current board is any defined Jetson Board."""
-        return self.id in boards._JETSON_IDS
+        return self.id in [v[0] for v in boards._JETSON_IDS]
 
     @property
     def any_sifive_board(self):
@@ -425,10 +451,16 @@ def any_udoo_board(self):
         """Check to see if the current board is an UDOO board"""
         return self.id in boards._UDOO_BOARD_IDS
 
+    @property
     def any_asus_tinker_board(self):
         """Check to see if the current board is an ASUS Tinker Board"""
         return self.id in boards._ASUS_TINKER_BOARD_IDS
 
+    @property
+    def any_stm32mp1(self):
+        """Check whether the current board is any stm32mp1 board."""
+        return self.id in boards._STM32MP1_IDS
+
     @property
     def any_embedded_linux(self):
         """Check whether the current board is any embedded Linux device."""
@@ -450,6 +482,7 @@ def any_embedded_linux(self):
                 self.any_clockwork_pi_board,
                 self.any_udoo_board,
                 self.any_asus_tinker_board,
+                self.any_stm32mp1,
             ]
         )
 

adafruit_platformdetect/chip.py

@@ -51,6 +51,7 @@ class Chip:
 
     def __init__(self, detector):
         self.detector = detector
+        self._chip_id = None
 
     @property
     def id(
@@ -59,6 +60,11 @@ def id(
         """Return a unique id for the detected chip, if any."""
         # There are some times we want to trick the platform detection
         # say if a raspberry pi doesn't have the right ID, or for testing
+
+        # Caching
+        if self._chip_id:
+            return self._chip_id
+
         try:
             return os.environ["BLINKA_FORCECHIP"]
         except KeyError:  # no forced chip, continue with testing!
@@ -75,14 +81,16 @@ def id(
                     "BLINKA_FT232H environment variable "
                     + "set, but no FT232H device found"
                 )
-            return chips.FT232H
+            self._chip_id = chips.FT232H
+            return self._chip_id
         if os.environ.get("BLINKA_MCP2221"):
             import hid
 
             # look for it based on PID/VID
             for dev in hid.enumerate():
                 if dev["vendor_id"] == 0x04D8 and dev["product_id"] == 0x00DD:
-                    return chips.MCP2221
+                    self._chip_id = chips.MCP2221
+                    return self._chip_id
             raise RuntimeError(
                 "BLINKA_MCP2221 environment variable "
                 + "set, but no MCP2221 device found"
@@ -91,23 +99,29 @@ def id(
             import usb
 
             if usb.core.find(idVendor=0x1D50, idProduct=0x60E6) is not None:
-                return chips.LPC4330
+                self._chip_id = chips.LPC4330
+                return self._chip_id
             raise RuntimeError(
                 "BLINKA_GREATFET environment variable "
                 + "set, but no GreatFET device found"
             )
         if os.environ.get("BLINKA_NOVA"):
-            return chips.BINHO
+            self._chip_id = chips.BINHO
+            return self._chip_id
 
         platform = sys.platform
         if platform in ("linux", "linux2"):
-            return self._linux_id()
+            self._chip_id = self._linux_id()
+            return self._chip_id
         if platform == "esp8266":
-            return chips.ESP8266
+            self._chip_id = chips.ESP8266
+            return self._chip_id
         if platform == "samd21":
-            return chips.SAMD21
+            self._chip_id = chips.SAMD21
+            return self._chip_id
         if platform == "pyboard":
-            return chips.STM32
+            self._chip_id = chips.STM32F405
+            return self._chip_id
         # nothing found!
         return None
 
@@ -133,6 +147,12 @@ def _linux_id(self):
         if self.detector.check_dt_compatible_value("rockchip,rk3288"):
             return chips.RK3288
 
+        if self.detector.check_dt_compatible_value("st,stm32mp157"):
+            return chips.STM32MP157
+
+        if self.detector.check_dt_compatible_value("sun50i-a64"):
+            return chips.A64
+
         linux_id = None
         hardware = self.detector.get_cpuinfo_field("Hardware")
         if (
@@ -150,8 +170,15 @@ def _linux_id(self):
                     linux_id = chips.RYZEN_V1605B
                 else:
                     linux_id = chips.GENERIC_X86
+            ##            print("linux_id = ", linux_id)
             elif vendor_id == "GenuineIntel":
-                linux_id = chips.GENERIC_X86
+                model_name = self.detector.get_cpuinfo_field("model name").upper()
+                ##                print('model_name =', model_name)
+                if "N3710" in model_name:
+                    linux_id = chips.PENTIUM_N3710
+                else:
+                    linux_id = chips.GENERIC_X86
+            ##            print("linux_id = ", linux_id)
 
             compatible = self.detector.get_device_compatible()
             if compatible and "tegra" in compatible:
@@ -181,6 +208,8 @@ def _linux_id(self):
                 linux_id = chips.A64
             if compatible and "sun50i-h6" in compatible:
                 linux_id = chips.H6
+            if compatible and "sun50i-h5" in compatible:
+                linux_id = chips.H5
             if compatible and "odroid-xu4" in compatible:
                 linux_id = chips.EXYNOS5422
 
@@ -219,9 +248,6 @@ def _linux_id(self):
                 linux_id = chips.SAMA5
             elif "Pinebook" in hardware:
                 linux_id = chips.A64
-            # elif "sun50iw1p1" in hardware:   #sun50iw1p1 is a common identfier in Allwinner SOC's. I do not believe it should be
-            # linux_id = chips.A64         #used as an identifier. I feel it makes more sense to rely on the device compatible field. Otherwise it will be
-            # Impossible to differentiate between Allwinner A64's and Allwinner H6's.
             elif "ASUS_TINKER_BOARD" in hardware:
                 linux_id = chips.RK3288
             elif "Xilinx Zynq" in hardware: