pymammotion 0.4.11__py3-none-any.whl → 0.4.12__py3-none-any.whl

pymammotion/bluetooth/ble.py

@@ -36,12 +36,10 @@ class MammotionBLE:
         return await self.connect()
 
     async def connect(self) -> bool:
-        if self.client is not None:
-            return await self.client.connect()
+        return await self.client.connect() if self.client is not None else False
 
     async def disconnect(self) -> bool:
-        if self.client is not None:
-            return await self.client.disconnect()
+        return await self.client.disconnect() if self.client is not None else False
 
     async def notification_handler(self, _characteristic: BleakGATTCharacteristic, data: bytearray) -> None:
         """Simple notification handler which prints the data received."""

pymammotion/data/model/device.py

@@ -92,8 +92,6 @@ class MowingDevice(DataClassORJSONMixin):
                     self.location.work_zone = (
                         location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
                     )
-                if location.bol_hash:
-                    self.map.bol_hash = location.bol_hash
 
         if toapp_report_data.fw_info:
             self.update_device_firmwares(toapp_report_data.fw_info)

pymammotion/data/model/hash_list.py

@@ -120,7 +120,6 @@ class HashList(DataClassORJSONMixin):
     hashlist for all our hashIDs for verification
     """
 
-    bol_hash: str = ""
     root_hash_lists: list[RootHashList] = field(default_factory=list)
     area: dict[int, FrameList] = field(default_factory=dict)  # type 0
     path: dict[int, FrameList] = field(default_factory=dict)  # type 2
@@ -135,6 +134,11 @@ class HashList(DataClassORJSONMixin):
         self.obstacle = {hash_id: frames for hash_id, frames in self.obstacle.items() if hash_id in hashlist}
         self.dump = {hash_id: frames for hash_id, frames in self.dump.items() if hash_id in hashlist}
         self.svg = {hash_id: frames for hash_id, frames in self.svg.items() if hash_id in hashlist}
+        self.area_name = [
+            area_item
+            for area_item in self.area_name
+            if area_item.hash in self.area.keys() or area_item.hash in self.hashlist
+        ]
 
     @property
     def hashlist(self) -> list[int]:
@@ -143,8 +147,7 @@ class HashList(DataClassORJSONMixin):
         # Combine data_couple from all RootHashLists
         return [i for root_list in self.root_hash_lists for obj in root_list.data for i in obj.data_couple]
 
-    @property
-    def missing_hashlist(self) -> list[int]:
+    def missing_hashlist(self, sub_cmd: int = 0) -> list[int]:
         """Return missing hashlist."""
         all_hash_ids = set(self.area.keys()).union(
             self.path.keys(), self.obstacle.keys(), self.dump.keys(), self.svg.keys()
@@ -153,10 +156,26 @@ class HashList(DataClassORJSONMixin):
             i
             for root_list in self.root_hash_lists
             for obj in root_list.data
+            if root_list.sub_cmd == sub_cmd
             for i in obj.data_couple
             if i not in all_hash_ids
         ]
 
+    def missing_root_hash_frame(self, hash_list: NavGetHashListAck) -> list[int]:
+        """Return missing root hash frame."""
+        target_root_list = next(
+            (
+                rhl
+                for rhl in self.root_hash_lists
+                if rhl.total_frame == hash_list.total_frame and rhl.sub_cmd == hash_list.sub_cmd
+            ),
+            None,
+        )
+        if target_root_list is None:
+            return []
+
+        return self._find_missing_frames(target_root_list)
+
     def update_root_hash_list(self, hash_list: NavGetHashListData) -> None:
         target_root_list = next(
             (
@@ -212,12 +231,15 @@ class HashList(DataClassORJSONMixin):
 
     def update(self, hash_data: NavGetCommData | SvgMessage) -> 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:
                 name = f"area {len(self.area_name)+1}" if hash_data.area_label is None else hash_data.area_label.label
                 self.area_name.append(AreaHashNameList(name=name, hash=hash_data.hash))
-            return self._add_hash_data(self.area, hash_data)
+            result = self._add_hash_data(self.area, hash_data)
+            self.update_hash_lists(self.hashlist)
+            return result
 
         if hash_data.type == PathType.OBSTACLE:
             return self._add_hash_data(self.obstacle, hash_data)
@@ -235,6 +257,9 @@ class HashList(DataClassORJSONMixin):
 
     @staticmethod
     def _find_missing_frames(frame_list: FrameList | RootHashList) -> list[int]:
+        if frame_list is None:
+            return []
+
         if frame_list.total_frame == len(frame_list.data):
             return []
         number_list = list(range(1, frame_list.total_frame + 1))

pymammotion/mammotion/devices/base.py

@@ -46,10 +46,10 @@ class MammotionBaseDevice:
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses."""
 
-        missing_frames = self.mower.map.missing_hash_frame(hash_ack)
+        missing_frames = self.mower.map.missing_root_hash_frame(hash_ack)
         if len(missing_frames) == 0:
-            if len(self.mower.map.missing_hashlist) > 0:
-                data_hash = self.mower.map.missing_hashlist.pop()
+            if len(self.mower.map.missing_hashlist(hash_ack.sub_cmd)) > 0:
+                data_hash = self.mower.map.missing_hashlist(hash_ack.sub_cmd).pop()
                 return await self.queue_command("synchronize_hash_data", hash_num=data_hash)
             return
 
@@ -67,7 +67,11 @@ class MammotionBaseDevice:
         if len(missing_frames) == 0:
             # get next in hash ack list
 
-            data_hash = self.mower.map.missing_hashlist.pop() if len(self.mower.map.missing_hashlist) > 0 else None
+            data_hash = (
+                self.mower.map.missing_hashlist(common_data.sub_cmd).pop()
+                if len(self.mower.map.missing_hashlist(common_data.sub_cmd)) > 0
+                else None
+            )
             if data_hash is None:
                 return
 
@@ -211,8 +215,8 @@ class MammotionBaseDevice:
         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 len(self.mower.map.missing_hashlist) > 0:
-            data_hash = self.mower.map.missing_hashlist.pop()
+        if len(self.mower.map.missing_hashlist()) > 0:
+            data_hash = self.mower.map.missing_hashlist().pop()
             await self.queue_command("synchronize_hash_data", hash_num=data_hash)
 
         # sub_cmd 3 is job hashes??

{pymammotion-0.4.11.dist-info → pymammotion-0.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.11
+Version: 0.4.12
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.11.dist-info → pymammotion-0.4.12.dist-info}/RECORD

@@ -10,7 +10,7 @@ pymammotion/aliyun/model/session_by_authcode_response.py,sha256=naMDigtvmpf-Ikf5
 pymammotion/aliyun/model/stream_subscription_response.py,sha256=7d0i8cNMAMX7aQjd2yebMDdqQkugcCzk-SD6oVtf18M,333
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
-pymammotion/bluetooth/ble.py,sha256=k5o2BVXSF2vLZ75U3PsUE8NomWFirJkYDVWfQQs_P1I,2484
+pymammotion/bluetooth/ble.py,sha256=XQWJBpSzeIawCrLTsVrq9LI6jmM_ALVTttUkosK2BRM,2480
 pymammotion/bluetooth/ble_message.py,sha256=47xoj22Kw5XF9VT965J_BxpvTdOgSXy4opqkbsojvDo,18795
 pymammotion/bluetooth/const.py,sha256=CCqyHsYbB0BAYjwdhXt_n6eWWxmhlUrAFjvVv57mbvE,1749
 pymammotion/bluetooth/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,7 +23,7 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=iyTqtWkpd6SCC-Y99z9mOdbQQtj7pROkfNdtKiUY2Jo,6988
+pymammotion/data/model/device.py,sha256=GRKaXPocoetyekHo4DQtPKmJQH9v7ksZvGxe0XgmnLc,6892
 pymammotion/data/model/device_config.py,sha256=dfva6mErOepLaen1CrjGaEVbEPrxRTSWXJh-yIn5iMI,2636
 pymammotion/data/model/device_info.py,sha256=Q0qJ6BflQycH_VFugwaFFXcvM69q2v9JAe2wWOcCggE,904
 pymammotion/data/model/device_limits.py,sha256=m8HdxD-RaAkPm7jHYb9GLxMEH9IfzBPz0ZypmsLnId4,1946
@@ -31,7 +31,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=pgjqURwmEIzjCMbl4Z5JDDkfxyUAdry1KhPfyir3-mU,777
-pymammotion/data/model/hash_list.py,sha256=8PTjTS9upK8ZKHHQZMFQTmFCoOHqvje0tGzAqyROAHU,9077
+pymammotion/data/model/hash_list.py,sha256=xbvve9t-VcsN_ezrWjkZyLKCdji4Ii0ota9R1fhrr4g,9926
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=bBbRhDe-imZsXDR0TN0emQv6BiIkAlXJFb5isPEjgDk,1078
 pymammotion/data/model/plan.py,sha256=wGlcJT-w0EdbWK9jI838TCOm_MABFg7WoR664VB8RWg,2880
@@ -65,7 +65,7 @@ pymammotion/mammotion/commands/messages/video.py,sha256=YQGIxKx2prA0X01ovNmMkX6Y
 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=M8YiGc9Oi6gWGfjlaFHrkzKAfT4JQ4Pr7K9eTcp2GJM,10264
+pymammotion/mammotion/devices/base.py,sha256=nzXpybSLX7o7ASVt85WYrmi0ycsATeQe-8ePMaQXXFY,10415
 pymammotion/mammotion/devices/mammotion.py,sha256=Zz2tUIdGA-jFSHLM3aO8tBMvVl7sBIBiqC9Kg7f-lm8,13190
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=0c-HXawLQVHz28s0HKaSCNq4wmLWJZZ3ATDVnCXdSrc,19579
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=gLdxaD759QphR10LsQchTTOHZi6jvnI2EHlbhMfsXvE,14373
@@ -117,7 +117,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.4.11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.11.dist-info/METADATA,sha256=FBZkAzoPsVivbbmMHe5fnnTh7viBsYwFcatQL0923xs,3834
-pymammotion-0.4.11.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pymammotion-0.4.11.dist-info/RECORD,,
+pymammotion-0.4.12.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.12.dist-info/METADATA,sha256=7OOHH8HQ2IzfLTBV7avw8fyUMUBu_i72OoQGDWkeXSg,3834
+pymammotion-0.4.12.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+pymammotion-0.4.12.dist-info/RECORD,,

{pymammotion-0.4.11.dist-info → pymammotion-0.4.12.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any