Merge pull request #841 from theophile/theophile

Change method of SBC model detection
theyosh · Oct 10, 2023 · 984e13c · 984e13c
2 parents 434c107 + b63495e
commit 984e13c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/terrariumEngine.py b/terrariumEngine.py
@@ -94,7 +94,7 @@ def __init__(self, version):
         self.update_available = False
         self.weather = None
         # Dirty hack... :(
-        self.device = re.search(r"Model\s+:\s+(?P<device>.*)", Path("/proc/cpuinfo").read_text()).group("device")
+        self.device = Path("/proc/device-tree/model").read_text().rstrip('\x00')
         init_db(self.version)
 
         # Send message that startup is ready..... else the startup will wait until done.... can take more then 1 minute
@@ -282,9 +282,7 @@ def load_settings(self):
 
         # Load device information
         try:
-            settings["device"] = re.search(r"Model\s+:\s+(?P<device>.*)", Path("/proc/cpuinfo").read_text()).group(
-                "device"
-            )
+            settings["device"] = Path("/proc/device-tree/model").read_text().rstrip('\x00')
         except Exception as ex:
             logger.debug(f"Error getting Pi info: {ex}")
             settings["device"] = "Unknown"