Merge pull request #362 from makermelissa/vivid-unit

Add Vivid Unit Detection
This commit is contained in:
Scott Shawcroft 2024-06-17 15:53:03 -07:00 committed by GitHub
commit 05c1e8dc3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions

View file

@ -167,6 +167,7 @@ class Board:
or self._armbian_id() or self._armbian_id()
or self._diet_pi_id() or self._diet_pi_id()
or self._asus_tinker_board_id() or self._asus_tinker_board_id()
or self._vivid_unit_id()
) )
elif chip_id == chips.RK3399PRO: elif chip_id == chips.RK3399PRO:
board_id = self._asus_tinker_board_id() board_id = self._asus_tinker_board_id()
@ -712,6 +713,14 @@ class Board:
return board return board
def _vivid_unit_id(self) -> Optional[str]:
"""Check what type of vivid unit."""
board_value = self.detector.get_device_model()
board = None
if board_value and "RK3399 VIVID" in board_value:
board = boards.VIVID_UNIT
return board
def _pcduino_board_id(self) -> Optional[str]: def _pcduino_board_id(self) -> Optional[str]:
"""Check on the type of Pcduino""" """Check on the type of Pcduino"""
board_value = self.detector.get_device_model() board_value = self.detector.get_device_model()
@ -1023,7 +1032,7 @@ class Board:
@property @property
def any_olimex_board(self): def any_olimex_board(self):
"""Check whether the current board is any Pine64 device.""" """Check whether the current board is any Olimex device."""
return self.id in boards._OLIMEX_IDS return self.id in boards._OLIMEX_IDS
@property @property
@ -1036,6 +1045,11 @@ class Board:
"""Check whether the current board is any Luckfox Pico device.""" """Check whether the current board is any Luckfox Pico device."""
return self.id in boards._LUCKFOX_IDS return self.id in boards._LUCKFOX_IDS
@property
def any_vivid_unit(self):
"""Check whether the current board is any Vivid Unit device."""
return self.id in boards._VIVID_UNIT_IDS
@property @property
def os_environ_board(self) -> bool: def os_environ_board(self) -> bool:
"""Check whether the current board is an OS environment variable special case.""" """Check whether the current board is an OS environment variable special case."""
@ -1103,6 +1117,7 @@ class Board:
yield self.any_repka_board yield self.any_repka_board
yield self.any_milkv_board yield self.any_milkv_board
yield self.any_luckfox_pico_board yield self.any_luckfox_pico_board
yield self.any_vivid_unit
return any(condition for condition in lazily_generate_conditions()) return any(condition for condition in lazily_generate_conditions())

View file

@ -232,6 +232,11 @@ KHADAS_VIM3 = "KHADAS_VIM3"
_KHADAS_40_PIN_IDS = (KHADAS_VIM3,) _KHADAS_40_PIN_IDS = (KHADAS_VIM3,)
# Vivid Unit
VIVID_UNIT = "VIVID_UNIT"
_VIVID_UNIT_IDS = (VIVID_UNIT,)
# Luckfox Pico boards # Luckfox Pico boards
LUCKFOX_PICO = "LUCKFOX_PICO" LUCKFOX_PICO = "LUCKFOX_PICO"
LUCKFOX_PICO_MAX = "LUCKFOX_PICO_MAX" LUCKFOX_PICO_MAX = "LUCKFOX_PICO_MAX"