pymammotion 0.4.32__py3-none-any.whl → 0.4.34__py3-none-any.whl

pymammotion/bluetooth/ble_message.py

@@ -399,7 +399,7 @@ class BleMessage:
         sequence = int(response[2])  # toInt
         current_sequence = self.mReadSequence.get() & 255
         if sequence == current_sequence:
-            _LOGGER.debug(f"Received bluetooth data 1: {response.hex()}, object: {self}")
+            # _LOGGER.debug(f"Received bluetooth data 1: {response.hex()}, object: {self}")
             return 2
 
         # Compare with the second counter, mod 255

pymammotion/data/model/__init__.py

@@ -2,8 +2,7 @@
 
 from .generate_route_information import GenerateRouteInformation
 from .hash_list import HashList
-from .plan import Plan
 from .rapid_state import RapidState, RTKStatus
 from .region_data import RegionData
 
-__all__ = ["GenerateRouteInformation", "HashList", "Plan", "RapidState", "RTKStatus", "RegionData"]
+__all__ = ["GenerateRouteInformation", "HashList", "RapidState", "RTKStatus", "RegionData"]

pymammotion/data/model/device_config.py

@@ -40,6 +40,7 @@ def create_path_order(operation_mode: OperationSettings, device_name: str) -> st
     bArr[1] = operation_mode.obstacle_laps
     bArr[3] = int(operation_mode.start_progress)
     bArr[2] = 0
+    bArr[5] = 0
     if not DeviceType.is_luba1(device_name):
         bArr[4] = 0
         if DeviceType.is_yuka(device_name) and not DeviceType.is_yuka_mini(device_name):

pymammotion/data/model/enums.py

@@ -1,6 +1,14 @@
 from enum import Enum
 
 
+class ConnectionPreference(Enum):
+    """Enum for connection preference."""
+
+    EITHER = 0
+    WIFI = 1
+    BLUETOOTH = 2
+
+
 class PositionMode(Enum):
     FIX = 0
     SINGLE = 1

pymammotion/data/model/hash_list.py

@@ -170,7 +170,7 @@ class HashList(DataClassORJSONMixin):
     dump: dict[int, FrameList] = field(default_factory=dict)  # type 12? / sub cmd 4
     svg: dict[int, FrameList] = field(default_factory=dict)  # type 13
     line: dict[int, FrameList] = field(default_factory=dict)  # type 10 possibly breakpoint? / sub cmd 3
-    plan: dict[int, Plan] = field(default_factory=dict)
+    plan: dict[str, Plan] = field(default_factory=dict)
     area_name: list[AreaHashNameList] = field(default_factory=list)
 
     def update_hash_lists(self, hashlist: list[int]) -> None:
@@ -281,7 +281,7 @@ class HashList(DataClassORJSONMixin):
 
     def update_plan(self, plan: Plan) -> None:
         if plan.total_plan_num != 0:
-            self.plan[plan.plan_index] = plan
+            self.plan[plan.plan_id] = plan
 
     def update(self, hash_data: NavGetCommData | SvgMessage) -> bool:
         """Update the map data."""

pymammotion/data/model/work.py

@@ -0,0 +1,27 @@
+"""bidire_reqconver_path as a model."""
+
+from dataclasses import dataclass, field
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+
+@dataclass
+class CurrentTaskSettings(DataClassORJSONMixin):
+    pver: int = 0
+    job_id: int = 0
+    job_ver: int = 0
+    job_mode: int = 0
+    sub_cmd: int = 0
+    edge_mode: int = 0
+    knife_height: int = 0
+    channel_width: int = 0
+    ultra_wave: int = 0
+    channel_mode: int = 0
+    toward: int = 0
+    speed: float = 0.0
+    zone_hashs: list[int] = field(default_factory=list)
+    path_hash: int = 0
+    reserved: str = ""
+    result: int = 0
+    toward_mode: int = 0
+    toward_included_angle: int = 0

pymammotion/data/state_manager.py

@@ -9,6 +9,7 @@ import betterproto
 
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.device_info import SideLight
+from pymammotion.data.model.enums import ConnectionPreference
 from pymammotion.data.model.hash_list import AreaHashNameList, NavGetCommData, NavGetHashListData, Plan, SvgMessage
 from pymammotion.data.model.work import CurrentTaskSettings
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
@@ -35,27 +36,27 @@ logger = logging.getLogger(__name__)
 class StateManager:
     """Manage state."""
 
-    _device: MowingDevice
-    last_updated_at: datetime = datetime.now()
-    cloud_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
-    cloud_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
-    cloud_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
-    cloud_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
-
-    # possibly don't need anymore
-    cloud_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
-
-    ble_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
-    ble_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
-    ble_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
-    ble_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
-
-    # possibly don't need anymore
-    ble_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
-
     def __init__(self, device: MowingDevice) -> None:
-        self._device = device
+        self._device: MowingDevice = device
         self.last_updated_at = datetime.now()
+        self.preference = ConnectionPreference.WIFI
+        self.cloud_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
+        self.cloud_get_commondata_ack_callback: (
+            Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None
+        ) = None
+        self.cloud_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
+        self.cloud_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
+
+        self.cloud_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
+
+        self.ble_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
+        self.ble_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = (
+            None
+        )
+        self.ble_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
+        self.ble_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
+
+        self.ble_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
 
     def get_device(self) -> MowingDevice:
         """Get device."""

pymammotion/mammotion/devices/base.py

@@ -34,7 +34,7 @@ def find_next_integer(lst: list[int], current_hash: int) -> int | None:
 class MammotionBaseDevice:
     """Base class for Mammotion devices."""
 
-    def __init__(self, state_manager: StateManager, cloud_device: Device | None = None) -> None:
+    def __init__(self, state_manager: StateManager, cloud_device: Device) -> None:
         """Initialize MammotionBaseDevice."""
         self.loop = asyncio.get_event_loop()
         self._state_manager = state_manager
@@ -247,18 +247,8 @@ class MammotionBaseDevice:
         #     if len(missing_frames) > 0:
         #         del self.mower.map.svg[hash]
 
-        if len(self.mower.map.root_hash_lists) == 0:
+        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)
-            # add a small delay to allow result to come through if it does.
-            await asyncio.sleep(1)
-
-        if len(self.mower.map.missing_hashlist()) > 0:
-            data_hash = self.mower.map.missing_hashlist().pop()
-            await self.queue_command("synchronize_hash_data", hash_num=data_hash)
-
-        # if len(self.mower.map.missing_hashlist(3)) > 0:
-        #     data_hash = self.mower.map.missing_hashlist(3).pop()
-        #     await self.queue_command("synchronize_hash_data", hash_num=data_hash)
 
         # sub_cmd 3 is job hashes??
         # sub_cmd 4 is dump location (yuka)

pymammotion/mammotion/devices/mammotion.py

@@ -11,8 +11,8 @@ from bleak.backends.device import BLEDevice
 
 from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
 from pymammotion.aliyun.model.dev_by_account_response import Device
-from pymammotion.data.model.account import Credentials
 from pymammotion.data.model.device import MowingDevice
+from pymammotion.data.model.enums import ConnectionPreference
 from pymammotion.data.state_manager import StateManager
 from pymammotion.http.http import MammotionHTTP
 from pymammotion.mammotion.devices.mammotion_bluetooth import MammotionBaseBLEDevice
@@ -48,9 +48,10 @@ class MammotionMixedDeviceManager:
         self.name = name
         self._state_manager = StateManager(MowingDevice())
         self._state_manager.get_device().name = name
-        self.add_ble(ble_device)
+        self.add_ble(cloud_device, ble_device)
         self.add_cloud(cloud_device, mqtt)
         self.preference = preference
+        self._state_manager.preference = preference
 
     @property
     def mower_state(self):
@@ -72,11 +73,13 @@ class MammotionMixedDeviceManager:
         else:
             return not self.ble().command_queue.empty()
 
-    def add_ble(self, ble_device: BLEDevice) -> None:
+    def add_ble(self, cloud_device: Device, ble_device: BLEDevice) -> None:
         if ble_device is not None:
-            self._ble_device = MammotionBaseBLEDevice(state_manager=self._state_manager, device=ble_device)
+            self._ble_device = MammotionBaseBLEDevice(
+                state_manager=self._state_manager, cloud_device=cloud_device, device=ble_device
+            )
 
-    def add_cloud(self, cloud_device: Device | None = None, mqtt: MammotionCloud | None = None) -> None:
+    def add_cloud(self, cloud_device: Device, mqtt: MammotionCloud) -> None:
         if cloud_device is not None:
             self._cloud_device = MammotionBaseCloudDevice(
                 mqtt, cloud_device=cloud_device, state_manager=self._state_manager
@@ -86,12 +89,22 @@ class MammotionMixedDeviceManager:
         self._cloud_device = cloud_device
 
     def remove_cloud(self) -> None:
+        self._state_manager.cloud_get_commondata_ack_callback = None
+        self._state_manager.cloud_get_hashlist_ack_callback = None
+        self._state_manager.cloud_get_plan_callback = None
+        self._state_manager.cloud_on_notification_callback = None
+        self._state_manager.cloud_gethash_ack_callback = None
         del self._cloud_device
 
     def replace_ble(self, ble_device: MammotionBaseBLEDevice) -> None:
         self._ble_device = ble_device
 
     def remove_ble(self) -> None:
+        self._state_manager.ble_get_commondata_ack_callback = None
+        self._state_manager.ble_get_hashlist_ack_callback = None
+        self._state_manager.ble_get_plan_callback = None
+        self._state_manager.ble_on_notification_callback = None
+        self._state_manager.ble_gethash_ack_callback = None
         del self._ble_device
 
     def replace_mqtt(self, mqtt: MammotionCloud) -> None:
@@ -139,22 +152,6 @@ class MammotionDeviceManager:
         del device_for_removal
 
 
-async def create_devices(
-    ble_device: BLEDevice,
-    cloud_credentials: Credentials | None = None,
-    preference: ConnectionPreference = ConnectionPreference.BLUETOOTH,
-):
-    mammotion = Mammotion()
-    mammotion.add_ble_device(ble_device, preference)
-
-    if cloud_credentials and preference == ConnectionPreference.EITHER or preference == ConnectionPreference.WIFI:
-        await mammotion.login_and_initiate_cloud(
-            cloud_credentials.account_id or cloud_credentials.email, cloud_credentials.password
-        )
-
-    return mammotion
-
-
 class Mammotion:
     """Represents a Mammotion account and its devices."""
 
@@ -173,11 +170,16 @@ class Mammotion:
         self._login_lock = asyncio.Lock()
 
     def add_ble_device(
-        self, ble_device: BLEDevice, preference: ConnectionPreference = ConnectionPreference.BLUETOOTH
+        self,
+        cloud_device: Device,
+        ble_device: BLEDevice,
+        preference: ConnectionPreference = ConnectionPreference.BLUETOOTH,
     ) -> None:
         if ble_device:
             self.device_manager.add_device(
-                MammotionMixedDeviceManager(name=ble_device.name, ble_device=ble_device, preference=preference)
+                MammotionMixedDeviceManager(
+                    name=ble_device.name, cloud_device=cloud_device, ble_device=ble_device, preference=preference
+                )
             )
 
     async def login_and_initiate_cloud(self, account, password, force: bool = False) -> None:

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -14,6 +14,7 @@ from bleak_retry_connector import (
     establish_connection,
 )
 
+from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.bluetooth import BleMessage
 from pymammotion.data.state_manager import StateManager
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
@@ -69,9 +70,11 @@ async def _handle_retry(fut: asyncio.Future[None], func, command: bytes) -> None
 class MammotionBaseBLEDevice(MammotionBaseDevice):
     """Base class for Mammotion BLE devices."""
 
-    def __init__(self, state_manager: StateManager, device: BLEDevice, interface: int = 0, **kwargs: Any) -> None:
+    def __init__(
+        self, state_manager: StateManager, cloud_device: Device, device: BLEDevice, interface: int = 0, **kwargs: Any
+    ) -> None:
         """Initialize MammotionBaseBLEDevice."""
-        super().__init__(state_manager)
+        super().__init__(state_manager, cloud_device)
         self._disconnect_strategy = True
         self._ble_sync_task = None
         self._prev_notification = None
@@ -88,6 +91,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self._connect_lock = asyncio.Lock()
         self._operation_lock = asyncio.Lock()
         self._key: str | None = None
+        self._cloud_device = cloud_device
         self.set_queue_callback(self.queue_command)
         self._state_manager.ble_gethash_ack_callback = self.datahash_response
         self._state_manager.ble_get_commondata_ack_callback = self.commdata_response
@@ -322,22 +326,23 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
 
     async def _notification_handler(self, _sender: BleakGATTCharacteristic, data: bytearray) -> None:
         """Handle notification responses."""
+
         if self._message is None:
             return
         result = self._message.parseNotification(data)
         if result == 0:
             data = await self._message.parseBlufiNotifyData(True)
+            self._message.clear_notification()
             try:
                 self._update_raw_data(data)
             except (KeyError, ValueError, IndexError, UnicodeDecodeError):
                 _LOGGER.exception("Error parsing message %s", data)
                 data = b""
-            finally:
-                self._message.clear_notification()
 
             _LOGGER.debug("%s: Received notification: %s", self.name, data)
         else:
             return
+
         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):

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -181,6 +181,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.mqtt_message_event.remove_subscribers(self._parse_message_for_device)
         self._state_manager.cloud_gethash_ack_callback = None
         self._state_manager.cloud_get_commondata_ack_callback = None
+        self._state_manager.cloud_get_plan_callback = None
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
 
@@ -229,7 +230,11 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         #     self.mqtt._mqtt_client.thing_on_thing_enable(None)
 
     async def _ble_sync(self) -> None:
-        if self.stopped or self.mqtt.is_connected is False or self.state_manager.get_device().report_data.dev.sys_status in NO_REQUEST_MODES:
+        if (
+            self.stopped
+            or self.mqtt.is_connected is False
+            or self.state_manager.get_device().report_data.dev.sys_status in NO_REQUEST_MODES
+        ):
             return
 
         command_bytes = self._commands.send_todev_ble_sync(3)

pymammotion/utility/mur_mur_hash.py

@@ -0,0 +1,114 @@
+import struct
+
+
+class MurMurHashUtil:
+    @staticmethod
+    def get_unsigned_int(i):
+        return i & 0xFFFFFFFF
+
+    @staticmethod
+    def hash(byte_arr: bytes):
+        # Create a bytearray view with little endian order
+        position = 0
+        remaining_bytes = len(byte_arr)
+
+        # Initial values
+        remaining = remaining_bytes ^ 97
+        j = 0
+
+        # Process 8 bytes at a time
+        while remaining_bytes >= 8:
+            multiplier = 1540483477
+
+            # First 4 bytes
+            unsigned_int = struct.unpack_from("<I", byte_arr, position)[0]
+            position += 4
+            unsigned_int = (MurMurHashUtil.get_unsigned_int(unsigned_int) * multiplier) & 0xFFFFFFFF
+            remaining = (
+                ((remaining * multiplier) & 0xFFFFFFFF)
+                ^ (((unsigned_int ^ (unsigned_int >> 24)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
+            ) & 0xFFFFFFFF
+
+            # Next 4 bytes
+            unsigned_int2 = struct.unpack_from("<I", byte_arr, position)[0]
+            position += 4
+            unsigned_int2 = (MurMurHashUtil.get_unsigned_int(unsigned_int2) * multiplier) & 0xFFFFFFFF
+            j = (
+                ((j * multiplier) & 0xFFFFFFFF)
+                ^ ((((unsigned_int2 ^ (unsigned_int2 >> 24)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF)
+            ) & 0xFFFFFFFF
+
+            remaining_bytes -= 8
+
+        # Process remaining 4 bytes if available
+        if remaining_bytes >= 4:
+            multiplier = 1540483477
+            unsigned_int3 = struct.unpack_from("<I", byte_arr, position)[0]
+            position += 4
+            unsigned_int3 = (MurMurHashUtil.get_unsigned_int(unsigned_int3) * multiplier) & 0xFFFFFFFF
+            remaining = (
+                ((remaining * multiplier) & 0xFFFFFFFF)
+                ^ ((((unsigned_int3 ^ (unsigned_int3 >> 24)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF)
+            ) & 0xFFFFFFFF
+            remaining_bytes -= 4
+
+        # Process final 1-3 bytes if available
+        if remaining_bytes == 1:
+            j = (
+                ((j ^ (MurMurHashUtil.get_unsigned_int(byte_arr[position]) & 0xFF)) & 0xFFFFFFFF) * 1540483477
+            ) & 0xFFFFFFFF
+        elif remaining_bytes == 2:
+            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_arr[position + 1]) & 0xFF) << 8)) & 0xFFFFFFFF
+            j = (
+                ((j ^ (MurMurHashUtil.get_unsigned_int(byte_arr[position]) & 0xFF)) & 0xFFFFFFFF) * 1540483477
+            ) & 0xFFFFFFFF
+        elif remaining_bytes == 3:
+            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_arr[position + 2]) & 0xFF) << 16)) & 0xFFFFFFFF
+            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_arr[position + 1]) & 0xFF) << 8)) & 0xFFFFFFFF
+            j = (
+                ((j ^ (MurMurHashUtil.get_unsigned_int(byte_arr[position]) & 0xFF)) & 0xFFFFFFFF) * 1540483477
+            ) & 0xFFFFFFFF
+
+        # Final mixing
+        multiplier = 1540483477
+        j5 = (((remaining ^ (j >> 18)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
+        j6 = (((j ^ (j5 >> 22)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
+        j7 = (((j5 ^ (j6 >> 17)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
+        j8 = j7 << 32
+
+        return j8 | ((((j6 ^ (j7 >> 19)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF)
+
+    @staticmethod
+    def hash_unsigned(s: str | bytes) -> None:
+        if isinstance(s, str):
+            return MurMurHashUtil.read_unsigned_long(MurMurHashUtil.hash(s.encode()))
+        elif isinstance(s, bytes) or isinstance(s, bytearray):
+            return MurMurHashUtil.read_unsigned_long(MurMurHashUtil.hash(s))
+        return None
+
+    @staticmethod
+    def long2bytes(value: int) -> bytes:
+        # Convert long to 8 bytes in little-endian order
+        result = bytearray(8)
+        for i in range(8):
+            result[7 - i] = (value >> (i * 8)) & 0xFF
+        return bytes(result)
+
+    @staticmethod
+    def read_unsigned_long(value: int) -> int:
+        return value & 0x7FFFFFFFFFFFFFFF
+
+    @staticmethod
+    def hash_unsigned_list(long_list: list[int]):
+        byte_arr = b""
+        for i in range(len(long_list)):
+            if i == 0:
+                byte_arr = MurMurHashUtil.long2bytes(long_list[i])
+            else:
+                byte_arr += MurMurHashUtil.long2bytes(long_list[i])
+
+        return MurMurHashUtil.read_unsigned_long(MurMurHashUtil.hash(byte_arr))
+
+    @staticmethod
+    def hash_string(s: str):
+        return MurMurHashUtil.hash(s.encode())

{pymammotion-0.4.32.dist-info → pymammotion-0.4.34.dist-info}/METADATA

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

{pymammotion-0.4.32.dist-info → pymammotion-0.4.34.dist-info}/RECORD

@@ -14,7 +14,7 @@ pymammotion/aliyun/tea/core.py,sha256=4SjhRkbPMbw-uI0lQnCN0SBNAHAgVFrpHeaauuu6nZ
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
 pymammotion/bluetooth/ble.py,sha256=XQWJBpSzeIawCrLTsVrq9LI6jmM_ALVTttUkosK2BRM,2480
-pymammotion/bluetooth/ble_message.py,sha256=47xoj22Kw5XF9VT965J_BxpvTdOgSXy4opqkbsojvDo,18795
+pymammotion/bluetooth/ble_message.py,sha256=qROCOsz68kfxWeEK3Hm4dfvsbA3SpxJRhX7sEmJAMZU,18797
 pymammotion/bluetooth/const.py,sha256=CCqyHsYbB0BAYjwdhXt_n6eWWxmhlUrAFjvVv57mbvE,1749
 pymammotion/bluetooth/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/bluetooth/data/convert.py,sha256=6DMwvzVr9FWCoQFIKSI2poFXjISc_m6X59g8FlVO0-o,800
@@ -24,29 +24,29 @@ pymammotion/bluetooth/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 pymammotion/bluetooth/model/atomic_integer.py,sha256=jtSqeqd6It3TvzZN7TJyYHQNRuItuw0Bg-cL0AUEBhY,1666
 pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
+pymammotion/data/model/__init__.py,sha256=UVRbSXGOjYnWv30ZEvzT5QRpdVqAbyeToo-t0QBWyi4,292
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
 pymammotion/data/model/device.py,sha256=oWwvnqb45tqErPgDu2P9OX8HRuN-NV6bYNTotU5ofRY,7027
-pymammotion/data/model/device_config.py,sha256=1kFkztZk3_DXHaEUZN-j_4s0HT83m4qLVAg2uHCyzFg,2638
+pymammotion/data/model/device_config.py,sha256=DTnoePsMwJrKVXqGeKvbZQjs8Zab61U5T3b-c-w0WlM,2654
 pymammotion/data/model/device_info.py,sha256=Q0qJ6BflQycH_VFugwaFFXcvM69q2v9JAe2wWOcCggE,904
 pymammotion/data/model/device_limits.py,sha256=m8HdxD-RaAkPm7jHYb9GLxMEH9IfzBPz0ZypmsLnId4,1946
-pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
+pymammotion/data/model/enums.py,sha256=NLImBbeqwbwBLbABC_NbBzk4M8OxhUTcto6QcGZVNOc,1707
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
 pymammotion/data/model/generate_route_information.py,sha256=pgjqURwmEIzjCMbl4Z5JDDkfxyUAdry1KhPfyir3-mU,777
-pymammotion/data/model/hash_list.py,sha256=V1rHovMViWD9bUWcgKEyQ0xkdtgrEEvTjyOOCNIhRJw,12124
+pymammotion/data/model/hash_list.py,sha256=t9pY5JkL8Ky5YE4y6FowsiBeEZJPFl8XrPvW21xavEE,12121
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=bBbRhDe-imZsXDR0TN0emQv6BiIkAlXJFb5isPEjgDk,1078
-pymammotion/data/model/plan.py,sha256=wGlcJT-w0EdbWK9jI838TCOm_MABFg7WoR664VB8RWg,2880
 pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9PGIDA8Ls,1251
 pymammotion/data/model/raw_data.py,sha256=x2xuqVC8CQuV3ui3QK4G5EqRET9EsNljHLHR11ByYgo,6471
 pymammotion/data/model/region_data.py,sha256=VokMRqB_o4OFL1TWAM90Fvm-1z4jcYrw3X2o760qpx4,2949
 pymammotion/data/model/report_info.py,sha256=3nXBFRfdKWnZj4YfBcrPwhBRpq58ICMQlrESfI1tTMg,3808
+pymammotion/data/model/work.py,sha256=AfKMItFqnRtAlVHzKCfYY-BQy-WFDYZBzdj-9Yc03bo,655
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
-pymammotion/data/state_manager.py,sha256=eL92Ul2L-qfF1tfz5gx4jewMkMMfbIGoYzAQY3jCyxc,9704
+pymammotion/data/state_manager.py,sha256=ClWwxwO88BLRkox0ljoZNzwdTWiPIBMyLBj-15V0GfI,9828
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -68,10 +68,10 @@ pymammotion/mammotion/commands/messages/video.py,sha256=Vn5F65ojr3chePBtfYjOg90E
 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=LwwzRlf6vE8x6khIBDIlJU2y7_k1tTITLFU74uMP7mg,12306
-pymammotion/mammotion/devices/mammotion.py,sha256=ffzwsQqO9zDwMElWYMsxi-J5_rGaOOOHdAm5D3DXprc,13671
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=VnFlZMQhGrpsNe5TYhOyGnGrZSoLIMWTLJ8asPLy19c,18725
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=pQiwL9MT9q4guay2sY4-v2TtiQMAEpmsPUTnBJvMDvI,14053
+pymammotion/mammotion/devices/base.py,sha256=bL6aPx5o8sv3BrdgSIkpqaBYtW6yQPJ4rKd9JEr-u6c,11815
+pymammotion/mammotion/devices/mammotion.py,sha256=W8LtaZyYa6WhtSPpC7KHBPL3B9OHLlvZTg-Dr1oEFpo,13989
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=r-IoqiBsgEUOxcvU0Ryz8RkW1oUJ6LcXLQa710cYmZI,18862
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=sVw-McsTJ_8wlkToL5rkjAlN2d3ituvqLona5w5bd1o,14160
 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
@@ -118,9 +118,10 @@ pymammotion/utility/device_config.py,sha256=65Jl73-dQDs4yMXwYXZW_bsgSvnwpFBZDu8O
 pymammotion/utility/device_type.py,sha256=Lhvi8CLY8qr1EghZFlFK85hhzsmyE0LHVZO0qAmYod4,12582
 pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,2227
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
+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.4.32.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.32.dist-info/METADATA,sha256=4D-uF3c0qwmbXqu_JKITQsHo03e_NEba3OIjnytXFsg,3878
-pymammotion-0.4.32.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pymammotion-0.4.32.dist-info/RECORD,,
+pymammotion-0.4.34.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.34.dist-info/METADATA,sha256=gIlSuwLIrxcSDNPZDFF-BpY9kNzJ8ZpSm8e9XcB_gOU,3878
+pymammotion-0.4.34.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.4.34.dist-info/RECORD,,

{pymammotion-0.4.32.dist-info → pymammotion-0.4.34.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

pymammotion/data/model/plan.py

@@ -1,55 +0,0 @@
-class Plan:
-    def __init__(self) -> None:
-        self.pver: int = 0
-        self.sub_cmd: int = 0
-        self.area: int = 0
-        self.work_time: int = 0
-        self.version: str = ""
-        self.id: str = ""
-        self.user_id: str = ""
-        self.device_id: str = ""
-        self.plan_id: str = ""
-        self.task_id: str = ""
-        self.job_id: str = ""
-        self.start_time: str = ""
-        self.end_time: str = ""
-        self.week: int = 0
-        self.knife_height: int = 0
-        self.model: int = 0
-        self.edge_mode: int = 0
-        self.required_time: int = 0
-        self.route_angle: int = 0
-        self.route_model: int = 0
-        self.route_spacing: int = 0
-        self.ultrasonic_barrier: int = 0
-        self.total_plan_num: int = 0
-        self.plan_index: int = 0
-        self.result: int = 0
-        self.speed: float = 0.0
-        self.task_name: str = ""
-        self.job_name: str = ""
-        self.zone_hashs: list[int] = []
-        self.reserved: str = ""
-        self.weeks: list[int] = []
-        self.start_date: str = ""
-        self.end_date: str = ""
-        self.job_type: int = 0
-        self.interval_days: int = 0
-        self.count_down: int = 0
-        self.is_enable: bool = True
-        self.is_mow_work: bool = True
-        self.is_sweeping_work: bool = True
-        self.mowing_laps: int = 0
-        self.path_order: int = 0
-        self.demond_angle: int = 90
-
-    def __str__(self) -> str:
-        return f"Plan(pver={self.pver}, sub_cmd={self.sub_cmd}, area={self.area}, work_time={self.work_time}, version='{self.version}', id='{self.id}', user_id='{self.user_id}', device_id='{self.device_id}', plan_id='{self.plan_id}', task_id='{self.task_id}', job_id='{self.job_id}', start_time='{self.start_time}', end_time='{self.end_time}', week={self.week}, knife_height={self.knife_height}, model={self.model}, edge_mode={self.edge_mode}, required_time={self.required_time}, route_angle={self.route_angle}, route_model={self.route_model}, route_spacing={self.route_spacing}, ultrasonic_barrier={self.ultrasonic_barrier}, total_plan_num={self.total_plan_num}, plan_index={self.plan_index}, result={self.result}, speed={self.speed}, task_name='{self.task_name}', job_name='{self.job_name}', zone_hashs={self.zone_hashs}, reserved='{self.reserved}', weeks={self.weeks}, start_date='{self.start_date}', end_date='{self.end_date}', job_type={self.job_type}, interval_days={self.interval_days}, count_down={self.count_down}, is_enable={self.is_enable}, mowing_laps={self.mowing_laps}, path_order={self.path_order}, demond_angle={self.demond_angle}, is_mow_work={self.is_mow_work}, is_sweeping_work={self.is_sweeping_work})"
-
-    def __eq__(self, other):
-        if isinstance(other, Plan):
-            return self.plan_id == other.plan_id
-        return False
-
-    def __hash__(self):
-        return hash(self.plan_id)