Clarify docstring and add missing newline.

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / agnostic / __init__.py

diff --git a/src/adafruit_blinka/agnostic/__init__.py b/src/adafruit_blinka/agnostic/__init__.py
index 89d06469b19dc04dd2770a404f63c9c8ffcc66c1..1f6eb4c300537ea219a81014c254f32acddcf4fb 100755 (executable)
--- a/src/adafruit_blinka/agnostic/__init__.py
+++ b/src/adafruit_blinka/agnostic/__init__.py
@@ -5,32 +5,21 @@
     common modules and operations, depending on platform support
 """
 import sys
+import adafruit_platformdetect
 
 # We intentionally are patching into this namespace as module names so skip the name check.
 # pylint: disable=invalid-name
-microcontroller = sys.platform
 
-board = None
-if microcontroller is not None:
-    if microcontroller == "esp8266":  # TODO more conservative board-guessing
-        board = "feather_huzzah"
-    elif microcontroller == "samd21":
-        board = "feather_m0_express"
-    elif microcontroller == "pyboard":
-        microcontroller = "stm32"
-        board = "pyboard"
-    elif microcontroller == "linux":
-        from Adafruit_GPIO import Platform
-        if Platform.platform_detect() == Platform.RASPBERRY_PI:
-            if Platform.pi_version() == 1:
-                board = "raspi_1"
-            elif Platform.pi_version() == 2:
-                board = "raspi_2"
-            elif Platform.pi_version() == 3:
-                board = "raspi_3"
+# We'll define board and chip id values in agnostic rather than accessing
+# detector directly elsewhere, just in case additional indirection is necessary
+# at some later point:
+
+detector = adafruit_platformdetect.Detector()
+chip_id = detector.chip.id
+board_id = detector.board.id
 
 implementation = sys.implementation.name
 if implementation == "micropython":
     from utime import sleep
-elif implementation == "circuitpython" or implementation == "cpython":
+elif implementation in ("circuitpython", "cpython"):
     from time import sleep