From a5178c37c0246c8acfc7ea4ee43a41c6f97ace88 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Tue, 1 Mar 2022 12:09:22 -0800 Subject: [PATCH] Fixed Beaglebone Black detection for Kernel 5.10 or higher --- adafruit_platformdetect/board.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index 047cf7d9..d58c3fe5 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -218,7 +218,6 @@ def _pi_rev_code(self) -> Optional[str]: # pylint: disable=no-self-use def _beaglebone_id(self) -> Optional[str]: """Try to detect id of a Beaglebone.""" - board_value = self.detector.get_device_compatible() # Older Builds if "freedom-u74-arty" in board_value: @@ -232,7 +231,11 @@ def _beaglebone_id(self) -> Optional[str]: with open("/sys/bus/nvmem/devices/0-00500/nvmem", "rb") as eeprom: eeprom_bytes = eeprom.read(16) except FileNotFoundError: - return None + try: + with open("/sys/bus/nvmem/devices/0-00501/nvmem", "rb") as eeprom: + eeprom_bytes = eeprom.read(16) + except FileNotFoundError: + return None if eeprom_bytes[:4] != b"\xaaU3\xee": return None @@ -249,7 +252,6 @@ def _beaglebone_id(self) -> Optional[str]: return model board_value = self.detector.get_armbian_release_field("BOARD") - return None # pylint: enable=no-self-use