Skip to content

Commit ad2e367

Browse files
committed
Convert _JETSON_IDS to a tuple
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.
1 parent ebcb4a0 commit ad2e367

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

adafruit_platformdetect/board.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def _tegra_id(self):
280280
if not compatible:
281281
return None
282282
compats = compatible.split("\x00")
283-
for board_id, board_compats in boards._JETSON_IDS.items():
283+
for board_id, board_compats in boards._JETSON_IDS:
284284
if any(v in compats for v in board_compats):
285285
return board_id
286286
return None

adafruit_platformdetect/constants/boards.py

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,25 +128,36 @@
128128

129129
_PYNQ_IDS = (PYNQ_Z1, PYNQ_Z2)
130130

131-
_JETSON_IDS = {
132-
JETSON_TX1: ("nvidia,p2371-2180", "nvidia,jetson-cv"),
133-
JETSON_TX2: (
131+
_JETSON_IDS = (
132+
(JETSON_TX1, (
133+
"nvidia,p2371-2180",
134+
"nvidia,jetson-cv",
135+
)),
136+
(JETSON_TX2, (
134137
"nvidia,p2771-0000",
135138
"nvidia,p2771-0888",
136139
"nvidia,p3489-0000",
137140
"nvidia,lightning",
138141
"nvidia,quill",
139142
"nvidia,storm",
140-
),
141-
JETSON_XAVIER: ("nvidia,p2972-0000", "nvidia,p2972-0006", "nvidia,jetson-xavier"),
142-
JETSON_NANO: ("nvidia,p3450-0000", "nvidia,p3450-0002", "nvidia,jetson-nano"),
143-
JETSON_NX: (
143+
)),
144+
(JETSON_XAVIER, (
145+
"nvidia,p2972-0000",
146+
"nvidia,p2972-0006",
147+
"nvidia,jetson-xavier",
148+
)),
149+
(JETSON_NANO, (
150+
"nvidia,p3450-0000",
151+
"nvidia,p3450-0002",
152+
"nvidia,jetson-nano",
153+
)),
154+
(JETSON_NX, (
144155
"nvidia,p3509-0000+p3668-0000",
145156
"nvidia,p3509-0000+p3668-0001",
146157
"nvidia,p3449-0000+p3668-0000",
147158
"nvidia,p3449-0000+p3668-0001",
148-
),
149-
}
159+
)),
160+
)
150161

151162
_RASPBERRY_PI_40_PIN_IDS = (
152163
RASPBERRY_PI_B_PLUS,

0 commit comments

Comments
 (0)