Add product code to manufacturer in device information

scottyphillips · Feb 20, 2024 · d422f28 · d422f28
1 parent 769a08c
commit d422f28
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 8 deletions.
diff --git a/custom_components/echonetlite/climate.py b/custom_components/echonetlite/climate.py
@@ -170,7 +170,12 @@ def device_info(self):
                 )
             },
             "name": self._device_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._connector._instance._eojgc][
                 self._connector._instance._eojcc
             ],

diff --git a/custom_components/echonetlite/config_flow.py b/custom_components/echonetlite/config_flow.py
@@ -155,6 +155,8 @@ async def enumerate_instances(
 
     manufacturer = state["manufacturer"]
     host_product_code = state.get("product_code")
+    if type(host_product_code) == str:
+        host_product_code = str.strip(host_product_code)
     if not isinstance(manufacturer, str):
         # If unable to resolve the manufacturer,
         # the raw identification number will be passed as int.

diff --git a/custom_components/echonetlite/fan.py b/custom_components/echonetlite/fan.py
@@ -92,7 +92,12 @@ def device_info(self):
                 )
             },
             "name": self._device_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._connector._instance._eojgc][
                 self._connector._instance._eojcc
             ],

diff --git a/custom_components/echonetlite/light.py b/custom_components/echonetlite/light.py
@@ -104,7 +104,12 @@ def device_info(self):
                 )
             },
             "name": self._attr_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._connector._instance._eojgc][
                 self._connector._instance._eojcc
             ],

diff --git a/custom_components/echonetlite/number.py b/custom_components/echonetlite/number.py
@@ -102,7 +102,12 @@ def device_info(self):
                 )
             },
             "name": self._device_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._connector._instance._eojgc][
                 self._connector._instance._eojcc
             ],

diff --git a/custom_components/echonetlite/select.py b/custom_components/echonetlite/select.py
@@ -100,7 +100,12 @@ def device_info(self):
                 )
             },
             "name": self._device_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._connector._instance._eojgc][
                 self._connector._instance._eojcc
             ],

diff --git a/custom_components/echonetlite/sensor.py b/custom_components/echonetlite/sensor.py
@@ -318,7 +318,12 @@ def device_info(self):
                 )
             },
             "name": self._device_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._eojgc][self._eojcc],
             # "sw_version": "",
         }

diff --git a/custom_components/echonetlite/switch.py b/custom_components/echonetlite/switch.py
@@ -153,7 +153,12 @@ def device_info(self):
                 )
             },
             "name": self._device_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._connector._instance._eojgc][
                 self._connector._instance._eojcc
             ],

diff --git a/custom_components/echonetlite/time.py b/custom_components/echonetlite/time.py
@@ -85,7 +85,12 @@ def device_info(self):
                 )
             },
             "name": self._device_name,
-            "manufacturer": self._connector._manufacturer,
+            "manufacturer": self._connector._manufacturer
+            + (
+                " " + self._connector._host_product_code
+                if self._connector._host_product_code
+                else ""
+            ),
             "model": EOJX_CLASS[self._connector._instance._eojgc][
                 self._connector._instance._eojcc
             ],