pymammotion 0.2.51__tar.gz → 0.2.52__tar.gz

{pymammotion-0.2.51 → pymammotion-0.2.52}/PKG-INFO

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

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/aliyun/cloud_gateway.py

@@ -62,6 +62,10 @@ class LoginException(Exception):
     """Raise exception when library cannot log in."""
 
 
+class CheckSessionException(Exception):
+    """Raise exception when checking session results in a failure."""
+
+
 class CloudIOTGateway:
     """Class for interacting with Aliyun Cloud IoT Gateway."""
 
@@ -528,7 +532,7 @@ class CloudIOTGateway:
 
         if int(response_body_dict.get("code")) != 200:
             logger.error(response_body_dict)
-            raise Exception("Error check or refresh token: " + response_body_dict.__str__())
+            raise CheckSessionException("Error check or refresh token: " + response_body_dict.__str__())
 
         session = SessionByAuthCodeResponse.from_dict(response_body_dict)
         session_data = session.data
@@ -725,3 +729,7 @@ class CloudIOTGateway:
     @property
     def login_by_oauth_response(self):
         return self._login_by_oauth_response
+
+    @property
+    def connect_response(self):
+        return self._connect_response

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/bluetooth/ble_message.py

@@ -56,25 +56,6 @@ class BleMessage:
         self.mAck = queue.Queue()
         self.notification = BlufiNotifyData()
 
-    async def get_device_version_main(self) -> None:
-        commEsp = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
-
-        for i in range(1, 8):
-            if i == 1:
-                commEsp.todev_devinfo_req.req_ids.add(id=i, type=6)
-            commEsp.todev_devinfo_req.req_ids.add(id=i, type=3)
-
-        lubaMsg = luba_msg_pb2.LubaMsg()
-        lubaMsg.msgtype = luba_msg_pb2.MSG_CMD_TYPE_ESP
-        lubaMsg.sender = luba_msg_pb2.DEV_MOBILEAPP
-        lubaMsg.msgattr = luba_msg_pb2.MSG_ATTR_REQ
-        lubaMsg.seqs = 1
-        lubaMsg.version = 1
-        lubaMsg.subtype = 1
-        lubaMsg.net.CopyFrom(commEsp)
-        byte_arr = lubaMsg.SerializeToString()
-        await self.post_custom_data_bytes(byte_arr)
-
     async def get_task(self) -> None:
         hash_map = {"pver": 1, "subCmd": 2, "result": 0}
         await self.post_custom_data(self.get_json_string(bleOrderCmd.task, hash_map))

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/data/model/device.py

@@ -10,6 +10,7 @@ from pymammotion.data.model import HashList, RapidState
 from pymammotion.data.model.device_config import DeviceLimits
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
+from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.proto.dev_net import DevNet
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.luba_mul import SocMul
@@ -33,6 +34,7 @@ from pymammotion.utility.map import CoordinateConverter
 class MowingDevice(DataClassORJSONMixin):
     """Wraps the betterproto dataclasses, so we can bypass the groups for keeping all data."""
 
+    mqtt_properties: ThingPropertiesMessage | None = None
     map: HashList = field(default_factory=HashList)
     location: Location = field(default_factory=Location)
     mowing_state: RapidState = field(default_factory=RapidState)

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/data/model/hash_list.py

@@ -12,6 +12,7 @@ class PathType(IntEnum):
     AREA = 0
     OBSTACLE = 1
     PATH = 2
+    DUMP = 12
 
 
 @dataclass
@@ -20,10 +21,15 @@ class FrameList(DataClassORJSONMixin):
     data: list[NavGetCommDataAck]
 
 
+@dataclass
+class NavGetHashListData(DataClassORJSONMixin, NavGetHashListAck):
+    """Dataclass for NavGetHashListData."""
+
+
 @dataclass
 class RootHashList(DataClassORJSONMixin):
     total_frame: int = 0
-    data: list[NavGetHashListAck] = list
+    data: list[NavGetHashListAck] = field(default_factory=list)
 
 
 @dataclass
@@ -45,15 +51,19 @@ class HashList(DataClassORJSONMixin):
     area: dict = field(default_factory=dict)  # type 0
     path: dict = field(default_factory=dict)  # type 2
     obstacle: dict = field(default_factory=dict)  # type 1
+    dump: dict = field(default_factory=dict)  # type 12?
     area_name: list[AreaHashNameList] = field(default_factory=list)
 
     def update_hash_lists(self, hashlist: list[int]) -> None:
         self.area = {hash_id: frames for hash_id, frames in self.area.items() if hash_id in hashlist}
         self.path = {hash_id: frames for hash_id, frames in self.path.items() if hash_id in hashlist}
         self.obstacle = {hash_id: frames for hash_id, frames in self.obstacle.items() if hash_id in hashlist}
+        self.dump = {hash_id: frames for hash_id, frames in self.dump.items() if hash_id in hashlist}
 
     @property
     def hashlist(self) -> list[int]:
+        if len(self.root_hash_list.data) == 0:
+            return []
         return [i for obj in self.root_hash_list.data for i in obj.data_couple]
 
     @property
@@ -62,7 +72,7 @@ class HashList(DataClassORJSONMixin):
             i
             for obj in self.root_hash_list.data
             for i in obj.data_couple
-            if i not in set(self.area.keys()).union(self.path.keys(), self.obstacle.keys())
+            if i not in set(self.area.keys()).union(self.path.keys(), self.obstacle.keys(), self.dump.keys())
         ]
 
     def update_root_hash_list(self, hash_list: NavGetHashListAck) -> None:
@@ -92,6 +102,9 @@ class HashList(DataClassORJSONMixin):
         if hash_data.type == PathType.PATH:
             return self._find_missing_frames(self.path.get(hash_data.hash))
 
+        if hash_data.type == PathType.DUMP:
+            return self._find_missing_frames(self.dump.get(hash_data.hash))
+
     def update(self, hash_data: NavGetCommDataAck) -> bool:
         """Update the map data."""
         if hash_data.type == PathType.AREA:
@@ -106,6 +119,9 @@ class HashList(DataClassORJSONMixin):
         if hash_data.type == PathType.PATH:
             return self._add_hash_data(self.path, hash_data)
 
+        if hash_data.type == PathType.DUMP:
+            return self._add_hash_data(self.dump, hash_data)
+
     @staticmethod
     def _find_missing_frames(frame_list: FrameList | RootHashList) -> list[int]:
         if frame_list.total_frame == len(frame_list.data):

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/data/mqtt/properties.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Generic, Literal, TypeVar, Union
+from typing import Any, Generic, Literal, TypeVar, Union
 
 from mashumaro import DataClassDictMixin
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -113,18 +113,62 @@ Items = Union[
 ]
 
 
+@dataclass
+class Item:
+    time: int
+    value: Union[int, float, str, dict[str, Any]]  # Depending on the type of value
+
+
+@dataclass
+class Items:
+    iotState: Item
+    extMod: Item
+    deviceVersionInfo: Item
+    leftMotorBootVersion: Item
+    knifeHeight: Item
+    rtMrMod: Item
+    iotMsgHz: Item
+    iotMsgTotal: Item
+    loraRawConfig: Item
+    loraGeneralConfig: Item
+    leftMotorVersion: Item
+    intMod: Item
+    coordinate: Item
+    bmsVersion: Item
+    rightMotorVersion: Item
+    stm32H7Version: Item
+    rightMotorBootVersion: Item
+    deviceVersion: Item
+    rtkVersion: Item
+    ltMrMod: Item
+    networkInfo: Item
+    bmsHardwareVersion: Item
+    batteryPercentage: Item
+    deviceState: Item
+    deviceOtherInfo: Item
+    mcBootVersion: Item
+
+
 @dataclass
 class Params(DataClassORJSONMixin):
+    deviceType: Literal["LawnMower"]
     checkFailedData: dict
     groupIdList: list[str]
+    _tenantId: str
     groupId: str
     categoryKey: Literal["LawnMower"]
     batchId: str
     gmtCreate: int
     productKey: str
+    generateTime: int
     deviceName: str
+    _traceId: str
     iotId: str
+    JMSXDeliveryCount: int
     checkLevel: int
+    qos: int
+    requestId: str
+    _categoryKey: str
     namespace: str
     tenantId: str
     thingType: Literal["DEVICE"]

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/data/state_manager.py

@@ -7,6 +7,7 @@ import betterproto
 
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.hash_list import AreaHashNameList
+from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck
 from pymammotion.utility.constant import WorkMode
@@ -34,6 +35,10 @@ class StateManager:
         """Set device."""
         self._device = device
 
+    async def properties(self, properties: ThingPropertiesMessage) -> None:
+        params = properties.params
+        self._device.mqtt_properties = params
+
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""
         res = betterproto.which_one_of(message, "LubaSubMsg")

pymammotion-0.2.52/pymammotion/mammotion/commands/abstract_message.py

@@ -0,0 +1,22 @@
+from abc import abstractmethod
+
+from pymammotion.proto.luba_msg import MsgCmdType, MsgDevice
+from pymammotion.utility.device_type import DeviceType
+
+
+class AbstractMessage:
+    @abstractmethod
+    def get_device_name(self) -> str:
+        """Get device name."""
+
+    def get_device_product_key(self) -> str:
+        """Get device name."""
+
+    def get_msg_device(self, msg_type: MsgCmdType, msg_device: MsgDevice) -> MsgDevice:
+        """Changes the rcver name if it's not a luba1."""
+        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

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/mammotion_command.py

@@ -1,4 +1,5 @@
 from pymammotion.mammotion.commands.messages.driver import MessageDriver
+from pymammotion.mammotion.commands.messages.media import MessageMedia
 from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
 from pymammotion.mammotion.commands.messages.network import MessageNetwork
 from pymammotion.mammotion.commands.messages.ota import MessageOta
@@ -7,7 +8,9 @@ from pymammotion.mammotion.commands.messages.video import MessageVideo
 from pymammotion.utility.movement import get_percent, transform_both_speeds
 
 
-class MammotionCommand(MessageSystem, MessageNavigation, MessageNetwork, MessageOta, MessageVideo, MessageDriver):
+class MammotionCommand(
+    MessageSystem, MessageNavigation, MessageNetwork, MessageOta, MessageVideo, MessageMedia, MessageDriver
+):
     """MQTT commands for Luba."""
 
     def __init__(self, device_name: str) -> None:

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/messages/driver.py

@@ -11,12 +11,11 @@ logger = getLogger(__name__)
 
 
 class MessageDriver(AbstractMessage, ABC):
-    @staticmethod
-    def send_order_msg_driver(driver):
+    def send_order_msg_driver(self, driver) -> bytes:
         return LubaMsg(
             msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_DRIVER,
             sender=MsgDevice.DEV_MOBILEAPP,
-            rcver=MsgDevice.DEV_MAINCTL,
+            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_EMBED_DRIVER, MsgDevice.DEV_MAINCTL),
             msgattr=MsgAttr.MSG_ATTR_REQ,
             timestamp=round(time.time() * 1000),
             seqs=1,

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/messages/media.py

@@ -1,15 +1,18 @@
 # === sendOrderMsg_Media ===
+from abc import ABC
+
+from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import luba_msg_pb2, luba_mul_pb2
+from pymammotion.proto.luba_msg import MsgCmdType, MsgDevice
 from pymammotion.proto.luba_mul import MUL_LANGUAGE
 
 
-class MessageMedia:
-    @staticmethod
+class MessageMedia(AbstractMessage, ABC):
     def send_order_msg_media(self, mul):
         luba_msg = luba_msg_pb2.LubaMsg(
             msgtype=luba_msg_pb2.MSG_CMD_TYPE_MUL,
             sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=luba_msg_pb2.SOC_MODULE_MULTIMEDIA,
+            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
             msgattr=luba_msg_pb2.MSG_ATTR_REQ,
             seqs=1,
             version=1,

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/messages/navigation.py

@@ -25,21 +25,11 @@ from pymammotion.proto.mctrl_nav import (
     WorkReportCmdData,
     WorkReportUpdateCmd,
 )
-from pymammotion.utility.device_type import DeviceType
 
 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 (
-            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
-
     def send_order_msg_nav(self, build) -> bytes:
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.MSG_CMD_TYPE_NAV,

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/messages/network.py

@@ -26,12 +26,22 @@ class MessageNetwork:
         comm_esp = dev_net_pb2.DevNet(todev_ble_sync=sync_type)
         return self.send_order_msg_net(comm_esp)
 
-    def get_device_base_info(self):
+    def get_device_base_info(self) -> bytes:
         net = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
         net.todev_devinfo_req.req_ids.add(id=1, type=6)
 
         return self.send_order_msg_net(net)
 
+    def get_device_version_main(self) -> bytes:
+        net = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
+
+        for i in range(1, 8):
+            if i == 1:
+                net.todev_devinfo_req.req_ids.add(id=i, type=6)
+            net.todev_devinfo_req.req_ids.add(id=i, type=3)
+
+        return self.send_order_msg_net(net)
+
     def get_4g_module_info(self) -> bytes:
         build = dev_net_pb2.DevNet(todev_get_mnet_cfg_req=dev_net_pb2.DevNet().todev_get_mnet_cfg_req)
         logger.debug("Send command -- Get device 4G network module information")

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/messages/ota.py

@@ -1,13 +1,17 @@
 # === sendOrderMsg_Ota ===
+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
 
 
-class MessageOta:
+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=luba_msg_pb2.DEV_MAINCTL,
+            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_EMBED_OTA, MsgDevice.DEV_MAINCTL),
             msgattr=luba_msg_pb2.MSG_ATTR_REQ,
             seqs=1,
             version=1,

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/messages/system.py

@@ -26,6 +26,16 @@ class MessageSystem(AbstractMessage, ABC):
     messageNavigation: MessageNavigation = MessageNavigation()
 
     def send_order_msg_sys(self, sys):
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_EMBED_SYS, MsgDevice.DEV_MAINCTL),
+            sys=sys,
+        )
+
+        return luba_msg.SerializeToString()
+
+    def send_order_msg_sys_legacy(self, sys):
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
             sender=MsgDevice.DEV_MOBILEAPP,
@@ -225,9 +235,10 @@ class MessageSystem(AbstractMessage, ABC):
         )
         logger.debug(f"Send command==== IOT slim data Act {
             build.todev_report_cfg.act} {build}")
-        return self.send_order_msg_sys(build)
+        return self.send_order_msg_sys_legacy(build)
 
     def get_report_cfg_stop(self, timeout: int = 10000, period: int = 1000, no_change_period: int = 1000):
+        # TODO use send_order_msg_sys_legacy
         mctlsys = MctlSys(
             todev_report_cfg=ReportInfoCfg(
                 act=RptAct.RPT_STOP,
@@ -260,6 +271,7 @@ class MessageSystem(AbstractMessage, ABC):
         return lubaMsg.SerializeToString()
 
     def get_report_cfg(self, timeout: int = 10000, period: int = 1000, no_change_period: int = 2000):
+        # TODO use send_order_msg_sys_legacy
         mctlsys = MctlSys(
             todev_report_cfg=ReportInfoCfg(
                 act=RptAct.RPT_START,

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/commands/messages/video.py

@@ -1,15 +1,18 @@
 # === sendOrderMsg_Video ===
+from abc import ABC
+
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import luba_msg_pb2, luba_mul_pb2
+from pymammotion.proto.luba_msg import MsgCmdType, MsgDevice
 from pymammotion.utility.device_type import DeviceType
 
 
-class MessageVideo(AbstractMessage):
+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,
             sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=luba_msg_pb2.SOC_MODULE_MULTIMEDIA,
+            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
             mul=mul,
         )
 

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/devices/base.py

@@ -74,7 +74,7 @@ class MammotionBaseDevice:
         if len(missing_frames) == 0:
             # get next in hash ack list
 
-            data_hash = self.mower.map.missing_hashlist.pop()
+            data_hash = self.mower.map.missing_hashlist.pop() if len(self.mower.map.missing_hashlist) > 0 else None
             if data_hash is None:
                 return
 

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/devices/mammotion.py

@@ -299,7 +299,7 @@ class Mammotion:
                 _LOGGER.debug(_stream_response)
                 return _stream_response
 
-    def mower(self, name: str):
+    def mower(self, name: str) -> MowingDevice | None:
         device = self.get_device_by_name(name)
         if device:
             return device.mower_state

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -13,6 +13,7 @@ from pymammotion.aliyun.cloud_gateway import DeviceOfflineException, SetupExcept
 from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.mqtt.event import ThingEventMessage
+from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.event.event import DataEvent
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
@@ -33,6 +34,7 @@ class MammotionCloud:
         self.command_queue = asyncio.Queue()
         self._waiting_queue = deque()
         self.mqtt_message_event = DataEvent()
+        self.mqtt_properties_event = DataEvent()
         self.on_ready_event = DataEvent()
         self.on_disconnected_event = DataEvent()
         self._operation_lock = asyncio.Lock()
@@ -127,6 +129,7 @@ class MammotionCloud:
                 # Call the callbacks for each cloudDevice
                 await self.mqtt_message_event.data_event(event)
             if event.method == "thing.properties":
+                await self.mqtt_properties_event.data_event(event)
                 _LOGGER.debug(event)
 
     async def _handle_mqtt_message(self, topic: str, payload: dict) -> None:
@@ -159,6 +162,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._commands: MammotionCommand = MammotionCommand(cloud_device.deviceName)
         self.currentID = ""
         self._mqtt.mqtt_message_event.add_subscribers(self._parse_message_for_device)
+        self._mqtt.mqtt_properties_event.add_subscribers(self._parse_message_properties_for_device)
         self._mqtt.on_ready_event.add_subscribers(self.on_ready)
         self._mqtt.on_disconnected_event.add_subscribers(self.on_disconnect)
         self.set_queue_callback(self.queue_command)
@@ -247,6 +251,11 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
                 return item
         return None
 
+    async def _parse_message_properties_for_device(self, event: ThingPropertiesMessage) -> None:
+        if event.params.iotId != self.iot_id:
+            return
+        self.state_manager.properties(event)
+
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
         params = event.params
         if event.params.iotId != self.iot_id:

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/proto/mctrl_nav.proto

@@ -141,7 +141,7 @@ message NavGetCommData {
   int32 subCmd = 2;
   int32 action = 3;
   int32 type = 4;
-  fixed64 Hash = 5;
+  int64 hash = 5;
   int64 paternalHashA = 6;
   int64 paternalHashB = 7;
   int32 totalFrame = 8;
@@ -434,7 +434,7 @@ message NavTaskCtrlAck {
 
 message NavMapNameMsg {
     int32 rw = 1;  // Represents RW field
-    fixed64 hash = 2;  // Represents HASH field
+    int64 hash = 2;  // Represents HASH field
     string name = 3;  // Represents NAME field
     int32 result = 4;  // Represents RESULT field
     string device_id = 5;  // Represents DEVICEID field
@@ -470,7 +470,7 @@ message SvgMessageAckT {
 
 message AreaHashName {
     string name = 2;
-    fixed64 hash = 1;
+    int64 hash = 1;
 }
 
 message AppGetAllAreaHashName {

{pymammotion-0.2.51 → pymammotion-0.2.52}/pymammotion/proto/mctrl_sys.proto

@@ -131,7 +131,7 @@ message vision_point_msg {
 }
 
 message vision_point_info_msg {
-  int32 lable = 1;
+  int32 label = 1;
   int32 num = 2;
   repeated vision_point_msg vision_point = 3;
 }
@@ -258,6 +258,12 @@ message rpt_lora {
   int32 lora_connection_status = 5;
 }
 
+message mqtt_rtk_connect {
+    int32 rtk_switch = 1;
+    int32 rtk_channel = 2;
+    string rtk_base_num = 3;
+}
+
 message rpt_rtk {
   int32 status = 1;
   int32 pos_level = 2;
@@ -271,6 +277,7 @@ message rpt_rtk {
   int32 co_view_stars = 10;
   int32 reset = 11;
   rpt_lora lora_info = 12;
+  mqtt_rtk_connect mqtt_rtk_info = 13;
 }
 
 message rpt_dev_location {
@@ -316,6 +323,12 @@ message rpt_connect_status {
   int32 mnet_rssi = 5;
   int32 mnet_inet = 6;
   net_used_type used_net = 7;
+  MnetCfg mnet_cfg = 8;
+}
+
+
+message nav_heading_state_t {
+    int32 heading_state = 1;
 }
 
 message rpt_work {
@@ -339,6 +352,7 @@ message rpt_work {
   int32 man_run_speed = 18;
   int32 nav_edit_status = 19;
   int32 knife_height = 20;
+  nav_heading_state_t nav_heading_state = 21;
 }
 
 message rpt_maintain {

{pymammotion-0.2.51 → pymammotion-0.2.52}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.51"
+version     = "0.2.52"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.51"
+version     = "0.2.52"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -55,7 +55,7 @@ mypy = "^1.10.0"
 pre-commit = "^3.8.0"
 
 [tool.bumpver]
-current_version = "0.2.51"
+current_version = "0.2.52"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true

pymammotion-0.2.51/pymammotion/mammotion/commands/abstract_message.py

@@ -1,10 +0,0 @@
-from abc import abstractmethod
-
-
-class AbstractMessage:
-    @abstractmethod
-    def get_device_name(self) -> str:
-        """Get device name."""
-
-    def get_device_product_key(self) -> str:
-        """Get device name."""