pymammotion 0.5.34__py3-none-any.whl → 0.5.44__py3-none-any.whl

pymammotion/mammotion/commands/messages/navigation.py

@@ -33,7 +33,7 @@ logger = logging.getLogger(__name__)
 
 
 class MessageNavigation(AbstractMessage, ABC):
-    def send_order_msg_nav(self, build) -> bytes:
+    def send_order_msg_nav(self, build: MctlNav) -> bytes:
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.NAV,
             sender=MsgDevice.DEV_MOBILEAPP,
@@ -206,9 +206,9 @@ class MessageNavigation(AbstractMessage, ABC):
             reserved=plan_bean.reserved,
             weeks=plan_bean.weeks,
             start_date=plan_bean.start_date,
-            trigger_type=plan_bean.job_type,
-            day=plan_bean.interval_days,
-            toward_included_angle=plan_bean.demond_angle,
+            trigger_type=plan_bean.trigger_type,
+            day=plan_bean.day,
+            toward_included_angle=plan_bean.toward_included_angle,
             toward_mode=0,
         )
         logger.debug(f"Send read job plan command planBean={plan_bean}")
@@ -262,7 +262,7 @@ class MessageNavigation(AbstractMessage, ABC):
             toapp_map_name_msg=NavMapNameMsg(
                 hash=0,
                 result=0,
-                device_id=device_id,  # iotId or ???
+                device_id=device_id,  # iot_id
                 rw=0,
             )
         )
@@ -390,7 +390,7 @@ class MessageNavigation(AbstractMessage, ABC):
         generate_route_information}")
         return self.send_order_msg_nav(MctlNav(bidire_reqconver_path=build))
 
-    def modify_generate_route_information(self, generate_route_information: GenerateRouteInformation) -> bytes:
+    def modify_route_information(self, generate_route_information: GenerateRouteInformation) -> bytes:
         logger.debug(f"Generate route data source: {generate_route_information}")
         build = NavReqCoverPath(
             pver=1,
@@ -432,7 +432,11 @@ class MessageNavigation(AbstractMessage, ABC):
         return self.send_order_msg_nav(build)
 
     def get_line_info_list(self, hash_list: list[int], transaction_id: int) -> bytes:
+        """Get route information (mow path) corresponding to the specified hash list based on time.
+        e.g transaction_id = int(time.time() * 1000)
+        """
         logger.debug(f"Sending==========Get route command: {hash_list}")
+
         build = MctlNav(
             app_request_cover_paths=AppRequestCoverPathsT(
                 pver=1, hash_list=hash_list, transaction_id=transaction_id, sub_cmd=0

pymammotion/mammotion/devices/__init__.py

@@ -1,5 +1,29 @@
-"""mqtt init."""
+"""Mammotion devices module."""
 
-from .mammotion import MammotionBaseBLEDevice
+from .mammotion import Mammotion, MammotionDeviceManager
+from .mammotion_bluetooth import MammotionBaseBLEDevice
+from .mammotion_cloud import MammotionBaseCloudDevice, MammotionCloud
+from .mammotion_mower_ble import MammotionMowerBLEDevice
+from .mammotion_mower_cloud import MammotionMowerCloudDevice
+from .mower_device import MammotionMowerDevice
+from .mower_manager import MammotionMowerDeviceManager
+from .rtk_ble import MammotionRTKBLEDevice
+from .rtk_cloud import MammotionRTKCloudDevice
+from .rtk_device import MammotionRTKDevice
+from .rtk_manager import MammotionRTKDeviceManager
 
-__all__ = ["MammotionBaseBLEDevice"]
+__all__ = [
+    "Mammotion",
+    "MammotionDeviceManager",
+    "MammotionMowerDeviceManager",
+    "MammotionBaseBLEDevice",
+    "MammotionBaseCloudDevice",
+    "MammotionCloud",
+    "MammotionMowerBLEDevice",
+    "MammotionMowerCloudDevice",
+    "MammotionMowerDevice",
+    "MammotionRTKBLEDevice",
+    "MammotionRTKCloudDevice",
+    "MammotionRTKDevice",
+    "MammotionRTKDeviceManager",
+]

pymammotion/mammotion/devices/base.py

@@ -1,4 +1,4 @@
-from abc import abstractmethod
+from abc import ABC, abstractmethod
 import asyncio
 import logging
 from typing import Any
@@ -6,35 +6,18 @@ from typing import Any
 import betterproto2
 
 from pymammotion.aliyun.model.dev_by_account_response import Device
-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 import LubaMsg, NavGetCommDataAck, NavGetHashListAck, NavPlanJobSet, SvgMessageAckT
-from pymammotion.utility.device_type import DeviceType
+from pymammotion.data.mower_state_manager import MowerStateManager
+from pymammotion.proto import LubaMsg
 
 _LOGGER = logging.getLogger(__name__)
 
 
-def find_next_integer(lst: list[int], current_hash: int) -> int | None:
-    try:
-        # Find the index of the current integer
-        current_index = lst.index(current_hash)
-
-        # Check if there is a next integer in the list
-        if current_index + 1 < len(lst):
-            return lst[current_index + 1]
-        else:
-            return None  # Or raise an exception or handle it in some other way
-    except ValueError:
-        # Handle the case where current_int is not in the list
-        return None  # Or raise an exception or handle it in some other way
-
-
-class MammotionBaseDevice:
+class MammotionBaseDevice(ABC):
     """Base class for Mammotion devices."""
 
-    def __init__(self, state_manager: StateManager, cloud_device: Device) -> None:
+    def __init__(self, state_manager: MowerStateManager, cloud_device: Device) -> None:
         """Initialize MammotionBaseDevice."""
         self.loop = asyncio.get_event_loop()
         self._state_manager = state_manager
@@ -43,57 +26,6 @@ class MammotionBaseDevice:
         self._notify_future: asyncio.Future[bytes] | None = None
         self._cloud_device = cloud_device
 
-    async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
-        """Handle datahash responses for root level hashs."""
-        current_frame = hash_ack.current_frame
-
-        missing_frames = self.mower.map.missing_root_hash_frame(hash_ack)
-        if len(missing_frames) == 0:
-            if len(self.mower.map.missing_hashlist(hash_ack.sub_cmd)) > 0:
-                data_hash = self.mower.map.missing_hashlist(hash_ack.sub_cmd).pop(0)
-                await self.queue_command("synchronize_hash_data", hash_num=data_hash)
-            return
-
-        if current_frame != missing_frames[0] - 1:
-            current_frame = missing_frames[0] - 1
-        await self.queue_command("get_hash_response", total_frame=hash_ack.total_frame, current_frame=current_frame)
-
-    async def commdata_response(self, common_data: NavGetCommDataAck | SvgMessageAckT) -> None:
-        """Handle common data responses."""
-        total_frame = common_data.total_frame
-        current_frame = common_data.current_frame
-
-        missing_frames = self.mower.map.missing_frame(common_data)
-        if len(missing_frames) == 0:
-            # get next in hash ack list
-
-            data_hash = (
-                self.mower.map.missing_hashlist(common_data.sub_cmd).pop(0)
-                if len(self.mower.map.missing_hashlist(common_data.sub_cmd)) > 0
-                else None
-            )
-            if data_hash is None:
-                return
-
-            await self.queue_command("synchronize_hash_data", hash_num=data_hash)
-        else:
-            if current_frame != missing_frames[0] - 1:
-                current_frame = missing_frames[0] - 1
-
-            region_data = RegionData()
-            region_data.hash = common_data.data_hash if isinstance(common_data, SvgMessageAckT) else common_data.hash
-            region_data.action = common_data.action if isinstance(common_data, NavGetCommDataAck) else None
-            region_data.type = common_data.type
-            region_data.sub_cmd = common_data.sub_cmd
-            region_data.total_frame = total_frame
-            region_data.current_frame = current_frame
-            await self.queue_command("get_regional_data", regional_data=region_data)
-
-    async def plan_callback(self, plan: NavPlanJobSet) -> None:
-        if plan.plan_index < plan.total_plan_num - 1:
-            index = plan.plan_index + 1
-            await self.queue_command("read_plan", sub_cmd=2, plan_index=index)
-
     def _update_raw_data(self, data: bytes) -> None:
         """Update raw and model data from notifications."""
         tmp_msg = LubaMsg().parse(data)
@@ -127,7 +59,7 @@ class MammotionBaseDevice:
             nav[nav_sub_msg[0]] = nav_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["nav"] = nav
 
-    def _update_sys_data(self, tmp_msg) -> None:
+    def _update_sys_data(self, tmp_msg: LubaMsg) -> None:
         """Update system data."""
         sys_sub_msg = betterproto2.which_one_of(tmp_msg.sys, "SubSysMsg")
         if sys_sub_msg[1] is None:
@@ -137,7 +69,7 @@ class MammotionBaseDevice:
         sys[sys_sub_msg[0]] = sys_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["sys"] = sys
 
-    def _update_driver_data(self, tmp_msg) -> None:
+    def _update_driver_data(self, tmp_msg: LubaMsg) -> None:
         """Update driver data."""
         drv_sub_msg = betterproto2.which_one_of(tmp_msg.driver, "SubDrvMsg")
         if drv_sub_msg[1] is None:
@@ -147,7 +79,7 @@ class MammotionBaseDevice:
         drv[drv_sub_msg[0]] = drv_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["driver"] = drv
 
-    def _update_net_data(self, tmp_msg) -> None:
+    def _update_net_data(self, tmp_msg: LubaMsg) -> None:
         """Update network data."""
         net_sub_msg = betterproto2.which_one_of(tmp_msg.net, "NetSubType")
         if net_sub_msg[1] is None:
@@ -160,7 +92,7 @@ class MammotionBaseDevice:
             net[net_sub_msg[0]] = net_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["net"] = net
 
-    def _update_mul_data(self, tmp_msg) -> None:
+    def _update_mul_data(self, tmp_msg: LubaMsg) -> None:
         """Update mul data."""
         mul_sub_msg = betterproto2.which_one_of(tmp_msg.mul, "SubMul")
         if mul_sub_msg[1] is None:
@@ -170,7 +102,7 @@ class MammotionBaseDevice:
         mul[mul_sub_msg[0]] = mul_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["mul"] = mul
 
-    def _update_ota_data(self, tmp_msg) -> None:
+    def _update_ota_data(self, tmp_msg: LubaMsg) -> None:
         """Update OTA data."""
         ota_sub_msg = betterproto2.which_one_of(tmp_msg.ota, "SubOtaMsg")
         if ota_sub_msg[1] is None:
@@ -191,71 +123,17 @@ class MammotionBaseDevice:
         return self._state_manager.get_device()
 
     @abstractmethod
-    async def queue_command(self, key: str, **kwargs: any) -> bytes | None:
+    async def queue_command(self, key: str, **kwargs: Any) -> None:
         """Queue commands to mower."""
 
     @abstractmethod
-    async def _ble_sync(self):
+    async def _ble_sync(self) -> None:
         """Send ble sync command every 3 seconds or sooner."""
 
     @abstractmethod
-    def stop(self):
+    def stop(self) -> None:
         """Stop everything ready for destroying."""
 
-    async def start_sync(self, retry: int) -> None:
-        """Start synchronization with the device."""
-        await self.queue_command("get_device_base_info")
-        await self.queue_command("get_device_product_model")
-        await self.queue_command("get_report_cfg")
-        """RTK and dock location."""
-        await self.queue_command("read_write_device", rw_id=5, context=1, rw=1)
-        await self.async_read_settings()
-
-    async def start_map_sync(self) -> None:
-        """Start sync of map data."""
-
-        self.mower.map.update_hash_lists(self.mower.map.hashlist)
-
-        await self.queue_command("send_todev_ble_sync", sync_type=3)
-
-        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)
-
-        if len(self.mower.map.plan) == 0 or list(self.mower.map.plan.values())[0].total_plan_num != len(
-            self.mower.map.plan
-        ):
-            await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
-
-        for hash_id, frame in list(self.mower.map.area.items()):
-            missing_frames = self.mower.map.find_missing_frames(frame)
-            if len(missing_frames) > 0:
-                del self.mower.map.area[hash_id]
-
-        for hash_id, frame in list(self.mower.map.path.items()):
-            missing_frames = self.mower.map.find_missing_frames(frame)
-            if len(missing_frames) > 0:
-                del self.mower.map.path[hash_id]
-
-        for hash_id, frame in list(self.mower.map.obstacle.items()):
-            missing_frames = self.mower.map.find_missing_frames(frame)
-            if len(missing_frames) > 0:
-                del self.mower.map.obstacle[hash_id]
-
-        # don't know why but total frame on svg is wrong
-        # for hash, frame in self.mower.map.svg.items():
-        #     missing_frames = self.mower.map.find_missing_frames(frame)
-        #     if len(missing_frames) > 0:
-        #         del self.mower.map.svg[hash]
-
-        if len(self.mower.map.root_hash_lists) == 0 or len(self.mower.map.missing_hashlist()) > 0:
-            await self.queue_command("get_all_boundary_hash_list", sub_cmd=0)
-
-        # sub_cmd 3 is job hashes??
-        # sub_cmd 4 is dump location (yuka)
-        # jobs list
-        #
-        # await self.queue_command("get_all_boundary_hash_list", sub_cmd=3)
-
     async def async_read_settings(self) -> None:
         """Read settings from device."""
         # no cutting in rain nav_sys_param_cmd (id 3 context 1/0)
@@ -276,10 +154,10 @@ class MammotionBaseDevice:
         await self.queue_command("read_write_device", rw_id=5, rw=1, context=2)
         await self.queue_command("read_write_device", rw_id=5, rw=1, context=3)
 
-    async def command(self, key: str, **kwargs):
+    async def command(self, key: str, **kwargs: Any) -> None:
         """Send a command to the device."""
-        return await self.queue_command(key, **kwargs)
+        await self.queue_command(key, **kwargs)
 
     @property
-    def state_manager(self):
+    def state_manager(self) -> MowerStateManager:
         return self._state_manager