pymammotion 0.4.29__py3-none-any.whl → 0.4.31__py3-none-any.whl

pymammotion/data/model/device_config.py

@@ -45,7 +45,7 @@ def create_path_order(operation_mode: OperationSettings, device_name: str) -> st
         if DeviceType.is_yuka(device_name) and not DeviceType.is_yuka_mini(device_name):
             bArr[5] = calculate_yuka_mode(operation_mode)
         else:
-            bArr[5] = 8 if DeviceType.is_luba_2(device_name) else 0
+            bArr[5] = 8 if DeviceType.is_luba_pro(device_name) else 0
 
         bArr[6] = int(operation_mode.collect_grass_frequency) if operation_mode.is_dump else 10
     if DeviceType.is_luba1(device_name):

pymammotion/http/http.py

@@ -138,12 +138,12 @@ class MammotionHTTP:
             ) as resp:
                 if resp.status != 200:
                     print(resp.json())
-                    return Response.from_dict({"status": resp.status, "msg": "Login failed"})
+                    return Response.from_dict({"code": resp.status, "msg": "Login failed"})
                 data = await resp.json()
                 login_response = Response[LoginResponseData].from_dict(data)
                 if login_response.data is None:
                     print(login_response)
-                    return Response.from_dict({"status": resp.status, "msg": "Login failed"})
+                    return Response.from_dict({"code": resp.status, "msg": "Login failed"})
                 self.login_info = LoginResponseData.from_dict(login_response.data)
                 self._headers["Authorization"] = (
                     f"Bearer {self.login_info.access_token}" if login_response.data else None

pymammotion/mammotion/commands/messages/driver.py

@@ -35,24 +35,24 @@ class MessageDriver(AbstractMessage, ABC):
             driver=driver,
         ).SerializeToString()
 
-    def set_blade_height(self, height: int):
+    def set_blade_height(self, height: int) -> bytes:
         logger.debug(f"Send knife height height={height}")
         build = MctlDriver(todev_knife_height_set=DrvKnifeHeight(knife_height=height))
         logger.debug(f"Send command--Knife motor height setting height={height}")
         return self.send_order_msg_driver(build)
 
-    def set_speed(self, speed: float):
+    def set_speed(self, speed: float) -> bytes:
         logger.debug(f"{self.get_device_name()} set speed, {speed}")
         build = MctlDriver(bidire_speed_read_set=DrvSrSpeed(speed=speed, rw=1))
         logger.debug(f"Send command--Speed setting speed={speed}")
         return self.send_order_msg_driver(build)
 
-    def syn_nav_star_point_data(self, sat_system: int):
+    def syn_nav_star_point_data(self, sat_system: int) -> bytes:
         build = MctlDriver(rtk_sys_mask_query=RtkSysMaskQueryT(sat_system=sat_system))
         logger.debug(f"Send command--Navigation satellite frequency point synchronization={sat_system}")
         return self.send_order_msg_driver(build)
 
-    def set_nav_star_point(self, cmd_req: str):
+    def set_nav_star_point(self, cmd_req: str) -> bytes:
         build = MctlDriver(rtk_cfg_req=RtkCfgReqT(cmd_req=cmd_req, cmd_length=len(cmd_req) - 1))
         logger.debug(f"Send command--Navigation satellite frequency point setting={cmd_req}")
         logger.debug(
@@ -60,7 +60,7 @@ class MessageDriver(AbstractMessage, ABC):
         )
         return self.send_order_msg_driver(build)
 
-    def get_speed(self):
+    def get_speed(self) -> bytes:
         build = MctlDriver(bidire_speed_read_set=DrvSrSpeed(rw=0))
         logger.debug("Send command--Get speed value")
         return self.send_order_msg_driver(build)
@@ -71,7 +71,7 @@ class MessageDriver(AbstractMessage, ABC):
         cut_knife_ctrl: int,
         cut_knife_height: int,
         max_run_speed: float,
-    ):
+    ) -> bytes:
         build = MctlDriver(
             mow_ctrl_by_hand=DrvMowCtrlByHand(
                 main_ctrl=main_ctrl,

pymammotion/mammotion/commands/messages/system.py

@@ -121,7 +121,7 @@ class MessageSystem(AbstractMessage, ABC):
     def allpowerfull_rw(self, rw_id: int, context: int, rw: int) -> bytes:
         if (
             rw_id == 6 or rw_id == 3 or rw_id == 7 or rw_id == 8 or rw_id == 10 or rw_id == 11
-        ) and DeviceType.is_luba_2(self.get_device_name()):
+        ) and DeviceType.is_luba_pro(self.get_device_name()):
             return self.messageNavigation.allpowerfull_rw_adapter_x3(rw_id, context, rw)
         build = MctlSys(bidire_comm_cmd=SysCommCmd(id=rw_id, context=context, rw=rw))
         logger.debug(f"Send command - 9 general read and write command id={rw_id}, context={context}, rw={rw}")

pymammotion/utility/device_type.py

@@ -190,7 +190,7 @@ class DeviceType(Enum):
         return device_type.get_value() == DeviceType.LUBA.get_value()
 
     @staticmethod
-    def is_luba_2(device_name: str, product_key: str = ""):
+    def is_luba_pro(device_name: str, product_key: str = ""):
         """Check if the device type is LUBA 2 or higher based on the device name
         and optional product key.
 
@@ -211,6 +211,7 @@ class DeviceType(Enum):
         return (
             device_type.get_value() >= DeviceType.LUBA_2.get_value()
             and device_type.get_value() != DeviceType.SPINO.get_value()
+            and not DeviceType.is_rtk(device_name, product_key)
         )
 
     @staticmethod
@@ -273,7 +274,12 @@ class DeviceType(Enum):
         else:
             device_type = DeviceType.value_of_str(device_name, product_key)
 
-        return DeviceType.RTK.get_value() <= device_type.get_value() < DeviceType.LUBA.get_value()
+        return (
+            DeviceType.RTK.get_value() == device_type.get_value()
+            or DeviceType.RTK3A0.get_value() == device_type.get_value()
+            or DeviceType.RTK3A1.get_value() == device_type.get_value()
+            or DeviceType.RTK3A2.get_value() == device_type.get_value()
+        )
 
     @staticmethod
     def contain_rtk_product_key(product_key) -> bool:

{pymammotion-0.4.29.dist-info → pymammotion-0.4.31.dist-info}/METADATA

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

{pymammotion-0.4.29.dist-info → pymammotion-0.4.31.dist-info}/RECORD

@@ -27,7 +27,7 @@ pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 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=GRKaXPocoetyekHo4DQtPKmJQH9v7ksZvGxe0XgmnLc,6892
-pymammotion/data/model/device_config.py,sha256=dfva6mErOepLaen1CrjGaEVbEPrxRTSWXJh-yIn5iMI,2636
+pymammotion/data/model/device_config.py,sha256=1kFkztZk3_DXHaEUZN-j_4s0HT83m4qLVAg2uHCyzFg,2638
 pymammotion/data/model/device_info.py,sha256=Q0qJ6BflQycH_VFugwaFFXcvM69q2v9JAe2wWOcCggE,904
 pymammotion/data/model/device_limits.py,sha256=m8HdxD-RaAkPm7jHYb9GLxMEH9IfzBPz0ZypmsLnId4,1946
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
@@ -51,19 +51,19 @@ pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/encryption.py,sha256=lzXu3WwBdQlzjXxWnlJuRgkCrKdPbxx5drhMitVKIEk,8287
-pymammotion/http/http.py,sha256=doncq4jXGQt6jXzt2ZL6n8pne45jPFAVJKhGabi5LMw,7363
+pymammotion/http/http.py,sha256=r8jvdh01OAQEBNYW8QHZ2v5MjzCFkv6FibE3kWRmdSg,7359
 pymammotion/http/model/http.py,sha256=tM5ikwVkWhRdXc2xi1NOLmWPH2mQEQelpaVgMlAEmlI,2333
 pymammotion/mammotion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/abstract_message.py,sha256=C1teY4Bd_BpBhAWWzKokoeXm7bjvDeV0sDL5CVpoyhI,829
 pymammotion/mammotion/commands/mammotion_command.py,sha256=3OFXQjF7HFwPd_j6utHVI2Kfwh7t6_6ff_9MKAWGTlk,2570
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymammotion/mammotion/commands/messages/driver.py,sha256=7lVfk3bHymgNf3toVhqYmCq8KrLTk_OaNz3oTmT_xY8,3647
+pymammotion/mammotion/commands/messages/driver.py,sha256=LAYGvAcDDXwwliQ1OfRwNBk1VpIdpURo1TlA64zpLA4,3701
 pymammotion/mammotion/commands/messages/media.py,sha256=NUmd6W5171sOZZ08GhUCqzpGMptVqXC36t-H3i42tOQ,1282
 pymammotion/mammotion/commands/messages/navigation.py,sha256=rvKxBAeH1fjLyabgpYX1FWAl98psvx4HiqZTHPbL9zs,23252
 pymammotion/mammotion/commands/messages/network.py,sha256=oO3PK6TKY563Jw-ZRpNmIzGCgkuk2SQm0BhcDL5claM,7595
 pymammotion/mammotion/commands/messages/ota.py,sha256=ZHLQRE5ETvLEIu2Vbj3m2XidIWT8uorYSHxkZd3pkRc,1376
-pymammotion/mammotion/commands/messages/system.py,sha256=ScXlurQAy8Z9WntXBRrxThnsVHFWfiNNltEWh-SVcvQ,14811
+pymammotion/mammotion/commands/messages/system.py,sha256=P3ndyhvvJbYFjurwMi6LRObG4yTBlooZAxuwa4guYec,14813
 pymammotion/mammotion/commands/messages/video.py,sha256=Vn5F65ojr3chePBtfYjOg90EHmZnZyA-1t6U3XB1m6A,1189
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
@@ -115,12 +115,12 @@ pymammotion/utility/constant/device_constant.py,sha256=g6QWBaP85h6PNxmk1cOqtP7Hv
 pymammotion/utility/conversions.py,sha256=v3YICy0zZwwBBzrUZgabI7GRfiDBnkiAX2qdtk3NxOY,89
 pymammotion/utility/datatype_converter.py,sha256=SPM_HuaaD_XOawlqEnA8qlRRZXGba3WjA8kGOZgeBlQ,4284
 pymammotion/utility/device_config.py,sha256=65Jl73-dQDs4yMXwYXZW_bsgSvnwpFBZDu8OQPEIgx8,27877
-pymammotion/utility/device_type.py,sha256=nl15OuM3x_iDc8lWijOqRv5UdWt6hkPtnEt9RMC4xPE,12306
+pymammotion/utility/device_type.py,sha256=Lhvi8CLY8qr1EghZFlFK85hhzsmyE0LHVZO0qAmYod4,12582
 pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,2227
 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.29.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.29.dist-info/METADATA,sha256=h6vaXXvXFLpqhGmLw4HZJlrfNlqxIgSabzcVRFrZ-M0,3878
-pymammotion-0.4.29.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pymammotion-0.4.29.dist-info/RECORD,,
+pymammotion-0.4.31.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.31.dist-info/METADATA,sha256=KmOCtXEg58cOCL2JClz50QKsSMIm2h0542JedHTFTf8,3878
+pymammotion-0.4.31.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+pymammotion-0.4.31.dist-info/RECORD,,