pymammotion 0.2.41__py3-none-any.whl → 0.2.43__py3-none-any.whl

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/aliyun/{dataclass → 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/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/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/data/model/device.py

@@ -109,10 +109,21 @@ class MowingDevice(DataClassORJSONMixin):
                         location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
                     )
 
-        self.report_data = self.report_data.from_dict(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
+        self.report_data.update(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/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/data/model/rapid_state.py

@@ -1,6 +1,8 @@
 from dataclasses import dataclass
 from enum import Enum
 
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
 from pymammotion.utility.conversions import parse_double
 
 
@@ -11,7 +13,7 @@ class RTKStatus(Enum):
 
 
 @dataclass
-class RapidState:
+class RapidState(DataClassORJSONMixin):
     pos_x: float = 0
     pos_y: float = 0
     rtk_status: RTKStatus = RTKStatus.NONE

pymammotion/data/model/report_info.py

@@ -63,22 +63,22 @@ class WorkData(DataClassORJSONMixin):
 
 
 @dataclass
-class ReportData:
+class ReportData(DataClassORJSONMixin):
     connect: ConnectData = field(default_factory=ConnectData)
     dev: DeviceData = field(default_factory=DeviceData)
     rtk: RTKData = field(default_factory=RTKData)
     locations: list[LocationData] = field(default_factory=list)
     work: WorkData = field(default_factory=WorkData)
 
-    def from_dict(self, data: dict):
+    def update(self, data: dict):
         locations = self.locations
         if data.get("locations") is not None:
             locations = [LocationData.from_dict(loc) for loc in data.get("locations", [])]
 
-        return ReportData(
-            connect=ConnectData.from_dict(data.get("connect", asdict(self.connect))),
-            dev=DeviceData.from_dict(data.get("dev", asdict(self.dev))),
-            rtk=RTKData.from_dict(data.get("rtk", asdict(self.rtk))),
-            locations=locations,
-            work=WorkData.from_dict(data.get("work", asdict(self.work))),
-        )
+
+        self.connect=ConnectData.from_dict(data.get("connect", asdict(self.connect)))
+        self.dev=DeviceData.from_dict(data.get("dev", asdict(self.dev)))
+        self.rtk=RTKData.from_dict(data.get("rtk", asdict(self.rtk)))
+        self.locations=locations
+        self.work=WorkData.from_dict(data.get("work", asdict(self.work)))
+

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/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/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/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/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/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")

pymammotion/mammotion/devices/mammotion.py

@@ -8,12 +8,10 @@ from enum import Enum
 from functools import cache
 from typing import Any
 
-from aiohttp import ClientSession
 from bleak.backends.device import BLEDevice
 
 from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
-from pymammotion.aliyun.dataclass.dev_by_account_response import Device
-from pymammotion.const import MAMMOTION_DOMAIN
+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.http.http import connect_http
@@ -105,7 +103,7 @@ class MammotionDevices:
     def get_device(self, mammotion_device_name: str) -> MammotionMixedDeviceManager:
         return self.devices.get(mammotion_device_name)
 
-    def remove_device(self, name) -> None:
+    async def remove_device(self, name) -> None:
         device_for_removal = self.devices.pop(name)
         if device_for_removal.has_cloud():
             should_disconnect = {
@@ -115,6 +113,11 @@ class MammotionDevices:
             }
             if len(should_disconnect) == 0:
                 device_for_removal.cloud()._mqtt.disconnect()
+            await device_for_removal.cloud().stop()
+        if device_for_removal.has_ble():
+            await device_for_removal.ble().stop()
+
+        del device_for_removal
 
 
 async def create_devices(
@@ -164,10 +167,7 @@ class Mammotion:
             exists: MammotionCloud | None = self.mqtt_list.get(account)
             if not exists or force:
                 cloud_client = await self.login(account, password)
-            else:
-                cloud_client = exists.cloud_client
-
-            await self.initiate_cloud_connection(account, cloud_client)
+                await self.initiate_cloud_connection(account, cloud_client)
 
     async def initiate_cloud_connection(self, account: str, cloud_client: CloudIOTGateway) -> None:
         if self.mqtt_list.get(account) is not None:
@@ -176,7 +176,6 @@ class Mammotion:
                 self.add_cloud_devices(self.mqtt_list.get(account))
                 return
 
-        self.cloud_client = cloud_client
         mammotion_cloud = MammotionCloud(
             MammotionMQTT(
                 region_id=cloud_client.region_response.data.regionId,
@@ -222,23 +221,22 @@ class Mammotion:
     async def login(self, account: str, password: str) -> CloudIOTGateway:
         """Login to mammotion cloud."""
         cloud_client = CloudIOTGateway()
-        async with ClientSession(MAMMOTION_DOMAIN) as session:
-            mammotion_http = await connect_http(account, password)
-            country_code = mammotion_http.login_info.userInformation.domainAbbreviation
-            _LOGGER.debug("CountryCode: " + country_code)
-            _LOGGER.debug("AuthCode: " + mammotion_http.login_info.authorization_code)
-            loop = asyncio.get_running_loop()
-            cloud_client.set_http(mammotion_http)
-            await loop.run_in_executor(
-                None, cloud_client.get_region, country_code, mammotion_http.login_info.authorization_code
-            )
-            await cloud_client.connect()
-            await cloud_client.login_by_oauth(country_code, mammotion_http.login_info.authorization_code)
-            await loop.run_in_executor(None, cloud_client.aep_handle)
-            await loop.run_in_executor(None, cloud_client.session_by_auth_code)
+        mammotion_http = await connect_http(account, password)
+        country_code = mammotion_http.login_info.userInformation.domainAbbreviation
+        _LOGGER.debug("CountryCode: " + country_code)
+        _LOGGER.debug("AuthCode: " + mammotion_http.login_info.authorization_code)
+        cloud_client.set_http(mammotion_http)
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(
+            None, cloud_client.get_region, country_code, mammotion_http.login_info.authorization_code
+        )
+        await cloud_client.connect()
+        await cloud_client.login_by_oauth(country_code, mammotion_http.login_info.authorization_code)
+        await loop.run_in_executor(None, cloud_client.aep_handle)
+        await loop.run_in_executor(None, cloud_client.session_by_auth_code)
 
-            await loop.run_in_executor(None, cloud_client.list_binding_by_account)
-            return cloud_client
+        await loop.run_in_executor(None, cloud_client.list_binding_by_account)
+        return cloud_client
 
     def remove_device(self, name: str) -> None:
         self.devices.remove_device(name)
@@ -284,6 +282,14 @@ class Mammotion:
                 return await device.cloud().start_map_sync()
             # TODO work with both with EITHER
 
+    async def get_stream_subscription(self, name: str):
+        device = self.get_device_by_name(name)
+        if self._preference is ConnectionPreference.WIFI:
+            if device.has_cloud():
+                _stream_response = await self.cloud().cloud_client.get_stream_subscription(device.cloud().iot_id)
+                _LOGGER.debug(_stream_response)
+                return _stream_response
+
     def mower(self, name: str):
         device = self.get_device_by_name(name)
         if device:

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -112,6 +112,11 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
                 130, lambda: asyncio.ensure_future(self.run_periodic_sync_task())
             )
 
+    async def stop(self) -> None:
+        """Stop all tasks and disconnect."""
+        self._ble_sync_task.cancel()
+        await self._client.disconnect()
+
     async def queue_command(self, key: str, **kwargs: Any) -> bytes | None:
         return await self._send_command_with_args(key, **kwargs)
 

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -2,13 +2,15 @@ import asyncio
 import base64
 import json
 import logging
+from asyncio import TimerHandle
 from collections import deque
 from typing import Any, Awaitable, Callable, Optional, cast
 
 import betterproto
 
 from pymammotion import CloudIOTGateway, MammotionMQTT
-from pymammotion.aliyun.dataclass.dev_by_account_response import Device
+from pymammotion.aliyun.cloud_gateway import DeviceOfflineException, SetupException
+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.event.event import DataEvent
@@ -27,12 +29,12 @@ class MammotionCloud:
     def __init__(self, mqtt_client: MammotionMQTT, cloud_client: CloudIOTGateway) -> None:
         self.cloud_client = cloud_client
         self.loop = asyncio.get_event_loop()
-        self._ble_sync_task = None
         self.is_ready = False
         self.command_queue = asyncio.Queue()
         self._waiting_queue = deque()
         self.mqtt_message_event = DataEvent()
         self.on_ready_event = DataEvent()
+        self.on_disconnected_event = DataEvent()
         self._operation_lock = asyncio.Lock()
         self._mqtt_client = mqtt_client
         self._mqtt_client.on_connected = self.on_connected
@@ -65,6 +67,7 @@ class MammotionCloud:
 
     async def on_disconnected(self) -> None:
         """Callback for when MQTT disconnects."""
+        await self.on_disconnected_event.data_event(None)
 
     async def process_queue(self) -> None:
         while True:
@@ -145,6 +148,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
     def __init__(self, mqtt: MammotionCloud, cloud_device: Device, mowing_state: MowingDevice) -> None:
         """Initialize MammotionBaseCloudDevice."""
         super().__init__(mowing_state, cloud_device)
+        self._ble_sync_task: TimerHandle | None = None
+        self.stopped = False
         self.on_ready_callback: Optional[Callable[[], Awaitable[None]]] = None
         self.loop = asyncio.get_event_loop()
         self._mqtt = mqtt
@@ -156,6 +161,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self.currentID = ""
         self._mqtt.mqtt_message_event.add_subscribers(self._parse_message_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)
 
         if self._mqtt.is_ready:
@@ -163,10 +169,32 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
     async def on_ready(self) -> None:
         """Callback for when MQTT is subscribed to events."""
-        await self._ble_sync()
-        await self.run_periodic_sync_task()
-        if self.on_ready_callback:
-            await self.on_ready_callback()
+        if self.stopped:
+            return
+        try:
+            await self._ble_sync()
+            if self._ble_sync_task is None or self._ble_sync_task.cancelled():
+                await self.run_periodic_sync_task()
+            if self.on_ready_callback:
+                await self.on_ready_callback()
+        except DeviceOfflineException:
+            await self.stop()
+        except SetupException:
+            await self.stop()
+
+    async def on_disconnect(self) -> None:
+        if self._ble_sync_task:
+            self._ble_sync_task.cancel()
+        loop = asyncio.get_event_loop()
+        self._mqtt.disconnect()
+        await loop.run_in_executor(None, self._mqtt.cloud_client.sign_out)
+
+    async def stop(self) -> None:
+        """Stop all tasks and disconnect."""
+        if self._ble_sync_task:
+            self._ble_sync_task.cancel()
+        self._mqtt.on_ready_event.remove_subscribers(self.on_ready)
+        self.stopped = True
 
     async def _ble_sync(self) -> None:
         command_bytes = self._commands.send_todev_ble_sync(3)
@@ -176,10 +204,11 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
     async def run_periodic_sync_task(self) -> None:
         """Send ble sync to robot."""
         try:
-            if not self._mqtt._operation_lock.locked():
+            if not self._mqtt._operation_lock.locked() or not self.stopped:
                 await self._ble_sync()
         finally:
-            self.schedule_ble_sync()
+            if not self.stopped:
+                self.schedule_ble_sync()
 
     def schedule_ble_sync(self) -> None:
         """Periodically sync to keep connection alive."""

pymammotion/mqtt/mammotion_mqtt.py

@@ -91,6 +91,9 @@ class MammotionMQTT:
     def disconnect(self) -> None:
         """Disconnect from MQTT Server."""
         logger.info("Disconnecting...")
+
+
+
         self._linkkit_client.disconnect()
 
     def _thing_on_thing_enable(self, user_data) -> None:
@@ -105,6 +108,15 @@ class MammotionMQTT:
         self._linkkit_client.subscribe_topic(
             f"/sys/{self._product_key}/{self._device_name}/app/down/thing/event/property/post_reply"
         )
+        self._linkkit_client.subscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/thing/wifi/status/notify"
+        )
+        self._linkkit_client.subscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/thing/wifi/connect/event/notify"
+        )
+        self._linkkit_client.subscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/_thing/event/notify"
+        )
         self._linkkit_client.subscribe_topic(f"/sys/{self._product_key}/{self._device_name}/app/down/thing/events")
         self._linkkit_client.subscribe_topic(f"/sys/{self._product_key}/{self._device_name}/app/down/thing/status")
         self._linkkit_client.subscribe_topic(f"/sys/{self._product_key}/{self._device_name}/app/down/thing/properties")

{pymammotion-0.2.41.dist-info → pymammotion-0.2.43.dist-info}/METADATA

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

{pymammotion-0.2.41.dist-info → pymammotion-0.2.43.dist-info}/RECORD

@@ -1,17 +1,18 @@
 pymammotion/__init__.py,sha256=jHCQrpJaG1jAoID9T4RT3g4JsZc0JpJqIcqjnA7cXd0,1605
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=X6Y9yyIXCwkPwgRqsBESUI5v6j-CKlJGJaEnMINyp8c,22780
+pymammotion/aliyun/cloud_gateway.py,sha256=vMNt5MquL-t7C0-yDAXQEYA37RR4cj2rdLfh5iQ131o,25561
 pymammotion/aliyun/cloud_service.py,sha256=px7dUKow5Z7VyebjYzuKkzkm77XbUXYiFiYO_2e-UQ0,2207
-pymammotion/aliyun/dataclass/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
-pymammotion/aliyun/dataclass/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
-pymammotion/aliyun/dataclass/dev_by_account_response.py,sha256=gskum11h9HPf4lKjLJKVrsxRl5BHaHJP2TPrI09SUYs,1032
-pymammotion/aliyun/dataclass/login_by_oauth_response.py,sha256=IXSLZ6XnOliOnyXo5Bh0ErqFjA11puACh_9NH0sSJGQ,1262
-pymammotion/aliyun/dataclass/regions_response.py,sha256=TBBWKF9j5iWjX4YbvMBHNDOnr0cEhbdfgApgCyJZhVg,651
-pymammotion/aliyun/dataclass/session_by_authcode_response.py,sha256=qW0pnnRXfyEuMbb9ORc013sYqZwO8z4i_h_SfSaA_bw,419
+pymammotion/aliyun/model/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
+pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
+pymammotion/aliyun/model/dev_by_account_response.py,sha256=QZeopszFlGI7wltla-XDyGMbg5QSnb4Q1wTINkkaJyA,1026
+pymammotion/aliyun/model/login_by_oauth_response.py,sha256=IXSLZ6XnOliOnyXo5Bh0ErqFjA11puACh_9NH0sSJGQ,1262
+pymammotion/aliyun/model/regions_response.py,sha256=TBBWKF9j5iWjX4YbvMBHNDOnr0cEhbdfgApgCyJZhVg,651
+pymammotion/aliyun/model/session_by_authcode_response.py,sha256=qW0pnnRXfyEuMbb9ORc013sYqZwO8z4i_h_SfSaA_bw,419
+pymammotion/aliyun/model/stream_subscription_response.py,sha256=po765WASQDboVCosbPEfDHNlanBf-3WMrA6iV3ezooY,357
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
 pymammotion/bluetooth/ble.py,sha256=YfkfEK3TLJ8BaidjAXfUVFv8reLCu6U_lYa3Bo0pddw,2449
-pymammotion/bluetooth/ble_message.py,sha256=m-RyxHncCWrYFoeNg_G9Co5afNADZuCm32jQaqaIFc8,16211
+pymammotion/bluetooth/ble_message.py,sha256=jQ_vece7a5WH_SW3pC_sdk6_Ch84bgWrRw3BatEje0c,16188
 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
@@ -21,8 +22,8 @@ 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/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=OGOVm3h-jTfL-hpCE07o2tLRk34i0rRO-hFjY8AHQRw,11472
-pymammotion/data/model/device_config.py,sha256=_DlpxqrybTfkPFxV-gPjNzIte0AKA_Oa_JRmDcVmLdk,2823
+pymammotion/data/model/device.py,sha256=s7S6Nicuk3acR8jxeeqZlVTZXB94DjYzo7gYdwjleUs,12071
+pymammotion/data/model/device_config.py,sha256=RkEbnkubJQ8nXPfZpuGPe_h9mGZGtxCxDSc8mY7UCT8,2824
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
@@ -31,19 +32,19 @@ pymammotion/data/model/hash_list.py,sha256=efUSelsj39IArxV_GEN7niM2fsVa1OL8ZjTox
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=5TrHSijUyPtIDWpNtgzx_vFQukRJWRz4gIrUaXggKPw,827
 pymammotion/data/model/plan.py,sha256=mcadkSL7fQXy0iJ0q786I3GEQY4i6kmQXfW6Ri69lcQ,2906
-pymammotion/data/model/rapid_state.py,sha256=BdJFD_DlhrVneg-PqEruqCoMty-CR7q_9Qna-hk1yd8,1171
+pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9PGIDA8Ls,1251
 pymammotion/data/model/region_data.py,sha256=OTV15vRyn9JORXsQPjWMNF1ZujuNhsOKl25KeqwMObA,3007
-pymammotion/data/model/report_info.py,sha256=IRVpsuEHg8zTrFIqrKUFMTz_y0u5GuWIRqf1V8mb0Fk,2226
+pymammotion/data/model/report_info.py,sha256=gY3L4UGEH37PS314e8d7DWuIczQxTIMfcf66xoVe0sY,2210
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=plt53w3kHulB_MfbkxK9j7AfdQ5ahVU2s4kiQMoLio4,4612
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
-pymammotion/data/state_manager.py,sha256=V9fcvC7CSzw0tT-x7Xmh_EbCXgA4z7JPJLLF8ILMNY4,3788
+pymammotion/data/state_manager.py,sha256=sP-y5jUFpL19sRwuaaSZcdGCn8jNOJhLg5sEkOTJhEw,4104
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=UzYnxV5DfvMDK3E06UvSzvzuBbaXOOUwO6xYt_zn9To,2034
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymammotion/http/http.py,sha256=OZHjQY9ZLdlsKK6MDqqV79JIH9WYWJe3-ey-WWbe2z4,2642
-pymammotion/http/model/http.py,sha256=_aVrtZZyR4EdR6GcuqMP9vH8qBLN7nKu0U2OeraCcG0,1607
+pymammotion/http/http.py,sha256=gJU8w3j8NL_m5YnxfbRxxm4y9SW0UfKr1iAaMvLsfuM,3562
+pymammotion/http/model/http.py,sha256=1NJP4hkBulcnpbD7Rcwltd8Ry9lnZzQVFJN8Oo7MKeM,1706
 pymammotion/mammotion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/abstract_message.py,sha256=nw6r7694yzl7iJKqRqhLmAPRjd_TL_Xo_-JXq2_a_ug,222
@@ -52,20 +53,20 @@ pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 pymammotion/mammotion/commands/messages/driver.py,sha256=ANIOEtjF23k7W_R_Yfgzxmc7p1KSBCF-l-tijUtw0Yg,3709
 pymammotion/mammotion/commands/messages/media.py,sha256=ps0l06CXy5Ej--gTNCsyKttwo7yHLVrJUpn-wNJYecs,1150
 pymammotion/mammotion/commands/messages/navigation.py,sha256=4rXBL-mViWc38K6x1w5O-GjwV8UWS5xZXkf4aHYjs8A,23684
-pymammotion/mammotion/commands/messages/network.py,sha256=gD7NKVKg8U2KNbPvgOxvTJXbznWdpdPQo9jBsQSx4OI,8027
+pymammotion/mammotion/commands/messages/network.py,sha256=61msRJWyXdrO8FbI_rhrO2K8R1qkGVUj5BFzNwm7lwg,8155
 pymammotion/mammotion/commands/messages/ota.py,sha256=XkeuWBZtpYMMBze6r8UN7dJXbe2FxUNGNnjwBpXJKM0,1240
-pymammotion/mammotion/commands/messages/system.py,sha256=a1XSqWdDTWLBspvjN8otT46ovz3GQ8zv3TT-1FayFbo,10912
+pymammotion/mammotion/commands/messages/system.py,sha256=XoDvnERAMXIj6oK6l-P7kVBmloaIOAf9flCq0Q6vryg,12399
 pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A51Ysui6x7SqFnhX8O2g,1007
 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=l1IKBMbUX8_IGQuEhLaFyNWmT3jBG5eai4_EvYLKKs0,11042
-pymammotion/mammotion/devices/mammotion.py,sha256=JnT5q5z9AxPI71WBu4kwdJwpYoWCJ_WkU315Cy1bPQM,11701
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=sgGeyQeAeA3lQodcalRYS4nDNAzjfFs9SddIB1kadvw,17355
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=dk49VY9yHO3d-Nb17y-D4YIURs2FTLMzWHUYrxBYhtw,10116
+pymammotion/mammotion/devices/base.py,sha256=53of3422C6g0jiKX0X4uo-eRI1Du31NA4RWLdw2O5u8,11131
+pymammotion/mammotion/devices/mammotion.py,sha256=od4crY_1hbBwlDt5St_IV_QT0jOT_tlKv_iplf_CTu4,11966
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=Lu8-85fBa-rGzssARqiydfQbPuIeeTcV-1ROIoYBKKM,17512
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=H_O3LrEOSlKm1JB8AoF5of7olyyiDhZAzD2cBXULUlo,11317
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=QZuqp2G5nywCFSwGNSayPI5JVL789yOxyr0UM0G7wzg,8295
+pymammotion/mqtt/mammotion_mqtt.py,sha256=-n_GryLoyl-ioQUQRnth4syToh8MwWOj-pt2p41J0xQ,8750
 pymammotion/proto/__init__.py,sha256=v3_P1LOsYRBN9qCAhaWrWMX7GWHrox9XD3hdZQxcPZM,190
 pymammotion/proto/basestation.proto,sha256=_x5gAz3FkZXS1jtq4GgZgaDCuRU-UV-7HTFdsfQ3zbo,1034
 pymammotion/proto/basestation.py,sha256=js64_N2xQYRxWPRdVNEapO0qe7vBlfYnjW5sE8hi7hw,2026
@@ -117,7 +118,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.2.41.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.41.dist-info/METADATA,sha256=PvEZh8Kc-G_xRw2ui8RLdm8ISx1Rn3yLlmUCxuNhGT8,4052
-pymammotion-0.2.41.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.41.dist-info/RECORD,,
+pymammotion-0.2.43.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.43.dist-info/METADATA,sha256=EG9s9oLqTmk_dzxkCpAAYxrCw9XP29gH_2N3L9yL_jM,4052
+pymammotion-0.2.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.43.dist-info/RECORD,,