pymammotion 0.2.49__py3-none-any.whl → 0.2.50__py3-none-any.whl

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/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/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/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.dist-info → pymammotion-0.2.50.dist-info}/METADATA

@@ -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.dist-info → pymammotion-0.2.50.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=jHCQrpJaG1jAoID9T4RT3g4JsZc0JpJqIcqjnA7cXd0,1605
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=vMNt5MquL-t7C0-yDAXQEYA37RR4cj2rdLfh5iQ131o,25561
+pymammotion/aliyun/cloud_gateway.py,sha256=96xbl_QefMcN0x8Dhz0OJQr_IaAcgrrrqfxCQAUGxTc,25668
 pymammotion/aliyun/cloud_service.py,sha256=px7dUKow5Z7VyebjYzuKkzkm77XbUXYiFiYO_2e-UQ0,2207
 pymammotion/aliyun/model/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
@@ -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=WMnXddqHGWz3Htiof2xhcXMcHLvqjNcsDWuXAQlllVo,4394
+pymammotion/data/model/hash_list.py,sha256=URJeh0vSy2dIDx0za2w-wtqFs4dQb2g9ec2UXz3f7TY,4638
 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
@@ -50,7 +50,7 @@ pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 pymammotion/mammotion/commands/abstract_message.py,sha256=nw6r7694yzl7iJKqRqhLmAPRjd_TL_Xo_-JXq2_a_ug,222
 pymammotion/mammotion/commands/mammotion_command.py,sha256=Cdv8sAt-W-Sihmhir1eN56OMA2e5b8y47NP2QKYqb-o,2419
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymammotion/mammotion/commands/messages/driver.py,sha256=ANIOEtjF23k7W_R_Yfgzxmc7p1KSBCF-l-tijUtw0Yg,3709
+pymammotion/mammotion/commands/messages/driver.py,sha256=spkNa-sag_7xDuHy7mjsR_Fc8z9ztNKHCjtojWayJms,3710
 pymammotion/mammotion/commands/messages/media.py,sha256=ps0l06CXy5Ej--gTNCsyKttwo7yHLVrJUpn-wNJYecs,1150
 pymammotion/mammotion/commands/messages/navigation.py,sha256=4rXBL-mViWc38K6x1w5O-GjwV8UWS5xZXkf4aHYjs8A,23684
 pymammotion/mammotion/commands/messages/network.py,sha256=61msRJWyXdrO8FbI_rhrO2K8R1qkGVUj5BFzNwm7lwg,8155
@@ -60,7 +60,7 @@ 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=o3G-A6JciBq2AUZaPdHtp6q9pp3blOxYb1ySI3Fg_Gk,9717
+pymammotion/mammotion/devices/base.py,sha256=iqvGglud4GYKgivBjzge7WU9-pLY8Z6l4QjShxLT7Go,9746
 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
@@ -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.49.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.49.dist-info/METADATA,sha256=Qw3Jl5LZDfCw9TOlEParI4X8ZffLGJiJdlHyWSRo2fQ,4052
-pymammotion-0.2.49.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.49.dist-info/RECORD,,
+pymammotion-0.2.50.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.50.dist-info/METADATA,sha256=k0s4Czkpb0hP2t0AK1kc5R3o_Y71HosYscCC6vdeIUI,4052
+pymammotion-0.2.50.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.50.dist-info/RECORD,,