Merge pull request #18 from tannewt/rogue_machine

Fix machine import when on normal Linux.

src/adafruit_blinka/agnostic/__init__.py

@@ -8,26 +8,26 @@
 
 # We intentionally are patching into this namespace as module names so skip the name check.
 # pylint: disable=invalid-name
-microcontroller = sys.platform
+platform = sys.platform
 
-board = None
-if microcontroller is not None:
-    if microcontroller == "esp8266":  # TODO more conservative board-guessing
-        board = "feather_huzzah"
-    elif microcontroller == "samd21":
-        board = "feather_m0_express"
-    elif microcontroller == "pyboard":
-        microcontroller = "stm32"
-        board = "pyboard"
-    elif microcontroller == "linux":
+board_id = None
+if platform is not None:
+    if platform == "esp8266":  # TODO more conservative board-guessing
+        board_id = "feather_huzzah"
+    elif platform == "samd21":
+        board_id = "feather_m0_express"
+    elif platform == "pyboard":
+        platform = "stm32"
+        board_id = "pyboard"
+    elif platform == "linux":
         from Adafruit_GPIO import Platform
         if Platform.platform_detect() == Platform.RASPBERRY_PI:
             if Platform.pi_version() == 1:
-                board = "raspi_1"
+                board_id = "raspi_1"
             elif Platform.pi_version() == 2:
-                board = "raspi_2"
+                board_id = "raspi_2"
             elif Platform.pi_version() == 3:
-                board = "raspi_3"
+                board_id = "raspi_3"
 
 implementation = sys.implementation.name
 if implementation == "micropython":

src/bitbangio.py

@@ -13,7 +13,7 @@
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):
         if agnostic.microcontroller == "stm32":
-            raise NotImplementedError("No software I2C on {}".format(agnostic.board))
+            raise NotImplementedError("No software I2C on {}".format(agnostic.board_id))
         self.init(scl, sda, frequency)
 
     def init(self, scl, sda, frequency):

src/board.py

@@ -29,15 +29,15 @@
 """
 import sys
 
-from adafruit_blinka.agnostic import board
+from adafruit_blinka.agnostic import board_id
 
-if board == "feather_huzzah":
+if board_id == "feather_huzzah":
     from adafruit_blinka.board.feather_huzzah import *
-elif board == "nodemcu":
+elif board_id == "nodemcu":
     from adafruit_blinka.board.nodemcu import *
-elif board == "pyboard":
+elif board_id == "pyboard":
     from adafruit_blinka.board.pyboard import *
-elif board == "raspi_2" or board == "raspi_3":
+elif board_id == "raspi_2" or board_id == "raspi_3":
     from adafruit_blinka.board.raspi_23 import *
 elif "sphinx" in sys.modules:
     pass

src/busio.py

@@ -8,15 +8,15 @@
 """
 
 from adafruit_blinka import Enum, Lockable, agnostic
-from adafruit_blinka.agnostic import board as boardId
+from adafruit_blinka.agnostic import board_id
 
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):
         self.init(scl, sda, frequency)
 
     def init(self, scl, sda, frequency):
         self.deinit()
-        if boardId == "raspi_3" or boardId == "raspi_2":
+        if board_id == "raspi_3" or board_id == "raspi_2":
             from adafruit_blinka.microcontroller.raspi_23.i2c import I2C as _I2C
         else:
             from machine import I2C as _I2C
@@ -64,7 +64,7 @@ def writeto(self, address, buffer, start=0, end=None, stop=True):
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
         self.deinit()
-        if boardId == "raspi_3" or boardId == "raspi_2":
+        if board_id == "raspi_3" or board_id == "raspi_2":
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
         else:
             from machine import SPI as _SPI
@@ -80,7 +80,7 @@ def __init__(self, clock, MOSI=None, MISO=None):
                 format((clock, MOSI, MISO), spiPorts))
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
-        if boardId == "raspi_3" or boardId == "raspi_2":
+        if board_id == "raspi_3" or board_id == "raspi_2":
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.raspi_23.pin import Pin
         else:

src/digitalio.py

@@ -7,10 +7,10 @@
 * Author(s): cefn
 """
 
-from adafruit_blinka.agnostic import board as boardId
-if boardId == "raspi_3" or boardId == "raspi_2":
+from adafruit_blinka.agnostic import board_id
+if board_id == "raspi_3" or board_id == "raspi_2":
     from adafruit_blinka.microcontroller.raspi_23.pin import Pin
-else:
+elif board_id == "pyboard":
     from machine import Pin
 from adafruit_blinka import Enum, ContextManaged
 

src/microcontroller/__init__.py

@@ -1,7 +1,7 @@
 """Microcontroller pins"""
 
-from adafruit_blinka import Enum, agnostic
-from adafruit_blinka.agnostic import board as board_id
+from adafruit_blinka import Enum
+from adafruit_blinka.agnostic import board_id, platform
 
 class Pin(Enum):
     """Reference Pin object"""
@@ -23,14 +23,14 @@ def __repr__(self):
 # 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 *
-elif agnostic.microcontroller == "stm32":
+elif platform == "stm32":
     from adafruit_blinka.microcontroller.stm32 import *
-elif agnostic.microcontroller == "linux":
+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)
+        raise NotImplementedError("Board not supported:", board_id)
 else:
-    raise NotImplementedError("Microcontroller not supported: ", agnostic.microcontroller)
+    raise NotImplementedError("Platform not supported:", platform)

src/microcontroller/pin.py

@@ -5,14 +5,14 @@
 # We intentionally are patching into this namespace so skip the wildcard check.
 # pylint: disable=unused-wildcard-import,wildcard-import
 
-if agnostic.microcontroller == "esp8266":
+if agnostic.platform == "esp8266":
     from adafruit_blinka.microcontroller.esp8266.pin import *
-elif agnostic.microcontroller == "stm32":
+elif agnostic.platform == "stm32":
     from adafruit_blinka.microcontroller.stm32.pin import *
-elif agnostic.microcontroller == "linux":
-    if agnostic.board == "raspi_3" or agnostic.board == "raspi_2":
+elif agnostic.platform == "linux":
+    if agnostic.board_id == "raspi_3" or agnostic.board_id == "raspi_2":
         from adafruit_blinka.microcontroller.raspi_23.pin import *
     else:
-        raise NotImplementedError("Board not supported: ", agnostic.board)
+        raise NotImplementedError("Board not supported: ", agnostic.board_id)
 else:
     raise NotImplementedError("Microcontroller not supported")