pymammotion 0.4.0b7__py3-none-any.whl → 0.4.1__py3-none-any.whl

pymammotion/mammotion/commands/messages/ota.py

@@ -2,17 +2,16 @@
 from abc import ABC
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.proto import luba_msg_pb2, mctrl_ota_pb2
-from pymammotion.proto.luba_msg import MsgCmdType, MsgDevice
+from pymammotion.proto import GetInfoReq, InfoType, LubaMsg, MctlOta, MsgAttr, MsgCmdType, MsgDevice
 
 
 class MessageOta(AbstractMessage, ABC):
     def send_order_msg_ota(self, ota):
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MSG_CMD_TYPE_EMBED_OTA,
-            sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_EMBED_OTA, MsgDevice.DEV_MAINCTL),
-            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.EMBED_OTA,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=self.get_msg_device(MsgCmdType.EMBED_OTA, MsgDevice.DEV_MAINCTL),
+            msgattr=MsgAttr.MSG_ATTR_REQ,
             seqs=1,
             version=1,
             subtype=1,
@@ -22,17 +21,13 @@ class MessageOta(AbstractMessage, ABC):
         return luba_msg.SerializeToString()
 
     def get_device_ota_info(self, log_type: int):
-        todev_get_info_req = mctrl_ota_pb2.MctlOta(
-            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_OTA)
-        )
+        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))
         return self.send_order_msg_ota(todev_get_info_req)
 
-    def get_device_info_new(self):
+    def get_device_info_new(self) -> bytes:
         """New device call for OTA upgrade information."""
-        todev_get_info_req = mctrl_ota_pb2.MctlOta(
-            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_BASE)
-        )
+        todev_get_info_req = MctlOta(todev_get_info_req=GetInfoReq(type=InfoType.IT_BASE))
         print("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

@@ -6,12 +6,15 @@ 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.luba_msg import LubaMsg, MsgAttr, MsgCmdType, MsgDevice
-from pymammotion.proto.mctrl_sys import (
+from pymammotion.proto import (
     DeviceProductTypeInfoT,
     LoraCfgReq,
+    LubaMsg,
     MctlSys,
     MCtrlSimulationCmdData,
+    MsgAttr,
+    MsgCmdType,
+    MsgDevice,
     ReportInfoCfg,
     RptAct,
     RptInfoType,
@@ -26,12 +29,12 @@ from pymammotion.utility.device_type import DeviceType
 class MessageSystem(AbstractMessage, ABC):
     messageNavigation: MessageNavigation = MessageNavigation()
 
-    def send_order_msg_sys(self, sys):
+    def send_order_msg_sys(self, sys) -> bytes:
         luba_msg = LubaMsg(
-            msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
-            msgattr=MsgAttr.MSG_ATTR_REQ,
+            msgtype=MsgCmdType.EMBED_SYS,
+            msgattr=MsgAttr.REQ,
             sender=MsgDevice.DEV_MOBILEAPP,
-            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_EMBED_SYS, MsgDevice.DEV_MAINCTL),
+            rcver=self.get_msg_device(MsgCmdType.EMBED_SYS, MsgDevice.DEV_MAINCTL),
             sys=sys,
             seqs=1,
             version=1,
@@ -42,10 +45,10 @@ class MessageSystem(AbstractMessage, ABC):
         return luba_msg.SerializeToString()
 
     @staticmethod
-    def send_order_msg_sys_legacy(sys):
+    def send_order_msg_sys_legacy(sys) -> bytes:
         luba_msg = LubaMsg(
-            msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
-            msgattr=MsgAttr.MSG_ATTR_REQ,
+            msgtype=MsgCmdType.EMBED_SYS,
+            msgattr=MsgAttr.REQ,
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=MsgDevice.DEV_MAINCTL,
             sys=sys,
@@ -57,7 +60,7 @@ class MessageSystem(AbstractMessage, ABC):
 
         return luba_msg.SerializeToString()
 
-    def reset_system(self):
+    def reset_system(self) -> bytes:
         build = MctlSys(todev_reset_system=1)
         logger.debug("Send command - send factory reset")
         return self.send_order_msg_sys(build)
@@ -102,7 +105,7 @@ class MessageSystem(AbstractMessage, ABC):
             is_sidelight}, operate:{operate}, timeCtrlLight:{build}")
         return self.send_order_msg_sys(build2)
 
-    def test_tool_order_to_sys(self, sub_cmd: int, param_id: int, param_value: list[int]):
+    def test_tool_order_to_sys(self, sub_cmd: int, param_id: int, param_value: list[int]) -> bytes:
         build = MCtrlSimulationCmdData(sub_cmd=sub_cmd, param_id=param_id, param_value=param_value)
         logger.debug(f"Send tool test command: subCmd={sub_cmd}, param_id:{
             param_id}, param_value={param_value}")
@@ -111,31 +114,39 @@ class MessageSystem(AbstractMessage, ABC):
             param_id}, param_value={param_value}")
         return self.send_order_msg_sys(build2)
 
-    def read_and_set_rtk_paring_code(self, op: int, cgf: str | None = None):
+    def read_and_set_rtk_paring_code(self, op: int, cgf: str | None = None) -> bytes:
         logger.debug(f"Send read and write base station configuration quality op:{
             op}, cgf:{cgf}")
         return self.send_order_msg_sys(MctlSys(todev_lora_cfg_req=LoraCfgReq(op=op, cfg=cgf)))
 
-    def allpowerfull_rw(self, id: int, context: int, rw: int) -> bytes:
-        if (id == 6 or id == 3 or id == 7) and DeviceType.is_luba_2(self.get_device_name()):
-            return self.messageNavigation.allpowerfull_rw_adapter_x3(id, context, rw)
-        build = MctlSys(bidire_comm_cmd=SysCommCmd(id=id, context=context, rw=rw))
-        logger.debug(f"Send command - 9 general read and write command id={id}, context={context}, rw={rw}")
-        if id == 5:
+    def allpowerfull_rw(self, rw_id: int, context: int, rw: int) -> bytes:
+        if (rw_id == 6 or rw_id == 3 or rw_id == 7) and DeviceType.is_luba_2(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}")
+        if rw_id == 5:
             # TODO investigate if the original code makes any difference to this call.
             """
-            LubaMsgOuterClass.LubaMsg.Builder protoBufBuilderSet = getProtoBufBuilderSet(LubaMsgOuterClass.MsgCmdType.MSG_CMD_TYPE_EMBED_SYS, LubaMsgOuterClass.MsgDevice.DEV_MAINCTL, LubaMsgOuterClass.MsgAttr.MSG_ATTR_REQ);
+            LubaMsgOuterClass.LubaMsg.Builder protoBufBuilderSet = getProtoBufBuilderSet(LubaMsgOuterClass.MsgCmdType.EMBED_SYS, LubaMsgOuterClass.MsgDevice.DEV_MAINCTL, LubaMsgOuterClass.MsgAttr.REQ);
             protoBufBuilderSet.setSys(build);
             sendMsg(protoBufBuilderSet, 122, true, "发送指令--9通用读写命令id=" + i + ",context=" + i2 + ",rw=" + i3);
             """
             return self.send_order_msg_sys(build)
         return self.send_order_msg_sys(build)
 
-    def traverse_mode(self, id: int) -> bytes:
+    def traverse_mode(self, context: int) -> bytes:
         """Sets the traversal mode back to charger."""
+        # setReChargeMode
         # 0 direct
         # 1 follow the perimeter
-        return self.allpowerfull_rw(7, id, 1)
+        return self.allpowerfull_rw(7, context, 1)
+
+    def turning_mode(self, context: int) -> bytes:
+        """Sets the traversal mode back to charger."""
+        # setTurnAroundMode
+        # 0 multipoint turn
+        # 1 zero turn
+        return self.allpowerfull_rw(6, context, 1)
 
     # Commented out as not needed and too many refs to try fix up
     # def factory_test_order(self, test_id: int, test_duration: int, expect: str):
@@ -298,10 +309,10 @@ class MessageSystem(AbstractMessage, ABC):
         mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC)
 
         luba_msg = LubaMsg(
-            msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
+            msgtype=MsgCmdType.EMBED_SYS,
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=MsgDevice.DEV_MAINCTL,
-            msgattr=MsgAttr.MSG_ATTR_REQ,
+            msgattr=MsgAttr.REQ,
             seqs=1,
             version=1,
             subtype=1,
@@ -334,10 +345,10 @@ class MessageSystem(AbstractMessage, ABC):
         mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_BASESTATION_INFO)
 
         luba_msg = LubaMsg(
-            msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
+            msgtype=MsgCmdType.EMBED_SYS,
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=MsgDevice.DEV_MAINCTL,
-            msgattr=MsgAttr.MSG_ATTR_REQ,
+            msgattr=MsgAttr.REQ,
             seqs=1,
             version=1,
             subtype=1,

pymammotion/mammotion/commands/messages/video.py

@@ -3,19 +3,17 @@ from abc import ABC
 import time
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.proto import luba_msg_pb2, luba_mul_pb2
-from pymammotion.proto.luba_msg import MsgAttr, MsgCmdType, MsgDevice
-from pymammotion.proto.luba_mul import MUL_CAMERA_POSITION
+from pymammotion.proto import LubaMsg, MsgAttr, MsgCmdType, MsgDevice, MulCameraPosition, MulSetVideo, SocMul
 from pymammotion.utility.device_type import DeviceType
 
 
 class MessageVideo(AbstractMessage, ABC):
     async def send_order_msg_video(self, mul):
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MSG_CMD_TYPE_MUL,
-            msgattr=MsgAttr.MSG_ATTR_REQ,
-            sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.MUL,
+            msgattr=MsgAttr.REQ,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=self.get_msg_device(MsgCmdType.MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
             mul=mul,
             seqs=1,
             version=1,
@@ -26,6 +24,6 @@ class MessageVideo(AbstractMessage, ABC):
         return luba_msg.SerializeToString()
 
     def device_agora_join_channel_with_position(self, enter_state: int):
-        position = MUL_CAMERA_POSITION.ALL if DeviceType.is_yuka(self.get_device_name()) else MUL_CAMERA_POSITION.LEFT
-        mctl_sys = luba_mul_pb2.SocMul(set_video=luba_mul_pb2.MulSetVideo(position=position, vi_switch=enter_state))
+        position = MulCameraPosition.ALL if DeviceType.is_yuka(self.get_device_name()) else MulCameraPosition.LEFT
+        mctl_sys = SocMul(set_video=MulSetVideo(position=position, vi_switch=enter_state))
         return self.send_order_msg_video(mctl_sys)

pymammotion/mammotion/devices/base.py

@@ -10,8 +10,8 @@ from pymammotion.data.model import RegionData
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.raw_data import RawMowerData
 from pymammotion.data.state_manager import StateManager
-from pymammotion.proto.luba_msg import LubaMsg
-from pymammotion.proto.mctrl_nav import NavGetCommDataAck, NavGetHashListAck, SvgMessageAckT
+from pymammotion.proto import LubaMsg, NavGetCommDataAck, NavGetHashListAck, SvgMessageAckT
+from pymammotion.utility.device_type import DeviceType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -198,13 +198,13 @@ class MammotionBaseDevice:
         await self.queue_command("get_device_product_model")
         await self.queue_command("get_report_cfg")
         """RTK and dock location."""
-        await self.queue_command("allpowerfull_rw", id=5, context=1, rw=1)
+        await self.queue_command("allpowerfull_rw", rw_id=5, context=1, rw=1)
         await self.async_read_settings()
 
     async def start_map_sync(self) -> None:
         """Start sync of map data."""
 
-        if self._cloud_device and len(self.mower.map.area_name) == 0:
+        if self._cloud_device and len(self.mower.map.area_name) == 0 and not DeviceType.is_luba1(self.mower.name):
             await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
 
         await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
@@ -222,11 +222,11 @@ class MammotionBaseDevice:
 
     async def async_read_settings(self) -> None:
         """Read settings from device."""
-        await self.queue_command("allpowerfull_rw", id=3, context=1, rw=0)
-        await self.queue_command("allpowerfull_rw", id=4, context=1, rw=0)
-        await self.queue_command("allpowerfull_rw", id=6, context=1, rw=0)
+        await self.queue_command("allpowerfull_rw", rw_id=3, context=1, rw=0)
+        await self.queue_command("allpowerfull_rw", rw_id=4, context=1, rw=0)
+        await self.queue_command("allpowerfull_rw", rw_id=6, context=1, rw=0)
         # traversal mode
-        await self.queue_command("allpowerfull_rw", id=7, context=1, rw=0)
+        await self.queue_command("allpowerfull_rw", rw_id=7, context=1, rw=0)
 
         await self.queue_command("read_and_set_sidelight", is_sidelight=True, operate=1)
 
@@ -234,8 +234,8 @@ class MammotionBaseDevice:
 
     async def async_get_errors(self) -> None:
         """Error codes."""
-        await self.queue_command("allpowerfull_rw", id=5, rw=1, context=2)
-        await self.queue_command("allpowerfull_rw", id=5, rw=1, context=3)
+        await self.queue_command("allpowerfull_rw", rw_id=5, rw=1, context=2)
+        await self.queue_command("allpowerfull_rw", rw_id=5, rw=1, context=3)
 
     async def command(self, key: str, **kwargs):
         """Send a command to the device."""

pymammotion/mammotion/devices/mammotion.py

@@ -34,6 +34,8 @@ class ConnectionPreference(Enum):
 
 class MammotionMixedDeviceManager:
     preference: ConnectionPreference
+    _ble_device: MammotionBaseBLEDevice | None = None
+    _cloud_device: MammotionBaseCloudDevice | None = None
 
     def __init__(
         self,
@@ -45,8 +47,7 @@ class MammotionMixedDeviceManager:
     ) -> None:
         self.name = name
         self._state_manager = StateManager(MowingDevice())
-        self._ble_device: MammotionBaseBLEDevice | None = None
-        self._cloud_device: MammotionBaseCloudDevice | None = None
+        self._state_manager.get_device().name = name
         self.add_ble(ble_device)
         self.add_cloud(cloud_device, mqtt)
         self.preference = preference
@@ -160,7 +161,7 @@ class Mammotion:
     device_manager = MammotionDeviceManager()
     mqtt_list: dict[str, MammotionCloud] = dict()
 
-    _instance: Mammotion = None
+    _instance: Mammotion | None = None
 
     def __new__(cls, *args: Any, **kwargs: Any):
         if not cls._instance:
@@ -213,14 +214,17 @@ class Mammotion:
         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:
-                self.device_manager.add_device(
-                    MammotionMixedDeviceManager(
-                        name=device.deviceName,
-                        cloud_device=device,
-                        mqtt=mqtt_client,
-                        preference=ConnectionPreference.WIFI,
-                    )
+                mixed_device = MammotionMixedDeviceManager(
+                    name=device.deviceName,
+                    cloud_device=device,
+                    mqtt=mqtt_client,
+                    preference=ConnectionPreference.WIFI,
                 )
+                mixed_device.mower_state.mower_state.product_key = device.productKey
+                mixed_device.mower_state.mower_state.model = (
+                    device.productName if device.productModel is None else device.productModel
+                )
+                self.device_manager.add_device(mixed_device)
             elif device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device:
                 if mower_device.cloud() is None:
                     mower_device.add_cloud(cloud_device=device, mqtt=mqtt_client)
@@ -264,7 +268,7 @@ class Mammotion:
         """Send a command to the device."""
         device = self.get_device_by_name(name)
         if device:
-            if device.preference is ConnectionPreference.BLUETOOTH:
+            if device.preference is ConnectionPreference.BLUETOOTH and device.has_ble():
                 return await device.ble().command(key)
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().command(key)
@@ -274,7 +278,7 @@ class Mammotion:
         """Send a command with args to the device."""
         device = self.get_device_by_name(name)
         if device:
-            if device.preference is ConnectionPreference.BLUETOOTH:
+            if device.preference is ConnectionPreference.BLUETOOTH and device.has_ble():
                 return await device.ble().command(key, **kwargs)
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().command(key, **kwargs)
@@ -283,7 +287,7 @@ class Mammotion:
     async def start_sync(self, name: str, retry: int):
         device = self.get_device_by_name(name)
         if device:
-            if device.preference is ConnectionPreference.BLUETOOTH:
+            if device.preference is ConnectionPreference.BLUETOOTH and device.has_ble():
                 return await device.ble().start_sync(retry)
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().start_sync(retry)
@@ -292,7 +296,7 @@ class Mammotion:
     async def start_map_sync(self, name: str):
         device = self.get_device_by_name(name)
         if device:
-            if device.preference is ConnectionPreference.BLUETOOTH:
+            if device.preference is ConnectionPreference.BLUETOOTH and device.has_ble():
                 return await device.ble().start_map_sync()
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().start_map_sync()

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -18,8 +18,7 @@ from pymammotion.bluetooth import BleMessage
 from pymammotion.data.state_manager import StateManager
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
-from pymammotion.proto import has_field
-from pymammotion.proto.luba_msg import LubaMsg
+from pymammotion.proto import LubaMsg, has_field
 
 DBUS_ERROR_BACKOFF_TIME = 0.25
 
@@ -334,7 +333,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
                 _LOGGER.exception("Error parsing message %s", data)
                 data = b""
             finally:
-                self._message.clearNotification()
+                self._message.clear_notification()
 
             _LOGGER.debug("%s: Received notification: %s", self.name, data)
         else:

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -20,8 +20,7 @@ from pymammotion.event.event import DataEvent
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
 from pymammotion.mqtt.mammotion_future import MammotionFuture
-from pymammotion.proto import has_field
-from pymammotion.proto.luba_msg import LubaMsg
+from pymammotion.proto import LubaMsg, has_field
 
 _LOGGER = logging.getLogger(__name__)
 

pymammotion/mqtt/linkkit/__init__.py

@@ -0,0 +1,5 @@
+"""Package for linkkit."""
+
+from .linkkit import LinkKit
+
+__all__ = ["LinkKit"]