python-roborock 7.4.2__py3-none-any.whl → 7.5.0__py3-none-any.whl

{python_roborock-7.4.2.dist-info → python_roborock-7.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-roborock
-Version: 7.4.2
+Version: 7.5.0
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/python-roborock/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/

{python_roborock-7.4.2.dist-info → python_roborock-7.5.0.dist-info}/RECORD

@@ -1,26 +1,26 @@
 roborock/__init__.py,sha256=jpp3MEmevRvoJ5tq2waCDGH5VfJk--Lv1DmrwEdDyEQ,375
-roborock/broadcast_protocol.py,sha256=fjNQW7NdBKRzSy6126TfCSoYGpT2Esj9Jd-t7tXFc_E,4015
+roborock/broadcast_protocol.py,sha256=HY3towvw_JyeAQxhMwD7XyG0Gvd3pn-Ik7BYb5iP6M4,4047
 roborock/callbacks.py,sha256=w2yPXtWFH7zfoFsLPYoCTbfwbE9p1ivA7iDcw20lJQI,4300
-roborock/cli.py,sha256=0xTv7rfXSKU19bc2b2SILuFifTVYDcAj-FSQDSOgi1k,63308
+roborock/cli.py,sha256=gbe444a9Hq-AU16a5ov3fmoX7mBcuxa7JN4YW43-P2M,63321
 roborock/const.py,sha256=fWpgUPrCgLnaXmncgjCLZET-t7wHWQlpyzV8qHtTjb4,2860
-roborock/device_features.py,sha256=EbMvw4vz0HvN23x9stj5CfNu45HE1tqg4HyygAzkU5Q,46753
+roborock/device_features.py,sha256=RZTE6WovDYPHD9B6Iv_1pEeKaTmqb993Qfo8lCW-9xA,46737
 roborock/diagnostics.py,sha256=OVfPCjBVidAlQtFz-WRlgCWOBIaXlO-73xQloXJaLwI,5107
 roborock/exceptions.py,sha256=t2YvfSRMymZPtdPV238itjxVJTaTq5-uBL_EM5FTlfg,3159
-roborock/protocol.py,sha256=eNUL6UGmtSdfsGM1mlYjmorukGGudV45iKXUA7a-Qa8,20193
+roborock/protocol.py,sha256=a0uwfn1uX1nVfRFK2QQTw2tHft9fCHBElLgzaEIhpW4,20179
 roborock/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 roborock/roborock_message.py,sha256=VWsytnm7nQqOMBj7oYbiqPPqwE9qClDSI03CFuHXsds,11822
 roborock/roborock_typing.py,sha256=xppavdf57-Cu6elj3MP403uT75Tjw5Zs6bLGPLQmZf4,15483
-roborock/util.py,sha256=mjw329ujLjoWPPAr9mG0VZstaVL06dmVvNnYACB-Pxk,1650
+roborock/util.py,sha256=4zibjn2MgPrLCiha66LUXZj907LOXUtNzugbbb0NIlo,1634
 roborock/web_api.py,sha256=ypW9e11U0jNXnyIQO9UN0DnIdz4c6AxtJlUJmjuEl-o,40514
 roborock/data/__init__.py,sha256=jSZHOrd-LfVN-TdBkjNW334ef99rGBz4-hPT_7KvoLs,278
-roborock/data/code_mappings.py,sha256=SGLJvHSdibUsXqCbQcqCGKm3x09JqhRKLoCgMCN1_s0,9769
-roborock/data/containers.py,sha256=ISfVcuDYFqMUiYa0V7NaMDH6snjYjJqOg6oKp-URghg,17900
+roborock/data/code_mappings.py,sha256=j-ZZRtQQdIMJQAgEwDAxWKreNhD6U36oIhBKr_nLbis,9783
+roborock/data/containers.py,sha256=ePz1tmhNY1QpgiVlyc8j6PH5kjU6fkZYtBByCFj2wzU,17896
 roborock/data/b01_q10/__init__.py,sha256=E4lwJcz4AI1z92FcYOJ-cY3fcfHSoXqvYVgfA-TgaRk,71
 roborock/data/b01_q10/b01_q10_code_mappings.py,sha256=UBFkxCWLYCGQatENmNwR0owkXrcB8AosnD-hICfS2AY,15203
 roborock/data/b01_q10/b01_q10_containers.py,sha256=HE1qAhYKDTz35oRgekYItNfD1iWTi7605-wpETcDzxU,11823
 roborock/data/b01_q7/__init__.py,sha256=D-Cd8eB0njf1PQPM6Exl_9A0AhpzIjrL0hapGOCEkkA,69
-roborock/data/b01_q7/b01_q7_code_mappings.py,sha256=aOJqNFrJWqRSvgruVIpuaB6tP7gwvr-sSGHVsCOJAHk,11072
-roborock/data/b01_q7/b01_q7_containers.py,sha256=jNEHoNEdq276XJZGGUmtSyJ81cSIzJwem-O_NOgmfdQ,10270
+roborock/data/b01_q7/b01_q7_code_mappings.py,sha256=S2KiBIpkUniEnw0hSSLeLWHZMZvq4Ld6RXzbaXO43Zk,11274
+roborock/data/b01_q7/b01_q7_containers.py,sha256=h01GNZM-M4OAMBO3aqE0LHgvmsrirssMmjR3YWdZMqo,10421
 roborock/data/dyad/__init__.py,sha256=Ksx7Ri1alsAYAyILOpj9iNbCC_6sF7xvETFRnTO4rdM,65
 roborock/data/dyad/dyad_code_mappings.py,sha256=PGzEpkdc1jsR5RLRnjVnI2Y87O_HFAFulwOjjjbT4B0,2872
 roborock/data/dyad/dyad_containers.py,sha256=klJD2wV-2McjAoSN8Bthuyeid59L7M8nzSvc3MtmqOI,434
@@ -29,7 +29,7 @@ roborock/data/mower/mower_code_mappings.py,sha256=T3NJEjgkYv3svIt7-gqFgrnNmVeBOk
 roborock/data/mower/mower_containers.py,sha256=PYNVhbGCafkchenBlBmG_fUnIC-9WfxF8gNB0C4_9Yo,4106
 roborock/data/v1/__init__.py,sha256=Lx_D6baZrCMxp57D0NcdiA8rssJ5NnInZwUwrT79XOI,91
 roborock/data/v1/v1_clean_modes.py,sha256=ZUhMqrM9MwnXFl3btZj9_LEAOmhNIl80krW-AiuWouk,13866
-roborock/data/v1/v1_code_mappings.py,sha256=_2ycHU9VH86SayZXPLXY1Ej6bJxRvOT_GDIdHsNUR04,12934
+roborock/data/v1/v1_code_mappings.py,sha256=hToQbd38mM3Dw8ONLyuDa2scqmNs0gNgOyqVgm-Gg7Y,12948
 roborock/data/v1/v1_containers.py,sha256=UBScIG6VKziEAC0FaQRHnfrGWDY06nITY8NkFJEzhiE,17256
 roborock/data/zeo/__init__.py,sha256=VxG5qG4M24DGOq2YAaxownWp6bEfj9DEOgOMHmTpcqY,63
 roborock/data/zeo/zeo_code_mappings.py,sha256=mfm2xoI8RllPZfyZE0HmUhUhLECwRD0llkMNWfaEHvw,8057
@@ -43,9 +43,9 @@ roborock/devices/file_cache.py,sha256=-G2Bm4ra8K_DvSBjntv5hGaRDB-VzSoKWcI0Y_kK6j
 roborock/devices/rpc/__init__.py,sha256=MDtZovvHi3F4Wbgyzu6gyjAjkZ6xYGU1LRQmtiIapuU,561
 roborock/devices/rpc/a01_channel.py,sha256=R33NQ3hK6pWjPzF2kaWVv93r9RrTWskg6_YWi3Oiiq4,3886
 roborock/devices/rpc/b01_q10_channel.py,sha256=nT7fsTtti37alm68CHzId8Wy3GMd6npiSNB8Gjegy3I,3494
-roborock/devices/rpc/b01_q7_channel.py,sha256=sE3U5r8RlSqSCXxSdd_a_4nPkOSkIPFvCTwxKMtcOnU,8738
+roborock/devices/rpc/b01_q7_channel.py,sha256=yHpuXr-_QG1NNWPV13fJzZGMsfHWBRHSEHz4I2xn8Xs,8754
 roborock/devices/rpc/v1_channel.py,sha256=xCQ9YqgTFteU-ptc9-H0w6HtZK3OyH8GBS4QNsxi18w,24365
-roborock/devices/traits/__init__.py,sha256=YaL9qoxG6IBG0XXDP0HMTvoc0Jkmq7AF6iH2oYWNtcg,765
+roborock/devices/traits/__init__.py,sha256=wUiMPJXm4oVULQy2zjPkChrb4cWy2L1kUqzU79oZ-vQ,779
 roborock/devices/traits/common.py,sha256=n3fHK4i4bkTU1QL7skMStJiUPIDlpN37z0T9mPQYoOY,4588
 roborock/devices/traits/traits_mixin.py,sha256=7t15l_Ty1cN-3-fKNtRH1XR6-mfadPnTBCQRZP4rAtc,2092
 roborock/devices/traits/a01/__init__.py,sha256=rRrdXgSsolyNC6MOCyYIfW8oaUmzt-p_uppuhzfYYIU,18375
@@ -70,10 +70,10 @@ roborock/devices/traits/b01/q10/volume.py,sha256=UnT0yYDQntxYwnpv4_NVychm0FnGAYR
 roborock/devices/traits/b01/q7/__init__.py,sha256=wHe2uncF49MlfPwyIgs0xbwnQo8q0eDEyHTh33iHq80,8549
 roborock/devices/traits/b01/q7/clean_summary.py,sha256=M43iJVeYjrkBV6ZxXdHtn4Rd5Mx-KAK7WLU5fABiN8I,2742
 roborock/devices/traits/b01/q7/map.py,sha256=NfPQAEwNCUsb0SYGMxmGeq4q4rEHqDJK0zTD5cE-ESs,1299
-roborock/devices/traits/b01/q7/map_content.py,sha256=M0anKPY82kN3wZZAu-vVWqpq_Cw-FA5YJ6QsMef9YPo,4722
+roborock/devices/traits/b01/q7/map_content.py,sha256=O4UMnmX0-K-jxhOaknUZpWJSwxUuaTd2_D9_AP-elGY,4920
 roborock/devices/traits/v1/__init__.py,sha256=gzp5b2aJCugHF_9jqEZG7ycsv_xCMZa8ymhtm3Nqofg,16986
 roborock/devices/traits/v1/child_lock.py,sha256=NeaPqcEoBRXvEzKZGonkyINkwCBOK3xa4zSWvJW66kA,1161
-roborock/devices/traits/v1/clean_summary.py,sha256=2uDl3Tg6H9INf7HTEPPat_PBgodoWeX_ko5MJgWggn8,4625
+roborock/devices/traits/v1/clean_summary.py,sha256=gwAwJMuJewrdSxmYEaD5mywYrqfz62__NB7sL23u98A,4641
 roborock/devices/traits/v1/command.py,sha256=2yNyCF_EDPkLE_vK6IN5VB8ZVypwrrwKTByCdQzJs3c,1494
 roborock/devices/traits/v1/common.py,sha256=fNjoFr5pYXkdhehj61Hyd7ImuF7qdQ-TOlEuwqD1Rnk,6610
 roborock/devices/traits/v1/consumeable.py,sha256=8r028GfP7LVLSXth42Bbq65MvuuDGjKWruRmFc5yoyU,2536
@@ -87,7 +87,7 @@ roborock/devices/traits/v1/map_content.py,sha256=w_34H6ItiYm98QFOmEDCP0AvTBWAFVu
 roborock/devices/traits/v1/maps.py,sha256=JdOjJCeJ6iAH85pNHKHbVGlD-zOrha9h6XAh7IDeQr8,3468
 roborock/devices/traits/v1/network_info.py,sha256=CX9-ye2Zb_8lAWPGvegXWSOguxMY2K0xO-2OmWmE67o,2291
 roborock/devices/traits/v1/obstacle_photos.py,sha256=Aul1sOxJ6AxLWqI5AbeHHSzxfUPzQfQDCPIvZ3oXb_4,4179
-roborock/devices/traits/v1/rooms.py,sha256=PKNEvzL_Pk5pxGpiMC-XgGpgWVRjivMw_yv7vpGlz3s,6221
+roborock/devices/traits/v1/rooms.py,sha256=SEAs3sHZxDmiiSWc9Korm838zu8ub_04CsmJVlT4F48,6237
 roborock/devices/traits/v1/routines.py,sha256=BfktlpnyDjD2DB3zBDS5BnmjZPE38aHa-wjMontPnik,931
 roborock/devices/traits/v1/smart_wash_params.py,sha256=6K3XrF5SRS39BWaMjjtGJgKX3lZ24jPsb6Nia4a9GVM,634
 roborock/devices/traits/v1/status.py,sha256=HPEUnpCbOxoZ6O_Dz3C3mJpYiIiq9vs8zvrzc78oxAw,5078
@@ -96,27 +96,27 @@ roborock/devices/traits/v1/volume.py,sha256=etRIYE0ynZZLEo2ez7Dm7_JbijmElrdjpn59
 roborock/devices/traits/v1/wash_towel_mode.py,sha256=bSXtaJ0ObDlXsJYuCHWCN3J0GyHEibPsDvOqBCxQW3Q,2039
 roborock/devices/transport/__init__.py,sha256=6_vMJ7BFAX_I56-Y0MT3TKhOXT4Qv5q_eT5dZLaUNqU,288
 roborock/devices/transport/channel.py,sha256=W9WR2tZRQSxr6C4Lh0kzPqHpoo4qc6006KtoG6_vdOk,981
-roborock/devices/transport/local_channel.py,sha256=kU49v6v3wsT6MQeN4wN-XkTxr-zByAihKZVh6xADjog,11611
+roborock/devices/transport/local_channel.py,sha256=xnCzhIMa6V01Okaoa5KlUFw7k0colFd14itfwlYyxl0,11627
 roborock/devices/transport/mqtt_channel.py,sha256=dpL1mZIoI4Glk3hfUO9JweWFHG1tZWLrWbt9f4RbvhQ,4789
 roborock/map/__init__.py,sha256=L3WHujuxUHCTTPaOElkJsTN_FkYhw01drfR-W4blgFc,146
-roborock/map/b01_grid_layers.py,sha256=VluAmKEIBTsvzGB5pUrr8iYFiyEx5siyDwBKft1C2vA,12290
-roborock/map/b01_map_parser.py,sha256=tTeeWH4fA4Pv4DvqN7PBQs92DuWTaD2rvD44Mo_t3OY,4433
-roborock/map/b01_q10_map_parser.py,sha256=EQMx2ZNVjHKsmKr6vR8JS7o86IZu85dNg3bKi5S0ZYw,29985
+roborock/map/b01_grid_layers.py,sha256=b87MsGXslqLR_5H_4z4aj1wQqYgeTuULWqt4_txOF-M,12303
+roborock/map/b01_map_parser.py,sha256=y4Qlgiwre3bn5_UpL6R-ytjg8kQqwkbvhIYFOtpAM3s,14814
+roborock/map/b01_q10_map_parser.py,sha256=Pt-goedXV60hg-mwHOgOF0f4TQBQmQXe6otpWaa99ps,29996
 roborock/map/b01_q10_overlays.py,sha256=JmriUbT4-oe6NiE94VttMplFc1HHQrAGNQIiZHj5QKk,6640
 roborock/map/b01_q10_render.py,sha256=b7YUBr53WXxOJhXbfb5IVmgi82iGcC0lJ_j9Ef3kV7M,13502
 roborock/map/map_parser.py,sha256=EcJcz9yld_wu7d5QrmxR2BTfJ801F6SaEgJkbIIap4w,5111
 roborock/map/room_colors.py,sha256=5Q85oR_7xsUyzHYGOJPuzsZ6LQSCpJwfxfWql1v6T1E,2152
 roborock/map/proto/__init__.py,sha256=XcH_s-E67_hcQNwqSkdtY7DgYE0mRBBJwctzsf8zng4,60
-roborock/map/proto/b01_scmap.proto,sha256=ux1OnI_-LSDOlTujCCUeOJrTsVCvjLAUKfyddu-rH5U,1929
-roborock/map/proto/b01_scmap_pb2.py,sha256=KxHxnxSvEjIAZJY5QO0pH5rY7uYxKlup8hyt30jFAtw,3767
+roborock/map/proto/b01_scmap.proto,sha256=lQtOruroUfrDK9EJ99cnGTi7avEK3CQ1haLIopDrS_A,3725
+roborock/map/proto/b01_scmap_pb2.py,sha256=HI7xxxpvV0cFl80B7T7RN74C3cP8YNqfukL_FW324ss,7493
 roborock/mqtt/__init__.py,sha256=Lplt5aS3lCJW09KX34tf2r6NHU8penM-R07FI56Z5CE,415
 roborock/mqtt/health_manager.py,sha256=i_3vbslHMebVd0VNBWalPaEnZi8gcRI3IcKPt2wlQF8,2208
-roborock/mqtt/roborock_session.py,sha256=BBNvMAWXDRx5ih3HrwG8H5cOFqaAaoa_zvE2OuSJ65c,21011
+roborock/mqtt/roborock_session.py,sha256=ir7HXs4gtoineiwlc6ixyAueBTCSPtNU8zPGgY9hGOE,21027
 roborock/mqtt/session.py,sha256=eVW1o6PziXaRyNXviPgC_kIVuqhPSrloAWuP2RYj-uo,4096
 roborock/protocols/__init__.py,sha256=1ems3I1_KUQoMf2Hf6ZYDKFhu5Gnsc0PbfD-dkQJ7vA,82
-roborock/protocols/a01_protocol.py,sha256=LpFsrZ9epwuTNsPprYGL0KgQD37DfvXfFrNuc_x-ieU,2454
+roborock/protocols/a01_protocol.py,sha256=nyUAn39CXH0xLqcRcr7JiORt2zFNgxP4F4ClVc3dvB4,2501
 roborock/protocols/b01_q10_protocol.py,sha256=Ac3_VHJ2DAwBiXFMPYOHExEV0prxS9Ju0djiC8nKtiI,4935
-roborock/protocols/b01_q7_protocol.py,sha256=o8repRrxhxknzspsg1K27ds643rs87ilWXbj8RJtOCs,4619
+roborock/protocols/b01_q7_protocol.py,sha256=2dk6nbDOhb0O-Q_UPKeZHjzdazbS-MA3PIqpXvqRqoo,4657
 roborock/protocols/v1_protocol.py,sha256=ntFQoGn1IF7v_BwjiGow478SJHBSKr6jq6M2s01OdaI,12918
 roborock/testing/__init__.py,sha256=rji4a-JBIWC_I6SUTG9j4r2bGxfhYUoopdDAzYQ1tmA,5086
 roborock/testing/a01_simulator.py,sha256=M4R0ATgebIva6Jl0BPKfwdGqdZjmjGZHlozAVVteJ5I,10477
@@ -124,9 +124,9 @@ roborock/testing/b01_q10_simulator.py,sha256=7k2poUIDI0akTw0rEcCpTUZq0gjr8z3kfTk
 roborock/testing/channel.py,sha256=vjulT5MHBe8lAq6XITUqcxJVcCILWx7ZEcw5imTx0Tk,7243
 roborock/testing/cloud.py,sha256=L2L0KlZDYaMuoV19KUQUoq5EAUDeNQ1lJ8Ew5YaOgjo,11946
 roborock/testing/simulator.py,sha256=g8ZUWVSjgAzuRRxWOCeOq-7deodyEItwUpqEw9RzCmQ,4347
-roborock/testing/v1_simulator.py,sha256=TQ2PsRoP_4kJvVn-Tm532ByHuaCKltsVjvTa2Ju4PAo,14407
-python_roborock-7.4.2.dist-info/METADATA,sha256=2EEnCpez1BS4kd3YAaXGO1fxAZ4y6tBwQ54lzvnB4UI,5278
-python_roborock-7.4.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-python_roborock-7.4.2.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
-python_roborock-7.4.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-python_roborock-7.4.2.dist-info/RECORD,,
+roborock/testing/v1_simulator.py,sha256=_LX_vsBMcB2Uu2QDt8QnQymgtVtbnwD5Xa7tmhiPAnY,14439
+python_roborock-7.5.0.dist-info/METADATA,sha256=UJyDy8lpgf3x32vXVYE46C2rlW0PSY3cTtToPhv_Jyk,5278
+python_roborock-7.5.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_roborock-7.5.0.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
+python_roborock-7.5.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+python_roborock-7.5.0.dist-info/RECORD,,

roborock/broadcast_protocol.py

@@ -4,7 +4,7 @@ import json
 import logging
 from asyncio import BaseTransport, Lock
 
-from construct import (  # type: ignore
+from construct import (  # type: ignore[import-untyped]
     Bytes,
     Checksum,
     GreedyBytes,
@@ -63,7 +63,7 @@ class RoborockProtocol(asyncio.DatagramProtocol):
                     parsed_message = BroadcastMessage(duid=json_payload["duid"], ip=json_payload["ip"], version=version)
                     _LOGGER.debug(f"Received broadcast: {parsed_message}")
                     self.devices_found.append(parsed_message)
-        except Exception as e:
+        except Exception as e:  # noqa: BLE001
             _LOGGER.warning(f"Failed to decode message: {data!r}. Error: {e}")
 
     async def discover(self) -> list[BroadcastMessage]:

roborock/cli.py

@@ -22,6 +22,8 @@ roborock> status --device_id <device_id>
 ```
 """
 
+# ruff: noqa: BLE001
+
 import asyncio
 import datetime
 import functools
@@ -38,9 +40,9 @@ try:
     import click
     import click_shell
     import yaml
-    from pyshark import FileCapture  # type: ignore
-    from pyshark.capture.live_capture import LiveCapture, UnknownInterfaceException  # type: ignore
-    from pyshark.packet.packet import Packet  # type: ignore
+    from pyshark import FileCapture  # type: ignore[import-untyped]
+    from pyshark.capture.live_capture import LiveCapture, UnknownInterfaceException  # type: ignore[import-untyped]
+    from pyshark.packet.packet import Packet  # type: ignore[import-untyped]
 except ImportError as err:
     raise SystemExit(
         f"The 'roborock' command line tool requires extra dependencies that are not installed ({err.name}).\n"
@@ -307,7 +309,7 @@ class RoborockContext(Cache):
 @click.pass_context
 def cli(ctx, debug: int):
     logging_config: dict[str, Any] = {"level": logging.DEBUG if debug > 0 else logging.INFO}
-    logging.basicConfig(**logging_config)  # type: ignore
+    logging.basicConfig(**logging_config)  # type: ignore[call-overload]
     ctx.obj = RoborockContext()
 
 
@@ -988,9 +990,8 @@ async def parser(_, local_key, device_ip, file):
                                     local_key,
                                 )
                                 print(f"Received request: {f}")
-                            except BaseException as e:
+                            except Exception as e:
                                 print(e)
-                                pass
                         elif packet.ip.src == device_ip:
                             try:
                                 f, buffer["data"] = MessageParser.parse(
@@ -998,16 +999,15 @@ async def parser(_, local_key, device_ip, file):
                                     local_key,
                                 )
                                 print(f"Received response: {f}")
-                            except BaseException as e:
+                            except Exception as e:
                                 print(e)
-                                pass
 
     try:
         await capture.packets_from_tshark(on_package, close_tshark=not file_provided)
-    except UnknownInterfaceException:
+    except UnknownInterfaceException as err:
         raise RoborockException(
             "You need to run 'rvictl -s XXXXXXXX-XXXXXXXXXXXXXXXX' first, with an iPhone connected to usb port"
-        )
+        ) from err
 
 
 def _parse_diagnostic_file(diagnostic_path: Path) -> dict[str, dict[str, Any]]:
@@ -1319,7 +1319,7 @@ def update_docs(data_file: str, output_file: str):
         ]
         # Regular features are the remaining keys, sorted alphabetically
         # We filter out the special rows to avoid duplicating them.
-        sorted_features = sorted(list(all_features - set(special_rows)))
+        sorted_features = sorted(all_features - set(special_rows))
 
         header = ["Feature"] + sorted_products
 

roborock/data/b01_q7/b01_q7_code_mappings.py

@@ -302,7 +302,11 @@ class B01Fault(RoborockModeEnum):
     # charging.
     F_2101 = ("fault_2101", 2101)
     F_2102 = ("cleaning_complete", 2102)  # Cleaning completed. Returning to the dock.
-    F_2103 = ("fault_2103", 2103)
+    F_2103 = (
+        "cleaning_complete_docked",
+        2103,
+    )  # Task finished and robot docked. Follows 2102 once docking and any auto-empty complete; persists
+    # while docked-idle. Not an error (hw-confirmed on a Q7 M5+).
     F_2104 = ("fault_2104", 2104)
     F_2105 = ("fault_2105", 2105)
     F_2108 = ("fault_2108", 2108)

roborock/data/b01_q7/b01_q7_containers.py

@@ -137,11 +137,11 @@ class B01Props(RoborockBase):
     custom_type: int | None = None
     sound: int | None = None
     work_mode: WorkModeMapping | None = None
-    station_act: int | None = None
+    station_act: int | None = None  # dock activity; 3 while collecting dust, 0 idle. hw-confirmed (Q7 M5+)
     charge_state: int | None = None
     current_map_id: int | None = None
     map_num: int | None = None
-    dust_action: int | None = None
+    dust_action: int | None = None  # 1 while the dock is collecting dust; read-only (prop.set rejected, code 1)
     quiet_is_open: int | None = None
     quiet_begin_time: int | None = None
     quiet_end_time: int | None = None

roborock/data/code_mappings.py

@@ -33,7 +33,7 @@ class RoborockEnum(IntEnum):
             if warning not in completed_warnings:
                 completed_warnings.add(warning)
                 _LOGGER.warning(warning)
-            return cls.unknown  # type: ignore
+            return cls.unknown  # type: ignore[attr-defined]
         default_value = next(item for item in cls)
         warning = f"Missing {cls.__name__} code: {key} - defaulting to {default_value}"
         if warning not in completed_warnings:

roborock/data/containers.py

@@ -52,7 +52,7 @@ def _attr_repr(obj: Any) -> str:
             continue
         try:
             v = getattr(obj, k)
-        except (RuntimeError, Exception):
+        except Exception:  # noqa: BLE001
             continue
         if callable(v):
             continue
@@ -210,7 +210,7 @@ class Reference(RoborockBase):
     r: str | None = None
     a: str | None = None
     m: str | None = None
-    l: str | None = None
+    l: str | None = None  # noqa: E741
 
 
 @dataclass
@@ -379,9 +379,9 @@ class HomeDataSchedule(RoborockBase):
 class HomeData(RoborockBase):
     id: int
     name: str
-    products: list[HomeDataProduct] = field(default_factory=lambda: [])
-    devices: list[HomeDataDevice] = field(default_factory=lambda: [])
-    received_devices: list[HomeDataDevice] = field(default_factory=lambda: [])
+    products: list[HomeDataProduct] = field(default_factory=list)
+    devices: list[HomeDataDevice] = field(default_factory=list)
+    received_devices: list[HomeDataDevice] = field(default_factory=list)
     lon: Any | None = None
     lat: Any | None = None
     geo_name: Any | None = None

roborock/data/v1/v1_code_mappings.py

@@ -151,7 +151,7 @@ class RoborockDssCodes(RoborockEnum):
     def _missing_(cls: type[Self], key) -> Self:
         # If the calculated value is not provided, then it should be viewed as okay.
         # As the math will sometimes result in you getting numbers that don't matter.
-        return cls.okay  # type: ignore
+        return cls.okay  # type: ignore[attr-defined]
 
 
 class ClearWaterBoxStatus(RoborockDssCodes):

roborock/device_features.py

@@ -643,7 +643,7 @@ class DeviceFeatures(RoborockBase):
             elif (product_features := f.metadata.get("product_features")) is not None:
                 if product_nickname is not None:
                     available_features = PRODUCT_FEATURE_MAP.get(product_nickname, [])
-                    if any(feat in available_features for feat in product_features):  # type: ignore
+                    if any(feat in available_features for feat in product_features):
                         kwargs[f.name] = True
 
         # The app combines runtime shake-mop, model shake/spin, and roller-mop

roborock/devices/rpc/b01_q7_channel.py

@@ -84,7 +84,7 @@ async def _send_command(
             return
         try:
             response = response_matcher(response_message)
-        except Exception as ex:
+        except Exception as ex:  # noqa: BLE001
             future.set_exception(ex)
             return
         if response is not None:

roborock/devices/traits/__init__.py

@@ -24,5 +24,5 @@ __all__ = [
 ]
 
 
-class Trait(ABC):
+class Trait(ABC):  # noqa: B024
     """Base class for all traits."""

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

@@ -6,6 +6,10 @@ This intentionally mirrors the v1 `MapContentTrait` contract:
 - fields `image_content`, `map_data`, and `raw_api_response` are then readable
 
 For B01/Q7 devices, the underlying raw map payload is retrieved via `MapTrait`.
+
+Q7 devices additionally stream map frames unprompted while cleaning; those arrive
+through `update_from_push()`, which keeps the same cached fields current and
+notifies registered update listeners.
 """
 
 import asyncio

roborock/devices/traits/v1/clean_summary.py

@@ -56,7 +56,7 @@ class CleanRecordConverter(common.V1TraitDataConverter):
                             rec.square_meter_area or 0
                         )
                     return final_record
-                except Exception:
+                except Exception:  # noqa: BLE001
                     # Return final record when an exception occurred
                     return final_record
             # There are still a few unknown variables in this.

roborock/devices/traits/v1/rooms.py

@@ -144,6 +144,6 @@ class RoomsTrait(Rooms, common.V1TraitMixin):
                 rooms_by_id.update({room.iot_id: room for room in shared_rooms})
                 return list(rooms_by_id.values())
             return await self._web_api.get_rooms()
-        except Exception:
+        except Exception:  # noqa: BLE001
             _LOGGER.debug("Failed to fetch rooms from web API", exc_info=True)
             return []

roborock/devices/transport/local_channel.py

@@ -158,7 +158,7 @@ class LocalChannel(Channel):
                     await self._ping()
             except asyncio.CancelledError:
                 break
-            except Exception:
+            except Exception:  # noqa: BLE001
                 self._logger.debug("Keep-alive ping failed", exc_info=True)
                 # Retry next interval
 

roborock/map/b01_grid_layers.py

@@ -198,7 +198,7 @@ def solve_calibration(
             min_sx, max_sx, min_sy, max_sy = min(sx), max(sx), min(sy), max(sy)
             if (max_sx - min_sx) >= w or (max_sy - min_sy) >= h:
                 continue  # path wider/taller than the map at this resolution
-            pts = list(zip(sx, sy))
+            pts = list(zip(sx, sy, strict=True))
             # Slide so every point stays in-bounds: px = px_f + ox in [0, w), py = oy - py_f in [0, h).
             for ox in range(ceil(-min_sx), ceil(w - max_sx)):
                 for oy in range(ceil(max_sy), ceil(h + min_sy)):

roborock/map/b01_map_parser.py

@@ -5,20 +5,36 @@ The inner SCMap blob is parsed with protobuf messages generated from
 """
 
 import io
+import math
+from collections import deque
 from dataclasses import dataclass
 
 from google.protobuf.message import DecodeError
 from PIL import Image
+from vacuum_map_parser_base.config.color import ColorsPalette, SupportedColor
+from vacuum_map_parser_base.config.drawable import Drawable
 from vacuum_map_parser_base.config.image_config import ImageConfig
-from vacuum_map_parser_base.map_data import ImageData, MapData
+from vacuum_map_parser_base.map_data import Area, ImageData, MapData, Path, Point, Room
 
 from roborock.exceptions import RoborockException
 from roborock.map.proto.b01_scmap_pb2 import RobotMap  # type: ignore[attr-defined]
 
-from .map_parser import ParsedMapData
+from .map_parser import MapParserConfig, ParsedMapData, _create_image_generator
+from .room_colors import adjacency_aware_room_colors
 
 _MAP_FILE_FORMAT = "PNG"
 
+_FLOOR = 127
+_WALL = 128
+
+_B01_DRAWABLES = [
+    Drawable.CHARGER,
+    Drawable.NO_GO_AREAS,
+    Drawable.PATH,
+    Drawable.ROOM_NAMES,
+    Drawable.VACUUM_POSITION,
+]
+
 
 @dataclass
 class B01MapParserConfig:
@@ -40,7 +56,11 @@ class B01MapParser:
         size_x, size_y, grid = _extract_grid(parsed)
         room_names = _extract_room_names(parsed)
 
-        image = _render_occupancy_image(grid, size_x=size_x, size_y=size_y, scale=self._config.map_scale)
+        room_pixels = _assign_room_pixels(parsed, grid, size_x=size_x, size_y=size_y)
+        carpet_pixels = _carpet_pixel_indices(parsed, grid, size_x=size_x, size_y=size_y)
+        image = _render_occupancy_image(
+            grid, room_pixels, carpet_pixels, size_x=size_x, size_y=size_y, scale=self._config.map_scale
+        )
 
         map_data = MapData()
         map_data.image = ImageData(
@@ -51,11 +71,30 @@ class B01MapParser:
             width=size_x,
             image_config=ImageConfig(scale=self._config.map_scale),
             data=image,
-            img_transformation=lambda p: p,
+            # Overlay points are stored in the rendered image's top-down pixel
+            # space. ImageDimensions applies V1's bottom-up flip before drawing,
+            # so this adapter cancels it (same approach as the Q10 renderer).
+            img_transformation=lambda p: Point(p.x, size_y - p.y - 1, p.a),
         )
         if room_names:
             map_data.additional_parameters["room_names"] = room_names
 
+        projector = _WorldToPixel(parsed)
+        has_drawables = _place_poses(map_data, parsed, projector)
+        map_data.rooms = _extract_rooms(parsed, projector, room_names)
+        has_drawables = has_drawables or bool(map_data.rooms)
+        if carpet_pixels:
+            # Same contract as the Q10 parser: flat top-down grid indices.
+            map_data.carpet_map = {(size_y - 1 - index // size_x) * size_x + index % size_x for index in carpet_pixels}
+
+        if has_drawables:
+            generator = _create_image_generator(
+                MapParserConfig(map_scale=self._config.map_scale),
+                drawables=_B01_DRAWABLES,
+            )
+            generator.draw_map(map_data)
+            image = map_data.image.data
+
         image_bytes = io.BytesIO()
         image.save(image_bytes, format=_MAP_FILE_FORMAT)
 
@@ -101,6 +140,100 @@ def _extract_grid(parsed: RobotMap) -> tuple[int, int, bytes]:
     return size_x, size_y, map_data[:expected_len]
 
 
+class _WorldToPixel:
+    """Project SCMap world coordinates (meters) into top-down image pixels."""
+
+    def __init__(self, parsed: RobotMap) -> None:
+        head = parsed.mapHead
+        self._min_x = head.minX
+        self._min_y = head.minY
+        self._max_x = head.maxX
+        self._max_y = head.maxY
+        self._resolution = head.resolution or 0.05
+        self._size_y = head.sizeY
+
+    def in_bounds(self, x: float, y: float) -> bool:
+        """Whether a world point lies inside the map (rejects placeholder poses)."""
+        return self._min_x <= x <= self._max_x and self._min_y <= y <= self._max_y
+
+    def to_pixel(self, x: float, y: float) -> tuple[float, float]:
+        """World meters to top-down image pixel coordinates."""
+        px = (x - self._min_x) / self._resolution
+        py = self._size_y - 1 - (y - self._min_y) / self._resolution
+        return px, py
+
+
+def _place_poses(map_data: MapData, parsed: RobotMap, projector: _WorldToPixel) -> bool:
+    """Populate charger, robot position and path from the decoded SCMap."""
+    has_drawables = False
+
+    if parsed.HasField("chargeStation") and projector.in_bounds(parsed.chargeStation.x, parsed.chargeStation.y):
+        px, py = projector.to_pixel(parsed.chargeStation.x, parsed.chargeStation.y)
+        map_data.charger = Point(px, py, math.degrees(parsed.chargeStation.phi))
+        has_drawables = True
+
+    if parsed.HasField("currentPose") and projector.in_bounds(parsed.currentPose.x, parsed.currentPose.y):
+        px, py = projector.to_pixel(parsed.currentPose.x, parsed.currentPose.y)
+        map_data.vacuum_position = Point(px, py, math.degrees(parsed.currentPose.phi))
+        has_drawables = True
+    elif map_data.charger is not None:
+        # A saved map carries no live pose; show the robot at its dock.
+        map_data.vacuum_position = Point(map_data.charger.x, map_data.charger.y, map_data.charger.a)
+
+    areas = [
+        Area(*(coord for point in area.points for coord in projector.to_pixel(point.x, point.y)))
+        for area in parsed.areaInfo
+        if len(area.points) == 4
+    ]
+    if areas:
+        # areaInfo type semantics are not yet mapped per zone kind; render all
+        # restricted areas through the no-go drawable for now.
+        map_data.no_go_areas = areas
+        has_drawables = True
+
+    if parsed.HasField("historyPose"):
+        pixels = [
+            Point(*projector.to_pixel(point.x, point.y))
+            for point in parsed.historyPose.points
+            if projector.in_bounds(point.x, point.y)
+        ]
+        if pixels:
+            map_data.path = Path(len(pixels), 1, 0, [pixels])
+            has_drawables = True
+
+    return has_drawables
+
+
+def _extract_rooms(parsed: RobotMap, projector: _WorldToPixel, room_names: dict[int, str]) -> dict[int, Room] | None:
+    """Build room bounding boxes (image-pixel space) from room outlines."""
+    rooms: dict[int, Room] = {}
+    label_positions = {
+        room.roomId: projector.to_pixel(room.roomNamePost.x, room.roomNamePost.y)
+        for room in parsed.roomDataInfo
+        if room.HasField("roomNamePost")
+    }
+    size_y = parsed.mapHead.sizeY
+    for outline in parsed.roomOutline:
+        if not outline.points:
+            continue
+        room_id = outline.roomId
+        # Outline points are top-down after the same vertical flip as the raster.
+        xs = [point.x for point in outline.points]
+        ys = [size_y - 1 - point.y for point in outline.points]
+        pos = label_positions.get(room_id)
+        rooms[room_id] = Room(
+            min(xs),
+            min(ys),
+            max(xs),
+            max(ys),
+            room_id,
+            room_names.get(room_id),
+            pos[0] if pos else None,
+            pos[1] if pos else None,
+        )
+    return rooms or None
+
+
 def _extract_room_names(parsed: RobotMap) -> dict[int, str]:
     # Expose room id/name mapping without inventing room geometry/polygons.
     room_names: dict[int, str] = {}
@@ -111,21 +244,138 @@ def _extract_room_names(parsed: RobotMap) -> dict[int, str]:
     return room_names
 
 
-def _render_occupancy_image(grid: bytes, *, size_x: int, size_y: int, scale: int) -> Image.Image:
-    """Render the B01 occupancy grid into a simple image."""
+def _assign_room_pixels(parsed: RobotMap, grid: bytes, *, size_x: int, size_y: int) -> bytearray:
+    """Assign a room id to each floor pixel by flood-filling from room labels.
+
+    The grid itself carries no room ids; room geometry arrives as boundary
+    pixel chains (``roomOutline``). Each room is filled from its label
+    position, bounded by walls and by any room's outline pixels, all in the
+    raw (bottom-up) grid space.
+    """
+    assignment = bytearray(len(grid))
+    outlines = {outline.roomId: outline for outline in parsed.roomOutline if outline.points}
+    if not outlines:
+        return assignment
+
+    barrier = {
+        point.y * size_x + point.x
+        for outline in outlines.values()
+        for point in outline.points
+        if point.x < size_x and point.y < size_y
+    }
+    floor_count = grid.count(_FLOOR)
+    # ponytail: leak guard — a gapped outline would flood the whole floor, so a
+    # fill larger than half of it is discarded instead of tracing outline gaps.
+    max_fill = floor_count // 2
+
+    head = parsed.mapHead
+    label_positions = {
+        room.roomId: (
+            int((room.roomNamePost.x - head.minX) / head.resolution),
+            int((room.roomNamePost.y - head.minY) / head.resolution),
+        )
+        for room in parsed.roomDataInfo
+        if room.HasField("roomNamePost")
+    }
+
+    for room_id, outline in outlines.items():
+        seed = label_positions.get(room_id)
+        if seed is None:
+            continue
+        col, row = seed
+        start = row * size_x + col
+        if not (0 <= col < size_x and 0 <= row < size_y) or grid[start] != _FLOOR:
+            continue
+        filled: list[int] = []
+        queue = deque([start])
+        seen = {start}
+        while queue and len(filled) <= max_fill:
+            index = queue.popleft()
+            filled.append(index)
+            for neighbor in (index - 1, index + 1, index - size_x, index + size_x):
+                if (
+                    0 <= neighbor < len(grid)
+                    and neighbor not in seen
+                    and grid[neighbor] == _FLOOR
+                    and assignment[neighbor] == 0
+                    and neighbor not in barrier
+                    # Row-wrap guard for the horizontal neighbors.
+                    and abs(neighbor % size_x - index % size_x) <= 1
+                ):
+                    seen.add(neighbor)
+                    queue.append(neighbor)
+        if len(filled) > max_fill:
+            continue
+        for index in filled:
+            assignment[index] = room_id
+        # Color the room's own boundary ring too where it sits on floor.
+        for point in outline.points:
+            index = point.y * size_x + point.x
+            if index < len(grid) and grid[index] == _FLOOR and assignment[index] == 0:
+                assignment[index] = room_id
+
+    return assignment
+
+
+def _carpet_pixel_indices(parsed: RobotMap, grid: bytes, *, size_x: int, size_y: int) -> set[int]:
+    """Raw-grid indices of floor pixels covered by enabled carpets."""
+    head = parsed.mapHead
+    resolution = head.resolution or 0.05
+    indices: set[int] = set()
+    for carpet in parsed.carpetInfo:
+        if not carpet.points or (carpet.HasField("enabled") and not carpet.enabled):
+            continue
+        cols = [int((point.x - head.minX) / resolution) for point in carpet.points]
+        rows = [int((point.y - head.minY) / resolution) for point in carpet.points]
+        for row in range(max(min(rows), 0), min(max(rows), size_y - 1) + 1):
+            for col in range(max(min(cols), 0), min(max(cols), size_x - 1) + 1):
+                index = row * size_x + col
+                if grid[index] == _FLOOR:
+                    indices.add(index)
+    return indices
+
+
+def _render_occupancy_image(
+    grid: bytes, room_pixels: bytearray, carpet_pixels: set[int], *, size_x: int, size_y: int, scale: int
+) -> Image.Image:
+    """Render the B01 occupancy grid with per-room colors."""
+
+    colors = ColorsPalette()
+    room_colors = {
+        room_id: tuple(color[:3]) + (255,)
+        for room_id, color in adjacency_aware_room_colors(
+            room_pixels, size_x, colors, lambda value: value or None
+        ).items()
+    }
 
     # The observed occupancy grid contains only:
     # - 0: outside/unknown
-    # - 127: wall/obstacle
-    # - 128: floor/free
-    table = bytearray(range(256))
-    table[0] = 0
-    table[127] = 180
-    table[128] = 255
-
-    mapped = grid.translate(bytes(table))
-    img = Image.frombytes("L", (size_x, size_y), mapped)
-    img = img.transpose(Image.Transpose.FLIP_TOP_BOTTOM).convert("RGB")
+    # - 127: floor/free
+    # - 128: wall/obstacle
+    # Same V1 palette roles as the Q10 renderer: transparent outside, grey
+    # walls/obstacles, MAP_INSIDE for floor not assigned to any room.
+    outside = (0, 0, 0, 0)
+    floor = tuple(colors.get_color(SupportedColor.MAP_INSIDE)[:3]) + (255,)
+    base_colors = {
+        0: outside,
+        _FLOOR: floor,
+        _WALL: tuple(colors.get_color(SupportedColor.GREY_WALL)[:3]) + (255,),
+    }
+
+    rgba = bytearray()
+    for index, value in enumerate(grid):
+        if value == _FLOOR and (room_id := room_pixels[index]):
+            color = room_colors.get(room_id, floor)
+        else:
+            color = base_colors.get(value, floor)
+        if index in carpet_pixels and (index // size_x + index % size_x) % 2 == 0:
+            # Checkerboard stipple, like the V1 carpet texture.
+            color = tuple(min(channel + 60, 255) for channel in color[:3]) + (255,)
+        rgba.extend(color)
+
+    # RGBA so the shared V1 ImageGenerator can alpha-composite overlay glyphs.
+    img = Image.frombytes("RGBA", (size_x, size_y), bytes(rgba))
+    img = img.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
 
     if scale > 1:
         img = img.resize((size_x * scale, size_y * scale), resample=Image.Resampling.NEAREST)

roborock/map/b01_q10_map_parser.py

@@ -341,7 +341,7 @@ def _drop_stray_leading_point(points: list[Q10Point]) -> list[Q10Point]:
     """
     if len(points) < 3:
         return points
-    steps = [math.hypot(b.x - a.x, b.y - a.y) for a, b in zip(points, points[1:])]
+    steps = [math.hypot(b.x - a.x, b.y - a.y) for a, b in zip(points, points[1:], strict=False)]
     median_rest = statistics.median(steps[1:])
     if median_rest > 0 and steps[0] > _STRAY_POINT_STEP_RATIO * median_rest:
         return points[1:]
@@ -425,7 +425,7 @@ def _infer_layout(decoded: bytes, width: int) -> tuple[int, bytes, bytes]:
     up with the marker. Used as a fallback when the header carries no usable
     height.
     """
-    for room_count in range(0, _MAX_ROOMS + 1):
+    for room_count in range(_MAX_ROOMS + 1):
         room_data_length = 2 + room_count * _ROOM_RECORD_LENGTH
         area = len(decoded) - room_data_length
         if area <= 0 or area % width:

roborock/map/proto/b01_scmap.proto

@@ -1,6 +1,6 @@
 // Checked-in B01/Q7 SCMap schema for the generated runtime protobuf module.
 // Regenerate the checked-in Python module after edits with:
-//   python -m grpc_tools.protoc -I./roborock/map/proto --python_out=./roborock/map/proto roborock/map/proto/b01_scmap.proto
+//   python -m grpc_tools.protoc -I. --python_out=. roborock/map/proto/b01_scmap.proto
 // The generated file `b01_scmap_pb2.py` is checked in for runtime use and should
 // not be edited by hand.
 syntax = "proto2";
@@ -47,6 +47,79 @@ message MapDataInfo {
   optional bytes mapData = 1;
 }
 
+message MapInfo {
+  optional uint32 mapId = 1;
+  optional string mapName = 2;
+}
+
+message DevicePoseDataInfo {
+  optional uint32 update = 1;
+  optional float x = 2;
+  optional float y = 3;
+}
+
+message DeviceHistoryPoseInfo {
+  optional uint32 poseId = 1;
+  repeated DevicePoseDataInfo points = 2;
+}
+
+message DevicePoseInfo {
+  optional float x = 1;
+  optional float y = 2;
+  optional float phi = 3;
+}
+
+message DeviceCurrentPoseInfo {
+  optional uint32 poseId = 1;
+  optional uint32 update = 2;
+  optional float x = 3;
+  optional float y = 4;
+  optional float phi = 5;
+}
+
+message DeviceAreaDataInfo {
+  optional uint32 status = 1;
+  optional uint32 type = 2;
+  optional uint32 areaIndex = 3;
+  repeated DevicePointInfo points = 4;
+}
+
+message RoomMatrixInfo {
+  optional bytes matrix = 1;
+}
+
+message RoomOutlinePointInfo {
+  optional uint32 x = 1;
+  optional uint32 y = 2;
+  optional uint32 value = 3;
+}
+
+message RoomBorderPointInfo {
+  optional uint32 x = 1;
+  optional uint32 y = 2;
+}
+
+message RoomBorderInfo {
+  repeated RoomBorderPointInfo points = 1;
+  repeated uint32 roomIds = 2;
+}
+
+message RoomOutlineInfo {
+  optional uint32 roomId = 1;
+  repeated RoomOutlinePointInfo points = 2;
+  repeated RoomBorderInfo borders = 3;
+}
+
+message CarpetDataInfo {
+  optional uint32 carpetId = 1;
+  optional uint32 type = 2;
+  optional uint32 unknown3 = 3;
+  repeated DevicePointInfo points = 4;
+  optional uint32 enabled = 6;
+  optional uint32 unknown7 = 7;
+  optional uint32 unknown8 = 8;
+}
+
 message RoomDataInfo {
   optional uint32 roomId = 1;
   optional string roomName = 2;
@@ -66,5 +139,13 @@ message RobotMap {
   optional MapExtInfo mapExtInfo = 2;
   optional MapHeadInfo mapHead = 3;
   optional MapDataInfo mapData = 4;
+  repeated MapInfo mapInfo = 5;
+  optional DeviceHistoryPoseInfo historyPose = 6;
+  optional DevicePoseInfo chargeStation = 7;
+  optional DeviceCurrentPoseInfo currentPose = 8;
+  repeated DeviceAreaDataInfo areaInfo = 9;
   repeated RoomDataInfo roomDataInfo = 12;
+  optional RoomMatrixInfo roomMatrix = 13;
+  repeated RoomOutlineInfo roomOutline = 14;
+  repeated CarpetDataInfo carpetInfo = 20;
 }

roborock/map/proto/b01_scmap_pb2.py

@@ -24,7 +24,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"roborock/map/proto/b01_scmap.proto\x12\tb01.scmap\"\'\n\x0f\x44\x65vicePointInfo\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"]\n\x0fMapBoundaryInfo\x12\x0e\n\x06mapMd5\x18\x01 \x01(\t\x12\r\n\x05vMinX\x18\x02 \x01(\r\x12\r\n\x05vMaxX\x18\x03 \x01(\r\x12\r\n\x05vMinY\x18\x04 \x01(\r\x12\r\n\x05vMaxY\x18\x05 \x01(\r\"\xd9\x01\n\nMapExtInfo\x12\x15\n\rtaskBeginDate\x18\x01 \x01(\r\x12\x15\n\rmapUploadDate\x18\x02 \x01(\r\x12\x10\n\x08mapValid\x18\x03 \x01(\r\x12\x0e\n\x06radian\x18\x04 \x01(\r\x12\r\n\x05\x66orce\x18\x05 \x01(\r\x12\x11\n\tcleanPath\x18\x06 \x01(\r\x12/\n\x0b\x62oudaryInfo\x18\x07 \x01(\x0b\x32\x1a.b01.scmap.MapBoundaryInfo\x12\x12\n\nmapVersion\x18\x08 \x01(\r\x12\x14\n\x0cmapValueType\x18\t \x01(\r\"\x8a\x01\n\x0bMapHeadInfo\x12\x11\n\tmapHeadId\x18\x01 \x01(\r\x12\r\n\x05sizeX\x18\x02 \x01(\r\x12\r\n\x05sizeY\x18\x03 \x01(\r\x12\x0c\n\x04minX\x18\x04 \x01(\x02\x12\x0c\n\x04minY\x18\x05 \x01(\x02\x12\x0c\n\x04maxX\x18\x06 \x01(\x02\x12\x0c\n\x04maxY\x18\x07 \x01(\x02\x12\x12\n\nresolution\x18\x08 \x01(\x02\"\x1e\n\x0bMapDataInfo\x12\x0f\n\x07mapData\x18\x01 \x01(\x0c\"\x87\x02\n\x0cRoomDataInfo\x12\x0e\n\x06roomId\x18\x01 \x01(\r\x12\x10\n\x08roomName\x18\x02 \x01(\t\x12\x12\n\nroomTypeId\x18\x03 \x01(\r\x12\x12\n\nmeterialId\x18\x04 \x01(\r\x12\x12\n\ncleanState\x18\x05 \x01(\r\x12\x11\n\troomClean\x18\x06 \x01(\r\x12\x16\n\x0eroomCleanIndex\x18\x07 \x01(\r\x12\x30\n\x0croomNamePost\x18\x08 \x01(\x0b\x32\x1a.b01.scmap.DevicePointInfo\x12\x0f\n\x07\x63olorId\x18\n \x01(\r\x12\x17\n\x0f\x66loor_direction\x18\x0b \x01(\r\x12\x12\n\nglobal_seq\x18\x0c \x01(\r\"\xc7\x01\n\x08RobotMap\x12\x0f\n\x07mapType\x18\x01 \x01(\r\x12)\n\nmapExtInfo\x18\x02 \x01(\x0b\x32\x15.b01.scmap.MapExtInfo\x12\'\n\x07mapHead\x18\x03 \x01(\x0b\x32\x16.b01.scmap.MapHeadInfo\x12\'\n\x07mapData\x18\x04 \x01(\x0b\x32\x16.b01.scmap.MapDataInfo\x12-\n\x0croomDataInfo\x18\x0c \x03(\x0b\x32\x17.b01.scmap.RoomDataInfo')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"roborock/map/proto/b01_scmap.proto\x12\tb01.scmap\"\'\n\x0f\x44\x65vicePointInfo\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"]\n\x0fMapBoundaryInfo\x12\x0e\n\x06mapMd5\x18\x01 \x01(\t\x12\r\n\x05vMinX\x18\x02 \x01(\r\x12\r\n\x05vMaxX\x18\x03 \x01(\r\x12\r\n\x05vMinY\x18\x04 \x01(\r\x12\r\n\x05vMaxY\x18\x05 \x01(\r\"\xd9\x01\n\nMapExtInfo\x12\x15\n\rtaskBeginDate\x18\x01 \x01(\r\x12\x15\n\rmapUploadDate\x18\x02 \x01(\r\x12\x10\n\x08mapValid\x18\x03 \x01(\r\x12\x0e\n\x06radian\x18\x04 \x01(\r\x12\r\n\x05\x66orce\x18\x05 \x01(\r\x12\x11\n\tcleanPath\x18\x06 \x01(\r\x12/\n\x0b\x62oudaryInfo\x18\x07 \x01(\x0b\x32\x1a.b01.scmap.MapBoundaryInfo\x12\x12\n\nmapVersion\x18\x08 \x01(\r\x12\x14\n\x0cmapValueType\x18\t \x01(\r\"\x8a\x01\n\x0bMapHeadInfo\x12\x11\n\tmapHeadId\x18\x01 \x01(\r\x12\r\n\x05sizeX\x18\x02 \x01(\r\x12\r\n\x05sizeY\x18\x03 \x01(\r\x12\x0c\n\x04minX\x18\x04 \x01(\x02\x12\x0c\n\x04minY\x18\x05 \x01(\x02\x12\x0c\n\x04maxX\x18\x06 \x01(\x02\x12\x0c\n\x04maxY\x18\x07 \x01(\x02\x12\x12\n\nresolution\x18\x08 \x01(\x02\"\x1e\n\x0bMapDataInfo\x12\x0f\n\x07mapData\x18\x01 \x01(\x0c\")\n\x07MapInfo\x12\r\n\x05mapId\x18\x01 \x01(\r\x12\x0f\n\x07mapName\x18\x02 \x01(\t\":\n\x12\x44\x65vicePoseDataInfo\x12\x0e\n\x06update\x18\x01 \x01(\r\x12\t\n\x01x\x18\x02 \x01(\x02\x12\t\n\x01y\x18\x03 \x01(\x02\"V\n\x15\x44\x65viceHistoryPoseInfo\x12\x0e\n\x06poseId\x18\x01 \x01(\r\x12-\n\x06points\x18\x02 \x03(\x0b\x32\x1d.b01.scmap.DevicePoseDataInfo\"3\n\x0e\x44\x65vicePoseInfo\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\x0b\n\x03phi\x18\x03 \x01(\x02\"Z\n\x15\x44\x65viceCurrentPoseInfo\x12\x0e\n\x06poseId\x18\x01 \x01(\r\x12\x0e\n\x06update\x18\x02 \x01(\r\x12\t\n\x01x\x18\x03 \x01(\x02\x12\t\n\x01y\x18\x04 \x01(\x02\x12\x0b\n\x03phi\x18\x05 \x01(\x02\"q\n\x12\x44\x65viceAreaDataInfo\x12\x0e\n\x06status\x18\x01 \x01(\r\x12\x0c\n\x04type\x18\x02 \x01(\r\x12\x11\n\tareaIndex\x18\x03 \x01(\r\x12*\n\x06points\x18\x04 \x03(\x0b\x32\x1a.b01.scmap.DevicePointInfo\" \n\x0eRoomMatrixInfo\x12\x0e\n\x06matrix\x18\x01 \x01(\x0c\";\n\x14RoomOutlinePointInfo\x12\t\n\x01x\x18\x01 \x01(\r\x12\t\n\x01y\x18\x02 \x01(\r\x12\r\n\x05value\x18\x03 \x01(\r\"+\n\x13RoomBorderPointInfo\x12\t\n\x01x\x18\x01 \x01(\r\x12\t\n\x01y\x18\x02 \x01(\r\"Q\n\x0eRoomBorderInfo\x12.\n\x06points\x18\x01 \x03(\x0b\x32\x1e.b01.scmap.RoomBorderPointInfo\x12\x0f\n\x07roomIds\x18\x02 \x03(\r\"~\n\x0fRoomOutlineInfo\x12\x0e\n\x06roomId\x18\x01 \x01(\r\x12/\n\x06points\x18\x02 \x03(\x0b\x32\x1f.b01.scmap.RoomOutlinePointInfo\x12*\n\x07\x62orders\x18\x03 \x03(\x0b\x32\x19.b01.scmap.RoomBorderInfo\"\xa3\x01\n\x0e\x43\x61rpetDataInfo\x12\x10\n\x08\x63\x61rpetId\x18\x01 \x01(\r\x12\x0c\n\x04type\x18\x02 \x01(\r\x12\x10\n\x08unknown3\x18\x03 \x01(\r\x12*\n\x06points\x18\x04 \x03(\x0b\x32\x1a.b01.scmap.DevicePointInfo\x12\x0f\n\x07\x65nabled\x18\x06 \x01(\r\x12\x10\n\x08unknown7\x18\x07 \x01(\r\x12\x10\n\x08unknown8\x18\x08 \x01(\r\"\x87\x02\n\x0cRoomDataInfo\x12\x0e\n\x06roomId\x18\x01 \x01(\r\x12\x10\n\x08roomName\x18\x02 \x01(\t\x12\x12\n\nroomTypeId\x18\x03 \x01(\r\x12\x12\n\nmeterialId\x18\x04 \x01(\r\x12\x12\n\ncleanState\x18\x05 \x01(\r\x12\x11\n\troomClean\x18\x06 \x01(\r\x12\x16\n\x0eroomCleanIndex\x18\x07 \x01(\r\x12\x30\n\x0croomNamePost\x18\x08 \x01(\x0b\x32\x1a.b01.scmap.DevicePointInfo\x12\x0f\n\x07\x63olorId\x18\n \x01(\r\x12\x17\n\x0f\x66loor_direction\x18\x0b \x01(\r\x12\x12\n\nglobal_seq\x18\x0c \x01(\r\"\xcc\x04\n\x08RobotMap\x12\x0f\n\x07mapType\x18\x01 \x01(\r\x12)\n\nmapExtInfo\x18\x02 \x01(\x0b\x32\x15.b01.scmap.MapExtInfo\x12\'\n\x07mapHead\x18\x03 \x01(\x0b\x32\x16.b01.scmap.MapHeadInfo\x12\'\n\x07mapData\x18\x04 \x01(\x0b\x32\x16.b01.scmap.MapDataInfo\x12#\n\x07mapInfo\x18\x05 \x03(\x0b\x32\x12.b01.scmap.MapInfo\x12\x35\n\x0bhistoryPose\x18\x06 \x01(\x0b\x32 .b01.scmap.DeviceHistoryPoseInfo\x12\x30\n\rchargeStation\x18\x07 \x01(\x0b\x32\x19.b01.scmap.DevicePoseInfo\x12\x35\n\x0b\x63urrentPose\x18\x08 \x01(\x0b\x32 .b01.scmap.DeviceCurrentPoseInfo\x12/\n\x08\x61reaInfo\x18\t \x03(\x0b\x32\x1d.b01.scmap.DeviceAreaDataInfo\x12-\n\x0croomDataInfo\x18\x0c \x03(\x0b\x32\x17.b01.scmap.RoomDataInfo\x12-\n\nroomMatrix\x18\r \x01(\x0b\x32\x19.b01.scmap.RoomMatrixInfo\x12/\n\x0broomOutline\x18\x0e \x03(\x0b\x32\x1a.b01.scmap.RoomOutlineInfo\x12-\n\ncarpetInfo\x18\x14 \x03(\x0b\x32\x19.b01.scmap.CarpetDataInfo')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -41,8 +41,32 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_MAPHEADINFO']._serialized_end=544
   _globals['_MAPDATAINFO']._serialized_start=546
   _globals['_MAPDATAINFO']._serialized_end=576
-  _globals['_ROOMDATAINFO']._serialized_start=579
-  _globals['_ROOMDATAINFO']._serialized_end=842
-  _globals['_ROBOTMAP']._serialized_start=845
-  _globals['_ROBOTMAP']._serialized_end=1044
+  _globals['_MAPINFO']._serialized_start=578
+  _globals['_MAPINFO']._serialized_end=619
+  _globals['_DEVICEPOSEDATAINFO']._serialized_start=621
+  _globals['_DEVICEPOSEDATAINFO']._serialized_end=679
+  _globals['_DEVICEHISTORYPOSEINFO']._serialized_start=681
+  _globals['_DEVICEHISTORYPOSEINFO']._serialized_end=767
+  _globals['_DEVICEPOSEINFO']._serialized_start=769
+  _globals['_DEVICEPOSEINFO']._serialized_end=820
+  _globals['_DEVICECURRENTPOSEINFO']._serialized_start=822
+  _globals['_DEVICECURRENTPOSEINFO']._serialized_end=912
+  _globals['_DEVICEAREADATAINFO']._serialized_start=914
+  _globals['_DEVICEAREADATAINFO']._serialized_end=1027
+  _globals['_ROOMMATRIXINFO']._serialized_start=1029
+  _globals['_ROOMMATRIXINFO']._serialized_end=1061
+  _globals['_ROOMOUTLINEPOINTINFO']._serialized_start=1063
+  _globals['_ROOMOUTLINEPOINTINFO']._serialized_end=1122
+  _globals['_ROOMBORDERPOINTINFO']._serialized_start=1124
+  _globals['_ROOMBORDERPOINTINFO']._serialized_end=1167
+  _globals['_ROOMBORDERINFO']._serialized_start=1169
+  _globals['_ROOMBORDERINFO']._serialized_end=1250
+  _globals['_ROOMOUTLINEINFO']._serialized_start=1252
+  _globals['_ROOMOUTLINEINFO']._serialized_end=1378
+  _globals['_CARPETDATAINFO']._serialized_start=1381
+  _globals['_CARPETDATAINFO']._serialized_end=1544
+  _globals['_ROOMDATAINFO']._serialized_start=1547
+  _globals['_ROOMDATAINFO']._serialized_end=1810
+  _globals['_ROBOTMAP']._serialized_start=1813
+  _globals['_ROBOTMAP']._serialized_end=2401
 # @@protoc_insertion_point(module_scope)

roborock/mqtt/roborock_session.py

@@ -165,7 +165,7 @@ class RoborockMqttSession(MqttSession):
                 await self._connection_task
             except asyncio.CancelledError:
                 _LOGGER.debug("MQTT connection task cancelled")
-            except Exception:
+            except Exception:  # noqa: BLE001
                 # Exceptions are logged and handled in _run_connection.
                 # There is a special case for exceptions on startup where we return
                 # immediately. Otherwise, we let the reconnect loop retry with

roborock/protocol.py

@@ -5,7 +5,7 @@ import logging
 from collections.abc import Callable
 from urllib.parse import urlparse
 
-from construct import (  # type: ignore
+from construct import (  # type: ignore[import-untyped]
     Bytes,
     Checksum,
     ChecksumError,
@@ -65,7 +65,7 @@ class Utils:
     @staticmethod
     def encode_timestamp(_timestamp: int) -> bytes:
         hex_value = f"{_timestamp:x}".zfill(8)
-        return "".join(list(map(lambda idx: hex_value[idx], [5, 6, 3, 7, 1, 2, 0, 4]))).encode()
+        return "".join([hex_value[idx] for idx in [5, 6, 3, 7, 1, 2, 0, 4]]).encode()
 
     @staticmethod
     def md5(data: bytes) -> bytes:
@@ -470,7 +470,7 @@ class _Parser:
                 }
             )
         return self.con.build(
-            {"messages": [message for message in messages], "remaining": b""},
+            {"messages": list(messages), "remaining": b""},
             local_key=local_key,
             prefixed=prefixed,
             connect_nonce=connect_nonce,

roborock/protocols/a01_protocol.py

@@ -62,7 +62,7 @@ def decode_rpc_response(message: RoborockMessage) -> dict[int, Any]:
     try:
         unpadded = unpad(message.payload, AES.block_size)
     except ValueError as err:
-        raise RoborockException(f"Unable to unpad A01 payload: {err}")
+        raise RoborockException(f"Unable to unpad A01 payload: {err}") from err
 
     try:
         payload = json.loads(unpadded.decode())
@@ -74,5 +74,7 @@ def decode_rpc_response(message: RoborockMessage) -> dict[int, Any]:
         raise RoborockException(f"Invalid A01 message format: 'dps' should be a dictionary for {message.payload!r}")
     try:
         return {int(key): value for key, value in datapoints.items()}
-    except ValueError:
-        raise RoborockException(f"Invalid A01 message format: 'dps' key should be an integer for {message.payload!r}")
+    except ValueError as err:
+        raise RoborockException(
+            f"Invalid A01 message format: 'dps' key should be an integer for {message.payload!r}"
+        ) from err

roborock/protocols/b01_q7_protocol.py

@@ -83,8 +83,10 @@ def decode_rpc_response(message: RoborockMessage) -> dict[int, Any]:
         raise RoborockException(f"Invalid B01 message format: 'dps' should be a dictionary for {message.payload!r}")
     try:
         return {int(key): value for key, value in datapoints.items()}
-    except ValueError:
-        raise RoborockException(f"Invalid B01 message format: 'dps' key should be an integer for {message.payload!r}")
+    except ValueError as err:
+        raise RoborockException(
+            f"Invalid B01 message format: 'dps' key should be an integer for {message.payload!r}"
+        ) from err
 
 
 @dataclass

roborock/testing/v1_simulator.py

@@ -346,7 +346,7 @@ class V1VacuumSimulator(RoborockDeviceSimulator):
             msg_id = inner["id"]
             method = inner["method"]
             params = inner.get("params", [])
-        except Exception as e:
+        except Exception as e:  # noqa: BLE001
             _LOGGER.debug("Failed to parse plaintext JSON RPC payload: %s", e, exc_info=True)
             return
 
@@ -358,7 +358,7 @@ class V1VacuumSimulator(RoborockDeviceSimulator):
         if handler:
             try:
                 result = handler(params)
-            except Exception as e:
+            except Exception as e:  # noqa: BLE001
                 error = str(e)
                 _LOGGER.debug("Error executing command handler for %s: %s", method, e, exc_info=True)
         else:

roborock/util.py

@@ -10,7 +10,7 @@ T = TypeVar("T")
 
 
 def unpack_list(value: list[T], size: int) -> list[T | None]:
-    return (value + [None] * size)[:size]  # type: ignore
+    return (value + [None] * size)[:size]
 
 
 class RoborockLoggerAdapter(logging.LoggerAdapter):