Add sensor entities for Roborock q10 s5+

homeassistant/components/roborock/coordinator.py

@@ -608,8 +608,9 @@ def __init__(
     async def _async_update_data(self) -> None:
         """Request a status push from the device.
 
-        This sends a fire-and-forget REQUEST_DPS command. The actual data
-        update will arrive asynchronously via the push listener.
+        This coordinator does not wait for any specific MQTT payload because
+        push messages are asynchronous and not guaranteed to contain every
+        field. Entities subscribe to trait updates and update as values arrive.
         """
         try:
             await self.api.refresh()

homeassistant/components/roborock/icons.json

@@ -40,6 +40,9 @@
       }
     },
     "sensor": {
+      "brush_remaining": {
+        "default": "mdi:brush"
+      },
       "clean_percent": {
         "default": "mdi:progress-check"
       },
@@ -49,6 +52,9 @@
       "cleaning_brush_time_left": {
         "default": "mdi:brush"
       },
+      "cleaning_time": {
+        "default": "mdi:clock-outline"
+      },
       "countdown": {
         "default": "mdi:clock-outline"
       },
@@ -67,6 +73,12 @@
       "main_brush_time_left": {
         "default": "mdi:brush"
       },
+      "mop_drying_remaining_time": {
+        "default": "mdi:clock-outline"
+      },
+      "mop_life_time_left": {
+        "default": "mdi:texture"
+      },
       "sensor_time_left": {
         "default": "mdi:eye-outline"
       },
@@ -79,6 +91,9 @@
       "strainer_time_left": {
         "default": "mdi:filter-variant"
       },
+      "times_after_clean": {
+        "default": "mdi:counter"
+      },
       "total_cleaning_area": {
         "default": "mdi:texture-box"
       },

homeassistant/components/roborock/sensor.py

@@ -19,6 +19,8 @@
     ZeoError,
     ZeoState,
 )
+from roborock.data.b01_q10.b01_q10_code_mappings import YXDeviceState
+from roborock.devices.traits.b01.q10.status import StatusTrait as Q10StatusTrait
 from roborock.roborock_message import RoborockDyadDataProtocol, RoborockZeoProtocol
 
 from homeassistant.components.sensor import (
@@ -34,6 +36,7 @@
 
 from .coordinator import (
     RoborockB01Q7UpdateCoordinator,
+    RoborockB01Q10UpdateCoordinator,
     RoborockConfigEntry,
     RoborockDataUpdateCoordinator,
     RoborockDataUpdateCoordinatorA01,
@@ -43,6 +46,7 @@
 from .entity import (
     RoborockCoordinatedEntityA01,
     RoborockCoordinatedEntityB01Q7,
+    RoborockCoordinatedEntityB01Q10,
     RoborockCoordinatedEntityV1,
     RoborockEntity,
 )
@@ -77,6 +81,13 @@ class RoborockSensorDescriptionB01(SensorEntityDescription):
     value_fn: Callable[[B01Props], StateType]
 
 
+@dataclass(frozen=True, kw_only=True)
+class RoborockSensorDescriptionQ10(SensorEntityDescription):
+    """A class that describes Roborock Q10 sensors."""
+
+    value_fn: Callable[[Q10StatusTrait], StateType]
+
+
 def _dock_error_value_fn(state: DeviceState) -> str | None:
     if (
         status := state.status.dock_error_status
@@ -412,6 +423,105 @@ def _dock_error_value_fn(state: DeviceState) -> str | None:
 ]
 
 
+Q10_B01_SENSOR_DESCRIPTIONS = [
+    RoborockSensorDescriptionQ10(
+        key="status",
+        translation_key="status",
+        device_class=SensorDeviceClass.ENUM,
+        value_fn=lambda data: data.status.value if data.status is not None else None,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        options=YXDeviceState.keys(),
+    ),
+    RoborockSensorDescriptionQ10(
+        key="battery",
+        value_fn=lambda data: data.battery,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.BATTERY,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="cleaning_time",
+        translation_key="cleaning_time",
+        value_fn=lambda data: data.clean_time,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.MINUTES,
+        device_class=SensorDeviceClass.DURATION,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="cleaning_area",
+        translation_key="cleaning_area",
+        value_fn=lambda data: data.clean_area,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfArea.SQUARE_METERS,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="total_cleaning_count",
+        translation_key="total_cleaning_count",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        value_fn=lambda data: data.total_clean_count,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="total_cleaning_area",
+        translation_key="total_cleaning_area",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        value_fn=lambda data: data.total_clean_area,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfArea.SQUARE_METERS,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="total_cleaning_time",
+        translation_key="total_cleaning_time",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        value_fn=lambda data: data.total_clean_time,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfTime.MINUTES,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        device_class=SensorDeviceClass.DURATION,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="main_brush_life",
+        translation_key="main_brush_life",
+        value_fn=lambda data: data.main_brush_life,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        device_class=SensorDeviceClass.DURATION,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="side_brush_life",
+        translation_key="side_brush_life",
+        value_fn=lambda data: data.side_brush_life,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        device_class=SensorDeviceClass.DURATION,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="filter_life",
+        translation_key="filter_life",
+        value_fn=lambda data: data.filter_life,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        device_class=SensorDeviceClass.DURATION,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="sensor_life",
+        translation_key="sensor_life",
+        value_fn=lambda data: data.sensor_life,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        device_class=SensorDeviceClass.DURATION,
+    ),
+    RoborockSensorDescriptionQ10(
+        key="clean_percent",
+        translation_key="clean_percent",
+        value_fn=lambda data: data.cleaning_progress,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
@@ -460,6 +570,11 @@ async def async_setup_entry(
         for description in Q7_B01_SENSOR_DESCRIPTIONS
         if description.value_fn(coordinator.data) is not None
     )
+    entities.extend(
+        RoborockSensorEntityB01Q10(coordinator, description)
+        for coordinator in coordinators.b01_q10
+        for description in Q10_B01_SENSOR_DESCRIPTIONS
+    )
     async_add_entities(entities)
 
 
@@ -568,3 +683,30 @@ def __init__(
     def native_value(self) -> StateType:
         """Return the value reported by the sensor."""
         return self.entity_description.value_fn(self.coordinator.data)
+
+
+class RoborockSensorEntityB01Q10(RoborockCoordinatedEntityB01Q10, SensorEntity):
+    """Representation of a B01 Q10 Roborock sensor."""
+
+    entity_description: RoborockSensorDescriptionQ10
+
+    def __init__(
+        self,
+        coordinator: RoborockB01Q10UpdateCoordinator,
+        description: RoborockSensorDescriptionQ10,
+    ) -> None:
+        """Initialize the entity."""
+        self.entity_description = description
+        super().__init__(f"{description.key}_{coordinator.duid_slug}", coordinator)
+
+    async def async_added_to_hass(self) -> None:
+        """Register trait listener for push-based status updates."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self.coordinator.api.status.add_update_listener(self.async_write_ha_state)
+        )
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the value reported by the sensor."""
+        return self.entity_description.value_fn(self.coordinator.api.status)

homeassistant/components/roborock/strings.json

@@ -368,6 +368,9 @@
           "water_empty": "Water empty"
         }
       },
+      "filter_life": {
+        "name": "Filter time used"
+      },
       "filter_time_left": {
         "name": "Filter time left"
       },
@@ -377,6 +380,9 @@
       "last_clean_start": {
         "name": "Last clean begin"
       },
+      "main_brush_life": {
+        "name": "Main brush time used"
+      },
       "main_brush_time_left": {
         "name": "Main brush time left"
       },
@@ -402,9 +408,15 @@
           "waiting_for_orders": "Waiting for orders"
         }
       },
+      "sensor_life": {
+        "name": "Sensor time used"
+      },
       "sensor_time_left": {
         "name": "Sensor time left"
       },
+      "side_brush_life": {
+        "name": "Side brush time used"
+      },
       "side_brush_time_left": {
         "name": "Side brush time left"
       },
@@ -430,15 +442,23 @@
           "locked": "Locked",
           "manual_mode": "Manual mode",
           "mapping": "Mapping",
+          "mopping": "Mopping",
           "paused": "[%key:common::state::paused%]",
+          "relocating": "Relocating",
           "remote_control_active": "Remote control active",
           "returning_home": "Returning home",
+          "saving_map": "Saving map",
           "segment_cleaning": "Segment cleaning",
           "shutting_down": "Shutting down",
+          "sleeping": "Sleeping",
           "spot_cleaning": "Spot cleaning",
           "starting": "Starting",
+          "sweep_and_mop": "Sweep and mop",
+          "sweeping": "Sweeping",
+          "transitioning": "Transitioning",
           "unknown": "Unknown",
           "updating": "Updating",
+          "waiting_to_charge": "Waiting to charge",
           "washing_the_mop": "Washing the mop",
           "zoned_cleaning": "Zoned cleaning"
         }
@@ -461,10 +481,14 @@
       "vacuum_error": {
         "name": "Vacuum error",
         "state": {
+          "audio_error": "Audio error",
           "battery_error": "Battery error",
           "bumper_stuck": "Bumper stuck",
           "cannot_cross_carpet": "Cannot cross carpet",
           "charging_error": "Charging error",
+          "check_clean_carouse": "Check the cleaning carousel",
+          "clean_carousel_exception": "Cleaning carousel error",
+          "clean_carousel_water_full": "Cleaning carousel water full",
           "clear_brush_exception": "Check that the water filter has been correctly installed",
           "clear_brush_exception_2": "Positioning button error",
           "clear_water_box_exception": "Clean water tank empty",
@@ -476,6 +500,7 @@
           "dirty_water_box_hoare": "Check the dirty water tank",
           "dock": "Dock not connected to power",
           "dock_locator_error": "Dock locator error",
+          "drain_water_exception": "Drain water exception",
           "fan_error": "Fan error",
           "filter_blocked": "Filter blocked",
           "filter_screen_exception": "Clean the dock water filter",
@@ -491,6 +516,7 @@
           "no_dustbin": "No dustbin",
           "nogo_zone_detected": "No-go zone detected",
           "none": "None",
+          "optical_flow_sensor_dirt": "Optical flow sensor dirty",
           "return_to_dock_fail": "Return to dock fail",
           "robot_on_carpet": "Robot on carpet",
           "robot_tilted": "Robot tilted",
@@ -500,10 +526,12 @@
           "sink_strainer_hoare": "Reinstall the water filter",
           "strainer_error": "Filter is wet or blocked",
           "temperature_protection": "Unit temperature protection",
+          "up_water_exception": "Water supply exception",
           "vertical_bumper_pressed": "Vertical bumper pressed",
           "vibrarise_jammed": "VibraRise jammed",
           "visual_sensor": "Camera error",
           "wall_sensor_dirty": "Wall sensor dirty",
+          "water_carriage_drop": "Water carriage dropped",
           "wheels_jammed": "Wheels jammed",
           "wheels_suspended": "Wheels suspended"
         }

tests/components/roborock/mock_data.py

@@ -1568,11 +1568,15 @@
 )
 
 Q10_STATUS = Q10Status(
-    clean_time=120,
+    clean_time=1800,
     clean_area=15,
     battery=100,
     status=YXDeviceState.CHARGING,
     fan_level=YXFanLevel.BALANCED,
     water_level=YXWaterLevel.MEDIUM,
     clean_count=1,
+    main_brush_life=81,
+    side_brush_life=90,
+    filter_life=90,
+    sensor_life=28,
 )