fix: add missing dock ids

Author: Lash-L

roborock/data/v1/v1_code_mappings.py

@@ -365,10 +365,27 @@ class RoborockDockTypeCode(RoborockEnum):
     shell_e_dock = 21
     shell_2e_dock = 22
     shell_3c_dock = 23
+    hera_dock = 24
+    k1s_pro_dock = 26
     type_27_dock = 27
     k1c_lite_dock = 28
+    k1r_dock = 29
     shell_2e_lite_dock = 30
+    shell_4rc_dock = 31
+    shell_4r_dock = 32
+    shell_4p_dock = 33
+    shell_4s_dock = 34
+    o7_dock = 35
+    k1d_dock = 37
+    shell_3p_dock = 38
+    shell_4d_dock = 39
     shell_2e_heat_dock = 40
+    f1_dock = 41
+    f1r_dock = 42
+    f2r_dock = 43
+    f1s_dock = 44
+    o7h_dock = 45
+    f1c_dock = 46
 
 
 class RoborockDockDustCollectionModeCode(RoborockEnum):

roborock/device_features.py

@@ -676,6 +676,8 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.o4_dock,
     RoborockDockTypeCode.o5_dock,
     RoborockDockTypeCode.o6_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.o7h_dock,
 }
 
 _CLEAN_FLUID_AUTO_DELIVERY_DOCK_TYPES = {
@@ -685,6 +687,10 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_3s_dock,
     RoborockDockTypeCode.o6_dock,
     RoborockDockTypeCode.couple_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.o7h_dock,
 }
 
 _CLEAN_FLUID_AUTO_DELIVERY_AM_DOCK_TYPES = {
@@ -696,6 +702,7 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_e_dock,
     RoborockDockTypeCode.shell_2e_dock,
     RoborockDockTypeCode.shell_3c_dock,
+    RoborockDockTypeCode.k1c_dock,
 }
 
 _AUTO_STERILIZE_DOCK_TYPES = {
@@ -725,6 +732,18 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_3s_dock,
     RoborockDockTypeCode.k1s_dock,
     RoborockDockTypeCode.shell_3c_dock,
+    RoborockDockTypeCode.k1s_pro_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.k1r_dock,
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_4p_dock,
+    RoborockDockTypeCode.shell_4s_dock,
+    RoborockDockTypeCode.k1d_dock,
+    RoborockDockTypeCode.shell_3p_dock,
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.f1c_dock,
 }
 
 _WATER_UPDOWN_DRAIN_DOCK_TYPES = {
@@ -745,6 +764,19 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_e_dock,
     RoborockDockTypeCode.shell_2e_dock,
     RoborockDockTypeCode.shell_3c_dock,
+    RoborockDockTypeCode.k1c_dock,
+    RoborockDockTypeCode.hera_dock,
+    RoborockDockTypeCode.k1s_pro_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_4r_dock,
+    RoborockDockTypeCode.shell_4p_dock,
+    RoborockDockTypeCode.shell_4s_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.shell_4d_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.o7h_dock,
 }
 
 _HATCH_DOOR_DOCK_COOL_FAN_DOCK_TYPES = {
@@ -755,6 +787,56 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_2e_lite_dock,
 }
 
+_HIGH_TMP_WATER_DOCK_TYPES = {
+    RoborockDockTypeCode.k1r_dock,
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_2e_heat_dock,
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1c_dock,
+}
+
+_DOUBLE_SERIAL_COMMUNICATION_DOCK_TYPES = {
+    RoborockDockTypeCode.k1s_pro_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.k1r_dock,
+    RoborockDockTypeCode.shell_4r_dock,
+    RoborockDockTypeCode.shell_4p_dock,
+    RoborockDockTypeCode.shell_4s_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.k1d_dock,
+    RoborockDockTypeCode.shell_3p_dock,
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.o7h_dock,
+    RoborockDockTypeCode.f1c_dock,
+}
+
+_DOUBLE_SERIAL_COMMUNICATION_AM_DOCK_TYPES = {
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_4d_dock,
+}
+
+_NO_WATER_FLOW_CAROUSEL_DOCK_TYPES = {
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1s_dock,
+}
+
+_SIMPLE_WASH_MODE_DOCK_TYPES = {
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1c_dock,
+}
+
+_STEAM_WASH_DOCK_TYPES = {
+    RoborockDockTypeCode.o7h_dock,
+}
+
 
 @dataclass(frozen=True)
 class RoborockDockFeatures:
@@ -855,6 +937,28 @@ def is_hatch_door_dock_cool_fan_supported(self) -> bool:
     def is_special_support_wash_temp(self) -> bool:
         return self.dock_type in _SPECIAL_WASH_TEMP_DOCK_TYPES
 
+    @property
+    def is_high_tmp_water_supported(self) -> bool:
+        return self.dock_type in _HIGH_TMP_WATER_DOCK_TYPES
+
+    @property
+    def is_double_serial_communication_supported(self) -> bool:
+        return self.dock_type in _DOUBLE_SERIAL_COMMUNICATION_DOCK_TYPES or self._matches_am_variant(
+            _DOUBLE_SERIAL_COMMUNICATION_AM_DOCK_TYPES
+        )
+
+    @property
+    def is_no_water_flow_carousel(self) -> bool:
+        return self.dock_type in _NO_WATER_FLOW_CAROUSEL_DOCK_TYPES
+
+    @property
+    def is_simple_wash_mode_supported(self) -> bool:
+        return self.dock_type in _SIMPLE_WASH_MODE_DOCK_TYPES
+
+    @property
+    def is_steam_wash_supported(self) -> bool:
+        return self.dock_type in _STEAM_WASH_DOCK_TYPES
+
 
 WASH_N_FILL_DOCK_TYPES = [
     dock_type for dock_type in RoborockDockTypeCode if RoborockDockFeatures.from_dock_type(dock_type).is_washable

tests/test_supported_features.py

@@ -9,6 +9,53 @@
 from roborock.device_features import DeviceFeatures, RoborockDockFeatures, is_valid_dock, is_wash_n_fill_dock
 from tests import mock_data
 
+# RR_API DockConfigs snapshot from the Qrevo Edge 2 bundle decoded on 2026-07-11.
+RR_API_DOCK_TYPES = {
+    0: "o0_dock",
+    1: "o1_dock",
+    2: "o2_dock",
+    3: "o3_dock",
+    5: "oc_dock",
+    6: "o3_plus_dock",
+    7: "o4_dock",
+    8: "pearl_dock",
+    9: "pearl_plus_dock",
+    10: "o5_dock",
+    11: "shell_2s_dock",
+    13: "couple_dock",
+    14: "shell_3_dock",
+    15: "shell_2c_dock",
+    16: "shell_3s_dock",
+    17: "k1_dock",
+    18: "o6_dock",
+    19: "k1c_dock",
+    20: "k1s_dock",
+    21: "shell_e_dock",
+    22: "shell_2e_dock",
+    23: "shell_3c_dock",
+    24: "hera_dock",
+    26: "k1s_pro_dock",
+    27: "type_27_dock",
+    28: "k1c_lite_dock",
+    29: "k1r_dock",
+    30: "shell_2e_lite_dock",
+    31: "shell_4rc_dock",
+    32: "shell_4r_dock",
+    33: "shell_4p_dock",
+    34: "shell_4s_dock",
+    35: "o7_dock",
+    37: "k1d_dock",
+    38: "shell_3p_dock",
+    39: "shell_4d_dock",
+    40: "shell_2e_heat_dock",
+    41: "f1_dock",
+    42: "f1r_dock",
+    43: "f2r_dock",
+    44: "f1s_dock",
+    45: "o7h_dock",
+    46: "f1c_dock",
+}
+
 
 def test_supported_features_qrevo_maxv():
     """Ensure that a QREVO MaxV has some more complicated features enabled."""
@@ -106,10 +153,27 @@ def test_new_feature_str_missing():
         (RoborockDockTypeCode.shell_e_dock, True, True),
         (RoborockDockTypeCode.shell_2e_dock, True, True),
         (RoborockDockTypeCode.shell_3c_dock, True, True),
+        (RoborockDockTypeCode.hera_dock, True, True),
+        (RoborockDockTypeCode.k1s_pro_dock, True, True),
         (RoborockDockTypeCode.type_27_dock, True, True),
         (RoborockDockTypeCode.k1c_lite_dock, True, True),
+        (RoborockDockTypeCode.k1r_dock, True, True),
         (RoborockDockTypeCode.shell_2e_lite_dock, True, True),
+        (RoborockDockTypeCode.shell_4rc_dock, True, True),
+        (RoborockDockTypeCode.shell_4r_dock, True, True),
+        (RoborockDockTypeCode.shell_4p_dock, True, True),
+        (RoborockDockTypeCode.shell_4s_dock, True, True),
+        (RoborockDockTypeCode.o7_dock, True, True),
+        (RoborockDockTypeCode.k1d_dock, True, True),
+        (RoborockDockTypeCode.shell_3p_dock, True, True),
+        (RoborockDockTypeCode.shell_4d_dock, True, True),
         (RoborockDockTypeCode.shell_2e_heat_dock, True, True),
+        (RoborockDockTypeCode.f1_dock, True, True),
+        (RoborockDockTypeCode.f1r_dock, True, True),
+        (RoborockDockTypeCode.f2r_dock, True, True),
+        (RoborockDockTypeCode.f1s_dock, True, True),
+        (RoborockDockTypeCode.o7h_dock, True, True),
+        (RoborockDockTypeCode.f1c_dock, True, True),
     ],
 )
 def test_dock_features(dock_type: RoborockDockTypeCode, is_collectable: bool, is_washable: bool) -> None:
@@ -122,6 +186,17 @@ def test_dock_features(dock_type: RoborockDockTypeCode, is_collectable: bool, is
     assert is_wash_n_fill_dock(dock_type) is dock_features.is_washable
 
 
+def test_all_rr_api_dock_types_are_mapped() -> None:
+    """Keep the enum synchronized with the RR_API DockConfigs snapshot."""
+    mapped_docks = {
+        dock_type.value: dock_type.name
+        for dock_type in RoborockDockTypeCode
+        if dock_type is not RoborockDockTypeCode.unknown
+    }
+
+    assert mapped_docks == RR_API_DOCK_TYPES
+
+
 def test_dock_feature_flags_from_rr_api() -> None:
     """Verify dock-specific feature flags that are not currently trait gates."""
     assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.shell_3s_dock).is_auto_sterilize_supported
@@ -135,6 +210,17 @@ def test_dock_feature_flags_from_rr_api() -> None:
     assert not RoborockDockFeatures.from_dock_type(
         RoborockDockTypeCode.shell_2e_heat_dock
     ).is_water_updown_drain_supported
+    assert RoborockDockFeatures.from_dock_type(
+        RoborockDockTypeCode.shell_3p_dock
+    ).is_clean_carousel_self_clean_supported
+    assert RoborockDockFeatures.from_dock_type(
+        RoborockDockTypeCode.shell_3p_dock
+    ).is_double_serial_communication_supported
+    assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.o7_dock).is_only_x_series
+    assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.o7_dock).is_clean_fluid_auto_delivery_supported
+    assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.o7h_dock).is_steam_wash_supported
+    assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.f1_dock).is_simple_wash_mode_supported
+    assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.f1r_dock).is_no_water_flow_carousel
 
 
 def test_dock_feature_flags_with_am_variants_from_rr_api() -> None:
@@ -166,6 +252,19 @@ def test_dock_feature_flags_with_am_variants_from_rr_api() -> None:
         RoborockDockTypeCode.shell_3c_dock, has_am=True
     ).is_water_updown_drain_supported
 
+    shell_4rc = RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.shell_4rc_dock)
+    shell_4rc_am = RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.shell_4rc_dock, has_am=True)
+    assert shell_4rc.is_clean_carousel_self_clean_supported
+    assert not shell_4rc_am.is_clean_carousel_self_clean_supported
+    assert not shell_4rc.is_water_updown_drain_supported
+    assert shell_4rc_am.is_water_updown_drain_supported
+    assert not shell_4rc.is_clean_fluid_auto_delivery_supported
+    assert not shell_4rc_am.is_clean_fluid_auto_delivery_supported
+    assert shell_4rc.is_high_tmp_water_supported
+    assert shell_4rc_am.is_high_tmp_water_supported
+    assert not shell_4rc.is_double_serial_communication_supported
+    assert shell_4rc_am.is_double_serial_communication_supported
+
 
 @pytest.mark.parametrize(
     ("device_filename"),