pymammotion 0.2.47__py3-none-any.whl → 0.2.48__py3-none-any.whl

pymammotion/data/model/hash_list.py

@@ -3,7 +3,7 @@ from enum import IntEnum
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
-from pymammotion.proto.mctrl_nav import AreaHashName, NavGetCommDataAck
+from pymammotion.proto.mctrl_nav import NavGetCommDataAck, NavGetHashListAck
 
 
 class PathType(IntEnum):
@@ -20,6 +20,12 @@ class FrameList(DataClassORJSONMixin):
     data: list[NavGetCommDataAck]
 
 
+@dataclass
+class RootHashList(DataClassORJSONMixin):
+    total_frame: int
+    data: list[NavGetHashListAck]
+
+
 @dataclass
 class AreaHashNameList(DataClassORJSONMixin):
     """Wrapper so we can serialize to and from dict."""
@@ -35,18 +41,38 @@ class HashList(DataClassORJSONMixin):
     hashlist for all our hashIDs for verification
     """
 
+    root_hash_list: RootHashList = field(default_factory=RootHashList)
     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 = [x for x in hashlist if not (x in self.hashlist or self.hashlist.append(x))]
+    def update_hash_lists(self, hashlist: list[int]) -> None:
         self.area = {hash_id: frames for hash_id, frames in self.area.items() if hash_id in hashlist}
         self.path = {hash_id: frames for hash_id, frames in self.path.items() if hash_id in hashlist}
         self.obstacle = {hash_id: frames for hash_id, frames in self.obstacle.items() if hash_id in hashlist}
 
+    @property
+    def hashlist(self) -> list[int]:
+        return [i for obj in self.root_hash_list.data for i in obj.data_couple]
+
+    def update_root_hash_list(self, hash_list: NavGetHashListAck) -> None:
+        self.root_hash_list.total_frame = hash_list.total_frame
+
+        for index, obj in enumerate(self.root_hash_list.data):
+            if obj.current_frame == hash_list.current_frame:
+                # Replace the item if current_frame matches
+                self.root_hash_list.data[index] = hash_list
+                self.update_hash_lists(self.hashlist)
+                return
+
+        # If no match was found, append the new item
+        self.root_hash_list.data.append(hash_list)
+        self.update_hash_lists(self.hashlist)
+
+    def missing_hash_frame(self):
+        return self._find_missing_frames(self.root_hash_list)
+
     def missing_frame(self, hash_data: NavGetCommDataAck) -> list[int]:
         if hash_data.type == PathType.AREA:
             return self._find_missing_frames(self.area.get(hash_data.hash))
@@ -62,7 +88,7 @@ class HashList(DataClassORJSONMixin):
         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))
+                self.area_name.append(AreaHashNameList(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:
@@ -72,7 +98,7 @@ class HashList(DataClassORJSONMixin):
             return self._add_hash_data(self.path, hash_data)
 
     @staticmethod
-    def _find_missing_frames(frame_list: FrameList) -> list[int]:
+    def _find_missing_frames(frame_list: FrameList | RootHashList) -> list[int]:
         if frame_list.total_frame == len(frame_list.data):
             return []
         number_list = list(range(1, frame_list.total_frame + 1))

pymammotion/data/state_manager.py

@@ -62,7 +62,7 @@ class StateManager:
         match nav_msg[0]:
             case "toapp_gethash_ack":
                 hashlist_ack: NavGetHashListAck = nav_msg[1]
-                self._device.map.set_hashlist(hashlist_ack.data_couple)
+                self._device.map.update_root_hash_list(hashlist_ack)
                 await self.gethash_ack_callback(nav_msg[1])
             case "toapp_get_commondata_ack":
                 common_data: NavGetCommDataAck = nav_msg[1]

pymammotion/mammotion/devices/base.py

@@ -9,7 +9,6 @@ from pymammotion.aliyun.model.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
 
@@ -55,7 +54,15 @@ class MammotionBaseDevice:
 
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses."""
-        await self.queue_command("synchronize_hash_data", hash_num=hash_ack.data_couple[0])
+        current_frame = hash_ack.current_frame
+
+        missing_frames = self.mower.map.missing_hash_frame()
+        if len(missing_frames) == 0:
+            return await self.queue_command("synchronize_hash_data", hash_num=self.mower.map.hashlist)
+
+        if current_frame != missing_frames[0] - 1:
+            current_frame = missing_frames[0] - 1
+        await self.queue_command("get_hash_response", total_frame=hash_ack.total_frame, current_frame=current_frame)
 
     async def commdata_response(self, common_data: NavGetCommDataAck) -> None:
         """Handle common data responses."""
@@ -66,7 +73,7 @@ class MammotionBaseDevice:
         if len(missing_frames) == 0:
             # get next in hash ack list
 
-            data_hash = find_next_integer(self.mower.nav.toapp_gethash_ack.data_couple, common_data.hash)
+            data_hash = find_next_integer(self.mower.map.hashlist, common_data.hash)
             if data_hash is None:
                 return
 
@@ -201,22 +208,16 @@ 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 and len(self.mower.map.area_name) == 0:
-                await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
-        except Exception:
-            """Do nothing for now."""
+        if self._cloud_device and len(self.mower.map.area_name) == 0:
+            await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
 
         await self.queue_command("read_plan", sub_cmd=2, plan_index=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_all_boundary_hash_list", sub_cmd=0)
+        await self.queue_command("get_hash_response", total_frame=1, current_frame=1)
+        for data_hash in self.mower.map.hashlist:
+            await self.queue_command("synchronize_hash_data", hash_num=data_hash)
 
         # sub_cmd 3 is job hashes??
         # sub_cmd 4 is dump location (yuka)

pymammotion/mammotion/devices/mammotion.py

@@ -247,8 +247,8 @@ class Mammotion:
         await loop.run_in_executor(None, cloud_client.list_binding_by_account)
         return cloud_client
 
-    def remove_device(self, name: str) -> None:
-        self.devices.remove_device(name)
+    async def remove_device(self, name: str) -> None:
+        await self.devices.remove_device(name)
 
     def get_device_by_name(self, name: str) -> MammotionMixedDeviceManager:
         return self.devices.get_device(name)

{pymammotion-0.2.47.dist-info → pymammotion-0.2.48.dist-info}/METADATA

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

{pymammotion-0.2.47.dist-info → pymammotion-0.2.48.dist-info}/RECORD

@@ -28,7 +28,7 @@ pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
 pymammotion/data/model/generate_route_information.py,sha256=MkUBoqGtCAKmiVQ4Q1pEoDVHZs5uLIo7vhfWT4nGbtY,801
-pymammotion/data/model/hash_list.py,sha256=Tj4yYOr4jlOj5oU1rw-ypUNsx3Q76QCwM6M_PZrAgaI,3463
+pymammotion/data/model/hash_list.py,sha256=CJfWRX_BwZlwGL06moePvuhc7eimsVNFLfFA8Gyhl0U,4360
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=5TrHSijUyPtIDWpNtgzx_vFQukRJWRz4gIrUaXggKPw,827
 pymammotion/data/model/plan.py,sha256=mcadkSL7fQXy0iJ0q786I3GEQY4i6kmQXfW6Ri69lcQ,2906
@@ -39,7 +39,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=plt53w3kHulB_MfbkxK9j7AfdQ5ahVU2s4kiQMoLio4,4612
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
-pymammotion/data/state_manager.py,sha256=sP-y5jUFpL19sRwuaaSZcdGCn8jNOJhLg5sEkOTJhEw,4104
+pymammotion/data/state_manager.py,sha256=bGZXaiIosNTrN0L8DmddLqL2MRKbixKmyd2XFiZMCTE,4101
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=UzYnxV5DfvMDK3E06UvSzvzuBbaXOOUwO6xYt_zn9To,2034
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,8 +60,8 @@ pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=6g0q94h1RZDtmYEL85SsFkn1F5BegQy_WC5a9hn8kqQ,9665
-pymammotion/mammotion/devices/mammotion.py,sha256=UyIPKY7XMy7zlfwKXmZetIw70bY5Ob8crhF6A-pU5Wo,12283
+pymammotion/mammotion/devices/base.py,sha256=o3G-A6JciBq2AUZaPdHtp6q9pp3blOxYb1ySI3Fg_Gk,9717
+pymammotion/mammotion/devices/mammotion.py,sha256=ForzwnQu1IRxtwsFMHAudFCtOAUJC01BcX5RK7dYYcs,12295
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=nyO7pkKgAoRPs-28ESf6ee-y3G5JTYRO-MCp4wKPMlE,17476
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=Q1Il0nCxH-8utg_9AKAY3HxuuhB78uHZV4yVpZ4k1TI,11282
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
@@ -118,7 +118,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.2.47.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.47.dist-info/METADATA,sha256=bNQeK12Z3_33er6aQINFxdnR5vdbKoD35Jqg612MCrI,4052
-pymammotion-0.2.47.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.47.dist-info/RECORD,,
+pymammotion-0.2.48.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.48.dist-info/METADATA,sha256=a0GU3o4x1fZ0_4a_iu37n0dDV2pco5d0iyOHexO74No,4052
+pymammotion-0.2.48.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.48.dist-info/RECORD,,