pymammotion 0.0.55__py3-none-any.whl → 0.0.56__py3-none-any.whl

pymammotion/mammotion/commands/abstract_message.py

@@ -5,3 +5,6 @@ class AbstractMessage:
     @abstractmethod
     def get_device_name(self) -> str:
         """Get device name."""
+
+    def get_device_product_key(self) -> str:
+        """Get device name."""

pymammotion/mammotion/commands/mammotion_command.py

@@ -4,18 +4,29 @@ 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.proto import dev_net_pb2, luba_msg_pb2
+from pymammotion.utility.device_type import DeviceType
 
 
 class MammotionCommand(MessageSystem, MessageNavigation, MessageNetwork, MessageOta, MessageVideo):
     """MQTT commands for Luba."""
 
+
+
     def __init__(self, device_name: str) -> None:
         self._device_name = device_name
+        self._product_key = ""
 
     def get_device_name(self) -> str:
         """Get device name."""
         return self._device_name
 
+    def get_device_product_key(self) -> str:
+        return self._product_key
+
+    def set_device_product_key(self, product_key: str) -> None:
+        self._product_key = product_key
+
+
     """BLE commands for Luba."""
 
     def send_todev_ble_sync(self, sync_type: int) -> bytes:

pymammotion/mammotion/commands/messages/navigation.py

@@ -14,6 +14,7 @@ from pymammotion.proto.mctrl_nav import (
     MctlNav,
     NavGetCommData,
     NavGetHashList,
+    NavMapNameMsg,
     NavPlanJobSet,
     NavPlanTaskExecute,
     NavReqCoverPath,
@@ -23,7 +24,7 @@ from pymammotion.proto.mctrl_nav import (
     NavUploadZigZagResultAck,
     SimulationCmdData,
     WorkReportCmdData,
-    WorkReportUpdateCmd, NavMapNameMsg,
+    WorkReportUpdateCmd,
 )
 from pymammotion.utility.device_type import DeviceType
 
@@ -31,10 +32,9 @@ logger = logging.getLogger(__name__)
 
 
 class MessageNavigation(AbstractMessage, ABC):
-
     def get_msg_device(self, msg_type: MsgCmdType, msg_device: MsgDevice) -> MsgDevice:
         """Changes the rcver name if it's not a luba1."""
-        if DeviceType.is_luba1(self.get_device_name()) and msg_type == MsgCmdType.MSG_CMD_TYPE_NAV:
+        if not DeviceType.is_luba1(self.get_device_name(), self.get_device_product_key()) and msg_type == MsgCmdType.MSG_CMD_TYPE_NAV:
             return MsgDevice.DEV_NAVIGATION
         return msg_device
 
@@ -265,10 +265,10 @@ class MessageNavigation(AbstractMessage, ABC):
         # Build the NavMapNameMsg with the specified parameters
         mctl_nav = MctlNav(
             toapp_map_name_msg=NavMapNameMsg(
-            hash=0,
-            result=0,
-            device_id=device_id, # iotId or ???
-            rw=0
+                hash=0,
+                result=0,
+                device_id=device_id,  # iotId or ???
+                rw=0,
             )
         )
 
@@ -279,13 +279,7 @@ class MessageNavigation(AbstractMessage, ABC):
     def set_area_name(self, device_id, hash_id: int, name: str) -> bytes:
         # Build the NavMapNameMsg with the specified parameters
         mctl_nav = MctlNav(
-            toapp_map_name_msg=NavMapNameMsg(
-            hash=hash_id,
-            name=name,
-            result=0,
-            device_id=device_id,
-            rw=1
-            )
+            toapp_map_name_msg=NavMapNameMsg(hash=hash_id, name=name, result=0, device_id=device_id, rw=1)
         )
 
         # Send the message with the specified ID and acknowledge flag
@@ -392,7 +386,7 @@ class MessageNavigation(AbstractMessage, ABC):
             channel_mode=generate_route_information.channel_mode,
             toward=generate_route_information.toward,
             toward_included_angle=generate_route_information.toward_included_angle,  # luba 2 yuka only
-            toward_mode=generate_route_information.toward_mode, # luba 2 yuka only
+            toward_mode=generate_route_information.toward_mode,  # luba 2 yuka only
             reserved=generate_route_information.path_order,
         )
         logger.debug(f"{self.get_device_name()}Generate route====={build}")

pymammotion/mammotion/devices/mammotion.py

@@ -545,6 +545,10 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         new_msg = LubaMsg().parse(data)
         if betterproto.serialized_on_wire(new_msg.net):
             if new_msg.net.todev_ble_sync != 0 or has_field(new_msg.net.toapp_wifi_iot_status):
+
+                if has_field(new_msg.net.toapp_wifi_iot_status) and self._commands.get_device_product_key() == "":
+                    self._commands.set_device_product_key(new_msg.net.toapp_wifi_iot_status.productkey)
+
                 return
 
         # may or may not be correct, some work could be done here to correctly match responses

{pymammotion-0.0.55.dist-info → pymammotion-0.0.56.dist-info}/METADATA

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

{pymammotion-0.0.55.dist-info → pymammotion-0.0.56.dist-info}/RECORD

@@ -43,12 +43,12 @@ pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/http.py,sha256=t9jO1U3Kjy30TzHkzQViv5BtmCKnNfyxrurAvXSghok,2284
 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=8m_z6iK67svgmaTG6a_BEj4pVV00JWiIoXLg4njfPZQ,145
-pymammotion/mammotion/commands/mammotion_command.py,sha256=kAk6ZVTfb6c7MmLAOCxG8wP2UlPooL04FBT1P0JaTfU,1275
+pymammotion/mammotion/commands/abstract_message.py,sha256=nw6r7694yzl7iJKqRqhLmAPRjd_TL_Xo_-JXq2_a_ug,222
+pymammotion/mammotion/commands/mammotion_command.py,sha256=5WwD-V0XBkaYIRhxe-kVTTNpeA0XMYZLvmU_pj9rgdc,1548
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/messages/driver.py,sha256=IFtmp9gJ3p3U2xtTgWVpKBMbnVnUht6Ioih17po6Hr4,3783
 pymammotion/mammotion/commands/messages/media.py,sha256=ps0l06CXy5Ej--gTNCsyKttwo7yHLVrJUpn-wNJYecs,1150
-pymammotion/mammotion/commands/messages/navigation.py,sha256=DGT5MVTp8ICO3kgwc_NT8S6Xx-qBoUQgCXM1_CFzQBY,23198
+pymammotion/mammotion/commands/messages/navigation.py,sha256=c7C6Dru-Xwtq-epzS9vKsy_6QlQ7ozKq9QDhFn2IRHU,23181
 pymammotion/mammotion/commands/messages/network.py,sha256=1a0BIhaBhBuhqYaK5EUqLbDgfzjzsIGrXS32wMKtxOU,8316
 pymammotion/mammotion/commands/messages/ota.py,sha256=XkeuWBZtpYMMBze6r8UN7dJXbe2FxUNGNnjwBpXJKM0,1240
 pymammotion/mammotion/commands/messages/system.py,sha256=qP6DwYPKTaRgqLZG4Ot8BLD2uzKxhLpCKYFIwek131k,10963
@@ -56,7 +56,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=EWV20MMzQuhbLlNlXbsyZKSEpeM7x1CQL7saU4Pn0-g,6165
 pymammotion/mammotion/devices/__init__.py,sha256=T72jt0ejtMjo1rPmn_FeMF3pmp0LLeRRpc9WcDKEYYY,126
-pymammotion/mammotion/devices/mammotion.py,sha256=JvGHVDFz7_RxbHS4As6WyMyrhIDHmgff8T2yDQzdfFU,30910
+pymammotion/mammotion/devices/mammotion.py,sha256=s-ubE2PSWV58LxMerXFrVO6ek3EL6kZkWn04Dacbzb4,31131
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_mqtt.py,sha256=EBnUwqah-mZNcAn5Hq2sV3NKXueIYWNhYPiaXwaXdHg,9084
 pymammotion/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,7 +103,7 @@ pymammotion/utility/datatype_converter.py,sha256=v6zym2Zu0upxQjR-xDqXwi3516zpntS
 pymammotion/utility/device_type.py,sha256=KYawu2glZMVlPmxRbA4kVFujXz3miHp3rJiOWRVj-GI,8285
 pymammotion/utility/periodic.py,sha256=9wJMfwXPlx6Mbp3Fws7LLTI34ZDKphH1bva_Ggyk32g,3281
 pymammotion/utility/rocker_util.py,sha256=syPL0QN4zMzHiTIkUKS7RXBBptjdbkfNlPddwUD5V3A,7171
-pymammotion-0.0.55.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.0.55.dist-info/METADATA,sha256=qCdZr_QrtFop1LRvSgpMHULtVGBHKde5X7EQMh0gIIs,3884
-pymammotion-0.0.55.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.0.55.dist-info/RECORD,,
+pymammotion-0.0.56.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.0.56.dist-info/METADATA,sha256=inWoWoU_uZ8bG46gGD7m7s2zVGXSc0NM_b2wNuL3lEE,3884
+pymammotion-0.0.56.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.0.56.dist-info/RECORD,,