Merge pull request #34 from ladyada/master

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

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 62a2baf03b65601b08426f08b40e92ab41a840c3..3973148c779705b5d30e643de0f352da126267e2 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -1,6 +1,7 @@
 """Microcontroller pins"""
 
 """Microcontroller pins"""
 

-from adafruit_blinka import Enum, agnostic
+from adafruit_blinka import Enum
+from adafruit_blinka.agnostic import board_id, platform

 
 class Pin(Enum):
     """Reference Pin object"""
 
 class Pin(Enum):
     """Reference Pin object"""


@@ -22,11 +23,14 @@ class Pin(Enum):
 # We intentionally are patching into this namespace so skip the wildcard check.
 # pylint: disable=unused-wildcard-import,wildcard-import
 
 # We intentionally are patching into this namespace so skip the wildcard check.
 # pylint: disable=unused-wildcard-import,wildcard-import
 

-if agnostic.microcontroller == "esp8266":
+if platform == "esp8266":

     from adafruit_blinka.microcontroller.esp8266 import *
     from adafruit_blinka.microcontroller.esp8266 import *

-elif agnostic.microcontroller == "stm32":
+elif platform == "stm32":

     from adafruit_blinka.microcontroller.stm32 import *
     from adafruit_blinka.microcontroller.stm32 import *

-elif agnostic.microcontroller == "raspi_3":
-    from adafruit_blinka.microcontroller.raspi_23 import *
+elif platform == "linux":
+    if board_id == "raspi_3" or board_id == "raspi_2":
+        from adafruit_blinka.microcontroller.raspi_23 import *
+    else:
+        raise NotImplementedError("Board not supported:", board_id)

 else:
 else:

-    raise NotImplementedError("Microcontroller not supported: ", agnostic.microcontroller)
+    raise NotImplementedError("Platform not supported:", platform)