Skip to content

Commit df08cc2

Browse files
committed
fix: correct some dock mapping
1 parent 89c8074 commit df08cc2

3 files changed

Lines changed: 21 additions & 1 deletion

File tree

roborock/data/v1/v1_code_mappings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ class RoborockDockTypeCode(RoborockEnum):
675675
type_27_dock = 27
676676
k1c_lite_dock = 28
677677
shell_2e_lite_dock = 30
678+
shell_2e_heat_dock = 40
678679

679680

680681
class RoborockDockDustCollectionModeCode(RoborockEnum):

roborock/device_features.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,14 +674,14 @@ def get_supported_features(self) -> list[str]:
674674

675675
_CLEAN_FLUID_AUTO_DELIVERY_DOCK_TYPES = {
676676
RoborockDockTypeCode.o4_dock,
677+
RoborockDockTypeCode.o5_dock,
677678
RoborockDockTypeCode.pearl_plus_dock,
678679
RoborockDockTypeCode.shell_3s_dock,
679680
RoborockDockTypeCode.o6_dock,
680681
RoborockDockTypeCode.couple_dock,
681682
}
682683

683684
_CLEAN_FLUID_AUTO_DELIVERY_AM_DOCK_TYPES = {
684-
RoborockDockTypeCode.o5_dock,
685685
RoborockDockTypeCode.shell_2s_dock,
686686
RoborockDockTypeCode.shell_3_dock,
687687
RoborockDockTypeCode.shell_2c_dock,
@@ -734,9 +734,11 @@ def get_supported_features(self) -> list[str]:
734734
RoborockDockTypeCode.shell_2c_dock,
735735
RoborockDockTypeCode.shell_3s_dock,
736736
RoborockDockTypeCode.k1_dock,
737+
RoborockDockTypeCode.k1s_dock,
737738
RoborockDockTypeCode.o6_dock,
738739
RoborockDockTypeCode.shell_e_dock,
739740
RoborockDockTypeCode.shell_2e_dock,
741+
RoborockDockTypeCode.shell_3c_dock,
740742
}
741743

742744
_HATCH_DOOR_DOCK_COOL_FAN_DOCK_TYPES = {

tests/test_supported_features.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ def test_new_feature_str_missing():
109109
(RoborockDockTypeCode.type_27_dock, True, True),
110110
(RoborockDockTypeCode.k1c_lite_dock, True, True),
111111
(RoborockDockTypeCode.shell_2e_lite_dock, True, True),
112+
(RoborockDockTypeCode.shell_2e_heat_dock, True, True),
112113
],
113114
)
114115
def test_dock_features(dock_type: RoborockDockTypeCode, is_collectable: bool, is_washable: bool) -> None:
@@ -128,6 +129,12 @@ def test_dock_feature_flags_from_rr_api() -> None:
128129
assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.o4_dock).is_clean_fluid_auto_delivery_supported
129130
assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.couple_dock).is_hatch_door_dock_cool_fan_supported
130131
assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.shell_2e_lite_dock).is_special_support_wash_temp
132+
assert not RoborockDockFeatures.from_dock_type(
133+
RoborockDockTypeCode.shell_2e_heat_dock
134+
).is_clean_fluid_auto_delivery_supported
135+
assert not RoborockDockFeatures.from_dock_type(
136+
RoborockDockTypeCode.shell_2e_heat_dock
137+
).is_water_updown_drain_supported
131138

132139

133140
def test_dock_feature_flags_with_am_variants_from_rr_api() -> None:
@@ -138,6 +145,10 @@ def test_dock_feature_flags_with_am_variants_from_rr_api() -> None:
138145
assert RoborockDockFeatures.from_dock_type(
139146
RoborockDockTypeCode.shell_3_dock, has_am=True
140147
).is_clean_fluid_auto_delivery_supported
148+
assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.o5_dock).is_clean_fluid_auto_delivery_supported
149+
assert RoborockDockFeatures.from_dock_type(
150+
RoborockDockTypeCode.o5_dock, has_am=True
151+
).is_clean_fluid_auto_delivery_supported
141152

142153
assert RoborockDockFeatures.from_dock_type(RoborockDockTypeCode.shell_3_dock).is_clean_carousel_self_clean_supported
143154
assert not RoborockDockFeatures.from_dock_type(
@@ -148,6 +159,12 @@ def test_dock_feature_flags_with_am_variants_from_rr_api() -> None:
148159
assert RoborockDockFeatures.from_dock_type(
149160
RoborockDockTypeCode.o5_dock, has_am=True
150161
).is_water_updown_drain_supported
162+
assert RoborockDockFeatures.from_dock_type(
163+
RoborockDockTypeCode.k1s_dock, has_am=True
164+
).is_water_updown_drain_supported
165+
assert RoborockDockFeatures.from_dock_type(
166+
RoborockDockTypeCode.shell_3c_dock, has_am=True
167+
).is_water_updown_drain_supported
151168

152169

153170
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)