refactor 96boards detection

  - Brings naming in line with existing conventions
  - Replaces `_is_96Boards()` with an `any_96boards` property
  - Renames `get_dt_compatible_field()` to `check_dt_compatible_value()`
    to distinguish between returning a field's string value and a boolean
    check on whether a value is present.
  - Adds a 96Boards check to `bin/detect.py`.

This might still need some changes, and definitely needs tested on actual
96Boards hardware.

Author: brennen

README.rst

@@ -11,8 +11,11 @@ generally dependent on the former.  Platform info is gathered from:
 
   - Python's `sys.platform`
 
-  - The `/proc/cpuinfo` file on Linux systems (for processor info, Raspberry Pi
-    hardware revisions, etc.)
+  - Various files on Linux systems:
+
+    - `/proc/cpuinfo` (for processor info, Raspberry Pi hardware revisions, etc.)
+
+    - `/proc/device-tree/compatible` (for 96Boards info)
 
   - Beaglebone EEPROM board IDs
 

adafruit_platformdetect/__init__.py

@@ -55,14 +55,14 @@ def get_cpuinfo_field(self, field):
 
         return None
 
-    def get_dt_compatible_field(self, field):
+    def check_dt_compatible_value(self, value):
         """
-        Search /proc/device-tree/compatible for a field and return True, if found,
+        Search /proc/device-tree/compatible for a value and return True, if found,
         otherwise False.
         """
         # Match a value like 'qcom,apq8016-sbc':
-        if field in open('/proc/device-tree/compatible').read():
-                 return True
+        if value in open('/proc/device-tree/compatible').read():
+             return True
 
         return False
 

adafruit_platformdetect/board.py

@@ -46,8 +46,7 @@
 ODROID_C2                   = "ODROID_C2"
 
 FTDI_FT232H                 = "FT232H"
-# XXX: naming
-_96BOARDS                   = "96BOARDS"
+LINARO_96BOARDS             = "LINARO_96BOARDS"
 # pylint: enable=bad-whitespace
 
 _RASPBERRY_PI_40_PIN_IDS = (
@@ -255,8 +254,10 @@ def id(self):
             board_id = ODROID_C2
         elif chip_id == ap_chip.FT232H:
             board_id = FTDI_FT232H
-        else:
-            board_id = self._is_96boards()
+        # TODO do we want to check chip ID at all for 96Boards?
+        # elif chip_id == APQ8016:
+        elif self.any_96boards:
+            board_id = LINARO_96BOARDS
 
         return board_id
     # pylint: enable=invalid-name
@@ -303,18 +304,22 @@ def _beaglebone_id(self):
         return None
     # pylint: enable=no-self-use
 
-    def _is_96Boards(self):
-        if self.detector.get_dt_compatible_field("qcom,apq8016-sbc") or self.detector.get_dt_compatible_field("hisilicon,hi3660-hikey960") or self.detector.get_dt_compatible_field("hisilicon,hi6220-hikey"):
-            return _96BOARDS
-        return None
-
     def _armbian_id(self):
-        """Check whether the current board is an OrangePi PC."""
+        """Find a board id for an OrangePi PC."""
         board_value = self.detector.get_armbian_release_field('BOARD')
         if board_value == "orangepipc":
             return ORANGE_PI_PC
         return None
 
+    @property
+    def any_96boards(self):
+        """Check if the current board is any 96Boards-family board."""
+        return (
+           self.detector.check_dt_compatible_value("qcom,apq8016-sbc")
+           or self.detector.check_dt_compatible_value("hisilicon,hi3660-hikey960")
+           or self.detector.check_dt_compatible_value("hisilicon,hi6220-hikey")
+        )
+
     @property
     def any_raspberry_pi(self):
         """Check whether the current board is any Raspberry Pi."""

adafruit_platformdetect/chip.py

@@ -69,13 +69,12 @@ def id(self): # pylint: disable=invalid-name,too-many-branches,too-many-return-s
 
     def _linux_id(self):
         """Attempt to detect the CPU on a computer running the Linux kernel."""
-        linux_id = None
 
-        hardware = self.detector.get_cpuinfo_field("Hardware")
+        if self.detector.check_dt_compatible_value("qcom,apq8016"):
+            return APQ8016
 
-        if self.detector.get_dt_compatible_field("qcom,apq8016"):
-            linux_id = APQ8016
-            return linux_id
+        linux_id = None
+        hardware = self.detector.get_cpuinfo_field("Hardware")
 
         if hardware is None:
             vendor_id = self.detector.get_cpuinfo_field("vendor_id")
@@ -92,7 +91,7 @@ def _linux_id(self):
         elif "ODROID-C2" in hardware:
             linux_id = S905
 
-        return linux_id
+        return None
 
     def __getattr__(self, attr):
         """

bin/detect.py

@@ -8,6 +8,7 @@
 
 print("Board id: ", detector.board.id)
 
+print("Is this a 96Boards board?", detector.board.LINARO_96BOARDS)
 print("Is this a Pi 3B+?", detector.board.RASPBERRY_PI_3B_PLUS)
 print("Is this a 40-pin Raspberry Pi?", detector.board.any_raspberry_pi_40_pin)
 print("Is this a BBB?", detector.board.BEAGLEBONE_BLACK)