Renaming and refactoring typos. Experimental logic for board-based Pin naming, fallin...

diff --git a/src/adafruit_blinka/__init__.py b/src/adafruit_blinka/__init__.py
index 0e52a3cf9a2b10317ca204d582d21b32541c40aa..32b2002ba2dab539ffd2468f870f8e9c88967ce3 100644 (file)
--- a/src/adafruit_blinka/__init__.py
+++ b/src/adafruit_blinka/__init__.py
@@ -37,7 +37,7 @@ class ContextManaged:
     def __exit__(self, exc_type, exc_value, traceback):
         self.deinit()
 
-def Lockable(ContextManaged):
+class Lockable(ContextManaged):
     _locked = False
 
     def try_lock(self):

diff --git a/src/adafruit_blinka/board/feather_m0_express.py b/src/adafruit_blinka/board/feather_m0_express.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/adafruit_blinka/board/nodemcu.py b/src/adafruit_blinka/board/nodemcu.py
index 94191347695df317011f24ee7755b384b401c5fa..83e4ca81064d1597b92d47d572c3250a2bea6366 100644 (file)
--- a/src/adafruit_blinka/board/nodemcu.py
+++ b/src/adafruit_blinka/board/nodemcu.py
@@ -1,4 +1,4 @@
-from microcontroller import pin
+from adafruit_blinka.microcontroller.esp8266 import pin
 
 D0 = pin.GPIO16
 D1 = pin.GPIO5
@@ -26,4 +26,4 @@ RX0 = D9
 TX0 = D10
 
 # GPIO0 and GPIO2 have built-in pull-ups on common ESP8266
-# breakout boards making them suitable for I2C SDA and SCL
+# breakout boards making them suitable for I2C SDA and SCL
\ No newline at end of file

diff --git a/src/adafruit_blinka/board/pyboard.py b/src/adafruit_blinka/board/pyboard.py
index 8c048738827f57f5597cddabdbd7077295452ebb..f5a5b0ca2a26249707ec8425789ad53c15bc8361 100644 (file)
--- a/src/adafruit_blinka/board/pyboard.py
+++ b/src/adafruit_blinka/board/pyboard.py
@@ -1,4 +1,4 @@
-from microcontroller import pin
+from adafruit_blinka.microcontroller.stm32 import pin
 
 X1=pin.A0
 X2=pin.A1

diff --git a/src/bitbangio.py b/src/bitbangio.py
index 8f9635b7525078cd915c7054afd910f079cc68e6..0dbeb82addba340e7777ef417e48fbd8dd328fad 100644 (file)
--- a/src/bitbangio.py
+++ b/src/bitbangio.py
@@ -5,7 +5,6 @@ from machine import Pin
 
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):
-        super().__init()
         self.init(scl, sda, frequency)
 
     def init(self, scl, sda, frequency):

diff --git a/src/board.py b/src/board.py
index 707c643284d05280a08fe3d253964900764471da..cd0390bca1ce936e8fbe8503c0cf6361ef71f14c 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -39,13 +39,11 @@ __repo__ = "https://github.com/adafruit/Adafruit_Micropython_Blinka.git"
 
 
 if board == "feather_huzzah":
-    pass
-elif board == "feather_m0_express":
-    pass
+    from adafruit_blinka.board.feather_huzzah import *
 elif board == "nodemcu":
-    pass
+    from adafruit_blinka.board.nodemcu import *
 elif board == "pyboard":
-    pass
+    from adafruit_blinka.board.pyboard import *
 else:
     raise NotImplementedError("Board not supported")
 gc.collect()
\ No newline at end of file

diff --git a/src/microcontroller.py b/src/microcontroller.py
index c34511a071659967564247073ea243d2c7029fb4..0daf1c597f8b6f8609bbb85038e32700a35d0eb5 100644 (file)
--- a/src/microcontroller.py
+++ b/src/microcontroller.py
@@ -5,11 +5,22 @@ class Pin(Enum):
     def __init__(self, id):
         """Identifier for pin, referencing platform-specific pin id"""
         self.id = id
-    pass
+
+    def __repr__(self):
+        import board
+        for key in dir(board):
+            if getattr(board, key) is self:
+                return "board.{}".format(key)
+        import microcontroller
+        for key in dir(microcontroller):
+            if getattr(microcontroller, key) is self:
+                return "microcontroller.{}".format(key)
+        return repr(self)
+
 
 if agnostic.microcontroller == "esp8266":
-    pass
+    from adafruit_blinka.microcontroller.esp8266 import *
 elif agnostic.microcontroller == "stm32":
-    pass
+    from adafruit_blinka.microcontroller.stm32 import *
 else:
     raise NotImplementedError("Microcontroller not supported")
\ No newline at end of file