Merge pull request #3 from adafruit/master

Merge

Author: twa127

adafruit_platformdetect/__init__.py

@@ -48,11 +48,11 @@ def get_cpuinfo_field(self, field):
 
         with open("/proc/cpuinfo", "r") as infile:
             cpuinfo = infile.read().split("\n")
+            infile.close()
             for line in cpuinfo:
                 match = re.search(pattern, line, flags=re.IGNORECASE)
                 if match:
                     return match.group(1)
-
         return None
 
     def check_dt_compatible_value(self, value):
@@ -61,12 +61,9 @@ def check_dt_compatible_value(self, value):
         otherwise False.
         """
         # Match a value like 'qcom,apq8016-sbc':
-        try:
-            with open("/proc/device-tree/compatible") as compatible:
-                if value in compatible.read():
-                    return True
-        except FileNotFoundError:
-            pass
+        dt_compatible = self.get_device_compatible()
+        if dt_compatible and value in dt_compatible:
+            return True
 
         return False
 
@@ -85,6 +82,7 @@ def get_armbian_release_field(self, field):
                     match = re.search(pattern, line)
                     if match:
                         field_value = match.group(1)
+                release_file.close()
         except FileNotFoundError:
             pass
 
@@ -100,6 +98,7 @@ def get_device_model(self):
         try:
             with open("/proc/device-tree/model", "r") as model_file:
                 model = model_file.read()
+                model_file.close()
         except FileNotFoundError:
             pass
 
@@ -114,6 +113,7 @@ def get_device_compatible(self):
         try:
             with open("/proc/device-tree/compatible", "r") as model_file:
                 model = model_file.read()
+                model_file.close()
         except FileNotFoundError:
             pass
 
@@ -129,21 +129,23 @@ def check_board_asset_tag_value(self):
         try:
             with open("/sys/devices/virtual/dmi/id/board_asset_tag", "r") as tag_file:
                 tag = tag_file.read().strip()
+                tag_file.close()
         except FileNotFoundError:
             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,
+        Search /sys/devices/virtual/dmi/id for the board name 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()
+                board_name.close()
         except FileNotFoundError:
             pass
 

adafruit_platformdetect/board.py

@@ -75,6 +75,8 @@ def id(self):
             board_id = self._pi_id()
         elif chip_id == chips.AM33XX:
             board_id = self._beaglebone_id()
+        elif chip_id == chips.DRA74X:
+            board_id = self._bbai_id()
         elif chip_id == chips.GENERIC_X86:
             board_id = boards.GENERIC_LINUX_PC
         elif chip_id == chips.SUN8I:
@@ -83,6 +85,8 @@ def id(self):
             board_id = self._sama5_id()
         elif chip_id == chips.IMX8MX:
             board_id = self._imx8mx_id()
+        elif chip_id == chips.IMX6ULL:
+            board_id = self._imx6ull_id()
         elif chip_id == chips.ESP8266:
             board_id = boards.FEATHER_HUZZAH
         elif chip_id == chips.SAMD21:
@@ -129,6 +133,8 @@ def id(self):
             board_id = self._clockwork_pi_id()
         elif chip_id == chips.RK3308:
             board_id = self._rock_pi_id()
+        elif chip_id == chips.ATOM_X5_Z8350:
+            board_id = self._rock_pi_id()
         elif chip_id == chips.RK3288:
             board_id = self._asus_tinker_board_id()
         elif chip_id == chips.RYZEN_V1605B:
@@ -228,6 +234,13 @@ def _beaglebone_id(self):
 
     # pylint: enable=no-self-use
 
+    def _bbai_id(self):
+        """Try to detect id of a Beaglebone AI related board."""
+        board_value = self.detector.get_device_model()
+        if "BeagleBone AI" in board_value:
+            return boards.BEAGLEBONE_AI
+        return None
+
     # pylint: disable=too-many-return-statements
     def _armbian_id(self):
         """Check whether the current board is an OrangePi board."""
@@ -236,30 +249,34 @@ def _armbian_id(self):
 
         if board_value == "orangepipc":
             board = boards.ORANGE_PI_PC
-        if board_value == "orangepi-r1":
+        elif board_value == "orangepi-r1":
             board = boards.ORANGE_PI_R1
-        if board_value == "orangepizero":
+        elif board_value == "orangepizero":
             board = boards.ORANGE_PI_ZERO
-        if board_value == "orangepione":
+        elif board_value == "orangepione":
             board = boards.ORANGE_PI_ONE
-        if board_value == "orangepilite":
+        elif board_value == "orangepilite":
             board = boards.ORANGE_PI_LITE
-        if board_value == "orangepiplus2e":
+        elif board_value == "orangepiplus2e":
             board = boards.ORANGE_PI_PLUS_2E
-        if board_value == "orangepipcplus":
+        elif board_value == "orangepipcplus":
             board = boards.ORANGE_PI_PC_PLUS
-        if board_value == "pinebook-a64":
+        elif board_value == "pinebook-a64":
             board = boards.PINEBOOK
-        if board_value == "pineH64":
+        elif board_value == "pineH64":
             board = boards.PINEH64
-        if board_value == "orangepi2":
+        elif board_value == "orangepi2":
             board = boards.ORANGE_PI_2
-        if board_value == "bananapim2zero":
+        elif board_value == "bananapim2zero":
             board = boards.BANANA_PI_M2_ZERO
-        if board_value == "orangepizeroplus2-h5":
+        elif board_value == "orangepizeroplus2-h5":
             board = boards.ORANGE_PI_ZERO_PLUS_2H5
-        if board_value == "orangepizeroplus":
+        elif board_value == "orangepizeroplus":
             board = boards.ORANGE_PI_ZERO_PLUS
+        elif board_value == "nanopiair":
+            board = boards.NANOPI_NEO_AIR
+        elif board_value == "nanopiduo2":
+            board = boards.NANOPI_DUO2
 
         return board
 
@@ -279,6 +296,8 @@ def _stm32mp1_id(self):
         board_value = self.detector.get_device_model()
         if "STM32MP157C-DK2" in board_value:
             return boards.STM32MP157C_DK2
+        if "LubanCat" in board_value:
+            return boards.LUBANCAT_STM32MP157
         return None
 
     def _imx8mx_id(self):
@@ -288,6 +307,13 @@ def _imx8mx_id(self):
             return boards.CORAL_EDGE_TPU_DEV
         return None
 
+    def _imx6ull_id(self):
+        """Check what type iMX6ULL board."""
+        board_value = self.detector.get_device_model()
+        if "LubanCat" in board_value or "Embedfire" in board_value:
+            return boards.LUBANCAT_IMX6ULL
+        return None
+
     def _tegra_id(self):
         """Try to detect the id of aarch64 board."""
         compatible = self.detector.get_device_compatible()
@@ -344,6 +370,8 @@ def _rock_pi_id(self):
         board = None
         if board_value and "ROCK Pi S" in board_value:
             board = boards.ROCK_PI_S
+        if self.detector.check_board_name_value() == "ROCK Pi X":
+            board = boards.ROCK_PI_X
         return board
 
     def _clockwork_pi_id(self):
@@ -374,6 +402,11 @@ def _asus_tinker_board_id(self):
             board = boards._ASUS_TINKER_BOARD_IDS
         return board
 
+    @property
+    def any_nanopi(self):
+        """Check whether the current board is any defined Nano Pi."""
+        return self.id in boards._NANOPI_IDS
+
     @property
     def any_96boards(self):
         """Check whether the current board is any 96boards board."""
@@ -404,6 +437,11 @@ def any_orange_pi(self):
         """Check whether the current board is any defined Orange Pi."""
         return self.id in boards._ORANGE_PI_IDS
 
+    @property
+    def any_lubancat(self):
+        """Check whether the current board is any defined lubancat."""
+        return self.id in boards._LUBANCAT_IDS
+
     @property
     def any_coral_board(self):
         """Check whether the current board is any defined Coral."""
@@ -477,6 +515,7 @@ def any_embedded_linux(self):
                 self.any_raspberry_pi,
                 self.any_beaglebone,
                 self.any_orange_pi,
+                self.any_nanopi,
                 self.any_giant_board,
                 self.any_jetson_board,
                 self.any_coral_board,
@@ -491,6 +530,7 @@ def any_embedded_linux(self):
                 self.any_udoo_board,
                 self.any_asus_tinker_board,
                 self.any_stm32mp1,
+                self.any_lubancat,
             ]
         )
 

adafruit_platformdetect/chip.py

@@ -159,6 +159,9 @@ def _linux_id(self):
         if self.detector.check_dt_compatible_value("mediatek,mt8167"):
             return chips.MT8167
 
+        if self.detector.check_dt_compatible_value("imx6ull"):
+            return chips.IMX6ULL
+
         linux_id = None
         hardware = self.detector.get_cpuinfo_field("Hardware")
 
@@ -178,6 +181,8 @@ def _linux_id(self):
                 ##                print('model_name =', model_name)
                 if "N3710" in model_name:
                     linux_id = chips.PENTIUM_N3710
+                elif "X5-Z8350" in model_name:
+                    linux_id = chips.ATOM_X5_Z8350
                 else:
                     linux_id = chips.GENERIC_X86
             ##            print("linux_id = ", linux_id)
@@ -234,6 +239,8 @@ def _linux_id(self):
         if not linux_id:
             if "AM33XX" in hardware:
                 linux_id = chips.AM33XX
+            elif "DRA74X" in hardware:
+                linux_id = chips.DRA74X
             elif "sun8i" in hardware:
                 linux_id = chips.SUN8I
             elif "ODROIDC" in hardware:

adafruit_platformdetect/constants/boards.py

@@ -12,6 +12,7 @@
 BEAGLEBONE_ENHANCED = "BEAGLEBONE_ENHANCED"
 BEAGLEBONE_USOMIQ = "BEAGLEBONE_USOMIQ"
 BEAGLEBONE_AIR = "BEAGLEBONE_AIR"
+BEAGLEBONE_AI = "BEAGLEBONE_AI"
 BEAGLEBONE_POCKETBONE = "BEAGLEBONE_POCKETBONE"
 BEAGLELOGIC_STANDALONE = "BEAGLELOGIC_STANDALONE"
 OSD3358_DEV_BOARD = "OSD3358_DEV_BOARD"
@@ -42,6 +43,10 @@
 ORANGE_PI_ZERO_PLUS_2H5 = "ORANGE_PI_ZERO_PLUS_2H5"
 ORANGE_PI_ZERO_PLUS = "ORANGE_PI_ZERO_PLUS"
 
+# Nano Pi boards
+NANOPI_NEO_AIR = "NANOPI_NEO_AIR"
+NANOPI_DUO2 = "NANOPI_DUO2"
+
 # Banana Pi boards
 BANANA_PI_M2_ZERO = "BANANA_PI_M2_ZERO"
 
@@ -64,6 +69,10 @@
 # STM32 MPU boards
 STM32MP157C_DK2 = "STM32MP157C_DK2"
 
+# Embedfire LubanCat board
+LUBANCAT_IMX6ULL = "LUBANCAT_IMX6ULL"
+LUBANCAT_STM32MP157 = "LUBANCAT_STM32MP157"
+
 # Various Raspberry Pi models
 RASPBERRY_PI_B_REV1 = "RASPBERRY_PI_B_REV1"
 RASPBERRY_PI_B_REV2 = "RASPBERRY_PI_B_REV2"
@@ -110,6 +119,7 @@
 SOPINE = "SOPINE"
 
 ROCK_PI_S = "ROCK_PI_S"
+ROCK_PI_X = "ROCK_PI_X"
 
 GREATFET_ONE = "GREATFET_ONE"
 
@@ -122,7 +132,10 @@
 _ASUS_TINKER_BOARD_IDS = (ASUS_TINKER_BOARD,)
 
 # STM32MP1
-_STM32MP1_IDS = (STM32MP157C_DK2,)
+_STM32MP1_IDS = (
+    STM32MP157C_DK2,
+    LUBANCAT_STM32MP157,
+)
 
 # OrangePI
 _ORANGE_PI_IDS = (
@@ -138,9 +151,21 @@
     ORANGE_PI_ZERO_PLUS,
 )
 
+# NanoPi
+_NANOPI_IDS = (
+    NANOPI_NEO_AIR,
+    NANOPI_DUO2,
+)
+
 # BananaPI
 _BANANA_PI_IDS = (BANANA_PI_M2_ZERO,)
 
+# LubanCat
+_LUBANCAT_IDS = (
+    LUBANCAT_IMX6ULL,
+    LUBANCAT_STM32MP157,
+)
+
 # Coral boards
 _CORAL_IDS = (
     CORAL_EDGE_TPU_DEV,
@@ -239,6 +264,7 @@
     BEAGLEBONE_ENHANCED,
     BEAGLEBONE_USOMIQ,
     BEAGLEBONE_AIR,
+    BEAGLEBONE_AI,
     BEAGLEBONE_POCKETBONE,
     BEAGLELOGIC_STANDALONE,
     OSD3358_DEV_BOARD,

adafruit_platformdetect/constants/chips.py

@@ -1,5 +1,7 @@
 """Definition of chips."""
 AM33XX = "AM33XX"
+DRA74X = "DRA74X"
+IMX6ULL = "IMX6ULL"
 IMX8MX = "IMX8MX"
 BCM2XXX = "BCM2XXX"
 ESP8266 = "ESP8266"
@@ -36,5 +38,6 @@
 STM32F405 = "STM32F405"
 STM32MP157 = "STM32MP157"
 MT8167 = "MT8167"
+ATOM_X5_Z8350 = "X5-Z8350"
 
 BCM_RANGE = {"BCM2708", "BCM2709", "BCM2711", "BCM2835", "BCM2837"}

bin/detect.py

@@ -13,14 +13,14 @@
 print("Is this a Pi 4B?", detector.board.RASPBERRY_PI_4B)
 print("Is this a 40-pin Raspberry Pi?", detector.board.any_raspberry_pi_40_pin)
 print("Is this a Raspberry Pi Compute Module?", detector.board.any_raspberry_pi_cm)
-print("Is this a BeagleBone Black?", detector.board.BEAGLEBONE_BLACK)
-print("Is this a BeagleBone Green?", detector.board.BEAGLEBONE_GREEN)
+print("Is this a BeagleBone Board?", detector.board.any_beaglebone)
 print("Is this a Giant Board?", detector.board.GIANT_BOARD)
 print("Is this a Coral Dev Board?", detector.board.CORAL_EDGE_TPU_DEV)
 print("Is this a Coral Dev Board Mini?", detector.board.CORAL_EDGE_TPU_DEV_MINI)
 print("Is this a SiFive Unleashed? ", detector.board.SIFIVE_UNLEASHED)
 print("Is this a PYNQ Board?", detector.board.PYNQ_Z1 | detector.board.PYNQ_Z2)
 print("Is this a Rock Pi board?", detector.board.any_rock_pi_board)
+print("Is this a NanoPi board?", detector.board.any_nanopi)
 print("Is this a Clockwork Pi board?", detector.board.any_clockwork_pi_board)
 print("Is this an embedded Linux system?", detector.board.any_embedded_linux)
 print("Is this a generic Linux PC?", detector.board.GENERIC_LINUX_PC)
@@ -67,3 +67,6 @@
 
 if detector.board.any_coral_board:
     print("Coral device detected.")
+
+if detector.board.any_lubancat:
+    print("LubanCat detected.")

docs/conf.py

@@ -23,7 +23,7 @@
 autodoc_mock_imports = ["machine"]
 
 intersphinx_mapping = {
-    "python": ("https://docs.python.org/3.5", None),
+    "python": ("https://docs.python.org/3.6", None),
     "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
 }