From 3ce8bb163e0383e7bdca6c3caae91a46c15b0ca4 Mon Sep 17 00:00:00 2001 From: zebular13 Date: Wed, 3 Nov 2021 13:15:41 -0700 Subject: [PATCH 1/2] Added full model name for MaaXBoards to fix conflict with other i.MX8M devices --- 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 cf9872ea..a7d1da70 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -336,9 +336,9 @@ def _stm32mp1_id(self): def _imx8mx_id(self): """Check what type iMX8M board.""" board_value = self.detector.get_device_model() - if "i.MX8MM" in board_value: + if "FSL i.MX8MM DDR4 EVK" in board_value: return boards.MAAXBOARD_MINI - if "i.MX8MQ" in board_value: + if "Freescale i.MX8MQ EVK" in board_value: return boards.MAAXBOARD if "Phanbell" in board_value: return boards.CORAL_EDGE_TPU_DEV From 3274256bc8ba4e78127f7812ba716347edb4717e Mon Sep 17 00:00:00 2001 From: zebular13 Date: Wed, 3 Nov 2021 14:36:49 -0700 Subject: [PATCH 2/2] MaaXBoards are now detected as generic linux boards --- 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 a7d1da70..906b07e9 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -610,6 +610,11 @@ def any_bananapi(self): """Check whether the current board is any BananaPi-family system.""" return self.id in boards._BANANA_PI_IDS + @property + def any_maaxboard(self): + """Check whether the current board is any BananaPi-family system.""" + return self.id in boards._MAAXBOARD_IDS + @property def any_embedded_linux(self): """Check whether the current board is any embedded Linux device.""" @@ -636,6 +641,7 @@ def any_embedded_linux(self): self.any_stm32mp1, self.any_lubancat, self.any_bananapi, + self.any_maaxboard, ] ) diff --git a/adafruit_platformdetect/constants/boards.py b/adafruit_platformdetect/constants/boards.py index 43488386..1675525a 100644 --- a/adafruit_platformdetect/constants/boards.py +++ b/adafruit_platformdetect/constants/boards.py @@ -463,4 +463,4 @@ _UDOO_BOARD_IDS = {UDOO_BOLT_V8: ("SC40-2000-0000-C0|C",), UDOO_X86: ("dummy",)} # MaaXBoard boards -_MAAXBOARD_DEV_IDS = ("MAAXBOARD", "MAAXBOARD_MINI") +_MAAXBOARD_IDS = ("MAAXBOARD", "MAAXBOARD_MINI")