Show underfloor heating devices in ViCare integration (home-assistant#154541)

Author: CFenner

homeassistant/components/vicare/const.py

@@ -21,8 +21,6 @@
     "Heatbox2_SRC",
     "E3_TCU10_x07",
     "E3_TCU41_x04",
-    "E3_FloorHeatingCircuitChannel",
-    "E3_FloorHeatingCircuitDistributorBox",
     "E3_RoomControl_One_522",
 ]
 

homeassistant/components/vicare/entity.py

@@ -29,13 +29,19 @@ def __init__(
         gateway_serial = device_config.getConfig().serial
         device_id = device_config.getId()
         model = device_config.getModel().replace("_", " ")
+        via_device_identifier: tuple[str, str] = ("", "")
 
         identifier = (
             f"{gateway_serial}_{device_serial.replace('-', '_')}"
             if device_serial is not None
             else f"{gateway_serial}_{device_id}"
         )
 
+        if device_serial is not None and device_serial.startswith("zigbee-"):
+            parts = device_serial.split("-")
+            if len(parts) == 3:  # expect format zigbee-<zigbee-ieee>-<channel-id>
+                via_device_identifier = (DOMAIN, f"{gateway_serial}_zigbee_{parts[1]}")
+
         self._api: PyViCareDevice | PyViCareHeatingDeviceComponent = (
             component if component else device
         )
@@ -50,4 +56,5 @@ def __init__(
             manufacturer="Viessmann",
             model=model,
             configuration_url=VIESSMANN_DEVELOPER_PORTAL,
+            via_device=via_device_identifier,
         )

tests/components/vicare/fixtures/FHTChannel.json

@@ -0,0 +1,72 @@
+{
+  "data": [
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setName": {
+          "isExecutable": true,
+          "name": "setName",
+          "params": {
+            "name": {
+              "constraints": {
+                "maxLength": 40,
+                "minLength": 1,
+                "regEx": "^[\\p{L}0-9]+( [\\p{L}0-9]+)*$"
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann-climatesolutions.com/iot/v2/features/installations/#######/gateways/################/devices/zigbee-################-2/features/device.name/commands/setName"
+        }
+      },
+      "deviceId": "zigbee-################-2",
+      "feature": "device.name",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "name": {
+          "type": "string",
+          "value": "Zone EG Bad"
+        }
+      },
+      "timestamp": "2025-10-05T14:18:35.990Z",
+      "uri": "https://api.viessmann-climatesolutions.com/iot/v2/features/installations/#######/gateways/################/devices/zigbee-################-2/features/device.name"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "zigbee-################-2",
+      "feature": "fht.valve",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "type": {
+          "type": "string",
+          "value": "normallyClosed"
+        }
+      },
+      "timestamp": "2025-10-05T14:18:35.990Z",
+      "uri": "https://api.viessmann-climatesolutions.com/iot/v2/features/installations/#######/gateways/################/devices/zigbee-################-2/features/fht.valve"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "zigbee-################-2",
+      "feature": "fht.valve.state",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "closed"
+        }
+      },
+      "timestamp": "2025-10-05T14:18:35.990Z",
+      "uri": "https://api.viessmann-climatesolutions.com/iot/v2/features/installations/#######/gateways/################/devices/zigbee-################-2/features/fht.valve.state"
+    }
+  ]
+}