Fixes for r2216o and new features for r2235

Tasshack · Dec 19, 2022 · 5e09a8a · 5e09a8a
1 parent 2ecbb31
commit 5e09a8a
Show file tree

Hide file tree

Showing 25 changed files with 772 additions and 313 deletions.
diff --git a/custom_components/dreame_vacuum/dreame/__init__.py b/custom_components/dreame_vacuum/dreame/__init__.py
@@ -12,6 +12,7 @@
     DreameVacuumState,
     DreameVacuumSelfCleanArea,
     DreameVacuumMopWashLevel,
+    DreameVacuumMoppingType,
     PROPERTY_AVAILABILITY,
     ACTION_AVAILABILITY,
     MAP_COLOR_SCHEME_LIST,

diff --git a/custom_components/dreame_vacuum/dreame/const.py b/custom_components/dreame_vacuum/dreame/const.py
@@ -17,6 +17,7 @@
     DreameVacuumCleaningMode,
     DreameVacuumSelfCleanArea,
     DreameVacuumMopWashLevel,
+    DreameVacuumMoppingType,
     DreameVacuumProperty,
     DreameVacuumAction,
 )
@@ -71,6 +72,13 @@
 TASK_STATUS_ZONE_MOPPING_PAUSE: Final = "zone_mopping_paused"
 TASK_STATUS_SEGMENT_MOPPING_PAUSE: Final = "room_mopping_paused"
 TASK_STATUS_AUTO_MOPPING_PAUSE: Final = "mopping_paused"
+TASK_STATUS_MONITOR_CRUISE : Final = "monitor_cruise"
+TASK_STATUS_MONITOR_CRUISE_PAUSE : Final = "monitor_cruise_pause"
+TASK_STATUS_MONITOR_SPOT : Final = "monitor_spot"
+TASK_STATUS_MONITOR_SPOT_PAUSE : Final = "monitor_spot_pause"
+TASK_STATUS_SUMMON_CLEAN_PAUSE : Final = "summon_clean_pause"
+TASK_STATUS_RETURNING_INSTALL_MOP : Final = "returning_to_install_mop"
+TASK_STATUS_RETURNING_REMOVE_MOP : Final = "returning_to_remove_mop"
 
 STATUS_CLEANING: Final = "cleaning"
 STATUS_FOLLOW_WALL: Final = "follow_wall_cleaning"
@@ -90,6 +98,9 @@
 STATUS_ZONE_CLEANING: Final = "zone_cleaning"
 STATUS_SPOT_CLEANING: Final = "spot_cleaning"
 STATUS_FAST_MAPPING: Final = "fast_mapping"
+STATUS_MONITOR_CRUISE: Final = "monitor_cruise"
+STATUS_MONITOR_SPOT: Final = "monitor_spot"
+STATUS_SUMMON_CLEAN: Final = "summon_clean"
 
 RELOCATION_STATUS_LOCATED: Final = "located"
 RELOCATION_STATUS_LOCATING: Final = "locating"
@@ -123,6 +134,10 @@
 MOP_WASH_LEVEL_DAILY: Final = "daily"
 MOP_WASH_LEVEL_WATER_SAVING: Final = "water_saving"
 
+MOPPING_TYPE_DEEP: Final = "deep"
+MOPPING_TYPE_DAILY: Final = "daily"
+MOPPING_TYPE_ACCURATE: Final = "accurate"
+
 WATER_TANK_INSTALLED: Final = "installed"
 WATER_TANK_NOT_INSTALLED: Final = "not_installed"
 WATER_TANK_MOP_INSTALLED: Final = "mop_installed"
@@ -301,7 +316,7 @@
 MAP_DATA_PARAMETER_WALL: Final = "wall"
 MAP_DATA_PARAMETER_SEGMENT: Final = "segment"
 
-DEVICE_MAP_KEY: Final = "H4sICLnrm2MEAGRldmljZWtleS50eHQAbc7BDoIgAIDhd+HcQREsu4UbWSohuZpHXWm5ppBN51rvnoy6ef4O//8GEto2asEauJzeI57FQTQ+5FIIsNCGPG2CHZB0cAGTMG/7wP+ZpW2lmqN3UVXq+FJur/bf5KyZXj7fe0JoeRMpGt76dqMETXkZMtcQRhMNYrRwmUXJPhaBG9eGbFefoM7vnQSSV3E+kR2Bxhw8ERNDQ2pMO8YrwooUfL5w7u9F+gAAAA=="
+DEVICE_MAP_KEY: Final = "H4sICGt+oGMEAGRldmljZWtleS50eHQAbc67DoIwAIXhd+nsQG8obhaDKFChEg0jBEGJgSIGgsZ3lwbcmL+c/OcDJIKQVGANdN+6u37k2W7/kEshwEIZMZQJfiQS0wQFTly1tjmZpmxVlycjrfMQm1LurvBvctbGXjzfeyKkGQPVlnNrq00trNDPHK6PRMlAneg1mkVucPCErXvFSFBXT0hjtjhA7JVczmzP0GiYDsRFV7KCWg33c8aTcJpBNUvLVAT4vdqYxTbdehX4/gAN9AoFFgEAAA=="
 
 PROPERTY_TO_NAME: Final = {
     DreameVacuumProperty.STATE: ["state", "State"],
@@ -529,6 +544,13 @@
     DreameVacuumTaskStatus.AUTO_DOCKING_PAUSED: TASK_STATUS_DOCKING_PAUSE,
     DreameVacuumTaskStatus.ZONE_DOCKING_PAUSED: TASK_STATUS_DOCKING_PAUSE,
     DreameVacuumTaskStatus.SEGMENT_DOCKING_PAUSED: TASK_STATUS_DOCKING_PAUSE,
+    DreameVacuumTaskStatus.MONITOR_CRUISE: TASK_STATUS_MONITOR_CRUISE,
+    DreameVacuumTaskStatus.MONITOR_CRUISE_PAUSE: TASK_STATUS_MONITOR_CRUISE_PAUSE,
+    DreameVacuumTaskStatus.MONITOR_SPOT: TASK_STATUS_MONITOR_SPOT,
+    DreameVacuumTaskStatus.MONITOR_SPOT_PAUSE: TASK_STATUS_MONITOR_SPOT_PAUSE,
+    DreameVacuumTaskStatus.SUMMON_CLEAN_PAUSE: TASK_STATUS_SUMMON_CLEAN_PAUSE,
+    DreameVacuumTaskStatus.RETURNING_INSTALL_MOP: TASK_STATUS_RETURNING_INSTALL_MOP,
+    DreameVacuumTaskStatus.RETURNING_REMOVE_MOP: TASK_STATUS_RETURNING_REMOVE_MOP,
 }
 
 STATUS_CODE_TO_NAME: Final = {
@@ -554,6 +576,9 @@
     DreameVacuumStatus.ZONE_CLEANING: STATUS_ZONE_CLEANING,
     DreameVacuumStatus.SPOT_CLEANING: STATUS_SPOT_CLEANING,
     DreameVacuumStatus.FAST_MAPPING: STATUS_FAST_MAPPING,
+    DreameVacuumStatus.MONITOR_CRUISE: STATUS_MONITOR_CRUISE,
+    DreameVacuumStatus.MONITOR_SPOT: STATUS_MONITOR_SPOT,
+    DreameVacuumStatus.SUMMON_CLEAN: STATUS_SUMMON_CLEAN,
 }
 
 RELOCATION_STATUS_CODE_TO_NAME: Final = {
@@ -692,6 +717,12 @@
     DreameVacuumMopWashLevel.WATER_SAVING: MOP_WASH_LEVEL_WATER_SAVING,
 }
 
+MOPPING_TYPE_TO_NAME: Final = {
+    DreameVacuumMoppingType.DEEP: MOPPING_TYPE_DEEP,
+    DreameVacuumMoppingType.DAILY: MOPPING_TYPE_DAILY,
+    DreameVacuumMoppingType.ACCURATE: MOPPING_TYPE_ACCURATE,
+}
+
 ERROR_CODE_TO_IMAGE_INDEX: Final = {
     DreameVacuumErrorCode.BUMPER: 1,
     DreameVacuumErrorCode.BUMPER_REPEAT: 1,