pymammotion 0.2.38__tar.gz → 0.2.39__tar.gz

{pymammotion-0.2.38 → pymammotion-0.2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.38
+Version: 0.2.39
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/aliyun/dataclass/regions_response.py

@@ -1,7 +1,6 @@
 from dataclasses import dataclass
 from typing import Optional, TypeVar
 
-from mashumaro import DataClassDictMixin
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -20,7 +19,7 @@ class RegionResponseData(DataClassORJSONMixin):
 
 
 @dataclass
-class RegionResponse(DataClassDictMixin):
+class RegionResponse(DataClassORJSONMixin):
     data: RegionResponseData
     code: int
     id: Optional[str] = None

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/data/model/device.py

@@ -1,8 +1,10 @@
 """MowingDevice class to wrap around the betterproto dataclasses."""
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from typing import Optional
 
 import betterproto
+from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
 from pymammotion.data.model.device_config import DeviceLimits
@@ -28,23 +30,17 @@ from pymammotion.utility.map import CoordinateConverter
 
 
 @dataclass
-class MowingDevice:
+class MowingDevice(DataClassORJSONMixin):
     """Wraps the betterproto dataclasses, so we can bypass the groups for keeping all data."""
 
-    device: LubaMsg
-    map: HashList
-    location: Location
-    mowing_state: RapidState
-
-    def __init__(self) -> None:
-        self.device = LubaMsg()
-        self.map = HashList(area={}, path={}, obstacle={}, hashlist=[])
-        self.location = Location()
-        self.report_data = ReportData()
-        self.err_code_list = []
-        self.err_code_list_time = []
-        self.limits = DeviceLimits(30, 70, 0.2, 0.6)
-        self.mowing_state = RapidState()
+    map: HashList = field(default_factory=HashList)
+    location: Location = field(default_factory=Location)
+    mowing_state: RapidState = field(default_factory=RapidState)
+    report_data: ReportData = field(default_factory=ReportData)
+    err_code_list: list = field(default_factory=list)
+    err_code_list_time: Optional[list] = field(default_factory=list)
+    limits: DeviceLimits = field(default_factory=DeviceLimits)
+    device: Optional[LubaMsg] = field(default_factory=LubaMsg)
 
     @classmethod
     def from_raw(cls, raw: dict) -> "MowingDevice":
@@ -161,7 +157,7 @@ class MowingDevice:
 
 
 @dataclass
-class DevNetData:
+class DevNetData(DataClassORJSONMixin):
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
     net: dict
@@ -184,7 +180,7 @@ class DevNetData:
 
 
 @dataclass
-class SysData:
+class SysData(DataClassORJSONMixin):
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
     sys: dict
@@ -207,7 +203,7 @@ class SysData:
 
 
 @dataclass
-class NavData:
+class NavData(DataClassORJSONMixin):
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
     nav: dict
@@ -230,7 +226,7 @@ class NavData:
 
 
 @dataclass
-class DriverData:
+class DriverData(DataClassORJSONMixin):
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
     driver: dict
@@ -253,7 +249,7 @@ class DriverData:
 
 
 @dataclass
-class MulData:
+class MulData(DataClassORJSONMixin):
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
     mul: dict
@@ -276,7 +272,7 @@ class MulData:
 
 
 @dataclass
-class OtaData:
+class OtaData(DataClassORJSONMixin):
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
     ota: dict
@@ -299,7 +295,7 @@ class OtaData:
 
 
 @dataclass
-class PeptData:
+class PeptData(DataClassORJSONMixin):
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
     pept: dict

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/data/model/device_config.py

@@ -1,18 +1,22 @@
 from dataclasses import dataclass, field
 
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
 from pymammotion.utility.device_type import DeviceType
 
 
 @dataclass
-class DeviceLimits:
-    blade_height_min: int
-    blade_height_max: int
-    working_speed_min: float
-    working_speed_max: float
+class DeviceLimits(DataClassORJSONMixin):
+    blade_height_min: int = 30
+    blade_height_max: int = 70
+    working_speed_min: float = 0.2
+    working_speed_max: float = 1.2
+    working_path_min: int = 15
+    working_path_max: int = 35
 
 
 @dataclass
-class OperationSettings:
+class OperationSettings(DataClassORJSONMixin):
     """Operation settings for a device."""
 
     is_mow: bool = True

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/data/model/hash_list.py

@@ -1,6 +1,8 @@
 from dataclasses import dataclass, field
 from enum import IntEnum
 
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
 from pymammotion.proto.mctrl_nav import AreaHashName, NavGetCommDataAck
 
 
@@ -13,23 +15,31 @@ class PathType(IntEnum):
 
 
 @dataclass
-class FrameList:
+class FrameList(DataClassORJSONMixin):
     total_frame: int
     data: list[NavGetCommDataAck]
 
 
 @dataclass
-class HashList:
+class AreaHashNameList(DataClassORJSONMixin):
+    """Wrapper so we can serialize to and from dict."""
+
+    name: str
+    hash: int
+
+
+@dataclass
+class HashList(DataClassORJSONMixin):
     """stores our map data.
     [hashID, FrameList].
     hashlist for all our hashIDs for verification
     """
 
-    area: dict  # type 0
-    path: dict  # type 2
-    obstacle: dict  # type 1
-    hashlist: list[int]
-    area_name: list[AreaHashName] = field(default_factory=list)
+    area: dict = field(default_factory=dict)  # type 0
+    path: dict = field(default_factory=dict)  # type 2
+    obstacle: dict = field(default_factory=dict)  # type 1
+    hashlist: list[int] = field(default_factory=list)
+    area_name: list[AreaHashNameList] = field(default_factory=list)
 
     def set_hashlist(self, hashlist: list[int]) -> None:
         self.hashlist = hashlist

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/data/model/location.py

@@ -1,10 +1,12 @@
 """Contains RTK models for robot location and RTK positions."""
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 
 @dataclass
-class Point:
+class Point(DataClassORJSONMixin):
     """Returns a lat long."""
 
     latitude: float = 0.0
@@ -23,17 +25,12 @@ class Dock(Point):
 
 
 @dataclass
-class Location:
+class Location(DataClassORJSONMixin):
     """Stores/retrieves RTK GPS data."""
 
-    device: Point
-    RTK: Point
-    dock: Dock
+    device: Point = field(default_factory=Point)
+    RTK: Point = field(default_factory=Point)
+    dock: Dock = field(default_factory=Dock)
     position_type: int = 0
     orientation: int = 0  # 360 degree rotation +-
     work_zone: int = 0
-
-    def __init__(self) -> None:
-        self.device = Point()
-        self.RTK = Point()
-        self.dock = Dock()

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/data/model/region_data.py

@@ -1,7 +1,11 @@
-from typing import List, Optional
+from dataclasses import dataclass
+from typing import Optional
 
+from mashumaro.mixins.orjson import DataClassORJSONMixin
 
-class RegionData:
+
+@dataclass
+class RegionData(DataClassORJSONMixin):
     def __init__(self) -> None:
         self.hash: Optional[int] = None
         self.action: int = 0

pymammotion-0.2.39/pymammotion/data/model/report_info.py

@@ -0,0 +1,84 @@
+from dataclasses import asdict, dataclass, field
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+
+@dataclass
+class ConnectData(DataClassORJSONMixin):
+    connect_type: int = 0
+    ble_rssi: int = 0
+    wifi_rssi: int = 0
+
+
+@dataclass
+class DeviceData(DataClassORJSONMixin):
+    sys_status: int = 0
+    charge_state: int = 0
+    battery_val: int = 0
+    sensor_status: int = 0
+    last_status: int = 0
+    sys_time_stamp: str = ""
+
+
+@dataclass
+class RTKData(DataClassORJSONMixin):
+    status: int = 0
+    pos_level: int = 0
+    gps_stars: int = 0
+    dis_status: str = ""
+    co_view_stars: int = 0
+
+
+@dataclass
+class LocationData(DataClassORJSONMixin):
+    real_pos_x: int = 0
+    real_pos_y: int = 0
+    real_toward: int = 0
+    pos_type: int = 0
+    bol_hash: str = ""
+
+
+@dataclass
+class WorkData(DataClassORJSONMixin):
+    path: int = 0
+    path_hash: str = ""
+    progress: int = 0
+    area: int = 0
+    bp_info: int = 0
+    bp_hash: str = ""
+    bp_pos_x: int = 0
+    bp_pos_y: int = 0
+    real_path_num: str = ""
+    path_pos_x: int = 0
+    path_pos_y: int = 0
+    ub_zone_hash: str = ""
+    ub_path_hash: str = ""
+    init_cfg_hash: str = ""
+    ub_ecode_hash: str = ""
+    nav_run_mode: int = 0
+    test_mode_status: int = 0
+    man_run_speed: int = 0
+    nav_edit_status: int = 0
+    knife_height: int = 0
+
+
+@dataclass
+class ReportData:
+    connect: ConnectData = field(default_factory=ConnectData)
+    dev: DeviceData = field(default_factory=DeviceData)
+    rtk: RTKData = field(default_factory=RTKData)
+    locations: list[LocationData] = field(default_factory=list)
+    work: WorkData = field(default_factory=WorkData)
+
+    def from_dict(self, data: dict):
+        locations = self.locations
+        if data.get("locations") is not None:
+            locations = [LocationData.from_dict(loc) for loc in data.get("locations", [])]
+
+        return ReportData(
+            connect=ConnectData.from_dict(data.get("connect", asdict(self.connect))),
+            dev=DeviceData.from_dict(data.get("dev", asdict(self.dev))),
+            rtk=RTKData.from_dict(data.get("rtk", asdict(self.rtk))),
+            locations=locations,
+            work=WorkData.from_dict(data.get("work", asdict(self.work))),
+        )

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/data/mqtt/event.py

@@ -154,7 +154,7 @@ class ThingEventMessage(DataClassORJSONMixin):
             params_obj = DeviceWarningEventParams.from_dict(params_dict)
         elif identifier == "device_config_req_event":
             params_obj = payload.get("params", {})
-        elif identifier == "device_notification_event":
+        elif identifier == "device_notification_event" or identifier == "device_warning_code_event":
             params_obj = DeviceNotificationEventParams.from_dict(params_dict)
         else:
             raise ValueError(f"Unknown identifier: {identifier} {params_dict}")

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/data/state_manager.py

@@ -5,6 +5,7 @@ from typing import Any, Awaitable, Callable, Optional
 import betterproto
 
 from pymammotion.data.model.device import MowingDevice
+from pymammotion.data.model.hash_list import AreaHashNameList
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck
 
@@ -65,7 +66,8 @@ class StateManager:
                     await self.get_commondata_ack_callback(common_data)
             case "toapp_all_hash_name":
                 hash_names: AppGetAllAreaHashName = nav_msg[1]
-                self._device.map.area_name = hash_names.hashnames
+                converted_list = [AreaHashNameList(name=item.name, hash=item.hash) for item in hash_names.hashnames]
+                self._device.map.area_name = converted_list
 
     async def _update_sys_data(self, message) -> None:
         """Update system."""
@@ -75,8 +77,6 @@ class StateManager:
                 self._device.buffer(sys_msg[1])
             case "toapp_report_data":
                 self._device.update_report_data(sys_msg[1])
-                if self.queue_command_callback:
-                    await self.queue_command_callback("get_report_cfg", stop=True)
             case "mow_to_app_info":
                 self._device.mow_info(sys_msg[1])
             case "system_tard_state_tunnel":

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/mammotion/commands/messages/system.py

@@ -227,7 +227,7 @@ class MessageSystem(AbstractMessage, ABC):
         return self.send_order_msg_sys(build)
 
     def get_report_cfg(
-        self, timeout: int = 10000, period: int = 1000, no_change_period: int = 1000, stop: bool = False
+        self, timeout: int = 10000, period: int = 1000, no_change_period: int = 2000, stop: bool = False
     ):
         mctlsys = MctlSys(
             todev_report_cfg=ReportInfoCfg(
@@ -239,15 +239,16 @@ class MessageSystem(AbstractMessage, ABC):
             )
         )
 
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_CONNECT.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_RTK.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_LOCAL.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_WORK.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_STA.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_MAINTAIN.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_POINT.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VIO.value)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC.value)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_CONNECT)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_RTK)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_LOCAL)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_WORK)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_STA)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_MAINTAIN)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_POINT)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VIO)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_BASESTATION)
 
         lubaMsg = LubaMsg()
         lubaMsg.msgtype = MsgCmdType.MSG_CMD_TYPE_EMBED_SYS

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/mammotion/devices/base.py

@@ -205,10 +205,6 @@ class MammotionBaseDevice:
 
             if self._cloud_device:
                 await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
-            elif has_field(self._mower.net.toapp_wifi_iot_status):
-                await self.queue_command(
-                    "get_area_name_list", device_id=self._mower.net.toapp_wifi_iot_status.devicename
-                )
         except Exception:
             """Do nothing for now."""
 

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/mammotion/devices/mammotion.py

@@ -177,7 +177,7 @@ class Mammotion:
                 return
 
         self.cloud_client = cloud_client
-        self.mqtt_list[account] = MammotionCloud(
+        mammotion_cloud = MammotionCloud(
             MammotionMQTT(
                 region_id=cloud_client.region_response.data.regionId,
                 product_key=cloud_client.aep_response.data.productKey,
@@ -189,7 +189,9 @@ class Mammotion:
             ),
             cloud_client,
         )
-        self.add_cloud_devices(self.mqtt_list.get(account))
+        self.mqtt_list[account] = mammotion_cloud
+        self.add_cloud_devices(mammotion_cloud)
+
         loop = asyncio.get_running_loop()
         await loop.run_in_executor(None, self.mqtt_list[account].connect_async)
 

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/proto/mctrl_nav.proto

@@ -141,7 +141,7 @@ message NavGetCommData {
   int32 subCmd = 2;
   int32 action = 3;
   int32 type = 4;
-  int64 Hash = 5;
+  fixed64 Hash = 5;
   int64 paternalHashA = 6;
   int64 paternalHashB = 7;
   int32 totalFrame = 8;
@@ -434,7 +434,7 @@ message NavTaskCtrlAck {
 
 message NavMapNameMsg {
     int32 rw = 1;  // Represents RW field
-    int64 hash = 2;  // Represents HASH field
+    fixed64 hash = 2;  // Represents HASH field
     string name = 3;  // Represents NAME field
     int32 result = 4;  // Represents RESULT field
     string device_id = 5;  // Represents DEVICEID field
@@ -469,10 +469,8 @@ message SvgMessageAckT {
 }
 
 message AreaHashName {
-    // Define fields for AreaHashName message here
-    // For example:
-    string name = 1;  // Replace with actual field definitions
-    int64 hash = 2;   // Replace with actual field definitions
+    string name = 2;
+    fixed64 hash = 1;
 }
 
 message AppGetAllAreaHashName {

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/proto/mctrl_nav.py

@@ -525,9 +525,8 @@ class SvgMessageAckT(betterproto.Message):
 
 @dataclass
 class AreaHashName(betterproto.Message):
-    # Define fields for AreaHashName message here For example:
-    name: str = betterproto.string_field(1)
-    hash: int = betterproto.int64_field(2)
+    name: str = betterproto.string_field(2)
+    hash: int = betterproto.fixed64_field(1)
 
 
 @dataclass

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/proto/mctrl_sys.proto

@@ -478,6 +478,7 @@ enum rpt_info_type {
   RIT_VISION_POINT = 7;
   RIT_VIO = 8;
   RIT_VISION_STATISTIC = 9;
+  RIT_BASESTATION_INFO = 10;
 }
 
 enum rpt_act {

{pymammotion-0.2.38 → pymammotion-0.2.39}/pymammotion/proto/mctrl_sys.py

@@ -78,6 +78,7 @@ class RptInfoType(betterproto.Enum):
     RIT_VISION_POINT = 7
     RIT_VIO = 8
     RIT_VISION_STATISTIC = 9
+    RIT_BASESTATION_INFO = 10
 
 
 class RptAct(betterproto.Enum):

{pymammotion-0.2.38 → pymammotion-0.2.39}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.38"
+version     = "0.2.39"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.38"
+version     = "0.2.39"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -55,7 +55,7 @@ mypy = "^1.10.0"
 pre-commit = "^3.8.0"
 
 [tool.bumpver]
-current_version = "0.2.38"
+current_version = "0.2.39"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true

pymammotion-0.2.38/pymammotion/data/model/report_info.py

@@ -1,146 +0,0 @@
-from dataclasses import asdict, dataclass, field
-
-
-@dataclass
-class ConnectData:
-    connect_type: int = 0
-    ble_rssi: int = 0
-    wifi_rssi: int = 0
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "ConnectData":
-        return cls(
-            connect_type=data.get("connect_type", 0),
-            ble_rssi=data.get("ble_rssi", 0),
-            wifi_rssi=data.get("wifi_rssi", 0),
-        )
-
-
-@dataclass
-class DeviceData:
-    sys_status: int = 0
-    charge_state: int = 0
-    battery_val: int = 0
-    sensor_status: int = 0
-    last_status: int = 0
-    sys_time_stamp: str = ""
-
-    @classmethod
-    def from_dict(cls, data: dict):
-        return cls(
-            sys_status=data.get("sys_status", 0),
-            charge_state=data.get("charge_state", 0),
-            battery_val=data.get("battery_val", 0),
-            sensor_status=data.get("sensor_status", 0),
-            last_status=data.get("last_status", 0),
-            sys_time_stamp=data.get("sys_time_stamp", ""),
-        )
-
-
-@dataclass
-class RTKData:
-    status: int = 0
-    pos_level: int = 0
-    gps_stars: int = 0
-    dis_status: str = ""
-    co_view_stars: int = 0
-
-    @classmethod
-    def from_dict(cls, data: dict):
-        return cls(
-            status=data.get("status", 0),
-            pos_level=data.get("pos_level", 0),
-            gps_stars=data.get("gps_stars", 0),
-            dis_status=data.get("dis_status", ""),
-            co_view_stars=data.get("co_view_stars", 0),
-        )
-
-
-@dataclass
-class LocationData:
-    real_pos_x: int = 0
-    real_pos_y: int = 0
-    real_toward: int = 0
-    pos_type: int = 0
-    bol_hash: str = ""
-
-    @classmethod
-    def from_dict(cls, data: dict):
-        return cls(
-            real_pos_x=data.get("real_pos_x", 0),
-            real_pos_y=data.get("real_pos_y", 0),
-            real_toward=data.get("real_toward", 0),
-            pos_type=data.get("pos_type", 0),
-            bol_hash=data.get("bol_hash", ""),
-        )
-
-
-@dataclass
-class WorkData:
-    path: int = 0
-    path_hash: str = ""
-    progress: int = 0
-    area: int = 0
-    bp_info: int = 0
-    bp_hash: str = ""
-    bp_pos_x: int = 0
-    bp_pos_y: int = 0
-    real_path_num: str = ""
-    path_pos_x: int = 0
-    path_pos_y: int = 0
-    ub_zone_hash: str = ""
-    ub_path_hash: str = ""
-    init_cfg_hash: str = ""
-    ub_ecode_hash: str = ""
-    nav_run_mode: int = 0
-    test_mode_status: int = 0
-    man_run_speed: int = 0
-    nav_edit_status: int = 0
-    knife_height: int = 0
-
-    @classmethod
-    def from_dict(cls, data: dict):
-        return cls(
-            path=data.get("path", 0),
-            path_hash=data.get("path_hash", ""),
-            progress=data.get("progress", 0),
-            area=data.get("area", 0),
-            bp_info=data.get("bp_info", 0),
-            bp_hash=data.get("bp_hash", ""),
-            bp_pos_x=data.get("bp_pos_x", 0),
-            bp_pos_y=data.get("bp_pos_y", 0),
-            real_path_num=data.get("real_path_num", ""),
-            path_pos_x=data.get("path_pos_x", 0),
-            path_pos_y=data.get("path_pos_y", 0),
-            ub_zone_hash=data.get("ub_zone_hash", ""),
-            ub_path_hash=data.get("ub_path_hash", ""),
-            init_cfg_hash=data.get("init_cfg_hash", ""),
-            ub_ecode_hash=data.get("ub_ecode_hash", ""),
-            nav_run_mode=data.get("nav_run_mode", 0),
-            test_mode_status=data.get("test_mode_status", 0),
-            man_run_speed=data.get("man_run_speed", 0),
-            nav_edit_status=data.get("nav_edit_status", 0),
-            knife_height=data.get("knife_height", 0),
-        )
-
-
-@dataclass
-class ReportData:
-    connect: ConnectData = field(default_factory=ConnectData)
-    dev: DeviceData = field(default_factory=DeviceData)
-    rtk: RTKData = field(default_factory=RTKData)
-    locations: list[LocationData] = field(default_factory=list)
-    work: WorkData = field(default_factory=WorkData)
-
-    def from_dict(self, data: dict):
-        locations = self.locations
-        if data.get("locations") is not None:
-            locations = [LocationData.from_dict(loc) for loc in data.get("locations", [])]
-
-        return ReportData(
-            connect=ConnectData.from_dict(data.get("connect", asdict(self.connect))),
-            dev=DeviceData.from_dict(data.get("dev", asdict(self.dev))),
-            rtk=RTKData.from_dict(data.get("rtk", asdict(self.rtk))),
-            locations=locations,
-            work=WorkData.from_dict(data.get("work", asdict(self.work))),
-        )