pymammotion 0.2.42__tar.gz → 0.2.43__tar.gz

{pymammotion-0.2.42 → pymammotion-0.2.43}/PKG-INFO

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

{pymammotion-0.2.42 → pymammotion-0.2.43}/pymammotion/data/model/device.py

@@ -109,7 +109,8 @@ class MowingDevice(DataClassORJSONMixin):
                         location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
                     )
 
-        self.report_data = self.report_data.from_dict(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
+        self.report_data.update(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
+
 
     def run_state_update(self, rapid_state: SystemRapidStateTunnelMsg) -> None:
         coordinate_converter = CoordinateConverter(self.location.RTK.latitude, self.location.RTK.longitude)

{pymammotion-0.2.42 → pymammotion-0.2.43}/pymammotion/data/model/rapid_state.py

@@ -1,6 +1,8 @@
 from dataclasses import dataclass
 from enum import Enum
 
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
 from pymammotion.utility.conversions import parse_double
 
 
@@ -11,7 +13,7 @@ class RTKStatus(Enum):
 
 
 @dataclass
-class RapidState:
+class RapidState(DataClassORJSONMixin):
     pos_x: float = 0
     pos_y: float = 0
     rtk_status: RTKStatus = RTKStatus.NONE

{pymammotion-0.2.42 → pymammotion-0.2.43}/pymammotion/data/model/report_info.py

@@ -63,22 +63,22 @@ class WorkData(DataClassORJSONMixin):
 
 
 @dataclass
-class ReportData:
+class ReportData(DataClassORJSONMixin):
     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):
+    def update(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))),
-        )
+
+        self.connect=ConnectData.from_dict(data.get("connect", asdict(self.connect)))
+        self.dev=DeviceData.from_dict(data.get("dev", asdict(self.dev)))
+        self.rtk=RTKData.from_dict(data.get("rtk", asdict(self.rtk)))
+        self.locations=locations
+        self.work=WorkData.from_dict(data.get("work", asdict(self.work)))
+

{pymammotion-0.2.42 → pymammotion-0.2.43}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.42"
+version     = "0.2.43"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.42"
+version     = "0.2.43"
 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.42"
+current_version = "0.2.43"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true