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

diff --git a/python/mcp/__init__.py b/python/mcp/__init__.py
index 799f33695e8156eff517de931894db3ca79a5cab..2ee42c22601ca91c6d0b6c24ecb6fe9fecfef95a 100644 (file)
--- 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 c76a6559561ca2c9c65fc8c67ef757640b50be0d..9d25685fd023f4ce8b4710494f08b3ab75e5108a 100644 (file)
--- 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 c347c7a147538dc4db00be777140695a367d89e8..4e165713e2d745c1d20eb364bf6464bf9f0d995b 100644 (file)
--- 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 7303d02c8e678d4a984a212779b07d26baa76249..7aaff3ea9dad61e1e73f0ea18a3b88eea7166796 100644 (file)
--- 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')