latest platformdetect api; clean up some pylint complaints & minor bugs

[Adafruit_Blinka-hackapet.git] / src / microcontroller / __init__.py

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 0cbdfda0e92f4c7bb34876d879fb2494b037c436..54fd6c88e7067ee01e399bc39549a8b5981b3e49 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -1,7 +1,8 @@
 """Microcontroller pins"""
 
 from adafruit_blinka import Enum
-from adafruit_blinka.agnostic import board_id, platform
+from adafruit_blinka.agnostic import board_id, chip_id
+from adafruit_platformdetect import chip as ap_chip
 
 class Pin(Enum):
     """Reference Pin object"""
@@ -21,20 +22,17 @@ class Pin(Enum):
         return repr(self)
 
 # We intentionally are patching into this namespace so skip the wildcard check.
-# pylint: disable=unused-wildcard-import,wildcard-import
+# pylint: disable=unused-wildcard-import,wildcard-import,ungrouped-imports
 
-if platform == "esp8266":
+if chip_id == ap_chip.ESP8266:
     from adafruit_blinka.microcontroller.esp8266 import *
-elif platform == "stm32":
+elif chip_id == ap_chip.STM32:
     from adafruit_blinka.microcontroller.stm32 import *
-elif platform == "linux":
-    if board_id == "raspi_3" or board_id == "raspi_2":
-        from adafruit_blinka.microcontroller.bcm283x import *
-    elif board_id == "beaglebone_black":
-        from adafruit_blinka.microcontroller.am335x import *
-    elif board_id == "orangepipc":
-        from adafruit_blinka.microcontroller.allwinner_h3 import *
-    else:
-        raise NotImplementedError("Board not supported:", board_id)
+elif chip_id == ap_chip.BCM2XXX:
+    from adafruit_blinka.microcontroller.bcm283x import *
+elif chip_id == ap_chip.AM33XX:
+    from adafruit_blinka.microcontroller.am335x import *
+elif chip_id == ap_chip.SUN8I:
+    from adafruit_blinka.microcontroller.allwinner_h3 import *
 else:
-    raise NotImplementedError("Platform not supported:", platform)
+    raise NotImplementedError("Microcontroller not supported:", chip_id)