latest platformdetect api; clean up some pylint complaints & minor bugs

[hackapet/Adafruit_Blinka.git] / src / digitalio.py

diff --git a/src/digitalio.py b/src/digitalio.py
index 8fb53854a81e7d27637b3ea137606e3759dd0294..ee1fd214da3b9c1f74e13815c54d1c0c8d3b27e3 100755 (executable)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -7,8 +7,18 @@ See `CircuitPython:digitalio` in CircuitPython for more details.
 * Author(s): cefn
 """
 
 * Author(s): cefn
 """
 

-from machine import Pin
-from adafruit_blinka.agnostic import board as boardId
+from adafruit_blinka.agnostic import board_id, detector
+
+# pylint: disable=ungrouped-imports,wrong-import-position
+
+if detector.board.any_raspberry_pi_2_or_3:
+    from adafruit_blinka.microcontroller.bcm283x.pin import Pin
+elif detector.board.BEAGLEBONE_BLACK:
+    from adafruit_blinka.microcontroller.am335x.pin import Pin
+elif detector.board.ORANGE_PI_PC:
+    from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
+elif detector.board.PYBOARD:
+    from machine import Pin

 from adafruit_blinka import Enum, ContextManaged
 
 class DriveMode(Enum):
 from adafruit_blinka import Enum, ContextManaged
 
 class DriveMode(Enum):


@@ -106,7 +116,7 @@ class DigitalInOut(ContextManaged):
                     self._pin.init(mode=Pin.IN, pull=Pin.PULL_DOWN)
                 else:
                     raise NotImplementedError("{} unsupported on {}".format(
                     self._pin.init(mode=Pin.IN, pull=Pin.PULL_DOWN)
                 else:
                     raise NotImplementedError("{} unsupported on {}".format(

-                        Pull.DOWN, boardId))
+                        Pull.DOWN, board_id))

             elif pul is None:
                 self._pin.init(mode=Pin.IN, pull=None)
             else:
             elif pul is None:
                 self._pin.init(mode=Pin.IN, pull=None)
             else: