From 5ae9bf9598d8d5012c16a68c1ca54208af6cbbfe Mon Sep 17 00:00:00 2001 From: Florent Bourghelle Date: Tue, 11 Mar 2025 11:31:04 +0100 Subject: [PATCH 1/3] Add Rock PI 3B --- adafruit_platformdetect/board.py | 6 ++++++ adafruit_platformdetect/constants/boards.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index 5c1ade88..95465896 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -468,6 +468,8 @@ def _armbian_id(self) -> Optional[str]: board = boards.PCDUINO3 elif board_value == "rock-3a": board = boards.ROCK_PI_3A + elif board_value == "rock-3b": + board = boards.ROCK_PI_3B elif board_value == "radxa-zero3": board = boards.RADXA_ZERO3 elif board_value == "repka-pi3-h5": @@ -645,6 +647,8 @@ def _rk3568_id(self) -> Optional[str]: board = boards.LUBANCAT2 if board_value and "ROCK3 Model A" in board_value: board = boards.ROCK_PI_3A + if board_value and "ROCK 3 Model B" in board_value: + board = boards.ROCK_PI_3B if board_value and "Hardkernel ODROID-M1" in board_value: board = boards.ODROID_M1 return board @@ -681,6 +685,8 @@ def _rock_pi_id(self) -> Optional[str]: board = boards.ROCK_PI_4_SE if board_value and "ROCK3 Model A" in board_value: board = boards.ROCK_PI_3A + if board_value and "ROCK 3 Model B" in board_value: + board = boards.ROCK_PI_3B return board def _libre_id(self) -> Optional[str]: diff --git a/adafruit_platformdetect/constants/boards.py b/adafruit_platformdetect/constants/boards.py index 392b4100..548fd8f9 100644 --- a/adafruit_platformdetect/constants/boards.py +++ b/adafruit_platformdetect/constants/boards.py @@ -208,6 +208,7 @@ RADXA_CM3 = "RADXA_CM3" ROCK_PI_3A = "ROCK_PI_3A" +ROCK_PI_3B = "ROCK_PI_3B" ROCK_PI_3C = "ROCK_PI_3C" ROCK_PI_S = "ROCK_PI_S" ROCK_PI_4 = "ROCK_PI_4" @@ -601,6 +602,7 @@ ROCK_PI_5C, RADXA_CM3, ROCK_PI_3A, + ROCK_PI_3B, ROCK_PI_3C, ) From 6d44d27d60272534afd3281a315d9d5b88c79bbb Mon Sep 17 00:00:00 2001 From: Florent Bourghelle Date: Tue, 11 Mar 2025 12:04:34 +0100 Subject: [PATCH 2/3] Chip ID equals to RK3568 on Radxa Rock 3B --- adafruit_platformdetect/board.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index 95465896..45465d4d 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -468,8 +468,6 @@ def _armbian_id(self) -> Optional[str]: board = boards.PCDUINO3 elif board_value == "rock-3a": board = boards.ROCK_PI_3A - elif board_value == "rock-3b": - board = boards.ROCK_PI_3B elif board_value == "radxa-zero3": board = boards.RADXA_ZERO3 elif board_value == "repka-pi3-h5": @@ -685,8 +683,6 @@ def _rock_pi_id(self) -> Optional[str]: board = boards.ROCK_PI_4_SE if board_value and "ROCK3 Model A" in board_value: board = boards.ROCK_PI_3A - if board_value and "ROCK 3 Model B" in board_value: - board = boards.ROCK_PI_3B return board def _libre_id(self) -> Optional[str]: From fb5cade5dfdcf7ff2c35bf0a289628b2e255a88a Mon Sep 17 00:00:00 2001 From: Florent Bourghelle Date: Tue, 11 Mar 2025 13:50:56 +0100 Subject: [PATCH 3/3] Model is Rock 3B and not Rock PI 3B --- adafruit_platformdetect/board.py | 2 +- adafruit_platformdetect/constants/boards.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index 45465d4d..9b8ee427 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -646,7 +646,7 @@ def _rk3568_id(self) -> Optional[str]: if board_value and "ROCK3 Model A" in board_value: board = boards.ROCK_PI_3A if board_value and "ROCK 3 Model B" in board_value: - board = boards.ROCK_PI_3B + board = boards.ROCK_3B if board_value and "Hardkernel ODROID-M1" in board_value: board = boards.ODROID_M1 return board diff --git a/adafruit_platformdetect/constants/boards.py b/adafruit_platformdetect/constants/boards.py index 548fd8f9..4b5c94f4 100644 --- a/adafruit_platformdetect/constants/boards.py +++ b/adafruit_platformdetect/constants/boards.py @@ -208,7 +208,7 @@ RADXA_CM3 = "RADXA_CM3" ROCK_PI_3A = "ROCK_PI_3A" -ROCK_PI_3B = "ROCK_PI_3B" +ROCK_3B = "ROCK_3B" ROCK_PI_3C = "ROCK_PI_3C" ROCK_PI_S = "ROCK_PI_S" ROCK_PI_4 = "ROCK_PI_4" @@ -602,7 +602,7 @@ ROCK_PI_5C, RADXA_CM3, ROCK_PI_3A, - ROCK_PI_3B, + ROCK_3B, ROCK_PI_3C, )