From a01ac306bad5f412e87095f5ed9538bd4b46c6f4 Mon Sep 17 00:00:00 2001 From: Geffen Avraham Date: Thu, 11 Mar 2021 17:54:49 +0000 Subject: [PATCH 1/3] Added detection for OSD32MP1 development board. --- adafruit_platformdetect/board.py | 14 ++++++-------- adafruit_platformdetect/constants/boards.py | 2 ++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index f51b3391..164b6f53 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -14,7 +14,7 @@ # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN @@ -223,7 +223,7 @@ def _beaglebone_id(self): if eeprom_bytes[:4] != b"\xaaU3\xee": return None - # special condition for BeagleBone Green rev. 1A + # special condition for BeagleBone Green rev. 1A # refer to GitHub issue #57 in this repo for more info if eeprom_bytes == b"\xaaU3\xeeA335BNLT\x1a\x00\x00\x00": return boards.BEAGLEBONE_GREEN @@ -302,6 +302,8 @@ def _stm32mp1_id(self): return boards.STM32MP157C_DK2 if "LubanCat" in board_value: return boards.LUBANCAT_STM32MP157 + if "OSD32MP1-BRK" in board_value: + return boards.OSD32MP1_BRK return None def _imx8mx_id(self): @@ -516,9 +518,7 @@ def any_stm32mp1(self): @property def any_embedded_linux(self): """Check whether the current board is any embedded Linux device.""" - return any( - [ - self.any_raspberry_pi, + return any([self.any_raspberry_pi, self.any_beaglebone, self.any_orange_pi, self.any_nanopi, @@ -536,9 +536,7 @@ def any_embedded_linux(self): self.any_udoo_board, self.any_asus_tinker_board, self.any_stm32mp1, - self.any_lubancat, - ] - ) + self.any_lubancat,]) @property def ftdi_ft232h(self): diff --git a/adafruit_platformdetect/constants/boards.py b/adafruit_platformdetect/constants/boards.py index 383a02ff..aa23a0a9 100644 --- a/adafruit_platformdetect/constants/boards.py +++ b/adafruit_platformdetect/constants/boards.py @@ -70,6 +70,7 @@ # STM32 MPU boards STM32MP157C_DK2 = "STM32MP157C_DK2" +OSD32MP1_BRK = "OSD32MP1_BRK" # Embedfire LubanCat board LUBANCAT_IMX6ULL = "LUBANCAT_IMX6ULL" @@ -138,6 +139,7 @@ _STM32MP1_IDS = ( STM32MP157C_DK2, LUBANCAT_STM32MP157, + OSD32MP1_BRK, ) # OrangePI From 0a73977e8af894469c0935d4f7599dfb4af90594 Mon Sep 17 00:00:00 2001 From: Geffen Avraham Date: Thu, 11 Mar 2021 19:20:18 +0000 Subject: [PATCH 2/3] Fixed reformatting. --- adafruit_platformdetect/board.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index 164b6f53..572ecf9a 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -518,7 +518,9 @@ def any_stm32mp1(self): @property def any_embedded_linux(self): """Check whether the current board is any embedded Linux device.""" - return any([self.any_raspberry_pi, + return any( + [ + self.any_raspberry_pi, self.any_beaglebone, self.any_orange_pi, self.any_nanopi, @@ -536,7 +538,9 @@ def any_embedded_linux(self): self.any_udoo_board, self.any_asus_tinker_board, self.any_stm32mp1, - self.any_lubancat,]) + self.any_lubancat, + ] + ) @property def ftdi_ft232h(self): From 013d2e27d4f93680bfba50a9e96ecce775bf58c9 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Fri, 12 Mar 2021 08:04:32 -0800 Subject: [PATCH 3/3] Update board.py Remove double spacing --- 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 572ecf9a..eced6c37 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -14,7 +14,7 @@ # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN @@ -223,7 +223,7 @@ def _beaglebone_id(self): if eeprom_bytes[:4] != b"\xaaU3\xee": return None - # special condition for BeagleBone Green rev. 1A + # special condition for BeagleBone Green rev. 1A # refer to GitHub issue #57 in this repo for more info if eeprom_bytes == b"\xaaU3\xeeA335BNLT\x1a\x00\x00\x00": return boards.BEAGLEBONE_GREEN