pymammotion 0.5.11__py3-none-any.whl → 0.5.13__py3-none-any.whl

pymammotion/data/state_manager.py

@@ -87,6 +87,7 @@ class StateManager:
         await self.on_status_callback(thing_status)
 
     async def device_event(self, device_event: ThingEventMessage) -> None:
+        """Sets MQTT event and calls callback."""
         self._device.mqtt_device_event = device_event
         await self.on_device_event_callback(device_event)
 
@@ -121,7 +122,7 @@ class StateManager:
             await self.status_callback.data_event(thing_status)
 
     async def on_device_event_callback(self, device_event: ThingEventMessage) -> None:
-        """Execute the status callback if it is set."""
+        """Executes the status callback if it is set."""
         if self.device_event_callback:
             await self.device_event_callback.data_event(device_event)
 

pymammotion/http/http.py

@@ -29,6 +29,7 @@ class MammotionHTTP:
         return await self.login(email, password)
 
     async def get_all_error_codes(self) -> dict[str, ErrorInfo]:
+        """Retrieves and parses all error codes from the MAMMOTION API."""
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.post(
                 "/user-server/v1/code/record/export-data",

pymammotion/mammotion/commands/abstract_message.py

@@ -7,12 +7,13 @@ from pymammotion.utility.device_type import DeviceType
 
 class AbstractMessage:
     seqs = AtomicInteger(0)
-    user_account: int = 1
+    user_account: int
 
     @abstractmethod
     def get_device_name(self) -> str:
         """Get device name."""
 
+    @abstractmethod
     def get_device_product_key(self) -> str:
         """Get device name."""
 

pymammotion/mammotion/commands/mammotion_command.py

@@ -5,6 +5,7 @@ from pymammotion.mammotion.commands.messages.network import MessageNetwork
 from pymammotion.mammotion.commands.messages.ota import MessageOta
 from pymammotion.mammotion.commands.messages.system import MessageSystem
 from pymammotion.mammotion.commands.messages.video import MessageVideo
+from pymammotion.utility.device_type import DeviceType
 from pymammotion.utility.movement import get_percent, transform_both_speeds
 
 
@@ -22,6 +23,13 @@ class MammotionCommand(
         """Get device name."""
         return self._device_name
 
+    def read_write_device(self, rw_id: int, context: int, rw: int):
+        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_pro(self.get_device_name()):
+            return self.allpowerfull_rw_adapter_x3(rw_id, context, rw)
+        return self.allpowerfull_rw(rw_id, context, rw)
+
     def get_device_product_key(self) -> str:
         return self._product_key
 

pymammotion/mammotion/commands/messages/navigation.py

@@ -50,7 +50,7 @@ class MessageNavigation(AbstractMessage, ABC):
 
     def allpowerfull_rw_adapter_x3(self, rw_id: int, context: int, rw: int) -> bytes:
         build = MctlNav(nav_sys_param_cmd=NavSysParamMsg(id=rw_id, context=context, rw=rw))
-        logger.debug(f"Send command--9 general read and write command id={id}, context={context}, rw={rw}")
+        logger.debug(f"Send command--x3 general read and write command id={rw_id}, context={context}, rw={rw}")
         return self.send_order_msg_nav(build)
 
     def along_border(self) -> bytes:

pymammotion/mammotion/commands/messages/ota.py

@@ -1,9 +1,12 @@
 # === sendOrderMsg_Ota ===
 from abc import ABC
+import logging
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import GetInfoReq, InfoType, LubaMsg, MctlOta, MsgAttr, MsgCmdType, MsgDevice
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class MessageOta(AbstractMessage, ABC):
     """Message OTA class."""
@@ -25,11 +28,11 @@ class MessageOta(AbstractMessage, ABC):
     def get_device_ota_info(self, log_type: int):
         todev_get_info_req = MctlOta(todev_get_info_req=GetInfoReq(type=InfoType.IT_OTA))
 
-        print("===Send command to get upgrade details===logType:" + str(log_type))
+        _LOGGER.debug("===Send command to get upgrade details===logType:" + str(log_type))
         return self.send_order_msg_ota(todev_get_info_req)
 
     def get_device_info_new(self) -> bytes:
         """New device call for OTA upgrade information."""
         todev_get_info_req = MctlOta(todev_get_info_req=GetInfoReq(type=InfoType.IT_BASE))
-        print("Send to get OTA upgrade information", "Get device information")
+        _LOGGER.debug("Send to get OTA upgrade information", "Get device information")
         return self.send_order_msg_ota(todev_get_info_req)

pymammotion/mammotion/commands/messages/system.py

@@ -5,7 +5,6 @@ import time
 
 from pymammotion import logger
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
 from pymammotion.proto import (
     DeviceProductTypeInfoT,
     LoraCfgReq,
@@ -23,12 +22,9 @@ from pymammotion.proto import (
     SysSetDateTime,
     TimeCtrlLight,
 )
-from pymammotion.utility.device_type import DeviceType
 
 
 class MessageSystem(AbstractMessage, ABC):
-    messageNavigation: MessageNavigation = MessageNavigation()
-
     def send_order_msg_sys(self, sys) -> bytes:
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.EMBED_SYS,
@@ -119,10 +115,6 @@ class MessageSystem(AbstractMessage, ABC):
         return self.send_order_msg_sys(MctlSys(todev_lora_cfg_req=LoraCfgReq(op=op, cfg=cgf)))
 
     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_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}")
         return self.send_order_msg_sys(build)

pymammotion/mammotion/devices/mammotion.py

@@ -139,9 +139,13 @@ class MammotionDeviceManager:
         if mammotion_device.has_ble():
             exists.replace_ble(mammotion_device.ble())
 
+    def has_device(self, mammotion_device_name: str) -> bool:
+        if self.devices.get(mammotion_device_name, None) is not None:
+            return True
+        return False
+
     def get_device(self, mammotion_device_name: str) -> MammotionMixedDeviceManager:
-        """Get a device."""
-        return self.devices.get(mammotion_device_name)
+        return self.devices[mammotion_device_name]
 
     async def remove_device(self, name: str) -> None:
         """Remove a device."""
@@ -229,8 +233,8 @@ class Mammotion:
     def add_cloud_devices(self, mqtt_client: MammotionCloud) -> None:
         """Add devices from cloud."""
         for device in mqtt_client.cloud_client.devices_by_account_response.data.data:
-            mower_device = self.device_manager.get_device(device.deviceName)
-            if device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device is None:
+            has_device = self.device_manager.has_device(device.deviceName)
+            if device.deviceName.startswith(("Luba-", "Yuka-")) and not has_device:
                 mixed_device = MammotionMixedDeviceManager(
                     name=device.deviceName,
                     iot_id=device.iotId,
@@ -282,8 +286,8 @@ class Mammotion:
         return self.device_manager.get_device(name)
 
     def get_or_create_device_by_name(self, device: Device, mqtt_client: MammotionCloud) -> MammotionMixedDeviceManager:
-        if mow_device := self.device_manager.get_device(device.deviceName):
-            return mow_device
+        if self.device_manager.has_device(device.deviceName):
+            return self.device_manager.get_device(device.deviceName)
         mow_device = MammotionMixedDeviceManager(
             name=device.deviceName,
             iot_id=device.iotId,

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -52,6 +52,7 @@ class MammotionCloud:
         self._mqtt_client.on_ready = self.on_ready
 
     async def on_ready(self) -> None:
+        """Starts processing the queue and emits the ready event."""
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
         await self.on_ready_event.data_event(None)
@@ -116,7 +117,16 @@ class MammotionCloud:
         await self._parse_mqtt_response(topic, payload)
 
     async def _parse_mqtt_response(self, topic: str, payload: dict) -> None:
-        """Parse the MQTT response."""
+        """Parse and handle MQTT responses based on the topic.
+        
+        This function processes different types of MQTT messages received from various
+        topics. It logs debug information and calls appropriate callback methods for
+        each event type.
+        
+        Args:
+            topic (str): The MQTT topic from which the message was received.
+            payload (dict): The payload data of the MQTT message.
+        """
         if topic.endswith("/app/down/thing/events"):
             _LOGGER.debug("Thing event received")
             event = ThingEventMessage.from_dicts(payload)
@@ -323,11 +333,23 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         await self.state_manager.status(status)
 
     async def _parse_device_event_for_device(self, status: ThingStatusMessage) -> None:
+        """Process device event if it matches the device's IoT ID."""
         if status.params.iotId != self.iot_id:
             return
         await self.state_manager.device_event(status)
 
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
+        """Parses a message received from a device and updates internal state.
+        
+        This function processes an incoming `ThingEventMessage`, checks if the message
+        is intended for this device, decodes the binary data, and updates raw data. It
+        then attempts to parse the binary data into a `LubaMsg`. If parsing fails, it
+        logs the exception. The function also handles setting the device product key if
+        not already set and processes specific sub-messages based on their types.
+        
+        Args:
+            event (ThingEventMessage): The event message received from the device.
+        """
         params = event.params
         new_msg = LubaMsg()
         if event.params.iotId != self.iot_id:

pymammotion/mqtt/mammotion_mqtt.py

@@ -180,7 +180,7 @@ class MammotionMQTT:
             asyncio.wrap_future(future, loop=self.loop)
 
     def _thing_on_connect(self, session_flag, rc, user_data) -> None:
-        """Is called on thing connect."""
+        """Handle connection event and execute callback if set."""
         self.is_connected = True
         if self.on_connected is not None:
             future = asyncio.run_coroutine_threadsafe(self.on_connected(), self.loop)

pymammotion/proto/mctrl_driver.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 enum CutterWorkMode {
   CUTTER_STANDARD = 0;
-  CUTTER_PERFORMANCE = 1;
-  CUTTER_ECONOMIC = 2;
+  CUTTER_ECONOMIC = 1;
+  CUTTER_PERFORMANCE = 2;
 }
 
 enum CollectMotorState {

{pymammotion-0.5.11.dist-info → pymammotion-0.5.13.dist-info}/METADATA

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

{pymammotion-0.5.11.dist-info → pymammotion-0.5.13.dist-info}/RECORD

@@ -46,42 +46,42 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=pj65y93ACcTzUIJkHZC6s_pRFBYaNMSU1wyYRhiGvw4,5571
 pymammotion/data/mqtt/properties.py,sha256=laud9rE-JqBHWKZ44Dov2yMkp3Ld8ghpBwlZ4_3g9uQ,4321
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
-pymammotion/data/state_manager.py,sha256=K3o__YsjBS5C5tEujANnxI-lgQpbXhPMUIy3sgVc3QI,12056
+pymammotion/data/state_manager.py,sha256=AyrXwcU7SxliQ1r8b_QqFMkMoS6l0VE-XfxLq7NZ5go,12107
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=Z8WYxv_-5khEqKjL1w4c_Et24G1Kdm8QFuIBylD3h3U,3021
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/encryption.py,sha256=lzXu3WwBdQlzjXxWnlJuRgkCrKdPbxx5drhMitVKIEk,8287
-pymammotion/http/http.py,sha256=7tIk7KzM6Wq4bWApcdAgsvQ139HEMvqfIX2STRVJTyM,12331
+pymammotion/http/http.py,sha256=-JT97FN8j5CfGPI5gPjFpOivBsKeP-IlzH0dIAioTvI,12406
 pymammotion/http/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/model/camera_stream.py,sha256=ilxQNny_w9Frwt-m8kbHinvyjDv4Bx8C2swfZ2lTEDE,600
 pymammotion/http/model/http.py,sha256=VDBmi9nyY5Y2ns_HYvKIyzbkKRxhZ5elpq0lWXWzbGw,4123
 pymammotion/http/model/response_factory.py,sha256=f5_ZR0-4sLOU-q28BVy5sQOReSoND2A8UvpOOwnwrzA,1936
 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=P5FcjGkfoQ1O4Q9JKdq306TisQnJ40xDXufR-juNn8k,792
-pymammotion/mammotion/commands/mammotion_command.py,sha256=3OFXQjF7HFwPd_j6utHVI2Kfwh7t6_6ff_9MKAWGTlk,2570
+pymammotion/mammotion/commands/abstract_message.py,sha256=M4qL-Yw5g3fTgS9jB9LUSgJSAqpUf7MME-2mfv471Sk,808
+pymammotion/mammotion/commands/mammotion_command.py,sha256=AMOx6nEbPa0HijbENomPLLuJummS1q-23BzgetBAuOI,2991
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/messages/driver.py,sha256=LAYGvAcDDXwwliQ1OfRwNBk1VpIdpURo1TlA64zpLA4,3701
 pymammotion/mammotion/commands/messages/media.py,sha256=X4LQG9SFNZXyqeaedjuEM10Jx9Bc6SN7kQFpKxrSFrQ,2934
-pymammotion/mammotion/commands/messages/navigation.py,sha256=aEEpvDW5QukJ0QiWMhPjjz0eTTF1ndQuvv8a6hJlUg0,23257
+pymammotion/mammotion/commands/messages/navigation.py,sha256=yI-B5HHGuZJXn9iYrxhYZ5BArde6wB_j9bUc5IcSIJE,23261
 pymammotion/mammotion/commands/messages/network.py,sha256=OrmW4-BP_o3piBjwXZ12WY0HqbXHQqeDXC0YaDPeBM8,7409
-pymammotion/mammotion/commands/messages/ota.py,sha256=ZHLQRE5ETvLEIu2Vbj3m2XidIWT8uorYSHxkZd3pkRc,1376
-pymammotion/mammotion/commands/messages/system.py,sha256=P_J6ikTXGuVEsekOKGEV6o-wfrFDf8ChF4Tzxz6uDtY,14275
+pymammotion/mammotion/commands/messages/ota.py,sha256=Nk3Tlp6n7hkbkuy355BlqbozHIHzsYnrH2cDO8QGaLk,1446
+pymammotion/mammotion/commands/messages/system.py,sha256=620kzRgX_ee9ATRgxQ1fwog4hN_-ijGNxGUH-wwlIIU,13816
 pymammotion/mammotion/commands/messages/video.py,sha256=WExYvIcfVnStM5viP1VW05Fl_SmZipxGTAvZFZh3ryQ,1302
 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=qDh7P7fnakDKgxTqjNLcQg8eE-6gHJaXAV0ONjhy_IU,12038
-pymammotion/mammotion/devices/mammotion.py,sha256=1SDIT4BazBoqqrsXmnNy5YjiP0vltVZ7IonZ7SlYQ8Q,15559
+pymammotion/mammotion/devices/mammotion.py,sha256=aZ5HvlBL798ImiS2xuf0YatrpWlDeb-U9lwIy33SohY,15722
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=mbZlbm3lAx5uLtHOR7rZ_hp4l9XPb2DnSzz4v8tdmKg,19352
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=aJ_SS2KgQsdD_qpSaHmGfhOyENPwatA6ae2Me41F8UI,15344
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=USYgv3ENplzy0dWu0JttBy9Ldl06yUkuhxI2dW0GfTQ,16527
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
 pymammotion/mqtt/linkkit/linkkit.py,sha256=SGWny2_LKa8qg8RD0Bgd3a4S_fMqpYxJ7a9eFRvgcN0,132923
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=p2efgd35ePi9bZxsGp2gtcS83BHiw7A1NR-utZx8Ijg,10183
+pymammotion/mqtt/mammotion_mqtt.py,sha256=OtLyTxow8xJc1RK1tv3ZCUBleTLZ3QABKmVYIcynoxU,10208
 pymammotion/proto/__init__.py,sha256=dUl6HZ0NMRQUVOWe5Kf3fOJFVC5YJ98I9xEfd1R9Wdg,73487
 pymammotion/proto/basestation.proto,sha256=YiSsDmT0DY_ep6DHay13SbhxGMhentYt0BmJrVQrwLQ,1198
 pymammotion/proto/basestation_pb2.py,sha256=suenbpMz9JZCXdGJGdiPaapppRz9Cf4IDzAXUfdIG3w,3083
@@ -98,7 +98,7 @@ pymammotion/proto/luba_msg_pb2.pyi,sha256=_pTiOzssrVbEty_yIjHpnQWbTNtFfKfqSC_wvp
 pymammotion/proto/luba_mul.proto,sha256=jAJN9Sts0PfqmLYDdte5NIY36oOrMP0bbqat6RuigYI,2135
 pymammotion/proto/luba_mul_pb2.py,sha256=MDZotppPPglKfTuBuWNjw6iHXbUVAH_PXPyl9VVF7sc,5724
 pymammotion/proto/luba_mul_pb2.pyi,sha256=KsTOSGRTvcO1qO7wxuu827zRT7Eb7xnUN-KRd7dgm6s,7713
-pymammotion/proto/mctrl_driver.proto,sha256=jbsPcPjbAc28TPQgTZWsR-AWi6eJ5iKXMk03aa7Hs5s,2181
+pymammotion/proto/mctrl_driver.proto,sha256=zu_9xKSPV3O1B1aB2tN1QwtDLiInpsKaa8xaDXl0Inc,2181
 pymammotion/proto/mctrl_driver_pb2.py,sha256=stUvD3hzZALsdmTJVl7giD2O4nded60zKbew-d1eFrI,5512
 pymammotion/proto/mctrl_driver_pb2.pyi,sha256=z8UgWQxXT1GLVRCrI6wuV6coerMvPbVCAGSskL5QLAU,8494
 pymammotion/proto/mctrl_nav.proto,sha256=sPAVCyIn5MZiQbp0wFk5KKJacSRUOy3zEiExa4ebikQ,12806
@@ -125,7 +125,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.5.11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.11.dist-info/METADATA,sha256=3Ui7RMa8Y5Ylkkar68fFQ5CNdDj29diGqPAs9QUrquU,3871
-pymammotion-0.5.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.11.dist-info/RECORD,,
+pymammotion-0.5.13.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.13.dist-info/METADATA,sha256=LYUr7QOScypshke_h4l0v8VQ5_y7_WMimCay7bIUwyw,3871
+pymammotion-0.5.13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.13.dist-info/RECORD,,