Skip to content

Commit c981220

Browse files
committed
fix: subclass Q10Room and Q10Point from RoborockBase
1 parent f540aa3 commit c981220

2 files changed

Lines changed: 6 additions & 19 deletions

File tree

‎roborock/devices/traits/b01/q10/map.py‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313
calibration, path placement and overlay placement remain inside the renderer.
1414
"""
1515

16-
import dataclasses
1716
import logging
1817
from dataclasses import dataclass, field
19-
from enum import Enum
2018
from typing import Any
2119

2220
from roborock.data import RoborockBase
2321
from roborock.data.b01_q10.b01_q10_code_mappings import B01_Q10_DP, YXDeviceState
24-
from roborock.data.containers import _camelize
2522
from roborock.devices.traits.common import DpsDataConverter, TraitUpdateListener
2623
from roborock.exceptions import RoborockException
2724
from roborock.map.b01_q10_map_parser import (
@@ -163,22 +160,11 @@ def _render(self) -> None:
163160

164161
def as_dict(self, exclude: set[str] | None = None) -> dict[str, Any]:
165162
"""Return the trait data as a dictionary, excluding large binary data."""
166-
167-
def _to_camel_dict(obj: Any) -> Any:
168-
return dataclasses.asdict(
169-
obj,
170-
dict_factory=lambda _fields: {
171-
_camelize(key): value.value if isinstance(value, Enum) else value
172-
for (key, value) in _fields
173-
if value is not None
174-
},
175-
)
176-
177163
exclude_set = exclude or set()
178164
data = {
179-
"rooms": [_to_camel_dict(room) for room in self.rooms],
180-
"path": [_to_camel_dict(point) for point in self.path],
181-
"robotPosition": _to_camel_dict(self.robot_position) if self.robot_position is not None else None,
165+
"rooms": [room.as_dict() for room in self.rooms],
166+
"path": [point.as_dict() for point in self.path],
167+
"robotPosition": self.robot_position.as_dict() if self.robot_position is not None else None,
182168
"robotHeading": self.robot_heading,
183169
}
184170
for key in exclude_set:

‎roborock/map/b01_q10_map_parser.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from vacuum_map_parser_base.config.image_config import ImageConfig
3030
from vacuum_map_parser_base.map_data import ImageData, MapData, Point
3131

32+
from roborock.data.containers import RoborockBase
3233
from roborock.exceptions import RoborockException
3334

3435
from .b01_grid_layers import (
@@ -113,7 +114,7 @@ def classify_q10_cell(value: int) -> str:
113114

114115

115116
@dataclass
116-
class Q10Room:
117+
class Q10Room(RoborockBase):
117118
"""A room (segment) described in a Q10 map packet."""
118119

119120
id: int
@@ -220,7 +221,7 @@ def layers(self) -> GridLayers:
220221

221222

222223
@dataclass
223-
class Q10Point:
224+
class Q10Point(RoborockBase):
224225
"""A single point in Q10 map/trace coordinate space."""
225226

226227
x: int

0 commit comments

Comments
 (0)