pymammotion 0.4.28__tar.gz → 0.4.30__tar.gz

{pymammotion-0.4.28 → pymammotion-0.4.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.28
+Version: 0.4.30
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: aiohttp (>=3.11.18,<4.0.0)
+Requires-Dist: aiohttp (>=3.9.1)
 Requires-Dist: alibabacloud-apigateway-util (>=0.0.2,<0.0.3)
 Requires-Dist: alibabacloud-iot-api-gateway (>=0.0.4,<0.0.5)
 Requires-Dist: alicloud-gateway-iot (>=1.0.0,<2.0.0)

{pymammotion-0.4.28 → pymammotion-0.4.30}/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-0.4.28 → pymammotion-0.4.30}/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-0.4.28 → pymammotion-0.4.30}/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-0.4.28 → pymammotion-0.4.30}/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-0.4.28 → pymammotion-0.4.30}/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()
+            and DeviceType.RTK3A0.get_value() != device_type.get_value()
+            and DeviceType.RTK3A1.get_value() != device_type.get_value()
+            and DeviceType.RTK3A2.get_value() != device_type.get_value()
+        )
 
     @staticmethod
     def contain_rtk_product_key(product_key) -> bool:

{pymammotion-0.4.28 → pymammotion-0.4.30}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.28"
+version     = "0.4.30"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -25,7 +25,7 @@ python = ">=3.11,<3.14"
 bleak = ">=0.21.0"
 protobuf = ">=4.23.1"
 py-jsonic = "^0.0.2"
-aiohttp = "^3.11.18"
+aiohttp = ">=3.9.1"
 paho-mqtt = "^2.1.0"
 alicloud-gateway-iot = "^1.0.0"
 alibabacloud-apigateway-util = "^0.0.2"
@@ -60,13 +60,13 @@ grpcio-tools = "^1.63.0"
 betterproto = {extras = ["compiler"], version = "^1.2.5"}
 pylint = "^3.2.2"
 ruff = "^0.9.3"
-pre-commit = "^3.8.0"
+pre-commit = "^4.2.0"
 mypy = "^1.11.2"
 autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.4.28"
+current_version = "0.4.30"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true