Merge pull request #63 from Tonymac32/master

[Adafruit_Blinka-hackapet.git] / src / microcontroller / pin.py

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 9ccd81f059da19b76c4d48032034bec4ae83b70a..5779050ef47b49aa9176f04446666a60f68dc7cd 100755 (executable)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -1,21 +1,20 @@
 """Pins named after their chip name."""
 
 """Pins named after their chip name."""
 

-from adafruit_blinka import agnostic
+import adafruit_platformdetect.chip as ap_chip
+from adafruit_blinka.agnostic import chip_id

 
 # We intentionally are patching into this namespace so skip the wildcard check.
 
 # We intentionally are patching into this namespace so skip the wildcard check.

-# pylint: disable=unused-wildcard-import,wildcard-import
-if agnostic.platform == "esp8266":
+# pylint: disable=unused-wildcard-import,wildcard-import,ungrouped-imports
+
+if chip_id == ap_chip.ESP8266:

     from adafruit_blinka.microcontroller.esp8266.pin import *
     from adafruit_blinka.microcontroller.esp8266.pin import *

-elif agnostic.platform == "stm32":
+elif chip_id == ap_chip.STM32:

     from adafruit_blinka.microcontroller.stm32.pin import *
     from adafruit_blinka.microcontroller.stm32.pin import *

-elif agnostic.platform == "linux":
-    if agnostic.board_id == "raspi_3" or agnostic.board_id == "raspi_2":
-        from adafruit_blinka.microcontroller.raspi_23.pin import *
-    elif agnostic.board_id == "beaglebone_black":
-        from adafruit_blinka.microcontroller.beaglebone_black.pin import *
-    elif agnostic.board_id == "orangepipc":
-        from adafruit_blinka.microcontroller.allwinner_h3.pin import *
-    else:
-        raise NotImplementedError("Board not supported: ", agnostic.board_id)
+elif chip_id == ap_chip.BCM2XXX:
+    from adafruit_blinka.microcontroller.bcm283x.pin import *
+elif chip_id == ap_chip.AM33XX:
+    from adafruit_blinka.microcontroller.am335x.pin import *
+elif chip_id == ap_chip.SUN8I:
+    from adafruit_blinka.microcontroller.allwinner_h3.pin import *

 else:
 else:

-    raise NotImplementedError("Microcontroller not supported")
+    raise NotImplementedError("Microcontroller not supported: ", chip_id)