From: Cefn Hoile <github.com@cefn.com>
Date: Mon, 19 Feb 2018 20:42:11 +0000 (+0000)
Subject: Merge branch 'master' of github.com:cefn/Adafruit_Micropython_Blinka
X-Git-Tag: 0.1.0~4^2~66
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/f15a0431b5c4185424541d41e5bd843838bf6efd?hp=64003e571413d855c0af2a686591b83aeb804467

Merge branch 'master' of github.com:cefn/Adafruit_Micropython_Blinka
---

diff --git a/python/mcp/__init__.py b/python/mcp/__init__.py
index 799f336..2ee42c2 100644
--- a/python/mcp/__init__.py
+++ b/python/mcp/__init__.py
@@ -30,8 +30,3 @@ class Enum(object):
                 yield (key, val)
 
 
-class Pin(Enum):
-    def __init__(self, id):
-        """ id type is likely platform-specific"""
-        self.id = id
-    pass
diff --git a/python/microcontroller/__init__.py b/python/microcontroller/__init__.py
index c76a655..9d25685 100644
--- a/python/microcontroller/__init__.py
+++ b/python/microcontroller/__init__.py
@@ -1,4 +1,11 @@
 import agnostic
+from mcp import Enum
+
+class Pin(Enum):
+    def __init__(self, id):
+        """Identifier for pin, referencing platform-specific pin id"""
+        self.id = id
+    pass
 
 if agnostic.microcontroller == "esp8266":
     from microcontroller.esp8266 import pin
diff --git a/python/microcontroller/esp8266.py b/python/microcontroller/esp8266.py
index c347c7a..4e16571 100644
--- a/python/microcontroller/esp8266.py
+++ b/python/microcontroller/esp8266.py
@@ -1,4 +1,4 @@
-from mcp import Pin as pin
+from microcontroller import Pin as pin
 
 pin.GPIO0=pin(0)
 pin.GPIO1=pin(1)
diff --git a/python/microcontroller/stm32.py b/python/microcontroller/stm32.py
index 7303d02..7aaff3e 100644
--- a/python/microcontroller/stm32.py
+++ b/python/microcontroller/stm32.py
@@ -1,4 +1,4 @@
-from mcp import Pin as pin
+from microcontroller import Pin as pin
 
 pin.A0=pin('A0')
 pin.A1=pin('A1')