Unique ID backward compatibility #44

toreamun · Oct 12, 2022 · 3449f76 · 3449f76
1 parent 5e18b53
commit 3449f76
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/custom_components/amshan/sensor.py b/custom_components/amshan/sensor.py
@@ -362,14 +362,13 @@ def unique_id(self) -> str | None:
                 )
             else:
                 manufacturer = {
-                    self._meter_info.manufacturer
-                    if self._meter_info.manufacturer
-                    else self._meter_info.manufacturer_id
+                    self._meter_info.manufacturer_id
+                    if self._meter_info.manufacturer_id
+                    else self._meter_info.manufacturer
                 }
                 self._unique_id = (
                     f"CEID-{self._config_entry_id}-"
-                    f"{manufacturer}"
-                    f"{self._meter_info.type_id if self._meter_info.type_id else ''}"
+                    f"{manufacturer}{self._meter_info.type_id}"
                     f"-{self.measure_id}"
                 )
         return self._unique_id