From 9f42d9e5c61cc715b65197d9849d2b085be05dc7 Mon Sep 17 00:00:00 2001 From: Yuyue <62864694+mmontol@users.noreply.github.com> Date: Tue, 11 Apr 2023 09:36:16 +0800 Subject: [PATCH 1/4] Update board.py Modify board_value for LubanCat1 LubanCat2 --- 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 30391a58..d6fc598b 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -501,7 +501,7 @@ def _rk3566_id(self) -> Optional[str]: board = None if board_value and "LubanCat-Zero" in board_value: board = boards.LUBANCAT_ZERO - if board_value and "LubanCat1" in board_value: + if board_value and "LubanCat-1" in board_value: board = boards.LUBANCAT1 if board_value and "Radxa CM3 IO" in board_value: board = boards.RADXA_CM3 @@ -511,7 +511,7 @@ def _rk3568_id(self) -> Optional[str]: """Check what type of rk3568 board.""" board_value = self.detector.get_device_model() board = None - if board_value and "LubanCat2" in board_value: + if board_value and "LubanCat-2" in board_value: board = boards.LUBANCAT2 if board_value and "ROCK3 Model A" in board_value: board = boards.ROCK_PI_3A From d354b1fff592a70aee19e3c9318f40e7adc3fa2a Mon Sep 17 00:00:00 2001 From: Yuyue <62864694+mmontol@users.noreply.github.com> Date: Thu, 13 Apr 2023 09:18:35 +0800 Subject: [PATCH 2/4] Update adafruit_platformdetect/board.py Co-authored-by: Melissa LeBlanc-Williams --- adafruit_platformdetect/board.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index d6fc598b..c672db13 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -501,7 +501,7 @@ def _rk3566_id(self) -> Optional[str]: board = None if board_value and "LubanCat-Zero" in board_value: board = boards.LUBANCAT_ZERO - if board_value and "LubanCat-1" in board_value: + if board_value and any([x in board_value for x in ("LubanCat1", "LubanCat-1")]): board = boards.LUBANCAT1 if board_value and "Radxa CM3 IO" in board_value: board = boards.RADXA_CM3 From 5e8e88c11b5ce0fa56050df48ce07f5e05900ec3 Mon Sep 17 00:00:00 2001 From: Yuyue <62864694+mmontol@users.noreply.github.com> Date: Thu, 13 Apr 2023 09:18:42 +0800 Subject: [PATCH 3/4] Update adafruit_platformdetect/board.py Co-authored-by: Melissa LeBlanc-Williams --- adafruit_platformdetect/board.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index c672db13..507061c1 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -511,7 +511,7 @@ def _rk3568_id(self) -> Optional[str]: """Check what type of rk3568 board.""" board_value = self.detector.get_device_model() board = None - if board_value and "LubanCat-2" in board_value: + if board_value and any([x in board_value for x in ("LubanCat2", "LubanCat-2")]): board = boards.LUBANCAT2 if board_value and "ROCK3 Model A" in board_value: board = boards.ROCK_PI_3A From bb3178287f0f00995742c63ad8ada4644c6a41eb Mon Sep 17 00:00:00 2001 From: Yuyue <62864694+mmontol@users.noreply.github.com> Date: Thu, 13 Apr 2023 09:58:04 +0800 Subject: [PATCH 4/4] Update board.py Fix --- 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 507061c1..896dfa9d 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -501,7 +501,7 @@ def _rk3566_id(self) -> Optional[str]: board = None if board_value and "LubanCat-Zero" in board_value: board = boards.LUBANCAT_ZERO - if board_value and any([x in board_value for x in ("LubanCat1", "LubanCat-1")]): + if board_value and any(x in board_value for x in ("LubanCat1", "LubanCat-1")): board = boards.LUBANCAT1 if board_value and "Radxa CM3 IO" in board_value: board = boards.RADXA_CM3 @@ -511,7 +511,7 @@ def _rk3568_id(self) -> Optional[str]: """Check what type of rk3568 board.""" board_value = self.detector.get_device_model() board = None - if board_value and any([x in board_value for x in ("LubanCat2", "LubanCat-2")]): + if board_value and any(x in board_value for x in ("LubanCat2", "LubanCat-2")): board = boards.LUBANCAT2 if board_value and "ROCK3 Model A" in board_value: board = boards.ROCK_PI_3A