From 00973a2cf54674d86bebfe15acd153578d42ab46 Mon Sep 17 00:00:00 2001 From: Hajime Fujimoto Date: Sat, 1 Jun 2024 21:44:22 +0900 Subject: [PATCH 1/3] Added support for Radxa Rock 5C --- adafruit_platformdetect/board.py | 6 +++++- adafruit_platformdetect/constants/boards.py | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index 1bf42a07..1f81d0b5 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -636,7 +636,11 @@ def _rock_pi_id(self) -> Optional[str]: if self.detector.check_board_name_value() == "ROCK Pi X": board = boards.ROCK_PI_X if board_value and "ROCK 5" in board_value.upper(): - board = boards.ROCK_PI_5 + rock_board_value = board_value.upper() + if "ROCK 5C" in rock_board_value: + board = boards.ROCK_PI_5C + else: + board = boards.ROCK_PI_5 if board_value and "RADXA ROCK 4C+" in board_value.upper(): board = boards.ROCK_PI_4_C_PLUS if board_value and "RADXA ROCK 4SE" in board_value.upper(): diff --git a/adafruit_platformdetect/constants/boards.py b/adafruit_platformdetect/constants/boards.py index a025769d..96cb0706 100644 --- a/adafruit_platformdetect/constants/boards.py +++ b/adafruit_platformdetect/constants/boards.py @@ -206,6 +206,7 @@ ROCK_PI_X = "ROCK_PI_X" ROCK_PI_E = "ROCK_PI_E" ROCK_PI_5 = "ROCK_PI_5" +ROCK_PI_5C = "ROCK_PI_5C" GREATFET_ONE = "GREATFET_ONE" @@ -539,6 +540,7 @@ RADXA_ZERO, RADXA_ZERO3, ROCK_PI_5, + ROCK_PI_5C, RADXA_CM3, ROCK_PI_3A, ROCK_PI_3C, From 2fbc1f05bdcf812598702fc326d9092d81bc2583 Mon Sep 17 00:00:00 2001 From: Hajime Fujimoto Date: Tue, 4 Jun 2024 22:58:18 +0900 Subject: [PATCH 2/3] Changed check order of Rock 5 and Rock 5C --- adafruit_platformdetect/board.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index 1f81d0b5..b1f40c1f 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -636,11 +636,9 @@ def _rock_pi_id(self) -> Optional[str]: if self.detector.check_board_name_value() == "ROCK Pi X": board = boards.ROCK_PI_X if board_value and "ROCK 5" in board_value.upper(): - rock_board_value = board_value.upper() - if "ROCK 5C" in rock_board_value: - board = boards.ROCK_PI_5C - else: - board = boards.ROCK_PI_5 + board = boards.ROCK_PI_5 + if board_value and "ROCK 5C" in board_value.upper(): + board = boards.ROCK_PI_5C if board_value and "RADXA ROCK 4C+" in board_value.upper(): board = boards.ROCK_PI_4_C_PLUS if board_value and "RADXA ROCK 4SE" in board_value.upper(): From ce32900a40185bfb2d00775e44f72ff83939325f Mon Sep 17 00:00:00 2001 From: Hajime Fujimoto Date: Thu, 6 Jun 2024 20:14:06 +0900 Subject: [PATCH 3/3] Check rock5c first --- adafruit_platformdetect/board.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index b1f40c1f..fce56e2a 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -635,10 +635,10 @@ def _rock_pi_id(self) -> Optional[str]: board = boards.ROCK_PI_E if self.detector.check_board_name_value() == "ROCK Pi X": board = boards.ROCK_PI_X - if board_value and "ROCK 5" in board_value.upper(): - board = boards.ROCK_PI_5 if board_value and "ROCK 5C" in board_value.upper(): board = boards.ROCK_PI_5C + elif board_value and "ROCK 5" in board_value.upper(): + board = boards.ROCK_PI_5 if board_value and "RADXA ROCK 4C+" in board_value.upper(): board = boards.ROCK_PI_4_C_PLUS if board_value and "RADXA ROCK 4SE" in board_value.upper():