Support for Matter EVSE (button entities version)

homeassistant/components/matter/button.py

@@ -7,6 +7,7 @@
 from typing import TYPE_CHECKING, Any
 
 from chip.clusters import Objects as clusters
+from chip.clusters.Objects import NullValue
 
 from homeassistant.components.button import (
     ButtonDeviceClass,
@@ -38,6 +39,7 @@ class MatterButtonEntityDescription(ButtonEntityDescription, MatterEntityDescrip
     """Describe Matter Button entities."""
 
     command: Callable[[], Any] | None = None
+    command_timeout: int | None = None
 
 
 class MatterCommandButton(MatterEntity, ButtonEntity):
@@ -53,6 +55,7 @@ async def async_press(self) -> None:
             node_id=self._endpoint.node.node_id,
             endpoint_id=self._endpoint.endpoint_id,
             command=self.entity_description.command(),
+            timed_request_timeout_ms=self.entity_description.command_timeout,
         )
 
 
@@ -147,4 +150,34 @@ async def async_press(self) -> None:
         value_contains=clusters.ActivatedCarbonFilterMonitoring.Commands.ResetCondition.command_id,
         allow_multi=True,
     ),
+    MatterDiscoverySchema(
+        platform=Platform.BUTTON,
+        entity_description=MatterButtonEntityDescription(
+            key="EnergyEvseEnableChargingButton",
+            translation_key="enable_charging",
+            command=lambda: clusters.EnergyEvse.Commands.EnableCharging(
+                chargingEnabledUntil=NullValue,
+                minimumChargeCurrent=0,
+                maximumChargeCurrent=0,
+            ),
+            command_timeout=3000,
+        ),
+        entity_class=MatterCommandButton,
+        required_attributes=(clusters.EnergyEvse.Attributes.AcceptedCommandList,),
+        value_contains=clusters.EnergyEvse.Commands.EnableCharging.command_id,
+        allow_multi=True,
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.BUTTON,
+        entity_description=MatterButtonEntityDescription(
+            key="EnergyEvseDisableChargingButton",
+            translation_key="disable_charging",
+            command=clusters.EnergyEvse.Commands.Disable,
+            command_timeout=3000,
+        ),
+        entity_class=MatterCommandButton,
+        required_attributes=(clusters.EnergyEvse.Attributes.AcceptedCommandList,),
+        value_contains=clusters.EnergyEvse.Commands.Disable.command_id,
+        allow_multi=True,
+    ),
 ]

homeassistant/components/matter/icons.json

@@ -17,6 +17,12 @@
       },
       "stop": {
         "default": "mdi:stop"
+      },
+      "enable_charging": {
+        "default": "mdi:play"
+      },
+      "disable_charging": {
+        "default": "mdi:stop"
       }
     },
     "fan": {
@@ -58,6 +64,15 @@
       "valve_position": {
         "default": "mdi:valve"
       },
+      "evse_state": {
+        "default": "mdi:ev-station"
+      },
+      "evse_supply_state": {
+        "default": "mdi:ev-station"
+      },
+      "evse_fault_state": {
+        "default": "mdi:ev-station"
+      },
       "battery_replacement_description": {
         "default": "mdi:battery-sync-outline"
       }

homeassistant/components/matter/sensor.py

@@ -71,6 +71,42 @@
     clusters.OperationalState.Enums.OperationalStateEnum.kError: "error",
 }
 
+EVSE_STATE_MAP = {
+    clusters.EnergyEvse.Enums.StateEnum.kNotPluggedIn: "not_plugged_in",
+    clusters.EnergyEvse.Enums.StateEnum.kPluggedInNoDemand: "plugged_in_no_demand",
+    clusters.EnergyEvse.Enums.StateEnum.kPluggedInDemand: "plugged_in_demand",
+    clusters.EnergyEvse.Enums.StateEnum.kPluggedInCharging: "plugged_in_charging",
+    clusters.EnergyEvse.Enums.StateEnum.kPluggedInDischarging: "plugged_in_discharging",
+    clusters.EnergyEvse.Enums.StateEnum.kSessionEnding: "session_ending",
+    clusters.EnergyEvse.Enums.StateEnum.kFault: "fault",
+}
+
+EVSE_SUPPLY_STATE_MAP = {
+    clusters.EnergyEvse.Enums.SupplyStateEnum.kDisabled: "disabled",
+    clusters.EnergyEvse.Enums.SupplyStateEnum.kChargingEnabled: "charging_enabled",
+    clusters.EnergyEvse.Enums.SupplyStateEnum.kDischargingEnabled: "discharging_enabled",
+    clusters.EnergyEvse.Enums.SupplyStateEnum.kDisabledDiagnostics: "disabled_diagnostics",
+}
+
+EVSE_FAULT_STATE_MAP = {
+    clusters.EnergyEvse.Enums.FaultStateEnum.kNoError: "no_error",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kMeterFailure: "meter_failure",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kOverVoltage: "over_voltage",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kUnderVoltage: "under_voltage",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kOverCurrent: "over_current",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kContactWetFailure: "contact_wet_failure",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kContactDryFailure: "contact_dry_failure",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kPowerLoss: "power_loss",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kPowerQuality: "power_quality",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kPilotShortCircuit: "pilot_short_circuit",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kEmergencyStop: "emergency_stop",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kEVDisconnected: "ev_disconnected",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kWrongPowerSupply: "wrong_power_supply",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kLiveNeutralSwap: "live_neutral_swap",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kOverTemperature: "over_temperature",
+    clusters.EnergyEvse.Enums.FaultStateEnum.kOther: "other",
+}
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -677,4 +713,101 @@ def _update_from_device(self) -> None:
             clusters.OperationalState.Attributes.OperationalStateList,
         ),
     ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="EnergyEvseState",
+            translation_key="evse_state",
+            device_class=SensorDeviceClass.ENUM,
+            options=list(EVSE_STATE_MAP.values()),
+            measurement_to_ha=EVSE_STATE_MAP.get,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.EnergyEvse.Attributes.State,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="EnergyEvseSupplyState",
+            translation_key="evse_supply_state",
+            device_class=SensorDeviceClass.ENUM,
+            options=list(EVSE_SUPPLY_STATE_MAP.values()),
+            measurement_to_ha=EVSE_SUPPLY_STATE_MAP.get,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.EnergyEvse.Attributes.SupplyState,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="EnergyEvseFaultState",
+            translation_key="evse_fault_state",
+            device_class=SensorDeviceClass.ENUM,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            options=list(EVSE_FAULT_STATE_MAP.values()),
+            measurement_to_ha=EVSE_FAULT_STATE_MAP.get,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.EnergyEvse.Attributes.FaultState,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="EnergyEvseCircuitCapacity",
+            translation_key="evse_circuit_capacity",
+            device_class=SensorDeviceClass.CURRENT,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfElectricCurrent.MILLIAMPERE,
+            suggested_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+            suggested_display_precision=2,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.EnergyEvse.Attributes.CircuitCapacity,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="EnergyEvseMinimumChargeCurrent",
+            translation_key="evse_min_charge_current",
+            device_class=SensorDeviceClass.CURRENT,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfElectricCurrent.MILLIAMPERE,
+            suggested_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+            suggested_display_precision=2,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.EnergyEvse.Attributes.MinimumChargeCurrent,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="EnergyEvseMaximumChargeCurrent",
+            translation_key="evse_max_charge_current",
+            device_class=SensorDeviceClass.CURRENT,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfElectricCurrent.MILLIAMPERE,
+            suggested_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+            suggested_display_precision=2,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.EnergyEvse.Attributes.MaximumChargeCurrent,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="EnergyEvseUserMaximumChargeCurrent",
+            translation_key="evse_user_max_charge_current",
+            device_class=SensorDeviceClass.CURRENT,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfElectricCurrent.MILLIAMPERE,
+            suggested_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+            suggested_display_precision=2,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.EnergyEvse.Attributes.UserMaximumChargeCurrent,),
+    ),
 ]

homeassistant/components/matter/strings.json

@@ -93,6 +93,12 @@
       },
       "reset_filter_condition": {
         "name": "Reset filter condition"
+      },
+      "enable_charging": {
+        "name": "Enable charging"
+      },
+      "disable_charging": {
+        "name": "Disable charging"
       }
     },
     "climate": {
@@ -254,6 +260,63 @@
       },
       "battery_replacement_description": {
         "name": "Battery type"
+      },
+      "evse_state": {
+        "name": "State",
+        "state": {
+          "not_plugged_in": "Not plugged in",
+          "plugged_in_no_demand": "Plugged in, no demand",
+          "plugged_in_demand": "Plugged in, demand",
+          "plugged_in_charging": "Plugged in, charging",
+          "plugged_in_discharging": "Plugged in, discharging",
+          "session_ending": "Session ending",
+          "fault": "Fault"
+        }
+      },
+      "evse_supply_state": {
+        "name": "Supply state",
+        "state": {
+          "disabled": "Disabled",
+          "charging_enabled": "Charging enabled",
+          "discharging_enabled": "Discharging enabled",
+          "disabled_diagnostics": "Disabled diagnostics"
+        }
+      },
+      "evse_fault_state": {
+        "name": "Fault state",
+        "state": {
+          "no_error": "OK",
+          "meter_failure": "Meter failure",
+          "over_voltage": "Over Voltage",
+          "under_voltage": "Under Voltage",
+          "over_current": "Over current",
+          "contact_wet_failure": "Contact wet failure",
+          "contact_dry_failure": "Contact dry failure",
+          "power_loss": "Power loss",
+          "power_quality": "Power quality",
+          "pilot_short_circuit": "Pilot short circuit",
+          "emergency_stop": "Emergency stop",
+          "ev_disconnected": "EV disconnected",
+          "wrong_power_supply": "Wrong power supply",
+          "live_neutral_swap": "Live neutral swap",
+          "over_temperature": "Over temperature",
+          "other": "Other fault"
+        }
+      },
+      "evse_circuit_capacity": {
+        "name": "Circuit capacity"
+      },
+      "evse_charge_current": {
+        "name": "Charge current"
+      },
+      "evse_min_charge_current": {
+        "name": "Min charge current"
+      },
+      "evse_max_charge_current": {
+        "name": "Max charge current"
+      },
+      "evse_user_max_charge_current": {
+        "name": "User max charge current"
       }
     },
     "switch": {

tests/components/matter/conftest.py

@@ -85,6 +85,7 @@ async def integration_fixture(
         "eve_energy_plug_patched",
         "eve_thermo",
         "eve_weather_sensor",
+        "evse_charging",
         "extended_color_light",
         "fan",
         "flow_sensor",