Merge pull request #8 from ladyada/master

Fix one missing Pi chip ID, add FT232H detect and overriding chip/board with envvar

Author: brennen

adafruit_platformdetect/board.py

@@ -1,4 +1,5 @@
 """Detect boards."""
+import os
 import adafruit_platformdetect.chip as ap_chip
 
 # Allow for aligned constant definitions:
@@ -43,6 +44,8 @@
 ODROID_C1                   = "ODROID_C1"
 ODROID_C1_PLUS              = "ODROID_C1_PLUS"
 ODROID_C2                   = "ODROID_C2"
+
+FTDI_FT232H                 = "FT232H"
 # pylint: enable=bad-whitespace
 
 _RASPBERRY_PI_40_PIN_IDS = (
@@ -173,6 +176,12 @@ def __init__(self, detector):
     @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
+        try:
+            return os.environ['BLINKA_FORCEBOARD']
+        except KeyError: # no forced board, continue with testing!
+            pass
 
         chip_id = self.detector.chip.id
         board_id = None
@@ -195,7 +204,8 @@ def id(self):
             board_id = ODROID_C1
         elif chip_id == ap_chip.S905:
             board_id = ODROID_C2
-
+        elif chip_id == ap_chip.FT232H:
+            board_id = FTDI_FT232H
         return board_id
     # pylint: enable=invalid-name
 

adafruit_platformdetect/chip.py

@@ -1,5 +1,6 @@
 """Attempt detection of current chip / CPU."""
 import sys
+import os
 
 AM33XX = "AM33XX"
 BCM2XXX = "BCM2XXX"
@@ -10,16 +11,48 @@
 S805 = "S805"
 S905 = "S905"
 GENERIC_X86 = "GENERIC_X86"
+FT232H = "FT232H"
 
 class Chip:
     """Attempt detection of current chip / CPU."""
     def __init__(self, detector):
         self.detector = detector
 
     @property
-    # pylint: disable=invalid-name
-    def id(self):
+    def id(self): # pylint: disable=invalid-name,too-many-branches,too-many-return-statements
         """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
+        try:
+            return os.environ['BLINKA_FORCECHIP']
+        except KeyError: # no forced chip, continue with testing!
+            pass
+
+        # Special case, if we have an environment var set, we could use FT232H
+        try:
+            if os.environ['BLINKA_FT232H']:
+                # we can't have ftdi1 as a dependency cause its wierd
+                # to install, sigh.
+                import ftdi1 as ftdi # pylint: disable=import-error
+                try:
+                    ctx = None
+                    ctx = ftdi.new()  # Create a libftdi context.
+                    # Enumerate FTDI devices.
+                    count, _ = ftdi.usb_find_all(ctx, 0, 0)
+                    if count < 0:
+                        raise RuntimeError('ftdi_usb_find_all returned error %d : %s' %
+                                           count, ftdi.get_error_string(self._ctx))
+                    if count == 0:
+                        raise RuntimeError('BLINKA_FT232H environment variable' + \
+                                           'set, but no FT232H device found')
+                finally:
+                    # Make sure to clean up list and context when done.
+                    if ctx is not None:
+                        ftdi.free(ctx)
+            return FT232H
+        except KeyError: # no FT232H environment var
+            pass
+
         platform = sys.platform
         if platform == "linux":
             return self._linux_id()
@@ -29,6 +62,7 @@ def id(self):
             return SAMD21
         if platform == "pyboard":
             return STM32
+        # nothing found!
         return None
     # pylint: enable=invalid-name
 
@@ -42,7 +76,7 @@ def _linux_id(self):
             vendor_id = self.detector.get_cpuinfo_field("vendor_id")
             if vendor_id in ("GenuineIntel", "AuthenticAMD"):
                 linux_id = GENERIC_X86
-        elif hardware in ("BCM2708", "BCM2708", "BCM2835"):
+        elif hardware in ("BCM2708", "BCM2709", "BCM2835"):
             linux_id = BCM2XXX
         elif "AM33XX" in hardware:
             linux_id = AM33XX