pymammotion 0.4.12b1__tar.gz → 0.4.13__tar.gz

{pymammotion-0.4.12b1 → pymammotion-0.4.13}/PKG-INFO

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

{pymammotion-0.4.12b1 → pymammotion-0.4.13}/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-0.4.12b1 → pymammotion-0.4.13}/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-0.4.12b1 → pymammotion-0.4.13}/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 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,6 +156,7 @@ 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
         ]
@@ -167,6 +171,9 @@ class HashList(DataClassORJSONMixin):
             ),
             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:
@@ -224,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)

{pymammotion-0.4.12b1 → pymammotion-0.4.13}/pymammotion/mammotion/devices/base.py

@@ -48,8 +48,8 @@ class MammotionBaseDevice:
 
         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
 
@@ -205,14 +209,16 @@ class MammotionBaseDevice:
     async def start_map_sync(self) -> None:
         """Start sync of map data."""
 
+        self.mower.map.update_hash_lists(self.mower.map.hashlist)
+
         if self._cloud_device and len(self.mower.map.area_name) == 0 and not DeviceType.is_luba1(self.mower.name):
             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)
 
         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.12b1 → pymammotion-0.4.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.12-beta1"
+version     = "0.4.13"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.4.12-beta1"
+current_version = "0.4.13"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true