Moved Pin into mcp layer to prevent circular import within microcontroller module.

diff --git a/python/mcp/__init__.py b/python/mcp/__init__.py
index c29025003703c598939431b24f8836b024e5a280..a8c4a84f5146dac324115ba420d9e55958ec7aba 100644 (file)
--- a/python/mcp/__init__.py
+++ b/python/mcp/__init__.py
@@ -28,4 +28,10 @@ class Enum(object):
         for key in dir(cls):
             if getattr(cls, key) is self:
                 return "{}.{}.{}".format(cls.__module__, cls.__qualname__, key)
         for key in dir(cls):
             if getattr(cls, key) is self:
                 return "{}.{}.{}".format(cls.__module__, cls.__qualname__, key)

-        return repr(self)
\ No newline at end of file
+        return repr(self)
+
+class Pin(Enum):
+    def __init__(self, id):
+        """ id type is likely platform-specific"""
+        self.id = id
+    pass

diff --git a/python/microcontroller/esp8266.py b/python/microcontroller/esp8266.py
index ff0960f63605a67d4f0a41ad87f861afc9ef5d35..c347c7a147538dc4db00be777140695a367d89e8 100644 (file)
--- a/python/microcontroller/esp8266.py
+++ b/python/microcontroller/esp8266.py
@@ -1,20 +1,29 @@
-from mcp import Enum
-class Pin(Enum):
-    def __init__(self, num):
-        self.num = num
-    pass
-Pin.GPIO0=Pin(0)
-Pin.GPIO2=Pin(2)
-Pin.GPIO4=Pin(4)
-Pin.GPIO5=Pin(5)
-Pin.GPIO12=Pin(12)
-Pin.GPIO13=Pin(13)
-Pin.GPIO14=Pin(14)
-Pin.GPIO15=Pin(15)
-Pin.GPIO16=Pin(16)
+from mcp import Pin as pin

 
 

+pin.GPIO0=pin(0)
+pin.GPIO1=pin(1)
+pin.GPIO2=pin(2)
+pin.GPIO3=pin(3)
+pin.GPIO4=pin(4)
+pin.GPIO5=pin(5)
+pin.GPIO12=pin(12)
+pin.GPIO13=pin(13)
+pin.GPIO14=pin(14)
+pin.GPIO15=pin(15)
+pin.GPIO16=pin(16)
+pin.TOUT=pin("TOUT")

 
 

+"""
+From introspection of microcontroller.pin on Feather Huzzah running CircuitPython
+>>> dir(microcontroller.pin)
+['TOUT', 'XPD_DCDC', 'MTMS', 'MTDI', 'MTCK', 'MTDO', 'GPIO2', 'GPIO0', 'GPIO4', 'SD_DATA_2', 'SD_DATA_3', 'SD_CMD', 'SD_CLK', 'SD_DATA_0', 'SD_DATA_1', 'DVDD', 'U0RXD', 'U0TXD']
+>>> dir(board)
+['ADC', 'GPIO16', 'GPIO14', 'SCK', 'GPIO12', 'MISO', 'GPIO13', 'MOSI', 'GPIO15', 'GPIO2', 'GPIO0', 'GPIO4', 'SDA', 'RX', 'TX', 'GPIO5', 'SCL']
+"""
+
+"""

 class cpu():
     def frequency(self):
         from machine import freq
         return freq()
 class cpu():
     def frequency(self):
         from machine import freq
         return freq()

+"""