Merge branch 'master' into s_m_t_devicenames

Author: CoMPaTech

.github/workflows/hassfest.yaml

@@ -0,0 +1,14 @@
+name: Validate with hassfest
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  validate:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v2"
+      - uses: home-assistant/actions/hassfest@master

custom_components/plugwise-beta/binary_sensor.py

@@ -114,11 +114,15 @@ def state(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
+        via_device = None
+        dev_name = f"{self._name.split('_')[0]} Sensors"
+        if self._dev_id is not self._api.gateway_id:
+            via_device = (DOMAIN, self._api.gateway_id)
         return {
             "identifiers": {(DOMAIN, self._dev_id)},
-            "name": self._name,
+            "name": dev_name,
             "manufacturer": "Plugwise",
-            "via_device": (DOMAIN, self._api.gateway_id),
+            "via_device": via_device,
         }
 
     @property

custom_components/plugwise-beta/climate.py

@@ -149,11 +149,15 @@ def name(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
+        via_device = None
+        dev_name = f"{self._name.split('_')[0]} Climate/Thermostat"
+        if self._dev_id is not self._api.gateway_id:
+            via_device = (DOMAIN, self._api.gateway_id)
         return {
             "identifiers": {(DOMAIN, self._dev_id)},
-            "name": self._name,
+            "name": dev_name,
             "manufacturer": "Plugwise",
-            "via_device": (DOMAIN, self._api.gateway_id),
+            "via_device": via_device,
         }
 
     @property

custom_components/plugwise-beta/sensor.py

@@ -256,9 +256,13 @@ def state(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
+        via_device = None
+        dev_name = f"{self._name.split('_')[0]} Sensors"
+        if self._dev_id is not self._api.gateway_id:
+            via_device = (DOMAIN, self._api.gateway_id)
         return {
             "identifiers": {(DOMAIN, self._dev_id)},
-            "name": self._name,
+            "name": dev_name,
             "manufacturer": "Plugwise",
             "via_device": (DOMAIN, self._via_id),
         }

custom_components/plugwise-beta/switch.py

@@ -66,11 +66,15 @@ def is_on(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
+        via_device = None
+        dev_name = f"{self._name.split('_')[0]} Plug/Switch"
+        if self._dev_id is not self._api.gateway_id:
+            via_device = (DOMAIN, self._api.gateway_id)
         return {
             "identifiers": {(DOMAIN, self._dev_id)},
-            "name": self._name,
+            "name": dev_name,
             "manufacturer": "Plugwise",
-            "via_device": (DOMAIN, self._api.gateway_id),
+            "via_device": via_device,
         }
 
     @property

custom_components/plugwise-beta/water_heater.py

@@ -100,11 +100,15 @@ def name(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
+        via_device = None
+        dev_name = f"{self._name.split('_')[0]} Heater Central/Boiler"
+        if self._dev_id is not self._api.gateway_id:
+            via_device = (DOMAIN, self._api.gateway_id)
         return {
             "identifiers": {(DOMAIN, self._dev_id)},
-            "name": self._name,
+            "name": dev_name,
             "manufacturer": "Plugwise",
-            "via_device": (DOMAIN, self._api.gateway_id),
+            "via_device": via_device,
         }
 
     @property