From: Andy Date: Wed, 13 Mar 2019 01:07:05 +0000 (-0700) Subject: Updated chip definitions X-Git-Tag: 1.2.5^2~3 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/88fea488367a181e580344bd4bf7e28f3bda9cc6?ds=inline Updated chip definitions --- diff --git a/src/adafruit_blinka/board/jetson_tx1.py b/src/adafruit_blinka/board/jetson_tx1.py index efcc033..e5dd8c7 100644 --- a/src/adafruit_blinka/board/jetson_tx1.py +++ b/src/adafruit_blinka/board/jetson_tx1.py @@ -1,6 +1,6 @@ """Pin definitions for Jetson TX1.""" -from adafruit_blinka.microcontroller.tegra.tx1 import pin +from adafruit_blinka.microcontroller.tegra.t210 import x1_pin as pin SDA = pin.SDA SCL = pin.SCL diff --git a/src/adafruit_blinka/board/jetson_tx2.py b/src/adafruit_blinka/board/jetson_tx2.py index ec1159f..906fa56 100644 --- a/src/adafruit_blinka/board/jetson_tx2.py +++ b/src/adafruit_blinka/board/jetson_tx2.py @@ -1,6 +1,6 @@ """Pin definitions for Jetson TX2.""" -from adafruit_blinka.microcontroller.tegra.tx2 import pin +from adafruit_blinka.microcontroller.tegra.t186 import pin SDA = pin.SDA SCL = pin.SCL diff --git a/src/adafruit_blinka/board/jetson_txx.py b/src/adafruit_blinka/board/jetson_txx.py index d4a5715..3fc7aa3 100644 --- a/src/adafruit_blinka/board/jetson_txx.py +++ b/src/adafruit_blinka/board/jetson_txx.py @@ -1,6 +1,6 @@ """Pin definitions for Jetson TXX.""" -from adafruit_blinka.microcontroller.tegra.txx import pin +from adafruit_blinka.microcontroller.tegra.t210 import xx_pin as pin SDA = pin.SDA SCL = pin.SCL diff --git a/src/adafruit_blinka/board/jetson_xavier.py b/src/adafruit_blinka/board/jetson_xavier.py index 4e26ab4..24e229f 100644 --- a/src/adafruit_blinka/board/jetson_xavier.py +++ b/src/adafruit_blinka/board/jetson_xavier.py @@ -1,6 +1,6 @@ """Pin definitions for Jetson XAVIER.""" -from adafruit_blinka.microcontroller.tegra.xavier import pin +from adafruit_blinka.microcontroller.tegra.t194 import pin SDA = pin.SDA SCL = pin.SCL diff --git a/src/adafruit_blinka/microcontroller/tegra/tx1/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t186/__init__.py similarity index 100% rename from src/adafruit_blinka/microcontroller/tegra/tx1/__init__.py rename to src/adafruit_blinka/microcontroller/tegra/t186/__init__.py diff --git a/src/adafruit_blinka/microcontroller/tegra/tx2/pin.py b/src/adafruit_blinka/microcontroller/tegra/t186/pin.py similarity index 100% rename from src/adafruit_blinka/microcontroller/tegra/tx2/pin.py rename to src/adafruit_blinka/microcontroller/tegra/t186/pin.py diff --git a/src/adafruit_blinka/microcontroller/tegra/tx2/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t194/__init__.py similarity index 100% rename from src/adafruit_blinka/microcontroller/tegra/tx2/__init__.py rename to src/adafruit_blinka/microcontroller/tegra/t194/__init__.py diff --git a/src/adafruit_blinka/microcontroller/tegra/xavier/pin.py b/src/adafruit_blinka/microcontroller/tegra/t194/pin.py similarity index 100% rename from src/adafruit_blinka/microcontroller/tegra/xavier/pin.py rename to src/adafruit_blinka/microcontroller/tegra/t194/pin.py diff --git a/src/adafruit_blinka/microcontroller/tegra/txx/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t210/__init__.py similarity index 100% rename from src/adafruit_blinka/microcontroller/tegra/txx/__init__.py rename to src/adafruit_blinka/microcontroller/tegra/t210/__init__.py diff --git a/src/adafruit_blinka/microcontroller/tegra/tx1/pin.py b/src/adafruit_blinka/microcontroller/tegra/t210/x1_pin.py similarity index 100% rename from src/adafruit_blinka/microcontroller/tegra/tx1/pin.py rename to src/adafruit_blinka/microcontroller/tegra/t210/x1_pin.py diff --git a/src/adafruit_blinka/microcontroller/tegra/txx/pin.py b/src/adafruit_blinka/microcontroller/tegra/t210/xx_pin.py similarity index 100% rename from src/adafruit_blinka/microcontroller/tegra/txx/pin.py rename to src/adafruit_blinka/microcontroller/tegra/t210/xx_pin.py diff --git a/src/adafruit_blinka/microcontroller/tegra/xavier/__init__.py b/src/adafruit_blinka/microcontroller/tegra/xavier/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/digitalio.py b/src/digitalio.py index 0d9bc5b..f129c47 100755 --- a/src/digitalio.py +++ b/src/digitalio.py @@ -19,14 +19,15 @@ elif detector.chip.SUN8I: from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin elif detector.chip.SAMA5: from adafruit_blinka.microcontroller.sama5.pin import Pin -elif detector.chip.TEGRA_TX1: - from adafruit_blinka.microcontroller.tegra.tx1.pin import Pin -elif detector.chip.TEGRA_TX2: - from adafruit_blinka.microcontroller.tegra.tx2.pin import Pin -elif detector.chip.TEGRA_XAVIER: - from adafruit_blinka.microcontroller.tegra.xavier.pin import Pin -elif detector.chip.TEGRA_TXX: - from adafruit_blinka.microcontroller.tegra.txx.pin import Pin +elif detector.chip.T210: + if detector.board.JETSON_TX1: + from adafruit_blinka.microcontroller.tegra.t210.x1_pin import Pin + elif detector.board.JETSON_TXX: + from adafruit_blinka.microcontroller.tegra.t210.xx_pin import Pin +elif detector.chip.T186: + from adafruit_blinka.microcontroller.tegra.t186.pin import Pin +elif detector.chip.T194: + from adafruit_blinka.microcontroller.tegra.t194.pin import Pin elif detector.chip.STM32: from machine import Pin from adafruit_blinka import Enum, ContextManaged diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py index a274126..80394b7 100755 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@ -36,13 +36,11 @@ elif chip_id == ap_chip.SUN8I: from adafruit_blinka.microcontroller.allwinner_h3 import * elif chip_id == ap_chip.SAMA5: from adafruit_blinka.microcontroller.sama5 import * -elif chip_id == ap_chip.TEGRA_TX1: - from adafruit_blinka.microcontroller.tegra.tx1 import * -elif chip_id == ap_chip.TEGRA_TX2: - from adafruit_blinka.microcontroller.tegra.tx2 import * -elif chip_id == ap_chip.TEGRA_XAVIER: - from adafruit_blinka.microcontroller.tegra.xavier import * -elif chip_id == ap_chip.TEGRA_TXX: - from adafruit_blinka.microcontroller.tegra.txx import * +elif chip_id == ap_chip.T210: + from adafruit_blinka.microcontroller.tegra.t210 import * +elif chip_id == ap_chip.T186: + from adafruit_blinka.microcontroller.tegra.t186 import * +elif chip_id == ap_chip.T194: + from adafruit_blinka.microcontroller.tegra.t194 import * else: raise NotImplementedError("Microcontroller not supported:", chip_id) diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py index 6314f00..7aa57c1 100755 --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@ -1,7 +1,7 @@ """Pins named after their chip name.""" -import adafruit_platformdetect.chip as ap_chip -from adafruit_blinka.agnostic import chip_id +from adafruit_platformdetect import chip as ap_chip, board as ap_board +from adafruit_blinka.agnostic import chip_id, board_id # We intentionally are patching into this namespace so skip the wildcard check. # pylint: disable=unused-wildcard-import,wildcard-import,ungrouped-imports @@ -18,13 +18,14 @@ elif chip_id == ap_chip.SUN8I: from adafruit_blinka.microcontroller.allwinner_h3.pin import * elif chip_id == ap_chip.SAMA5: from adafruit_blinka.microcontroller.sama5.pin import * -elif chip_id == ap_chip.TEGRA_TX1: - from adafruit_blinka.microcontroller.tegra.tx1.pin import * -elif chip_id == ap_chip.TEGRA_TX2: - from adafruit_blinka.microcontroller.tegra.tx2.pin import * -elif chip_id == ap_chip.TEGRA_XAVIER: - from adafruit_blinka.microcontroller.tegra.xavier.pin import * -elif chip_id == ap_chip.TEGRA_TXX: - from adafruit_blinka.microcontroller.tegra.txx.pin import * +elif chip_id == ap_chip.T210: + if board_id == ap_board.JETSON_TX1: + from adafruit_blinka.microcontroller.tegra.t210.x1_pin import * + elif board_id == ap_board.JETSON_TXX: + from adafruit_blinka.microcontroller.tegra.t210.xx_pin import * +elif chip_id == ap_chip.T186: + from adafruit_blinka.microcontroller.tegra.t186.pin import * +elif chip_id == ap_chip.T194: + from adafruit_blinka.microcontroller.tegra.t194.pin import * else: raise NotImplementedError("Microcontroller not supported: ", chip_id)