simplify device_serial_number

Author: jaredmauch

classes/transports/canbus.py

@@ -242,22 +242,15 @@ def read_data(self) -> dict[str, str]:
 
         # Check for serial number variables and promote to device_serial_number
         if info:
-            # Look for common serial number variable names
-            serial_variable_names = [
-                "serial_number", "serialnumber", "serialno", 
-                "device_serial_number", "device_serial", "serial"
-            ]
-            
-            for key, value in info.items():
-                key_lower = key.lower()
-                if any(serial_name in key_lower for serial_name in serial_variable_names):
-                    if value and value != "None" and str(value).strip():
-                        # Found a valid serial number, promote it
-                        if self.device_serial_number != str(value):
-                            self._log.info(f"Promoting parsed serial number: {value} (from variable: {key})")
-                            self.device_serial_number = str(value)
-                            self.update_identifier()
-                        break
+            # Look for serial number variable
+            if "serial_number" in info:
+                value = info["serial_number"]
+                if value and value != "None" and str(value).strip():
+                    # Found a valid serial number, promote it
+                    if self.device_serial_number != str(value):
+                        self._log.info(f"Promoting parsed serial number: {value} (from variable: serial_number)")
+                        self.device_serial_number = str(value)
+                        self.update_identifier()
 
         currentTime = time.time()
 

classes/transports/modbus_base.py

@@ -205,22 +205,15 @@ def read_data(self) -> dict[str, str]:
 
         # Check for serial number variables and promote to device_serial_number
         if info:
-            # Look for common serial number variable names
-            serial_variable_names = [
-                "serial_number", "serialnumber", "serialno", 
-                "device_serial_number", "device_serial", "serial"
-            ]
-            
-            for key, value in info.items():
-                key_lower = key.lower()
-                if any(serial_name in key_lower for serial_name in serial_variable_names):
-                    if value and value != "None" and str(value).strip():
-                        # Found a valid serial number, promote it
-                        if self.device_serial_number != str(value):
-                            self._log.info(f"Promoting parsed serial number: {value} (from variable: {key})")
-                            self.device_serial_number = str(value)
-                            self.update_identifier()
-                        break
+            # Look for serial number variable
+            if "serial_number" in info:
+                value = info["serial_number"]
+                if value and value != "None" and str(value).strip():
+                    # Found a valid serial number, promote it
+                    if self.device_serial_number != str(value):
+                        self._log.info(f"Promoting parsed serial number: {value} (from variable: serial_number)")
+                        self.device_serial_number = str(value)
+                        self.update_identifier()
 
         if not info:
             self._log.info("Register is Empty; transport busy?")

classes/transports/serial_pylon.py

@@ -122,22 +122,15 @@ def read_data(self):
 
         # Check for serial number variables and promote to device_serial_number
         if info:
-            # Look for common serial number variable names
-            serial_variable_names = [
-                "serial_number", "serialnumber", "serialno", 
-                "device_serial_number", "device_serial", "serial"
-            ]
-            
-            for key, value in info.items():
-                key_lower = key.lower()
-                if any(serial_name in key_lower for serial_name in serial_variable_names):
-                    if value and value != "None" and str(value).strip():
-                        # Found a valid serial number, promote it
-                        if self.device_serial_number != str(value):
-                            self._log.info(f"Promoting parsed serial number: {value} (from variable: {key})")
-                            self.device_serial_number = str(value)
-                            self.update_identifier()
-                        break
+            # Look for serial number variable
+            if "serial_number" in info:
+                value = info["serial_number"]
+                if value and value != "None" and str(value).strip():
+                    # Found a valid serial number, promote it
+                    if self.device_serial_number != str(value):
+                        self._log.info(f"Promoting parsed serial number: {value} (from variable: serial_number)")
+                        self.device_serial_number = str(value)
+                        self.update_identifier()
 
         if not info:
             self._log.info("Data is Empty; Serial Pylon Transport busy?")