Fix machine import when on normal Linux.

Also, rename variables for clarity.

diff --git a/src/adafruit_blinka/agnostic/__init__.py b/src/adafruit_blinka/agnostic/__init__.py
index 89d06469b19dc04dd2770a404f63c9c8ffcc66c1..1a33b499316683240911940754eb37993626daf9 100755 (executable)
--- a/src/adafruit_blinka/agnostic/__init__.py
+++ b/src/adafruit_blinka/agnostic/__init__.py
@@ -8,26 +8,26 @@ import sys
 
 # We intentionally are patching into this namespace as module names so skip the name check.
 # pylint: disable=invalid-name
 
 # 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:
         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:
             elif Platform.pi_version() == 2:

-                board = "raspi_2"
+                board_id = "raspi_2"

             elif Platform.pi_version() == 3:
             elif Platform.pi_version() == 3:

-                board = "raspi_3"
+                board_id = "raspi_3"

 
 implementation = sys.implementation.name
 if implementation == "micropython":
 
 implementation = sys.implementation.name
 if implementation == "micropython":

diff --git a/src/bitbangio.py b/src/bitbangio.py
index aa679f0de881f6e56aecd82319220caa96a15c54..817bdbcd19eed760792074859eeef0f947a552cb 100755 (executable)
--- a/src/bitbangio.py
+++ b/src/bitbangio.py
@@ -13,7 +13,7 @@ from adafruit_blinka import Lockable, agnostic
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):
         if agnostic.microcontroller == "stm32":
 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):
         self.init(scl, sda, frequency)
 
     def init(self, scl, sda, frequency):

diff --git a/src/board.py b/src/board.py
index b9411749d3175262033f5de1e3738f128f062461..59005b0778f823ec18474aa24a6da77dec7ee504 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -29,15 +29,15 @@ See `CircuitPython:board` in CircuitPython for more details.
 """
 import sys
 
 """
 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 *
     from adafruit_blinka.board.feather_huzzah import *

-elif board == "nodemcu":
+elif board_id == "nodemcu":

     from adafruit_blinka.board.nodemcu import *
     from adafruit_blinka.board.nodemcu import *

-elif board == "pyboard":
+elif board_id == "pyboard":

     from adafruit_blinka.board.pyboard import *
     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
     from adafruit_blinka.board.raspi_23 import *
 elif "sphinx" in sys.modules:
     pass

diff --git a/src/busio.py b/src/busio.py
index 708039c686b33fb1caabdfe6d9299a9bc2af07d6..302eb882dc813c41da72cb3f3db7d8600cb104da 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -8,7 +8,7 @@ See `CircuitPython:busio` in CircuitPython for more details.
 """
 
 from adafruit_blinka import Enum, Lockable, agnostic
 """
 
 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):
 
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):


@@ -16,7 +16,7 @@ class I2C(Lockable):
 
     def init(self, scl, sda, frequency):
         self.deinit()
 
     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
             from adafruit_blinka.microcontroller.raspi_23.i2c import I2C as _I2C
         else:
             from machine import I2C as _I2C


@@ -64,7 +64,7 @@ class I2C(Lockable):
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
         self.deinit()
 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
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
         else:
             from machine import SPI as _SPI


@@ -80,7 +80,7 @@ class SPI(Lockable):
                 format((clock, MOSI, MISO), spiPorts))
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
                 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:
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.raspi_23.pin import Pin
         else:

diff --git a/src/digitalio.py b/src/digitalio.py
index 84aeebdc9bd94c0b660f0563055fdcb79e2780f2..93b45a941e95c83fe9688e225fd8ba46b096e714 100755 (executable)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -7,10 +7,10 @@ See `CircuitPython:digitalio` in CircuitPython for more details.
 * Author(s): cefn
 """
 
 * 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
     from adafruit_blinka.microcontroller.raspi_23.pin import Pin

-else:
+elif board_id == "pyboard":

     from machine import Pin
 from adafruit_blinka import Enum, ContextManaged
 
     from machine import Pin
 from adafruit_blinka import Enum, ContextManaged