Skip to content

Commit aa493d0

Browse files
changed starfive board detection function
1 parent 05220e5 commit aa493d0

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

adafruit_platformdetect/board.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
from adafruit_platformdetect.constants import boards, chips
3232

33-
3433
__version__ = "0.0.0+auto.0"
3534
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PlatformDetect.git"
3635

@@ -149,13 +148,13 @@ def id(self) -> Optional[str]:
149148
board_id = self._pine64_id()
150149
elif chip_id == chips.H6:
151150
board_id = (
152-
self._pine64_id() or self._armbian_id() or self._repka_variants_id()
151+
self._pine64_id() or self._armbian_id() or self._repka_variants_id()
153152
)
154153
elif chip_id == chips.H5:
155154
board_id = (
156-
self._armbian_id()
157-
or self._allwinner_variants_id()
158-
or self._repka_variants_id()
155+
self._armbian_id()
156+
or self._allwinner_variants_id()
157+
or self._repka_variants_id()
159158
)
160159
elif chip_id == chips.H616:
161160
board_id = self._armbian_id() or self._allwinner_variants_id()
@@ -165,11 +164,11 @@ def id(self) -> Optional[str]:
165164
board_id = self._rock_pi_id()
166165
elif chip_id == chips.RK3399:
167166
board_id = (
168-
self._rock_pi_id()
169-
or self._armbian_id()
170-
or self._diet_pi_id()
171-
or self._asus_tinker_board_id()
172-
or self._vivid_unit_id()
167+
self._rock_pi_id()
168+
or self._armbian_id()
169+
or self._diet_pi_id()
170+
or self._asus_tinker_board_id()
171+
or self._vivid_unit_id()
173172
)
174173
elif chip_id == chips.RK3399PRO:
175174
board_id = self._asus_tinker_board_id()
@@ -189,10 +188,10 @@ def id(self) -> Optional[str]:
189188
board_id = self._rk3568_id()
190189
elif chip_id == chips.RK3588:
191190
board_id = (
192-
self._rock_pi_id()
193-
or self._orange_pi_id()
194-
or self._armbian_id()
195-
or self._rk3588_id()
191+
self._rock_pi_id()
192+
or self._orange_pi_id()
193+
or self._armbian_id()
194+
or self._rk3588_id()
196195
)
197196
elif chip_id == chips.RYZEN_V1605B:
198197
board_id = self._udoo_id()
@@ -231,9 +230,10 @@ def id(self) -> Optional[str]:
231230
def _starfive_id(self) -> Optional[str]:
232231
model = None
233232
board_value = self.detector.get_device_compatible()
234-
if board_value == "starfive,visionfive-v2starfive,jh7110":
233+
if 'visionfive-v2starfive' in str(board_value):
235234
model = boards.VISIONFIVE2
236235
return model
236+
237237
def _pi_id(self) -> Optional[str]:
238238
"""Try to detect id of a Raspberry Pi."""
239239
# Check for Pi boards:
@@ -578,7 +578,7 @@ def _pynq_id(self) -> Optional[str]:
578578
"""Try to detect the id for Xilinx PYNQ boards."""
579579
try:
580580
with open(
581-
"/proc/device-tree/chosen/pynq_board", "r", encoding="utf-8"
581+
"/proc/device-tree/chosen/pynq_board", "r", encoding="utf-8"
582582
) as board_file:
583583
board_model = board_file.read()
584584
match = board_model.upper().replace("-", "_").rstrip("\x00")
@@ -698,7 +698,7 @@ def _j4105_id(self) -> Optional[str]:
698698
"""Try to detect the id of J4105 board."""
699699
try:
700700
with open(
701-
"/sys/devices/virtual/dmi/id/board_name", "r", encoding="utf-8"
701+
"/sys/devices/virtual/dmi/id/board_name", "r", encoding="utf-8"
702702
) as board_name:
703703
board_value = board_name.read().rstrip()
704704
if board_value in ("ODYSSEY-X86J41X5", "ODYSSEY-X86J41O5"):

0 commit comments

Comments
 (0)