Support for Matter 1.4 Water Heater

homeassistant/components/matter/binary_sensor.py

@@ -262,4 +262,16 @@ def _update_from_device(self) -> None:
         entity_class=MatterBinarySensor,
         required_attributes=(clusters.SmokeCoAlarm.Attributes.InterconnectCOAlarm,),
     ),
+    MatterDiscoverySchema(
+        platform=Platform.BINARY_SENSOR,
+        entity_description=MatterBinarySensorEntityDescription(
+            key="WaterHeaterManagementBoostStateSensor",
+            translation_key="boost_state",
+            measurement_to_ha=lambda x: (
+                x == clusters.WaterHeaterManagement.Enums.BoostStateEnum.kActive
+            ),
+        ),
+        entity_class=MatterBinarySensor,
+        required_attributes=(clusters.WaterHeaterManagement.Attributes.BoostState,),
+    ),
 ]

homeassistant/components/matter/discovery.py

@@ -27,6 +27,7 @@
 from .update import DISCOVERY_SCHEMAS as UPDATE_SCHEMAS
 from .vacuum import DISCOVERY_SCHEMAS as VACUUM_SCHEMAS
 from .valve import DISCOVERY_SCHEMAS as VALVE_SCHEMAS
+from .water_heater import DISCOVERY_SCHEMAS as WATER_HEATER_SCHEMAS
 
 DISCOVERY_SCHEMAS: dict[Platform, list[MatterDiscoverySchema]] = {
     Platform.BINARY_SENSOR: BINARY_SENSOR_SCHEMAS,
@@ -44,6 +45,7 @@
     Platform.UPDATE: UPDATE_SCHEMAS,
     Platform.VACUUM: VACUUM_SCHEMAS,
     Platform.VALVE: VALVE_SCHEMAS,
+    Platform.WATER_HEATER: WATER_HEATER_SCHEMAS,
 }
 SUPPORTED_PLATFORMS = tuple(DISCOVERY_SCHEMAS)
 

homeassistant/components/matter/icons.json

@@ -66,6 +66,12 @@
       "operational_state": {
         "default": "mdi:play-pause"
       },
+      "tank_volume": {
+        "default": "mdi:water-boiler"
+      },
+      "tank_percentage": {
+        "default": "mdi:water-boiler"
+      },
       "valve_position": {
         "default": "mdi:valve"
       },

homeassistant/components/matter/select.py

@@ -41,6 +41,7 @@
     | clusters.DishwasherMode
     | clusters.EnergyEvseMode
     | clusters.DeviceEnergyManagementMode
+    | clusters.WaterHeaterMode
 )
 
 
@@ -302,6 +303,18 @@ def _update_from_device(self) -> None:
             clusters.DeviceEnergyManagementMode.Attributes.SupportedModes,
         ),
     ),
+    MatterDiscoverySchema(
+        platform=Platform.SELECT,
+        entity_description=MatterSelectEntityDescription(
+            key="MatterWaterHeaterMode",
+            translation_key="water_heater_mode",
+        ),
+        entity_class=MatterModeSelectEntity,
+        required_attributes=(
+            clusters.WaterHeaterMode.Attributes.CurrentMode,
+            clusters.WaterHeaterMode.Attributes.SupportedModes,
+        ),
+    ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
         entity_description=MatterSelectEntityDescription(

homeassistant/components/matter/sensor.py

@@ -37,6 +37,7 @@
     UnitOfPower,
     UnitOfPressure,
     UnitOfTemperature,
+    UnitOfVolume,
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -65,7 +66,6 @@
     clusters.SmokeCoAlarm.Enums.ContaminationStateEnum.kCritical: "critical",
 }
 
-
 OPERATIONAL_STATE_MAP = {
     # enum with known Operation state values which we can translate
     clusters.OperationalState.Enums.OperationalStateEnum.kStopped: "stopped",
@@ -77,6 +77,12 @@
     clusters.RvcOperationalState.Enums.OperationalStateEnum.kDocked: "docked",
 }
 
+BOOST_STATE_MAP = {
+    clusters.WaterHeaterManagement.Enums.BoostStateEnum.kInactive: "inactive",
+    clusters.WaterHeaterManagement.Enums.BoostStateEnum.kActive: "active",
+    clusters.WaterHeaterManagement.Enums.BoostStateEnum.kUnknownEnumValue: None,
+}
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -892,4 +898,44 @@ def _update_from_device(self) -> None:
             clusters.OvenCavityOperationalState.Attributes.OperationalStateList,
         ),
     ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="WaterHeaterManagementTankVolume",
+            translation_key="tank_volume",
+            device_class=SensorDeviceClass.VOLUME_STORAGE,
+            native_unit_of_measurement=UnitOfVolume.LITERS,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.WaterHeaterManagement.Attributes.TankVolume,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="WaterHeaterManagementTankPercentage",
+            translation_key="tank_percentage",
+            native_unit_of_measurement=PERCENTAGE,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.WaterHeaterManagement.Attributes.TankPercentage,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="WaterHeaterManagementEstimatedHeatRequired",
+            translation_key="estimated_heat_required",
+            device_class=SensorDeviceClass.ENERGY,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfEnergy.MILLIWATT_HOUR,
+            suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+            suggested_display_precision=3,
+            state_class=SensorStateClass.TOTAL,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(
+            clusters.WaterHeaterManagement.Attributes.EstimatedHeatRequired,
+        ),
+    ),
 ]

homeassistant/components/matter/strings.json

@@ -76,6 +76,9 @@
       },
       "muted": {
         "name": "Muted"
+      },
+      "boost_state": {
+        "name": "Boost state"
       }
     },
     "button": {
@@ -217,6 +220,9 @@
       },
       "laundry_washer_spin_speed": {
         "name": "Spin speed"
+      },
+      "water_heater_mode": {
+        "name": "Water heater mode"
       }
     },
     "sensor": {
@@ -267,6 +273,15 @@
       "switch_current_position": {
         "name": "Current switch position"
       },
+      "tank_volume": {
+        "name": "Tank volume"
+      },
+      "tank_percentage": {
+        "name": "Tank percentage"
+      },
+      "estimated_heat_required": {
+        "name": "Required heating energy"
+      },
       "valve_position": {
         "name": "Valve position"
       },
@@ -297,6 +312,11 @@
       "valve": {
         "name": "[%key:component::valve::title%]"
       }
+    },
+    "water_heater": {
+      "water_heater": {
+        "name": "Water heater"
+      }
     }
   },
   "issues": {