fix: try to fix fan setting

Author: Lash-L

roborock/data/b01_q7/b01_q7_code_mappings.py

@@ -24,7 +24,6 @@ class SCWindMapping(RoborockModeEnum):
     STANDARD = ("balanced", 1)
     STRONG = ("turbo", 2)
     SUPER_STRONG = ("max", 3)
-    MAX = ("max_plus", 4)
 
 
 class WaterLevelMapping(RoborockModeEnum):

roborock/devices/b01_channel.py

@@ -28,12 +28,15 @@ async def send_decoded_command(
     dps: int,
     command: CommandType,
     params: ParamsType,
-) -> dict[str, Any]:
-    """Send a command on the MQTT channel and get a decoded response."""
+) -> Any:
+    """Send a command on the MQTT channel and get a decoded response.
+
+    Note: B01 "set" commands may return a scalar (e.g. 0/"ok") rather than a dict.
+    """
     _LOGGER.debug("Sending MQTT command: %s", params)
     msg_id = str(get_next_int(100000000000, 999999999999))
     roborock_message = encode_mqtt_payload(dps, command, params, msg_id)
-    future: asyncio.Future[dict[str, Any]] = asyncio.get_running_loop().create_future()
+    future: asyncio.Future[Any] = asyncio.get_running_loop().create_future()
 
     def find_response(response_message: RoborockMessage) -> None:
         """Handle incoming messages and resolve the future."""
@@ -59,10 +62,7 @@ def find_response(response_message: RoborockMessage) -> None:
                 _LOGGER.debug("Received query response: %s", inner)
                 data = inner.get("data")
                 if not future.done():
-                    if isinstance(data, dict):
-                        future.set_result(data)
-                    else:
-                        future.set_exception(RoborockException(f"Unexpected data type for response: {data}"))
+                    future.set_result(data)
 
     unsub = await mqtt_channel.subscribe(find_response)
 

roborock/devices/traits/b01/q7/__init__.py

@@ -36,9 +36,11 @@ async def query_values(self, props: list[RoborockB01Props]) -> B01Props | None:
             command=RoborockB01Q7Methods.GET_PROP,
             params={"property": props},
         )
+        if not isinstance(result, dict):
+            raise TypeError(f"Unexpected response type for GET_PROP: {type(result).__name__}: {result!r}")
         return B01Props.from_dict(result)
 
-    async def set_prop(self, prop: RoborockB01Props, value: Any) -> dict[str, Any]:
+    async def set_prop(self, prop: RoborockB01Props, value: Any) -> Any:
         """Set a property on the device."""
         return await send_decoded_command(
             self._channel,
@@ -47,15 +49,15 @@ async def set_prop(self, prop: RoborockB01Props, value: Any) -> dict[str, Any]:
             params={prop: value},
         )
 
-    async def set_fan_speed(self, fan_speed: SCWindMapping) -> dict[str, Any]:
+    async def set_fan_speed(self, fan_speed: SCWindMapping) -> Any:
         """Set the fan speed (wind)."""
         return await self.set_prop(RoborockB01Props.WIND, fan_speed.code)
 
-    async def set_water_level(self, water_level: WaterLevelMapping) -> dict[str, Any]:
+    async def set_water_level(self, water_level: WaterLevelMapping) -> Any:
         """Set the water level (water)."""
         return await self.set_prop(RoborockB01Props.WATER, water_level.code)
 
-    async def start_clean(self) -> dict[str, Any]:
+    async def start_clean(self) -> Any:
         """Start cleaning."""
         return await send_decoded_command(
             self._channel,
@@ -68,7 +70,7 @@ async def start_clean(self) -> dict[str, Any]:
             },
         )
 
-    async def pause_clean(self) -> dict[str, Any]:
+    async def pause_clean(self) -> Any:
         """Pause cleaning."""
         return await send_decoded_command(
             self._channel,
@@ -81,7 +83,7 @@ async def pause_clean(self) -> dict[str, Any]:
             },
         )
 
-    async def stop_clean(self) -> dict[str, Any]:
+    async def stop_clean(self) -> Any:
         """Stop cleaning."""
         return await send_decoded_command(
             self._channel,
@@ -94,7 +96,7 @@ async def stop_clean(self) -> dict[str, Any]:
             },
         )
 
-    async def return_to_dock(self) -> dict[str, Any]:
+    async def return_to_dock(self) -> Any:
         """Return to dock."""
         return await send_decoded_command(
             self._channel,
@@ -103,7 +105,7 @@ async def return_to_dock(self) -> dict[str, Any]:
             params={},
         )
 
-    async def find_me(self) -> dict[str, Any]:
+    async def find_me(self) -> Any:
         """Locate the robot."""
         return await send_decoded_command(
             self._channel,

roborock/protocols/b01_protocol.py

@@ -28,7 +28,10 @@ def encode_mqtt_payload(dps: int, command: CommandType, params: ParamsType, msg_
             dps: {
                 "method": str(command),
                 "msgId": msg_id,
-                "params": params or [],
+                # Important: some B01 methods use an empty object `{}` (not `[]`) for
+                # "no params", and some setters legitimately send `0` which is falsy.
+                # Only default to `[]` when params is actually None.
+                "params": params if params is not None else [],
             }
         }
     }

roborock/roborock_typing.py

@@ -280,11 +280,14 @@ class RoborockCommand(str, Enum):
 class RoborockB01Q7Methods(StrEnum):
     """Methods used by the Roborock Q7 model."""
 
+    # NOTE: In the Q7 Hermes dump these appear as suffixes and are also used
+    # with an "event." prefix at runtime (see `hermes/.../module_524.js`).
     ADD_CLEAN_FAILED_POST = "add_clean_failed.post"
+    EVENT_ADD_CLEAN_FAILED_POST = "event.add_clean_failed.post"
     CLEAN_FINISH_POST = "clean_finish.post"
+    EVENT_CLEAN_FINISH_POST = "event.clean_finish.post"
     EVENT_BUILD_MAP_FINISH_POST = "event.BuildMapFinish.post"
     EVENT_MAP_CHANGE_POST = "event.map_change.post"
-    EVENT_TYPE = "event.type"
     EVENT_WORK_APPOINT_CLEAN_FAILED_POST = "event.work_appoint_clean_failed.post"
     START_CLEAN_POST = "startClean.post"
     ADD_ORDER = "service.add_order"
@@ -338,7 +341,6 @@ class RoborockB01Q7Methods(StrEnum):
     GET_PREFERENCE = "service.get_preference"
     GET_RECORD_LIST = "service.get_record_list"
     GET_ORDER = "service.get_order"
-    EVENT_ORDER_LIST_POST = "event.order_list.post"
     POST_PROP = "prop.post"