Merge pull request #73 from ladyada/master

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

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
old mode 100644 (file)
new mode 100755 (executable)
index c1b0027..a3d7eec
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -1,10 +1,14 @@
-from adafruit_blinka import Enum, agnostic
+"""Microcontroller pins"""
 
+from adafruit_platformdetect import chip as ap_chip
+from adafruit_blinka import Enum
+from adafruit_blinka.agnostic import board_id, chip_id
 
 class Pin(Enum):
-    def __init__(self, id):
+    """Reference Pin object"""
+    def __init__(self, pin_id):
         """Identifier for pin, referencing platform-specific pin id"""
-        self.id = id
+        self._id = pin_id
 
     def __repr__(self):
         import board
@@ -17,10 +21,18 @@ class Pin(Enum):
                 return "microcontroller.pin.{}".format(key)
         return repr(self)
 
+# We intentionally are patching into this namespace so skip the wildcard check.
+# pylint: disable=unused-wildcard-import,wildcard-import,ungrouped-imports
 
-if agnostic.microcontroller == "esp8266":
+if chip_id == ap_chip.ESP8266:
     from adafruit_blinka.microcontroller.esp8266 import *
-elif agnostic.microcontroller == "stm32":
+elif chip_id == ap_chip.STM32:
     from adafruit_blinka.microcontroller.stm32 import *
+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("Microcontroller not supported")
\ No newline at end of file
+    raise NotImplementedError("Microcontroller not supported:", chip_id)