Add Full support for roborock Zeo washing/drying machines

homeassistant/components/roborock/binary_sensor.py

@@ -6,6 +6,7 @@
 from dataclasses import dataclass
 
 from roborock.data import CleanFluidStatus, RoborockStateCode
+from roborock.roborock_message import RoborockZeoProtocol
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -15,9 +16,15 @@
 from homeassistant.const import ATTR_BATTERY_CHARGING, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
 
-from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
-from .entity import RoborockCoordinatedEntityV1
+from .coordinator import (
+    RoborockConfigEntry,
+    RoborockDataUpdateCoordinator,
+    RoborockDataUpdateCoordinatorA01,
+    RoborockWashingMachineUpdateCoordinator,
+)
+from .entity import RoborockCoordinatedEntityA01, RoborockCoordinatedEntityV1
 from .models import DeviceState
 
 PARALLEL_UPDATES = 0
@@ -34,6 +41,14 @@ class RoborockBinarySensorDescription(BinarySensorEntityDescription):
     """Whether this sensor is for the dock."""
 
 
+@dataclass(frozen=True, kw_only=True)
+class RoborockBinarySensorDescriptionA01(BinarySensorEntityDescription):
+    """A class that describes Roborock A01 binary sensors."""
+
+    data_protocol: RoborockZeoProtocol
+    value_fn: Callable[[StateType], bool]
+
+
 BINARY_SENSOR_DESCRIPTIONS = [
     RoborockBinarySensorDescription(
         key="dry_status",
@@ -111,21 +126,52 @@ class RoborockBinarySensorDescription(BinarySensorEntityDescription):
 ]
 
 
+ZEO_BINARY_SENSOR_DESCRIPTIONS: list[RoborockBinarySensorDescriptionA01] = [
+    RoborockBinarySensorDescriptionA01(
+        key="detergent_empty",
+        data_protocol=RoborockZeoProtocol.DETERGENT_EMPTY,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        translation_key="detergent_empty",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=bool,
+    ),
+    RoborockBinarySensorDescriptionA01(
+        key="softener_empty",
+        data_protocol=RoborockZeoProtocol.SOFTENER_EMPTY,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        translation_key="softener_empty",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=bool,
+    ),
+]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Roborock vacuum binary sensors."""
-    async_add_entities(
+    entities: list[BinarySensorEntity] = [
         RoborockBinarySensorEntity(
             coordinator,
             description,
         )
         for coordinator in config_entry.runtime_data.v1
         for description in BINARY_SENSOR_DESCRIPTIONS
         if description.value_fn(coordinator.data) is not None
+    ]
+    entities.extend(
+        RoborockBinarySensorEntityA01(
+            coordinator,
+            description,
+        )
+        for coordinator in config_entry.runtime_data.a01
+        if isinstance(coordinator, RoborockWashingMachineUpdateCoordinator)
+        for description in ZEO_BINARY_SENSOR_DESCRIPTIONS
+        if description.data_protocol in coordinator.request_protocols
     )
+    async_add_entities(entities)
 
 
 class RoborockBinarySensorEntity(RoborockCoordinatedEntityV1, BinarySensorEntity):
@@ -150,3 +196,24 @@ def __init__(
     def is_on(self) -> bool:
         """Return the value reported by the sensor."""
         return bool(self.entity_description.value_fn(self.coordinator.data))
+
+
+class RoborockBinarySensorEntityA01(RoborockCoordinatedEntityA01, BinarySensorEntity):
+    """Representation of a A01 Roborock binary sensor."""
+
+    entity_description: RoborockBinarySensorDescriptionA01
+
+    def __init__(
+        self,
+        coordinator: RoborockDataUpdateCoordinatorA01,
+        description: RoborockBinarySensorDescriptionA01,
+    ) -> None:
+        """Initialize the entity."""
+        self.entity_description = description
+        super().__init__(f"{description.key}_{coordinator.duid_slug}", coordinator)
+
+    @property
+    def is_on(self) -> bool:
+        """Return the value reported by the sensor."""
+        value = self.coordinator.data[self.entity_description.data_protocol]
+        return self.entity_description.value_fn(value)

homeassistant/components/roborock/button.py

@@ -10,6 +10,7 @@
 
 from roborock.devices.traits.v1.consumeable import ConsumableAttribute
 from roborock.exceptions import RoborockException
+from roborock.roborock_message import RoborockZeoProtocol
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
@@ -18,8 +19,13 @@
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
-from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
-from .entity import RoborockEntity, RoborockEntityV1
+from .coordinator import (
+    RoborockConfigEntry,
+    RoborockDataUpdateCoordinator,
+    RoborockDataUpdateCoordinatorA01,
+    RoborockWashingMachineUpdateCoordinator,
+)
+from .entity import RoborockCoordinatedEntityA01, RoborockEntity, RoborockEntityV1
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -65,6 +71,32 @@ class RoborockButtonDescription(ButtonEntityDescription):
 ]
 
 
+@dataclass(frozen=True, kw_only=True)
+class RoborockButtonDescriptionA01(ButtonEntityDescription):
+    """Describes a Roborock A01 button entity."""
+
+    data_protocol: RoborockZeoProtocol
+
+
+ZEO_BUTTON_DESCRIPTIONS = [
+    RoborockButtonDescriptionA01(
+        key="start",
+        data_protocol=RoborockZeoProtocol.START,
+        translation_key="start",
+    ),
+    RoborockButtonDescriptionA01(
+        key="pause",
+        data_protocol=RoborockZeoProtocol.PAUSE,
+        translation_key="pause",
+    ),
+    RoborockButtonDescriptionA01(
+        key="shutdown",
+        data_protocol=RoborockZeoProtocol.SHUTDOWN,
+        translation_key="shutdown",
+    ),
+]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
@@ -98,6 +130,15 @@ async def async_setup_entry(
                 )
                 for routine in routines
             ),
+            (
+                RoborockButtonEntityA01(
+                    coordinator,
+                    description,
+                )
+                for coordinator in config_entry.runtime_data.a01
+                if isinstance(coordinator, RoborockWashingMachineUpdateCoordinator)
+                for description in ZEO_BUTTON_DESCRIPTIONS
+            ),
         )
     )
 
@@ -160,3 +201,35 @@ def __init__(
     async def async_press(self, **kwargs: Any) -> None:
         """Press the button."""
         await self._coordinator.execute_routines(self._routine_id)
+
+
+class RoborockButtonEntityA01(RoborockCoordinatedEntityA01, ButtonEntity):
+    """A class to define Roborock A01 button entities."""
+
+    entity_description: RoborockButtonDescriptionA01
+
+    def __init__(
+        self,
+        coordinator: RoborockDataUpdateCoordinatorA01,
+        entity_description: RoborockButtonDescriptionA01,
+    ) -> None:
+        """Create an A01 button entity."""
+        self.entity_description = entity_description
+        super().__init__(
+            f"{entity_description.key}_{coordinator.duid_slug}", coordinator
+        )
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        try:
+            await self.coordinator.api.set_value(  # type: ignore[attr-defined]
+                self.entity_description.data_protocol,
+                1,
+            )
+        except RoborockException as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="button_press_failed",
+            ) from err
+        finally:
+            await self.coordinator.async_request_refresh()

homeassistant/components/roborock/coordinator.py

@@ -432,6 +432,18 @@ def __init__(
             RoborockZeoProtocol.COUNTDOWN,
             RoborockZeoProtocol.WASHING_LEFT,
             RoborockZeoProtocol.ERROR,
+            RoborockZeoProtocol.TIMES_AFTER_CLEAN,
+            RoborockZeoProtocol.DETERGENT_EMPTY,
+            RoborockZeoProtocol.SOFTENER_EMPTY,
+            RoborockZeoProtocol.DETERGENT_TYPE,
+            RoborockZeoProtocol.SOFTENER_TYPE,
+            RoborockZeoProtocol.MODE,
+            RoborockZeoProtocol.PROGRAM,
+            RoborockZeoProtocol.TEMP,
+            RoborockZeoProtocol.RINSE_TIMES,
+            RoborockZeoProtocol.SPIN_LEVEL,
+            RoborockZeoProtocol.DRYING_MODE,
+            RoborockZeoProtocol.SOUND_SET,
         ]
 
     async def _async_update_data(