pymammotion 0.2.41__tar.gz → 0.2.42__tar.gz

{pymammotion-0.2.41 → pymammotion-0.2.42}/PKG-INFO

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

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/aliyun/cloud_gateway.py

@@ -17,14 +17,14 @@ from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequ
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
 
-from pymammotion.aliyun.dataclass.aep_response import AepResponse
-from pymammotion.aliyun.dataclass.connect_response import ConnectResponse
-from pymammotion.aliyun.dataclass.dev_by_account_response import (
+from pymammotion.aliyun.model.aep_response import AepResponse
+from pymammotion.aliyun.model.connect_response import ConnectResponse
+from pymammotion.aliyun.model.dev_by_account_response import (
     ListingDevByAccountResponse,
 )
-from pymammotion.aliyun.dataclass.login_by_oauth_response import LoginByOAuthResponse
-from pymammotion.aliyun.dataclass.regions_response import RegionResponse
-from pymammotion.aliyun.dataclass.session_by_authcode_response import (
+from pymammotion.aliyun.model.login_by_oauth_response import LoginByOAuthResponse
+from pymammotion.aliyun.model.regions_response import RegionResponse
+from pymammotion.aliyun.model.session_by_authcode_response import (
     SessionByAuthCodeResponse,
 )
 from pymammotion.const import ALIYUN_DOMAIN, APP_KEY, APP_SECRET, APP_VERSION
@@ -436,6 +436,49 @@ class CloudIOTGateway:
 
         return response.body
 
+    def sign_out(self) -> None:
+        config = Config(
+            app_key=self._app_key,
+            app_secret=self._app_secret,
+            domain=self._region_response.data.apiGatewayEndpoint,
+        )
+        client = Client(config)
+
+        # build request
+        request = CommonParams(api_ver="1.0.4", language="en-US")
+        body = IoTApiRequest(
+            id=str(uuid.uuid4()),
+            params={
+                "request": {
+                    "refreshToken": self._session_by_authcode_response.data.refreshToken,
+                    "identityId": self._session_by_authcode_response.data.identityId,
+                }
+            },
+            request=request,
+            version="1.0",
+        )
+
+        # send request
+        # possibly need to do this ourselves
+        response = client.do_request(
+            "/iotx/account/invalidSession",
+            "https",
+            "POST",
+            None,
+            body,
+            RuntimeOptions(),
+        )
+        logger.debug(response.status_message)
+        logger.debug(response.headers)
+        logger.debug(response.status_code)
+        logger.debug(response.body)
+
+        # Decode the response body
+        response_body_str = response.body.decode("utf-8")
+
+        # Load the JSON string into a dictionary
+        response_body_dict = json.loads(response_body_str)
+
     def check_or_refresh_session(self):
         """Check or refresh the session."""
         logger.debug("Try to refresh token")
@@ -542,6 +585,47 @@ class CloudIOTGateway:
         self._devices_by_account_response = ListingDevByAccountResponse.from_dict(response_body_dict)
         return self._devices_by_account_response
 
+    def list_binding_by_dev(self, iot_id: str):
+        config = Config(
+            app_key=self._app_key,
+            app_secret=self._app_secret,
+            domain=self._region_response.data.apiGatewayEndpoint,
+        )
+
+        client = Client(config)
+
+        # build request
+        request = CommonParams(
+            api_ver="1.0.8",
+            language="en-US",
+            iot_token=self._session_by_authcode_response.data.iotToken,
+        )
+        body = IoTApiRequest(
+            id=str(uuid.uuid4()),
+            params={"pageSize": 100, "pageNo": 1, "iotId": iot_id},
+            request=request,
+            version="1.0",
+        )
+
+        # send request
+        response = client.do_request("/uc/listBindingByDev", "https", "POST", None, body, RuntimeOptions())
+        logger.debug(response.status_message)
+        logger.debug(response.headers)
+        logger.debug(response.status_code)
+        logger.debug(response.body)
+
+        # Decode the response body
+        response_body_str = response.body.decode("utf-8")
+
+        # Load the JSON string into a dictionary
+        response_body_dict = json.loads(response_body_str)
+
+        if int(response_body_dict.get("code")) != 200:
+            raise Exception("Error in creating session: " + response_body_dict["msg"])
+
+        self._devices_by_account_response = ListingDevByAccountResponse.from_dict(response_body_dict)
+        return self._devices_by_account_response
+
     def send_cloud_command(self, iot_id: str, command: bytes) -> str:
         """Send a cloud command to the specified IoT device."""
 
@@ -587,7 +671,6 @@ class CloudIOTGateway:
             version="1.0",
         )
         logger.debug(self.converter.printBase64Binary(command))
-
         # send request
         response = client.do_request("/thing/service/invoke", "https", "POST", None, body, RuntimeOptions())
         logger.debug(response.status_message)

{pymammotion-0.2.41/pymammotion/aliyun/dataclass → pymammotion-0.2.42/pymammotion/aliyun/model}/dev_by_account_response.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import Optional
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin

pymammotion-0.2.42/pymammotion/aliyun/model/stream_subscription_response.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass
+from typing import List
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+
+@dataclass
+class Camera(DataClassORJSONMixin):
+    cameraId: int
+    token: str
+
+
+@dataclass
+class StreamSubscriptionResponse(DataClassORJSONMixin):
+    appid: str
+    cameras: List[Camera]
+    channelName: str
+    token: str
+    uid: int

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/bluetooth/ble_message.py

@@ -16,7 +16,6 @@ from pymammotion.bluetooth.data.convert import parse_custom_data
 from pymammotion.bluetooth.data.framectrldata import FrameCtrlData
 from pymammotion.bluetooth.data.notifydata import BlufiNotifyData
 from pymammotion.data.model.execute_boarder import ExecuteBorder
-from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
 from pymammotion.proto import (
     dev_net_pb2,
     luba_msg_pb2,
@@ -49,7 +48,6 @@ class BleMessage:
     mReadSequence: iter
     mAck: queue
     notification: BlufiNotifyData
-    messageNavigation: MessageNavigation = MessageNavigation()
 
     def __init__(self, client: BleakClient) -> None:
         self.client = client
@@ -123,9 +121,9 @@ class BleMessage:
 
     async def requestDeviceStatus(self) -> None:
         request = False
-        type = self.messageNavigation.getTypeValue(0, 5)
+        type = self.getTypeValue(0, 5)
         try:
-            request = await self.messageNavigation.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
+            request = await self.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
             # _LOGGER.debug(request)
         except Exception as err:
             # Log.w(TAG, "post requestDeviceStatus interrupted")
@@ -137,9 +135,9 @@ class BleMessage:
 
     async def requestDeviceVersion(self) -> None:
         request = False
-        type = self.messageNavigation.getTypeValue(0, 7)
+        type = self.getTypeValue(0, 7)
         try:
-            request = await self.messageNavigation.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
+            request = await self.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
             # _LOGGER.debug(request)
         except Exception as err:
             # Log.w(TAG, "post requestDeviceStatus interrupted")
@@ -147,7 +145,7 @@ class BleMessage:
             _LOGGER.error(err)
 
     async def sendBorderPackage(self, executeBorder: ExecuteBorder) -> None:
-        await self.messageNavigation.post_custom_data(serialize(executeBorder))
+        await self.post_custom_data(serialize(executeBorder))
 
     async def gatt_write(self, data: bytes) -> None:
         await self.client.write_gatt_char(UUID_WRITE_CHARACTERISTIC, data, True)
@@ -340,6 +338,10 @@ class BleMessage:
             # onPostCustomDataResult(status, data)
         except Exception as err:
             _LOGGER.debug(err)
+            # we might be constantly connected and in a bad state
+            self.mSendSequence = itertools.count()
+            self.mReadSequence = itertools.count()
+            await self.client.disconnect()
 
     async def post(
         self,

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/data/model/device.py

@@ -112,7 +112,17 @@ class MowingDevice(DataClassORJSONMixin):
         self.report_data = self.report_data.from_dict(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
 
     def run_state_update(self, rapid_state: SystemRapidStateTunnelMsg) -> None:
+        coordinate_converter = CoordinateConverter(self.location.RTK.latitude, self.location.RTK.longitude)
         self.mowing_state = RapidState().from_raw(rapid_state.rapid_state_data)
+        self.location.position_type = self.mowing_state.pos_type
+        self.location.orientation = self.mowing_state.toward / 10000
+        self.location.device = coordinate_converter.enu_to_lla(
+            parse_double(self.mowing_state.pos_y, 4.0), parse_double(self.mowing_state.pos_x, 4.0)
+        )
+        if self.mowing_state.zone_hash:
+            self.location.work_zone = (
+                self.mowing_state.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
+            )
 
     def mow_info(self, toapp_mow_info: MowToAppInfoT) -> None:
         pass

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/data/model/device_config.py

@@ -8,7 +8,7 @@ from pymammotion.utility.device_type import DeviceType
 @dataclass
 class DeviceLimits(DataClassORJSONMixin):
     blade_height_min: int = 30
-    blade_height_max: int = 70
+    blade_height_max: int = 100
     working_speed_min: float = 0.2
     working_speed_max: float = 1.2
     working_path_min: int = 15

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/data/state_manager.py

@@ -1,5 +1,6 @@
 """Manage state from notifications into MowingDevice."""
 
+from datetime import datetime
 from typing import Any, Awaitable, Callable, Optional
 
 import betterproto
@@ -8,12 +9,14 @@ from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.hash_list import AreaHashNameList
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck
+from pymammotion.utility.constant import WorkMode
 
 
 class StateManager:
     """Manage state."""
 
     _device: MowingDevice
+    last_updated_at: datetime = datetime.now()
 
     def __init__(self, device: MowingDevice) -> None:
         self._device = device
@@ -21,6 +24,7 @@ class StateManager:
         self.get_commondata_ack_callback: Optional[Callable[[NavGetCommDataAck], Awaitable[None]]] = None
         self.on_notification_callback: Optional[Callable[[], Awaitable[None]]] = None
         self.queue_command_callback: Optional[Callable[[str, dict[str, Any]], Awaitable[bytes]]] = None
+        self.last_updated_at = datetime.now()
 
     def get_device(self) -> MowingDevice:
         """Get device."""
@@ -33,6 +37,7 @@ class StateManager:
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""
         res = betterproto.which_one_of(message, "LubaSubMsg")
+        self.last_updated_at = datetime.now()
 
         match res[0]:
             case "nav":
@@ -78,7 +83,8 @@ class StateManager:
             case "toapp_report_data":
                 self._device.update_report_data(sys_msg[1])
                 if self.queue_command_callback:
-                    await self.queue_command_callback("get_report_cfg", stop=True)
+                    if self._device.sys.toapp_report_data.dev.sys_status != WorkMode.MODE_WORKING:
+                        await self.queue_command_callback("get_report_cfg_stop")
             case "mow_to_app_info":
                 self._device.mow_info(sys_msg[1])
             case "system_tard_state_tunnel":

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/http/http.py

@@ -3,6 +3,7 @@ from typing import cast
 
 from aiohttp import ClientSession
 
+from pymammotion.aliyun.model.stream_subscription_response import StreamSubscriptionResponse
 from pymammotion.const import (
     MAMMOTION_API_DOMAIN,
     MAMMOTION_CLIENT_ID,
@@ -43,6 +44,22 @@ class MammotionHTTP:
                 data = await resp.json()
                 response = Response.from_dict(data)
 
+    async def get_stream_subscription(self, iot_id: str) -> Response[StreamSubscriptionResponse]:
+        """Get agora.io data for view camera stream"""
+        async with ClientSession(MAMMOTION_API_DOMAIN) as session:
+            async with session.post(
+                "/device-server/v1/stream/subscription",
+                json={"deviceId": iot_id},
+                headers={
+                    "Authorization": f"{self._headers.get('Authorization', "")}",
+                    "Content-Type": "application/json",
+                },
+            ) as resp:
+                data = await resp.json()
+                # TODO catch errors from mismatch like token expire etc
+                # Assuming the data format matches the expected structure
+                return Response[StreamSubscriptionResponse].from_dict(data)
+
     @classmethod
     async def login(cls, session: ClientSession, username: str, password: str) -> Response[LoginResponseData]:
         async with session.post(

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/http/model/http.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Generic, Literal, Optional, TypeVar
 
 from mashumaro import DataClassDictMixin
+from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 DataT = TypeVar("DataT")
@@ -51,6 +52,9 @@ class Response(DataClassDictMixin, Generic[DataT]):
     msg: str
     data: DataT | None = None
 
+    class Config(BaseConfig):
+        omit_default = True
+
 
 @dataclass
 class LoginResponseUserInformation(DataClassORJSONMixin):

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/mammotion/commands/messages/network.py

@@ -1,5 +1,5 @@
 # === sendOrderMsg_Net  ===
-
+from pymammotion import logger
 from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
 from pymammotion.proto import dev_net_pb2, luba_msg_pb2
 
@@ -34,12 +34,12 @@ class MessageNetwork:
 
     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)
-        print("Send command -- Get device 4G network module information")
+        logger.debug("Send command -- Get device 4G network module information")
         return self.send_order_msg_net(build)
 
     def get_4g_info(self) -> bytes:
         build = dev_net_pb2.DevNet(todev_mnet_info_req=dev_net_pb2.DevNet().todev_mnet_info_req)
-        print("Send command -- Get device 4G network information")
+        logger.debug("Send command -- Get device 4G network information")
         return self.send_order_msg_net(build)
 
     def set_zmq_enable(self) -> bytes:
@@ -50,12 +50,12 @@ class MessageNetwork:
                 tx_zmq_url="tcp://0.0.0.0:5555",
             )
         )
-        print("Send command -- Set vision ZMQ to enable")
+        logger.debug("Send command -- Set vision ZMQ to enable")
         return self.send_order_msg_net(build)
 
     def set_iot_setting(self, iot_control_type: dev_net_pb2.iot_conctrl_type) -> bytes:
         build = dev_net_pb2.DevNet(todev_set_iot_offline_req=iot_control_type)
-        print("Send command -- Device re-online")
+        logger.debug("Send command -- Device re-online")
         return self.send_order_msg_net(build)
 
     def set_device_log_upload(
@@ -75,7 +75,7 @@ class MessageNetwork:
             num=number,
             type=type,
         )
-        print(
+        logger.debug(
             f"Send log====Feedback====Command======requestID:{request_id} operation:{operation} serverIp:{server_ip} type:{type}"
         )
         return self.send_order_msg_net(dev_net_pb2.DevNet(todev_ble_sync=1, todev_uploadfile_req=build))
@@ -98,7 +98,7 @@ class MessageNetwork:
             num=number,
             type=type,
         )
-        print(
+        logger.debug(
             f"Send log====Feedback====Command======requestID:{request_id}  operation:{operation} serverIp:{server_ip}  type:{type}"
         )
         return self.send_order_msg_net(dev_net_pb2.DevNet(todev_ble_sync=1, todev_uploadfile_req=build))
@@ -126,7 +126,7 @@ class MessageNetwork:
 
     def get_device_network_info(self) -> bytes:
         build = dev_net_pb2.DevNet(todev_networkinfo_req=dev_net_pb2.GetNetworkInfoReq(req_ids=1))
-        print("Send command - get device network information")
+        logger.debug("Send command - get device network information")
         return self.send_order_msg_net(build)
 
     def set_device_4g_enable_status(self, new_4g_status: bool) -> bytes:
@@ -141,7 +141,7 @@ class MessageNetwork:
             ),
         )
 
-        print(f"Send command - set 4G (on/off status). newWifiStatus={new_4g_status}")
+        logger.debug(f"Send command - set 4G (on/off status). newWifiStatus={new_4g_status}")
         return self.send_order_msg_net(build)
 
     def set_device_wifi_enable_status(self, new_wifi_status: bool) -> bytes:
@@ -149,11 +149,11 @@ class MessageNetwork:
             todev_ble_sync=1,
             todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(configParam=4, wifi_enable=new_wifi_status),
         )
-        print(f"szNetwork: Send command - set network (on/off status). newWifiStatus={new_wifi_status}")
+        logger.debug(f"szNetwork: Send command - set network (on/off status). newWifiStatus={new_wifi_status}")
         return self.send_order_msg_net(build)
 
     def wifi_connectinfo_update(self, device_name: str, is_binary: bool) -> bytes:
-        print(
+        logger.debug(
             f"Send command - get Wifi connection information.wifiConnectinfoUpdate().deviceName={device_name}.isBinary={is_binary}"
         )
         if is_binary:
@@ -161,7 +161,7 @@ class MessageNetwork:
                 todev_ble_sync=1,
                 todev_WifiMsgUpload=dev_net_pb2.DrvWifiUpload(wifi_msg_upload=1),
             )
-            print("Send command - get Wifi connection information")
+            logger.debug("Send command - get Wifi connection information")
             return self.send_order_msg_net(build)
         self.wifi_connectinfo_update2()
 
@@ -171,10 +171,10 @@ class MessageNetwork:
         #     68, hash_map))  # ToDo: Fix this
 
     def get_record_wifi_list(self, is_binary: bool) -> bytes:
-        print(f"getRecordWifiList().isBinary={is_binary}")
+        logger.debug(f"getRecordWifiList().isBinary={is_binary}")
         if is_binary:
             build = dev_net_pb2.DevNet(todev_ble_sync=1, todev_WifiListUpload=dev_net_pb2.DrvWifiList())
-            print("Send command - get memorized WiFi list upload command")
+            logger.debug("Send command - get memorized WiFi list upload command")
             return self.send_order_msg_net(build)
         self.get_record_wifi_list2()
 
@@ -189,7 +189,7 @@ class MessageNetwork:
                 todev_ble_sync=1,
                 todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(configParam=status, Confssid=ssid),
             )
-            print(
+            logger.debug(
                 f"Send command - set network (disconnect, direct connect, forget, no operation reconnect) operation command (downlink ssid={ssid}, status={status})"
             )
             return self.send_order_msg_net(build)

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/mammotion/commands/messages/system.py

@@ -2,6 +2,7 @@
 import datetime
 from abc import ABC
 
+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
@@ -36,7 +37,7 @@ class MessageSystem(AbstractMessage, ABC):
 
     def reset_system(self):
         build = MctlSys(todev_reset_system=1)
-        print("Send command - send factory reset")
+        logger.debug("Send command - send factory reset")
         return self.send_order_msg_sys(build)
 
     def set_blade_control(self, on_off: int):
@@ -72,24 +73,24 @@ class MessageSystem(AbstractMessage, ABC):
                 end_hour=0,
                 end_min=0,
             )
-        print(f"Send read and write sidelight command is_sidelight:{
+        logger.debug(f"Send read and write sidelight command is_sidelight:{
             is_sidelight}, operate:{operate}")
         build2 = MctlSys(todev_time_ctrl_light=build)
-        print(f"Send command - send read and write sidelight command is_sidelight:{
+        logger.debug(f"Send command - send read and write sidelight command is_sidelight:{
             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]):
         build = MCtrlSimulationCmdData(sub_cmd=sub_cmd, param_id=param_id, param_value=param_value)
-        print(f"Send tool test command: subCmd={sub_cmd}, param_id:{
+        logger.debug(f"Send tool test command: subCmd={sub_cmd}, param_id:{
             param_id}, param_value={param_value}")
         build2 = MctlSys(simulation_cmd=build)
-        print(f"Send tool test command: subCmd={sub_cmd}, param_id:{
+        logger.debug(f"Send tool test command: subCmd={sub_cmd}, param_id:{
             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):
-        print(f"Send read and write base station configuration quality op:{
+    def read_and_set_rtk_paring_code(self, op: int, cgf: str | None = None):
+        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)))
 
@@ -98,7 +99,7 @@ class MessageSystem(AbstractMessage, ABC):
             self.messageNavigation.allpowerfull_rw_adapter_x3(id, context, rw)
             return
         build = MctlSys(bidire_comm_cmd=SysCommCmd(id=id, context=context, rw=rw))
-        print(f"Send command - 9 general read and write command 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:
             # This logic doesnt make snese, but its what they had so..
             return self.send_order_msg_sys(build)
@@ -107,7 +108,7 @@ class MessageSystem(AbstractMessage, ABC):
     # 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):
     #     new_builder = mow_to_app_qctools_info_t.Builder()
-    #     print(f"Factory tool print, expect={expect}")
+    #     logger.debug(f"Factory tool logger.debug, expect={expect}")
     #     if not expect:
     #         build = new_builder.set_type_value(
     #             test_id).set_time_of_duration(test_duration).build()
@@ -157,11 +158,11 @@ class MessageSystem(AbstractMessage, ABC):
     #         else:
     #             build = new_builder.set_type_value(
     #                 test_id).set_time_of_duration(test_duration).build()
-    #     print(f"Factory tool print, mow_to_app_qctools_info_t={
+    #     logger.debug(f"Factory tool logger.debug, mow_to_app_qctools_info_t={
     #         build.except_count}, mow_to_app_qctools_info_t22={build.except_list}")
     #     build2 = MctlSys(mow_to_app_qctools_info=build)
-    #     print(f"Send command - factory tool test command testId={
-    #         test_id}, testDuration={test_duration}", "Factory tool print222", True)
+    #     logger.debug(f"Send command - factory tool test command testId={
+    #         test_id}, testDuration={test_duration}", "Factory tool logger.debug222", True)
     #     return self.send_order_msg_sys(build2)
 
     def send_sys_set_date_time(self):
@@ -175,7 +176,7 @@ class MessageSystem(AbstractMessage, ABC):
         i7 = calendar.second
         i8 = calendar.utcoffset().total_seconds() // 60 if calendar.utcoffset() else 0
         i9 = 1 if calendar.dst() else 0
-        print(f"Print time zone, time zone={
+        logger.debug(f"Print time zone, time zone={
             i8}, daylight saving time={i9} week={i4}")
         build = MctlSys(
             todev_data_time=SysSetDateTime(
@@ -190,7 +191,7 @@ class MessageSystem(AbstractMessage, ABC):
                 daylight=i9,
             )
         )
-        print(
+        logger.debug(
             f"Send command - synchronize time zone={i8}, daylight saving time={i9} week={i4}, day:{
             i3}, month:{i2}, hours:{i5}, minutes:{i6}, seconds:{i7}, year={i}",
             "Time synchronization",
@@ -222,16 +223,46 @@ class MessageSystem(AbstractMessage, ABC):
                 count=count,
             )
         )
-        print(f"Send command==== IOT slim data Act {
+        logger.debug(f"Send command==== IOT slim data Act {
             build.todev_report_cfg.act} {build}")
         return self.send_order_msg_sys(build)
 
-    def get_report_cfg(
-        self, timeout: int = 10000, period: int = 1000, no_change_period: int = 2000, stop: bool = False
-    ):
+    def get_report_cfg_stop(self, timeout: int = 10000, period: int = 1000, no_change_period: int = 1000):
         mctlsys = MctlSys(
             todev_report_cfg=ReportInfoCfg(
-                act=RptAct.RPT_STOP if stop else RptAct.RPT_START,
+                act=RptAct.RPT_STOP,
+                timeout=timeout,
+                period=period,
+                no_change_period=no_change_period,
+                count=1,
+            )
+        )
+
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_CONNECT)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_RTK)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_LOCAL)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_WORK)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_STA)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_MAINTAIN)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_POINT)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VIO)
+        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC)
+
+        lubaMsg = LubaMsg()
+        lubaMsg.msgtype = MsgCmdType.MSG_CMD_TYPE_EMBED_SYS
+        lubaMsg.sender = MsgDevice.DEV_MOBILEAPP
+        lubaMsg.rcver = MsgDevice.DEV_MAINCTL
+        lubaMsg.msgattr = MsgAttr.MSG_ATTR_REQ
+        lubaMsg.seqs = 1
+        lubaMsg.version = 1
+        lubaMsg.subtype = 1
+        lubaMsg.sys = mctlsys
+        return lubaMsg.SerializeToString()
+
+    def get_report_cfg(self, timeout: int = 10000, period: int = 1000, no_change_period: int = 2000):
+        mctlsys = MctlSys(
+            todev_report_cfg=ReportInfoCfg(
+                act=RptAct.RPT_START,
                 timeout=timeout,
                 period=period,
                 no_change_period=no_change_period,

{pymammotion-0.2.41 → pymammotion-0.2.42}/pymammotion/mammotion/devices/base.py

@@ -5,7 +5,7 @@ from typing import Any, Awaitable, Callable
 
 import betterproto
 
-from pymammotion.aliyun.dataclass.dev_by_account_response import Device
+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.state_manager import StateManager
@@ -190,6 +190,10 @@ class MammotionBaseDevice:
     async def _ble_sync(self):
         """Send ble sync command every 3 seconds or sooner."""
 
+    @abstractmethod
+    def stop(self):
+        """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")