Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions roborock/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from Crypto.Cipher import AES
from Crypto.Util.Padding import unpad

from .code_mappings import RoborockDockTypeCode, RoborockEnum
from .code_mappings import RoborockDockTypeCode
from .containers import (
CleanRecord,
CleanSummary,
Expand Down Expand Up @@ -166,7 +166,7 @@ def on_message_received(self, messages: list[RoborockMessage]) -> None:

def on_connection_lost(self, exc: Optional[Exception]) -> None:
self._last_disconnection = self.time_func()
_LOGGER.warning("Roborock client disconnected")
_LOGGER.info("Roborock client disconnected")
if exc is not None:
_LOGGER.warning(exc)

Expand Down Expand Up @@ -223,7 +223,10 @@ async def send_command(self, method: RoborockCommand, params: Optional[list | di
async def get_status(self) -> Status | None:
status = await self.send_command(RoborockCommand.GET_STATUS)
if isinstance(status, dict):
return Status.from_dict(status)
status = Status.from_dict(status)
status.update_status(self.device_info.model_specification)
return status

return None

async def get_dnd_timer(self) -> DNDTimer | None:
Expand Down Expand Up @@ -294,7 +297,7 @@ async def get_smart_wash_params(self) -> SmartWashParams | None:
_LOGGER.error(e)
return None

async def get_dock_summary(self, dock_type: RoborockEnum) -> DockSummary | None:
async def get_dock_summary(self, dock_type: RoborockDockTypeCode) -> DockSummary | None:
"""Gets the status summary from the dock with the methods available for a given dock.

:param dock_type: RoborockDockTypeCode"""
Expand All @@ -306,7 +309,7 @@ async def get_dock_summary(self, dock_type: RoborockEnum) -> DockSummary | None:
DustCollectionMode | WashTowelMode | SmartWashParams | None,
]
] = [self.get_dust_collection_mode()]
if dock_type == RoborockDockTypeCode["3"]:
if dock_type == RoborockDockTypeCode.empty_wash_fill_dock or dock_type == RoborockDockTypeCode.s8_dock:
commands += [
self.get_wash_towel_mode(),
self.get_smart_wash_params(),
Expand All @@ -333,7 +336,7 @@ async def get_prop(self) -> DeviceProp | None:
if clean_summary and clean_summary.records and len(clean_summary.records) > 0:
last_clean_record = await self.get_clean_record(clean_summary.records[0])
dock_summary = None
if status and status.dock_type is not None and status.dock_type != RoborockDockTypeCode["0"]:
if status and status.dock_type is not None and status.dock_type != RoborockDockTypeCode.no_dock:
dock_summary = await self.get_dock_summary(status.dock_type)
if any([status, dnd_timer, clean_summary, consumable]):
return DeviceProp(
Expand Down
8 changes: 6 additions & 2 deletions roborock/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,12 @@ async def command(ctx, cmd, device_id, params):
await _discover(ctx)
login_data = context.login_data()
home_data = login_data.home_data
device = next((device for device in home_data.get_all_devices() if device.duid == device_id))
device_info = RoborockDeviceInfo(device=device)
devices = home_data.devices + home_data.received_devices
device = next((device for device in devices if device.duid == device_id), None)
model_specification = next(
(product.model_specification for product in home_data.products if product.did == device.duid), None
)
device_info = RoborockDeviceInfo(device=device, model_specification=model_specification)
mqtt_client = RoborockMqttClient(login_data.user_data, device_info)
await mqtt_client.send_command(cmd, params)
mqtt_client.__del__()
Expand Down
Loading