adafruit-mirror/Adafruit_Python_PlatformDetect
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Convert _JETSON_IDS to a tuple

Browse source 
This will allow us to control the order that each entry is checked,
whereas the current dictionary is unordered. This will be useful when
adding support for future very similar boards.
This commit is contained in:
Stephen Warren 2020-10-05 12:28:10 -06:00
parent 89b73da013
commit e3fede2f5c
2 changed files with 44 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adafruit_platformdetect/board.py
View file

@ -280,7 +280,7 @@ class Board:
if not compatible:
return None
compats = compatible.split("\x00")
for board_id, board_compats in boards._JETSON_IDS.items():
for board_id, board_compats in boards._JETSON_IDS:
if any(v in compats for v in board_compats):
return board_id
return None

60
adafruit_platformdetect/constants/boards.py
View file

@ -128,25 +128,51 @@ _CORAL_IDS = (CORAL_EDGE_TPU_DEV,)
_PYNQ_IDS = (PYNQ_Z1, PYNQ_Z2)
_JETSON_IDS = {
JETSON_TX1: ("nvidia,p2371-2180", "nvidia,jetson-cv"),
JETSON_TX2: (
"nvidia,p2771-0000",
"nvidia,p2771-0888",
"nvidia,p3489-0000",
"nvidia,lightning",
"nvidia,quill",
"nvidia,storm",
_JETSON_IDS = (
(
JETSON_TX1,
(
"nvidia,p2371-2180",
"nvidia,jetson-cv",
),
),
JETSON_XAVIER: ("nvidia,p2972-0000", "nvidia,p2972-0006", "nvidia,jetson-xavier"),
JETSON_NANO: ("nvidia,p3450-0000", "nvidia,p3450-0002", "nvidia,jetson-nano"),
JETSON_NX: (
"nvidia,p3509-0000+p3668-0000",
"nvidia,p3509-0000+p3668-0001",
"nvidia,p3449-0000+p3668-0000",
"nvidia,p3449-0000+p3668-0001",
(
JETSON_TX2,
(
"nvidia,p2771-0000",
"nvidia,p2771-0888",
"nvidia,p3489-0000",
"nvidia,lightning",
"nvidia,quill",
"nvidia,storm",
),
),
}
(
JETSON_XAVIER,
(
"nvidia,p2972-0000",
"nvidia,p2972-0006",
"nvidia,jetson-xavier",
),
),
(
JETSON_NANO,
(
"nvidia,p3450-0000",
"nvidia,p3450-0002",
"nvidia,jetson-nano",
),
),
(
JETSON_NX,
(
"nvidia,p3509-0000+p3668-0000",
"nvidia,p3509-0000+p3668-0001",
"nvidia,p3449-0000+p3668-0000",
"nvidia,p3449-0000+p3668-0001",
),
),
)
_RASPBERRY_PI_40_PIN_IDS = (
RASPBERRY_PI_B_PLUS,