pymammotion 0.2.49__tar.gz → 0.2.50__tar.gz

{pymammotion-0.2.49 → pymammotion-0.2.50}/PKG-INFO

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

{pymammotion-0.2.49 → pymammotion-0.2.50}/pymammotion/aliyun/cloud_gateway.py

@@ -478,6 +478,8 @@ class CloudIOTGateway:
 
         # Load the JSON string into a dictionary
         response_body_dict = json.loads(response_body_str)
+        logger.debug(response_body_dict)
+        return response_body_dict
 
     def check_or_refresh_session(self):
         """Check or refresh the session."""
@@ -689,6 +691,7 @@ class CloudIOTGateway:
                 str(response_body_dict.get("msg")),
             )
             if response_body_dict.get("code") == 29003:
+                self.sign_out()
                 raise SetupException(response_body_dict.get("code"))
             if response_body_dict.get("code") == 6205:
                 raise DeviceOfflineException(response_body_dict.get("code"))

{pymammotion-0.2.49 → pymammotion-0.2.50}/pymammotion/data/model/hash_list.py

@@ -22,8 +22,8 @@ class FrameList(DataClassORJSONMixin):
 
 @dataclass
 class RootHashList(DataClassORJSONMixin):
-    total_frame: int = 1
-    data: list[NavGetHashListAck] = field(default_factory=list)
+    total_frame: int
+    data: list[NavGetHashListAck]
 
 
 @dataclass
@@ -56,6 +56,15 @@ class HashList(DataClassORJSONMixin):
     def hashlist(self) -> list[int]:
         return [i for obj in self.root_hash_list.data for i in obj.data_couple]
 
+    @property
+    def missing_hashlist(self) -> list[int]:
+        return [
+            i
+            for obj in self.root_hash_list.data
+            for i in obj.data_couple
+            if i not in set(self.area.keys()).union(self.path.keys(), self.obstacle.keys())
+        ]
+
     def update_root_hash_list(self, hash_list: NavGetHashListAck) -> None:
         self.root_hash_list.total_frame = hash_list.total_frame
 

{pymammotion-0.2.49 → pymammotion-0.2.50}/pymammotion/mammotion/commands/messages/driver.py

@@ -27,7 +27,7 @@ class MessageDriver(AbstractMessage, ABC):
 
     def set_blade_height(self, height: int):
         logger.debug(f"Send knife height height={height}")
-        build = mctrl_driver.MctlDriver(todev_knife_height_set=mctrl_driver.DrvKnifeHeight(knifeHeight=height))
+        build = mctrl_driver.MctlDriver(todev_knife_height_set=mctrl_driver.DrvKnifeHeight(knife_height=height))
         logger.debug(f"Send command--Knife motor height setting height={height}")
         return self.send_order_msg_driver(build)
 

{pymammotion-0.2.49 → pymammotion-0.2.50}/pymammotion/mammotion/devices/base.py

@@ -58,7 +58,8 @@ class MammotionBaseDevice:
 
         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)
+            data_hash = self.mower.map.missing_hashlist.pop()
+            return await self.queue_command("synchronize_hash_data", hash_num=data_hash)
 
         if current_frame != missing_frames[0] - 1:
             current_frame = missing_frames[0] - 1
@@ -73,7 +74,7 @@ class MammotionBaseDevice:
         if len(missing_frames) == 0:
             # get next in hash ack list
 
-            data_hash = find_next_integer(self.mower.map.hashlist, common_data.hash)
+            data_hash = self.mower.map.missing_hashlist.pop()
             if data_hash is None:
                 return
 
@@ -216,8 +217,8 @@ class MammotionBaseDevice:
 
         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)
+        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??
         # sub_cmd 4 is dump location (yuka)

{pymammotion-0.2.49 → pymammotion-0.2.50}/pyproject.toml

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