pymammotion 0.2.31__tar.gz → 0.2.32__tar.gz

{pymammotion-0.2.31 → pymammotion-0.2.32}/PKG-INFO

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

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/aliyun/cloud_gateway.py

@@ -593,6 +593,7 @@ class CloudIOTGateway:
         logger.debug(response.headers)
         logger.debug(response.status_code)
         logger.debug(response.body)
+        logger.debug(iot_id)
 
         response_body_str = response.body.decode("utf-8")
         response_body_dict = json.loads(response_body_str)
@@ -635,5 +636,5 @@ class CloudIOTGateway:
         return self._client_id
 
     @property
-    def login_by_oath_response(self):
+    def login_by_oauth_response(self):
         return self._login_by_oauth_response

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/data/model/device_config.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from pymammotion.utility.device_type import DeviceType
 
@@ -35,6 +35,7 @@ class OperationSettings:
     border_mode: int = 1  # border laps
     obstacle_laps: int = 1
     start_progress: int = 0
+    areas: list[int] = field(default_factory=list)
 
 
 def create_path_order(operation_mode: OperationSettings, device_name: str) -> str:
@@ -59,7 +60,7 @@ def create_path_order(operation_mode: OperationSettings, device_name: str) -> st
         bArr[6] = b
     if DeviceType.is_luba1(device_name):
         bArr[4] = operation_mode.toward_mode
-    return str(bArr, "UTF-8")
+    return bArr.decode()
 
 
 def calculate_yuka_mode(operation_mode: OperationSettings) -> int:

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/data/model/hash_list.py

@@ -1,7 +1,7 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from enum import IntEnum
 
-from pymammotion.proto.mctrl_nav import NavGetCommDataAck
+from pymammotion.proto.mctrl_nav import NavGetCommDataAck, AreaHashName
 
 
 class PathType(IntEnum):
@@ -24,11 +24,11 @@ class HashList:
     [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)
 
     def set_hashlist(self, hashlist: list[int]) -> None:
         self.hashlist = hashlist
@@ -49,6 +49,9 @@ class HashList:
     def update(self, hash_data: NavGetCommDataAck) -> bool:
         """Update the map data."""
         if hash_data.type == PathType.AREA:
+            existing_name = next((area for area in self.area_name if area.hash == hash_data.hash), None)
+            if not existing_name:
+                self.area_name.append(AreaHashName(name=f"area {len(self.area_name)+1}", hash=hash_data.hash))
             return self._add_hash_data(self.area, hash_data)
 
         if hash_data.type == PathType.OBSTACLE:

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/data/model/mowing_modes.py

@@ -43,7 +43,7 @@ class BypassStrategy(IntEnum):
     direct_touch = 0
     slow_touch = 1
     less_touch = 2
-    no_touch = 3  # luba 2 yuka only or possibly value of 10
+    no_touch = 10  # luba 2 yuka only or possibly value of 10
 
 
 class PathAngleSetting(IntEnum):

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/data/mqtt/event.py

@@ -1,6 +1,7 @@
+import base64
 from base64 import b64decode
 from dataclasses import dataclass
-from typing import Any, Literal, Optional, Union
+from typing import Any, Literal, Optional, Union, Mapping
 
 from google.protobuf import json_format
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -36,7 +37,9 @@ class Base64EncodedProtobuf(SerializableType):
 
 @dataclass
 class DeviceProtobufMsgEventValue(DataClassORJSONMixin):
-    content: Base64EncodedProtobuf
+    content: str
+
+
 
 
 @dataclass
@@ -61,7 +64,7 @@ class DeviceNotificationEventCode(DataClassORJSONMixin):
 
 @dataclass
 class DeviceNotificationEventValue(DataClassORJSONMixin):
-    data: DeviceNotificationEventCode
+    data: str # parsed to DeviceNotificationEventCode
 
 
 @dataclass
@@ -147,15 +150,15 @@ class ThingEventMessage(DataClassORJSONMixin):
         identifier = params_dict.get("identifier")
         if identifier is None:
             """Request configuration event."""
-            params_obj = DeviceConfigurationRequestEvent(**params_dict)
+            params_obj = DeviceConfigurationRequestEvent.from_dict(params_dict)
         elif identifier == "device_protobuf_msg_event":
-            params_obj = DeviceProtobufMsgEventParams(**params_dict)
+            params_obj = DeviceProtobufMsgEventParams.from_dict(params_dict)
         elif identifier == "device_warning_event":
-            params_obj = DeviceWarningEventParams(**params_dict)
+            params_obj = DeviceWarningEventParams.from_dict(params_dict)
         elif identifier == "device_config_req_event":
             params_obj = payload.get("params", {})
         elif identifier == "device_notification_event":
-            params_obj = DeviceNotificationEventParams(**params_dict)
+            params_obj = DeviceNotificationEventParams.from_dict(params_dict)
         else:
             raise ValueError(f"Unknown identifier: {identifier} {params_dict}")
 

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/data/state_manager.py

@@ -6,7 +6,7 @@ import betterproto
 
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.proto.luba_msg import LubaMsg
-from pymammotion.proto.mctrl_nav import NavGetCommDataAck, NavGetHashListAck
+from pymammotion.proto.mctrl_nav import NavGetCommDataAck, NavGetHashListAck, AppGetAllAreaHashName
 
 
 class StateManager:
@@ -62,6 +62,10 @@ class StateManager:
                 updated = self._device.map.update(common_data)
                 if updated:
                     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
+
 
     def _update_sys_data(self, message) -> None:
         """Update system."""

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/event/event.py

@@ -1,4 +1,5 @@
 import asyncio
+from typing import Any
 
 
 class Event:
@@ -54,9 +55,12 @@ class DataEvent:
     def __init__(self) -> None:
         self.on_data_event = Event()
 
-    async def data_event(self, data) -> None:
+    async def data_event(self, data: Any) -> None:
         # This function will be executed when data is received.
-        await self.on_data_event(data)
+        if data:
+            await self.on_data_event(data)
+        else:
+            await self.on_data_event(None)
 
     def add_subscribers(self, obj_method) -> None:
         self.on_data_event += obj_method

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/mammotion/commands/messages/navigation.py

@@ -375,20 +375,21 @@ class MessageNavigation(AbstractMessage, ABC):
 
     def generate_route_information(self, generate_route_information: GenerateRouteInformation) -> bytes:
         logger.debug(f"Generate route data source:{generate_route_information}")
+
         build = NavReqCoverPath(
             pver=1,
             sub_cmd=0,
             zone_hashs=generate_route_information.one_hashs,
-            job_mode=generate_route_information.job_mode,
-            edge_mode=generate_route_information.edge_mode,
-            knife_height=generate_route_information.blade_height,
-            speed=generate_route_information.speed,
-            ultra_wave=generate_route_information.ultra_wave,
-            channel_width=generate_route_information.channel_width,
-            channel_mode=generate_route_information.channel_mode,
-            toward=generate_route_information.toward,
-            toward_included_angle=generate_route_information.toward_included_angle,  # luba 2 yuka only
-            toward_mode=generate_route_information.toward_mode,  # luba 2 yuka only
+            job_mode=int(generate_route_information.job_mode),
+            edge_mode=int(generate_route_information.edge_mode),
+            knife_height=int(generate_route_information.blade_height),
+            speed=float(generate_route_information.speed),
+            ultra_wave=int(generate_route_information.ultra_wave),
+            channel_width=int(generate_route_information.channel_width),
+            channel_mode=int(generate_route_information.channel_mode),
+            toward=int(generate_route_information.toward),
+            toward_included_angle=int(generate_route_information.toward_included_angle),  # luba 2 yuka only
+            toward_mode=int(generate_route_information.toward_mode),  # luba 2 yuka only
             reserved=generate_route_information.path_order,
         )
         logger.debug(f"{self.get_device_name()}Generate route====={build}")
@@ -402,14 +403,14 @@ class MessageNavigation(AbstractMessage, ABC):
             pver=1,
             sub_cmd=3,
             zone_hashs=generate_route_information.one_hashs,
-            job_mode=generate_route_information.job_mode,
-            edge_mode=generate_route_information.edge_mode,
-            knife_height=generate_route_information.blade_height,
-            speed=generate_route_information.speed,
-            ultra_wave=generate_route_information.ultra_wave,
-            channel_width=generate_route_information.channel_width,
-            channel_mode=generate_route_information.channel_mode,
-            toward=generate_route_information.toward,
+            job_mode=int(generate_route_information.job_mode),
+            edge_mode=int(generate_route_information.edge_mode),
+            knife_height=int(generate_route_information.blade_height),
+            speed=float(generate_route_information.speed),
+            ultra_wave=int(generate_route_information.ultra_wave),
+            channel_width=int(generate_route_information.channel_width),
+            channel_mode=int(generate_route_information.channel_mode),
+            toward=int(generate_route_information.toward),
             reserved=generate_route_information.path_order,
         )
         logger.debug(f"{self.get_device_name()} Generate route ===== {build}")

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/mammotion/devices/base.py

@@ -5,13 +5,14 @@ from typing import Any, Awaitable, Callable
 
 import betterproto
 
-from pymammotion.aliyun.dataclass.connect_response import Device
+from pymammotion.aliyun.dataclass.dev_by_account_response import Device
 from pymammotion.data.model import RegionData
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.state_manager import StateManager
 from pymammotion.proto import has_field
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import NavGetCommDataAck, NavGetHashListAck
+from pymammotion.utility.device_type import DeviceType
 from pymammotion.utility.movement import get_percent, transform_both_speeds
 
 _LOGGER = logging.getLogger(__name__)
@@ -197,17 +198,30 @@ class MammotionBaseDevice:
 
     async def start_map_sync(self) -> None:
         """Start sync of map data."""
+        try:
+            # work out why this crashes sometimes for better proto
+
+            if self._cloud_device:
+                if not DeviceType.is_luba1(self._cloud_device.deviceName, self._cloud_device.productKey):
+                    await self.queue_command("get_area_name_list", device_id=self._cloud_device.deviceName)
+            if has_field(self._mower.net.toapp_wifi_iot_status):
+                if not DeviceType.is_luba1(self._mower.net.toapp_wifi_iot_status.devicename):
+                    await self.queue_command("get_area_name_list",
+                                         device_id=self._mower.net.toapp_wifi_iot_status.devicename)
+        except Exception:
+            """Do nothing for now."""
+
         await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
 
-        await self.queue_command("get_all_boundary_hash_list", sub_cmd=0)
+        if not has_field(self.mower.nav.toapp_gethash_ack):
+            await self.queue_command("get_all_boundary_hash_list", sub_cmd=0)
+            await self.queue_command("get_hash_response", total_frame=1, current_frame=1)
+        else:
+            for data_hash in self.mower.nav.toapp_gethash_ack.data_couple:
+                await self.queue_command("synchronize_hash_data", hash_num=data_hash)
+
 
-        await self.queue_command("get_hash_response", total_frame=1, current_frame=1)
 
-        # work out why this crashes sometimes for better proto
-        if self._cloud_device:
-            await self.queue_command("get_area_name_list", device_id=self._cloud_device.deviceName)
-        if 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)
 
         # sub_cmd 3 is job hashes??
         # sub_cmd 4 is dump location (yuka)

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/mammotion/devices/mammotion.py

@@ -75,6 +75,9 @@ class MammotionMixedDeviceManager:
     def replace_ble(self, ble_device: MammotionBaseBLEDevice) -> None:
         self._ble_device = ble_device
 
+    def replace_mqtt(self, mqtt: MammotionCloud) -> None:
+        self._cloud_device._mqtt = mqtt
+
     def has_cloud(self) -> bool:
         return self._cloud_device is not None
 
@@ -159,6 +162,10 @@ class Mammotion:
                 self.devices.add_device(
                     MammotionMixedDeviceManager(name=device.deviceName, cloud_device=device, mqtt=self.mqtt)
                 )
+            elif device.deviceName.startswith(("Luba-", "Yuka-")) and self.devices.get_device(device.deviceName):
+                device = self.devices.get_device(device.deviceName)
+                device.replace_mqtt(self.mqtt)
+
 
     def set_disconnect_strategy(self, disconnect: bool) -> None:
         for device_name, device in self.devices.devices:

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -42,8 +42,10 @@ class MammotionCloud:
         # temporary for testing only
         # self._start_sync_task = self.loop.call_later(30, lambda: asyncio.ensure_future(self.start_sync(0)))
 
-    def on_ready(self) -> None:
-        self.on_ready_event.data_event(None)
+    async def on_ready(self) -> None:
+        loop = asyncio.get_event_loop()
+        loop.create_task(self.process_queue())
+        await self.on_ready_event.data_event(None)
 
     def is_connected(self) -> bool:
         return self._mqtt_client.is_connected
@@ -63,7 +65,7 @@ class MammotionCloud:
     async def on_disconnected(self) -> None:
         """Callback for when MQTT disconnects."""
 
-    async def _process_queue(self) -> None:
+    async def process_queue(self) -> None:
         while True:
             # Get the next item from the queue
             iot_id, key, command, future = await self.command_queue.get()
@@ -113,7 +115,8 @@ class MammotionCloud:
             _LOGGER.debug("Thing event received")
             event = ThingEventMessage.from_dicts(payload)
             params = event.params
-            if params.get("identifier", None) is None:
+            if isinstance(params, dict) or params.identifier is None:
+                _LOGGER.debug("Received dict params: %s", params)
                 return
             if params.identifier == "device_protobuf_msg_event" and event.method == "thing.events":
                 _LOGGER.debug("Protobuf event")
@@ -158,11 +161,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
     async def on_ready(self) -> None:
         """Callback for when MQTT is subscribed to events."""
-        loop = asyncio.get_event_loop()
-
         await self._ble_sync()
         await self.run_periodic_sync_task()
-        loop.create_task(self._process_queue())
         if self.on_ready_callback:
             await self.on_ready_callback()
 
@@ -186,6 +186,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
                 160, lambda: asyncio.ensure_future(self.run_periodic_sync_task())
             )
 
+
     async def queue_command(self, key: str, **kwargs: Any) -> bytes:
         # Create a future to hold the result
         _LOGGER.debug("Queueing command: %s", key)
@@ -221,9 +222,9 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         params = event.params
         if event.params.iotId != self.iot_id:
             return
-        binary_data = base64.b64decode(params.value.content.proto)
-        self._update_raw_data(cast(bytes, binary_data))
-        new_msg = LubaMsg().parse(cast(bytes, binary_data))
+        binary_data = base64.b64decode(params.value.content)
+        self._update_raw_data(binary_data)
+        new_msg = LubaMsg().parse(binary_data)
 
         if (
             self._commands.get_device_product_key() == ""

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/mqtt/mammotion_mqtt.py

@@ -175,7 +175,7 @@ class MammotionMQTT:
             event = ThingEventMessage(**payload)
             params = event.params
             if params.identifier == "device_protobuf_msg_event":
-                content = LubaMsg().parse(base64.b64decode(params.value.content.proto))
+                content = LubaMsg().parse(base64.b64decode(params.value.content))
 
                 logger.info("Unhandled protobuf event: %s", betterproto.which_one_of(content, "LubaSubMsg"))
             elif params.identifier == "device_warning_event":

{pymammotion-0.2.31 → pymammotion-0.2.32}/pymammotion/proto/mctrl_nav.py

@@ -142,7 +142,7 @@ class NavGetHashList(betterproto.Message):
     sub_cmd: int = betterproto.int32_field(2)
     total_frame: int = betterproto.int32_field(3)
     current_frame: int = betterproto.int32_field(4)
-    data_hash: float = betterproto.fixed64_field(5)
+    data_hash: int = betterproto.fixed64_field(5)
     reserved: str = betterproto.string_field(6)
 
 
@@ -152,7 +152,7 @@ class NavGetHashListAck(betterproto.Message):
     sub_cmd: int = betterproto.int32_field(2)
     total_frame: int = betterproto.int32_field(3)
     current_frame: int = betterproto.int32_field(4)
-    data_hash: float = betterproto.fixed64_field(5)
+    data_hash: int = betterproto.fixed64_field(5)
     hash_len: int = betterproto.int32_field(6)
     reserved: str = betterproto.string_field(7)
     result: int = betterproto.int32_field(8)
@@ -170,7 +170,7 @@ class NavGetCommData(betterproto.Message):
     paternal_hash_b: int = betterproto.int64_field(7)
     total_frame: int = betterproto.int32_field(8)
     current_frame: int = betterproto.int32_field(9)
-    data_hash: float = betterproto.fixed64_field(10)
+    data_hash: int = betterproto.fixed64_field(10)
     reserved: str = betterproto.string_field(11)
 
 
@@ -181,12 +181,12 @@ class NavGetCommDataAck(betterproto.Message):
     result: int = betterproto.int32_field(3)
     action: int = betterproto.int32_field(4)
     type: int = betterproto.int32_field(5)
-    hash: float = betterproto.fixed64_field(6)
-    paternal_hash_a: float = betterproto.fixed64_field(7)
-    paternal_hash_b: float = betterproto.fixed64_field(8)
+    hash: int = betterproto.fixed64_field(6)
+    paternal_hash_a: int = betterproto.fixed64_field(7)
+    paternal_hash_b: int = betterproto.fixed64_field(8)
     total_frame: int = betterproto.int32_field(9)
     current_frame: int = betterproto.int32_field(10)
-    data_hash: float = betterproto.fixed64_field(11)
+    data_hash: int = betterproto.fixed64_field(11)
     data_len: int = betterproto.int32_field(12)
     data_couple: list["CommDataCouple"] = betterproto.message_field(13)
     reserved: str = betterproto.string_field(14)
@@ -206,8 +206,8 @@ class NavReqCoverPath(betterproto.Message):
     channel_mode: int = betterproto.int32_field(10)
     toward: int = betterproto.int32_field(11)
     speed: float = betterproto.float_field(12)
-    zone_hashs: list[float] = betterproto.fixed64_field(13)
-    path_hash: float = betterproto.fixed64_field(14)
+    zone_hashs: list[int] = betterproto.fixed64_field(13)
+    path_hash: int = betterproto.fixed64_field(14)
     reserved: str = betterproto.string_field(15)
     result: int = betterproto.int32_field(16)
     toward_mode: int = betterproto.int32_field(17)
@@ -226,12 +226,12 @@ class NavUploadZigZagResult(betterproto.Message):
     current_zone_path_num: int = betterproto.int32_field(8)
     current_zone_path_id: int = betterproto.int32_field(9)
     current_zone: int = betterproto.int32_field(10)
-    current_hash: float = betterproto.fixed64_field(11)
+    current_hash: int = betterproto.fixed64_field(11)
     total_frame: int = betterproto.int32_field(12)
     current_frame: int = betterproto.int32_field(13)
     channel_mode: int = betterproto.int32_field(14)
     channel_mode_id: int = betterproto.int32_field(15)
-    data_hash: float = betterproto.fixed64_field(16)
+    data_hash: int = betterproto.fixed64_field(16)
     data_len: int = betterproto.int32_field(17)
     reserved: str = betterproto.string_field(18)
     data_couple: list["CommDataCouple"] = betterproto.message_field(19)
@@ -242,10 +242,10 @@ class NavUploadZigZagResult(betterproto.Message):
 class NavUploadZigZagResultAck(betterproto.Message):
     pver: int = betterproto.int32_field(1)
     current_zone: int = betterproto.int32_field(2)
-    current_hash: float = betterproto.fixed64_field(3)
+    current_hash: int = betterproto.fixed64_field(3)
     total_frame: int = betterproto.int32_field(4)
     current_frame: int = betterproto.int32_field(5)
-    data_hash: float = betterproto.fixed64_field(6)
+    data_hash: int = betterproto.fixed64_field(6)
     reserved: str = betterproto.string_field(7)
     sub_cmd: int = betterproto.int32_field(8)
 
@@ -270,8 +270,8 @@ class NavTaskIdRw(betterproto.Message):
 
 @dataclass
 class NavSysHashOverview(betterproto.Message):
-    commonhash_overview: float = betterproto.fixed64_field(1)
-    path_hash_overview: float = betterproto.fixed64_field(2)
+    commonhash_overview: int = betterproto.fixed64_field(1)
+    path_hash_overview: int = betterproto.fixed64_field(2)
 
 
 @dataclass
@@ -281,7 +281,7 @@ class NavTaskBreakPoint(betterproto.Message):
     toward: int = betterproto.int32_field(3)
     flag: int = betterproto.int32_field(4)
     action: int = betterproto.int32_field(5)
-    zone_hash: float = betterproto.fixed64_field(6)
+    zone_hash: int = betterproto.fixed64_field(6)
 
 
 @dataclass
@@ -314,13 +314,13 @@ class NavPlanJobSet(betterproto.Message):
     speed: float = betterproto.float_field(26)
     task_name: str = betterproto.string_field(27)
     job_name: str = betterproto.string_field(28)
-    zone_hashs: list[float] = betterproto.fixed64_field(29)
+    zone_hashs: list[int] = betterproto.fixed64_field(29)
     reserved: str = betterproto.string_field(30)
     start_date: str = betterproto.string_field(31)
     end_date: str = betterproto.string_field(32)
     trigger_type: int = betterproto.int32_field(33)
     day: int = betterproto.int32_field(34)
-    weeks: list[float] = betterproto.fixed32_field(35)
+    weeks: list[int] = betterproto.fixed32_field(35)
     remained_seconds: int = betterproto.int64_field(36)
     toward_mode: int = betterproto.int32_field(37)
     toward_included_angle: int = betterproto.int32_field(38)
@@ -388,19 +388,19 @@ class AppRequestCoverPathsT(betterproto.Message):
     sub_cmd: int = betterproto.int32_field(2)
     total_frame: int = betterproto.int32_field(3)
     current_frame: int = betterproto.int32_field(4)
-    data_hash: float = betterproto.fixed64_field(5)
+    data_hash: int = betterproto.fixed64_field(5)
     transaction_id: int = betterproto.int64_field(6)
     reserved: list[int] = betterproto.int64_field(7)
-    hash_list: list[float] = betterproto.fixed64_field(8)
+    hash_list: list[int] = betterproto.fixed64_field(8)
 
 
 @dataclass
 class CoverPathPacketT(betterproto.Message):
-    path_hash: float = betterproto.fixed64_field(1)
+    path_hash: int = betterproto.fixed64_field(1)
     path_type: int = betterproto.int32_field(2)
     path_total: int = betterproto.int32_field(3)
     path_cur: int = betterproto.int32_field(4)
-    zone_hash: float = betterproto.fixed64_field(5)
+    zone_hash: int = betterproto.fixed64_field(5)
     data_couple: list["CommDataCouple"] = betterproto.message_field(6)
 
 
@@ -415,7 +415,7 @@ class CoverPathUploadT(betterproto.Message):
     current_frame: int = betterproto.int32_field(7)
     total_path_num: int = betterproto.int32_field(8)
     vaild_path_num: int = betterproto.int32_field(9)
-    data_hash: float = betterproto.fixed64_field(10)
+    data_hash: int = betterproto.fixed64_field(10)
     transaction_id: int = betterproto.int64_field(11)
     reserved: list[int] = betterproto.int64_field(12)
     data_len: int = betterproto.int32_field(13)
@@ -424,7 +424,7 @@ class CoverPathUploadT(betterproto.Message):
 
 @dataclass
 class ZoneStartPrecentT(betterproto.Message):
-    data_hash: float = betterproto.fixed64_field(1)
+    data_hash: int = betterproto.fixed64_field(1)
     x: float = betterproto.float_field(2)
     y: float = betterproto.float_field(3)
     index: int = betterproto.int32_field(4)

{pymammotion-0.2.31 → pymammotion-0.2.32}/pyproject.toml

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