pymammotion 0.4.44__tar.gz → 0.4.45__tar.gz

{pymammotion-0.4.44 → pymammotion-0.4.45}/PKG-INFO

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

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/__init__.py

@@ -35,7 +35,8 @@ if __name__ == "__main__":
     CLIENT_ID = os.environ.get("CLIENT_ID")
     IOT_TOKEN = os.environ.get("IOT_TOKEN")
     REGION = os.environ.get("REGION")
-    cloud_client = CloudIOTGateway()
+    mammotion_http = MammotionHTTP()
+    cloud_client = CloudIOTGateway(mammotion_http)
     luba = MammotionMQTT(
         iot_token=IOT_TOKEN or "",
         region_id=REGION or "",

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/aliyun/cloud_gateway.py

@@ -95,6 +95,7 @@ class CloudIOTGateway:
 
     def __init__(
         self,
+        mammotion_http: MammotionHTTP,
         connect_response: ConnectResponse | None = None,
         login_by_oauth_response: LoginByOAuthResponse | None = None,
         aep_response: AepResponse | None = None,
@@ -103,7 +104,7 @@ class CloudIOTGateway:
         dev_by_account: ListingDevByAccountResponse | None = None,
     ) -> None:
         """Initialize the CloudIOTGateway."""
-        self.mammotion_http: MammotionHTTP | None = None
+        self.mammotion_http: MammotionHTTP = mammotion_http
         self._app_key = APP_KEY
         self._app_secret = APP_SECRET
         self.domain = ALIYUN_DOMAIN
@@ -152,8 +153,9 @@ class CloudIOTGateway:
             hashlib.sha1,
         ).hexdigest()
 
-    async def get_region(self, country_code: str, auth_code: str):
+    async def get_region(self, country_code: str):
         """Get the region based on country code and auth code."""
+        auth_code = self.mammotion_http.login_info.authorization_code
 
         if self._region_response is not None:
             return self._region_response
@@ -347,8 +349,9 @@ class CloudIOTGateway:
                     return self._connect_response
                 raise LoginException(data)
 
-    async def login_by_oauth(self, country_code: str, auth_code: str):
+    async def login_by_oauth(self, country_code: str):
         """Login by OAuth."""
+        auth_code = self.mammotion_http.login_info.authorization_code
         region_url = self._region_response.data.oaApiGatewayEndpoint
 
         async with ClientSession() as session:

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/mammotion/devices/base.py

@@ -1,6 +1,8 @@
 from abc import abstractmethod
 import asyncio
+import datetime
 import logging
+import time
 from typing import Any
 
 import betterproto
@@ -34,6 +36,8 @@ def find_next_integer(lst: list[int], current_hash: int) -> int | None:
 class MammotionBaseDevice:
     """Base class for Mammotion devices."""
 
+    command_sent_time: datetime = time.time()
+
     def __init__(self, state_manager: StateManager, cloud_device: Device) -> None:
         """Initialize MammotionBaseDevice."""
         self.loop = asyncio.get_event_loop()

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/mammotion/devices/mammotion.py

@@ -30,6 +30,8 @@ class MammotionMixedDeviceManager:
     def __init__(
         self,
         name: str,
+        iot_id: str,
+        cloud_client: CloudIOTGateway,
         mammotion_http: MammotionHTTP,
         cloud_device: Device | None = None,
         ble_device: BLEDevice | None = None,
@@ -39,6 +41,8 @@ class MammotionMixedDeviceManager:
         self._ble_device: MammotionBaseBLEDevice | None = None
         self._cloud_device: MammotionBaseCloudDevice | None = None
         self.name = name
+        self.iot_id = iot_id
+        self.cloud_client = cloud_client
         self._state_manager = StateManager(MowingDevice())
         self._state_manager.get_device().name = name
         self.add_ble(cloud_device, ble_device)
@@ -177,7 +181,7 @@ class Mammotion:
                 return
             mammotion_http = exists.cloud_client.mammotion_http
             await mammotion_http.refresh_login(account, password)
-            await self.connect_iot(mammotion_http, exists.cloud_client)
+            await self.connect_iot(exists.cloud_client)
 
             if not exists.is_connected():
                 loop = asyncio.get_running_loop()
@@ -212,6 +216,8 @@ class Mammotion:
             if device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device is None:
                 mixed_device = MammotionMixedDeviceManager(
                     name=device.deviceName,
+                    iot_id=device.iotId,
+                    cloud_client=mqtt_client.cloud_client,
                     mammotion_http=mqtt_client.cloud_client.mammotion_http,
                     cloud_device=device,
                     mqtt=mqtt_client,
@@ -236,19 +242,19 @@ class Mammotion:
 
     async def login(self, account: str, password: str) -> CloudIOTGateway:
         """Login to mammotion cloud."""
-        cloud_client = CloudIOTGateway()
         mammotion_http = MammotionHTTP()
+        cloud_client = CloudIOTGateway(mammotion_http)
         await mammotion_http.login(account, password)
-        await self.connect_iot(mammotion_http, cloud_client)
+        await self.connect_iot(cloud_client)
         return cloud_client
 
     @staticmethod
-    async def connect_iot(mammotion_http: MammotionHTTP, cloud_client: CloudIOTGateway) -> None:
+    async def connect_iot(cloud_client: CloudIOTGateway) -> None:
+        mammotion_http = cloud_client.mammotion_http
         country_code = mammotion_http.login_info.userInformation.domainAbbreviation
-        cloud_client.set_http(mammotion_http)
-        await cloud_client.get_region(country_code, mammotion_http.login_info.authorization_code)
+        await cloud_client.get_region(country_code)
         await cloud_client.connect()
-        await cloud_client.login_by_oauth(country_code, mammotion_http.login_info.authorization_code)
+        await cloud_client.login_by_oauth(country_code)
         await cloud_client.aep_handle()
         await cloud_client.session_by_auth_code()
         await cloud_client.list_binding_by_account()

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -1,6 +1,7 @@
 import asyncio
 from collections.abc import Awaitable, Callable
 import logging
+import time
 from typing import Any, cast
 from uuid import UUID
 
@@ -366,6 +367,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         assert self._client is not None
         _LOGGER.debug("%s: Sending command: %s", self.name, key)
         await self._message.post_custom_data_bytes(command)
+        self.command_sent_time = time.time()
 
     def get_address(self) -> str:
         """Return address of device."""

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -5,6 +5,7 @@ from collections import deque
 from collections.abc import Awaitable, Callable
 import json
 import logging
+import time
 from typing import Any
 
 import betterproto
@@ -102,6 +103,7 @@ class MammotionCloud:
         self._key = key
         _LOGGER.debug("Sending command: %s", key)
         await self._mqtt_client.get_cloud_client().send_cloud_command(iot_id, command)
+        self.command_sent_time = time.time()
 
     async def _on_mqtt_message(self, topic: str, payload: str, iot_id: str) -> None:
         """Handle incoming MQTT messages."""

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/mqtt/mammotion_mqtt.py

@@ -139,8 +139,6 @@ class MammotionMQTT:
             future = asyncio.run_coroutine_threadsafe(self.on_ready(), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
         # self._linkkit_client.query_ota_firmware()
-        # command = MammotionCommand(device_name="Luba")
-        # self._cloud_client.send_cloud_command(command.get_report_cfg())
 
     def unsubscribe(self) -> None:
         self._linkkit_client.unsubscribe_topic(

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/luba_msg.proto

@@ -47,6 +47,7 @@ enum MsgCmdType {
   MSG_CMD_TYPE_ESP = 248;
   MSG_CMD_TYPE_MUL = 249;
   MSG_CMD_TYPE_PEPT = 250;
+  MSG_CMD_TYPE_BASESTATION = 251;
 }
 
 enum MsgAttr {
@@ -71,5 +72,5 @@ enum MsgDevice {
   DEV_LOCALIZATION = 18;
   DEV_PERCEPTION = 19;
   SOC_MODULE_MULTIMEDIA = 21;
-  DEV_IOTCTRL = 25;
+  DEV_IOTCTRL = 29;
 }

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/luba_msg_pb2.py

@@ -21,7 +21,7 @@ from pymammotion.proto import luba_mul_pb2 as pymammotion_dot_proto_dot_luba__mu
 from pymammotion.proto import mctrl_pept_pb2 as pymammotion_dot_proto_dot_mctrl__pept__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n pymammotion/proto/luba_msg.proto\x1a#pymammotion/proto/basestation.proto\x1a$pymammotion/proto/mctrl_driver.proto\x1a!pymammotion/proto/mctrl_nav.proto\x1a!pymammotion/proto/mctrl_sys.proto\x1a\x1fpymammotion/proto/dev_net.proto\x1a!pymammotion/proto/mctrl_ota.proto\x1a pymammotion/proto/luba_mul.proto\x1a\"pymammotion/proto/mctrl_pept.proto\"\t\n\x07MsgNull\"\xb7\x03\n\x07LubaMsg\x12\x1c\n\x07msgtype\x18\x01 \x01(\x0e\x32\x0b.MsgCmdType\x12\x1a\n\x06sender\x18\x02 \x01(\x0e\x32\n.MsgDevice\x12\x19\n\x05rcver\x18\x03 \x01(\x0e\x32\n.MsgDevice\x12\x19\n\x07msgattr\x18\x04 \x01(\x0e\x32\x08.MsgAttr\x12\x0c\n\x04seqs\x18\x05 \x01(\x05\x12\x0f\n\x07version\x18\x06 \x01(\x05\x12\x0f\n\x07subtype\x18\x07 \x01(\x05\x12\x16\n\x03net\x18\x08 \x01(\x0b\x32\x07.DevNetH\x00\x12\x17\n\x03sys\x18\n \x01(\x0b\x32\x08.MctlSysH\x00\x12\x17\n\x03nav\x18\x0b \x01(\x0b\x32\x08.MctlNavH\x00\x12\x1d\n\x06\x64river\x18\x0c \x01(\x0b\x32\x0b.MctlDriverH\x00\x12\x17\n\x03ota\x18\r \x01(\x0b\x32\x08.MctlOtaH\x00\x12\x16\n\x03mul\x18\x0e \x01(\x0b\x32\x07.SocMulH\x00\x12\x18\n\x04null\x18\x10 \x01(\x0b\x32\x08.MsgNullH\x00\x12\x19\n\x04pept\x18\x11 \x01(\x0b\x32\t.MctlPeptH\x00\x12\x1c\n\x04\x62\x61se\x18\x12 \x01(\x0b\x32\x0c.BaseStationH\x00\x12\x11\n\ttimestamp\x18\x0f \x01(\x04\x42\x0c\n\nLubaSubMsg*\xd7\x02\n\nMsgCmdType\x12\x16\n\x12MSG_CMD_TYPE_START\x10\x00\x12\x15\n\x10MSG_CMD_TYPE_NAV\x10\xf0\x01\x12\x1e\n\x19MSG_CMD_TYPE_LOCALIZATION\x10\xf1\x01\x12\x1a\n\x15MSG_CMD_TYPE_PLANNING\x10\xf2\x01\x12\x1e\n\x19MSG_CMD_TYPE_EMBED_DRIVER\x10\xf3\x01\x12\x1b\n\x16MSG_CMD_TYPE_EMBED_SYS\x10\xf4\x01\x12\x1f\n\x1aMSG_CMD_TYPE_EMBED_MIDWARE\x10\xf5\x01\x12\x1b\n\x16MSG_CMD_TYPE_EMBED_OTA\x10\xf6\x01\x12\x1d\n\x18MSG_CMD_TYPE_APPLICATION\x10\xf7\x01\x12\x15\n\x10MSG_CMD_TYPE_ESP\x10\xf8\x01\x12\x15\n\x10MSG_CMD_TYPE_MUL\x10\xf9\x01\x12\x16\n\x11MSG_CMD_TYPE_PEPT\x10\xfa\x01*V\n\x07MsgAttr\x12\x11\n\rMSG_ATTR_NONE\x10\x00\x12\x10\n\x0cMSG_ATTR_REQ\x10\x01\x12\x11\n\rMSG_ATTR_RESP\x10\x02\x12\x13\n\x0fMSG_ATTR_REPORT\x10\x03*\xa8\x02\n\tMsgDevice\x12\x10\n\x0c\x44\x45V_COMM_ESP\x10\x00\x12\x0f\n\x0b\x44\x45V_MAINCTL\x10\x01\x12\x11\n\rDEV_LEFTMOTOR\x10\x02\x12\x12\n\x0e\x44\x45V_RIGHTMOTOR\x10\x03\x12\x13\n\x0f\x44\x45V_BASESTATION\x10\x04\x12\x0e\n\nDEV_RTKCLI\x10\x05\x12\x0f\n\x0b\x44\x45V_USBHOST\x10\x06\x12\x11\n\rDEV_MOBILEAPP\x10\x07\x12\x11\n\rDEV_IOTSERVER\x10\x08\x12\x0b\n\x07\x44\x45V_BMS\x10\t\x12\x12\n\x0e\x44\x45V_NAVIGATION\x10\x11\x12\x14\n\x10\x44\x45V_LOCALIZATION\x10\x12\x12\x12\n\x0e\x44\x45V_PERCEPTION\x10\x13\x12\x19\n\x15SOC_MODULE_MULTIMEDIA\x10\x15\x12\x0f\n\x0b\x44\x45V_IOTCTRL\x10\x19\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n pymammotion/proto/luba_msg.proto\x1a#pymammotion/proto/basestation.proto\x1a$pymammotion/proto/mctrl_driver.proto\x1a!pymammotion/proto/mctrl_nav.proto\x1a!pymammotion/proto/mctrl_sys.proto\x1a\x1fpymammotion/proto/dev_net.proto\x1a!pymammotion/proto/mctrl_ota.proto\x1a pymammotion/proto/luba_mul.proto\x1a\"pymammotion/proto/mctrl_pept.proto\"\t\n\x07MsgNull\"\xb7\x03\n\x07LubaMsg\x12\x1c\n\x07msgtype\x18\x01 \x01(\x0e\x32\x0b.MsgCmdType\x12\x1a\n\x06sender\x18\x02 \x01(\x0e\x32\n.MsgDevice\x12\x19\n\x05rcver\x18\x03 \x01(\x0e\x32\n.MsgDevice\x12\x19\n\x07msgattr\x18\x04 \x01(\x0e\x32\x08.MsgAttr\x12\x0c\n\x04seqs\x18\x05 \x01(\x05\x12\x0f\n\x07version\x18\x06 \x01(\x05\x12\x0f\n\x07subtype\x18\x07 \x01(\x05\x12\x16\n\x03net\x18\x08 \x01(\x0b\x32\x07.DevNetH\x00\x12\x17\n\x03sys\x18\n \x01(\x0b\x32\x08.MctlSysH\x00\x12\x17\n\x03nav\x18\x0b \x01(\x0b\x32\x08.MctlNavH\x00\x12\x1d\n\x06\x64river\x18\x0c \x01(\x0b\x32\x0b.MctlDriverH\x00\x12\x17\n\x03ota\x18\r \x01(\x0b\x32\x08.MctlOtaH\x00\x12\x16\n\x03mul\x18\x0e \x01(\x0b\x32\x07.SocMulH\x00\x12\x18\n\x04null\x18\x10 \x01(\x0b\x32\x08.MsgNullH\x00\x12\x19\n\x04pept\x18\x11 \x01(\x0b\x32\t.MctlPeptH\x00\x12\x1c\n\x04\x62\x61se\x18\x12 \x01(\x0b\x32\x0c.BaseStationH\x00\x12\x11\n\ttimestamp\x18\x0f \x01(\x04\x42\x0c\n\nLubaSubMsg*\xf6\x02\n\nMsgCmdType\x12\x16\n\x12MSG_CMD_TYPE_START\x10\x00\x12\x15\n\x10MSG_CMD_TYPE_NAV\x10\xf0\x01\x12\x1e\n\x19MSG_CMD_TYPE_LOCALIZATION\x10\xf1\x01\x12\x1a\n\x15MSG_CMD_TYPE_PLANNING\x10\xf2\x01\x12\x1e\n\x19MSG_CMD_TYPE_EMBED_DRIVER\x10\xf3\x01\x12\x1b\n\x16MSG_CMD_TYPE_EMBED_SYS\x10\xf4\x01\x12\x1f\n\x1aMSG_CMD_TYPE_EMBED_MIDWARE\x10\xf5\x01\x12\x1b\n\x16MSG_CMD_TYPE_EMBED_OTA\x10\xf6\x01\x12\x1d\n\x18MSG_CMD_TYPE_APPLICATION\x10\xf7\x01\x12\x15\n\x10MSG_CMD_TYPE_ESP\x10\xf8\x01\x12\x15\n\x10MSG_CMD_TYPE_MUL\x10\xf9\x01\x12\x16\n\x11MSG_CMD_TYPE_PEPT\x10\xfa\x01\x12\x1d\n\x18MSG_CMD_TYPE_BASESTATION\x10\xfb\x01*V\n\x07MsgAttr\x12\x11\n\rMSG_ATTR_NONE\x10\x00\x12\x10\n\x0cMSG_ATTR_REQ\x10\x01\x12\x11\n\rMSG_ATTR_RESP\x10\x02\x12\x13\n\x0fMSG_ATTR_REPORT\x10\x03*\xa8\x02\n\tMsgDevice\x12\x10\n\x0c\x44\x45V_COMM_ESP\x10\x00\x12\x0f\n\x0b\x44\x45V_MAINCTL\x10\x01\x12\x11\n\rDEV_LEFTMOTOR\x10\x02\x12\x12\n\x0e\x44\x45V_RIGHTMOTOR\x10\x03\x12\x13\n\x0f\x44\x45V_BASESTATION\x10\x04\x12\x0e\n\nDEV_RTKCLI\x10\x05\x12\x0f\n\x0b\x44\x45V_USBHOST\x10\x06\x12\x11\n\rDEV_MOBILEAPP\x10\x07\x12\x11\n\rDEV_IOTSERVER\x10\x08\x12\x0b\n\x07\x44\x45V_BMS\x10\t\x12\x12\n\x0e\x44\x45V_NAVIGATION\x10\x11\x12\x14\n\x10\x44\x45V_LOCALIZATION\x10\x12\x12\x12\n\x0e\x44\x45V_PERCEPTION\x10\x13\x12\x19\n\x15SOC_MODULE_MULTIMEDIA\x10\x15\x12\x0f\n\x0b\x44\x45V_IOTCTRL\x10\x1d\x62\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'pymammotion.proto.luba_msg_pb2', globals())
@@ -29,11 +29,11 @@ if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
   _MSGCMDTYPE._serialized_start=773
-  _MSGCMDTYPE._serialized_end=1116
-  _MSGATTR._serialized_start=1118
-  _MSGATTR._serialized_end=1204
-  _MSGDEVICE._serialized_start=1207
-  _MSGDEVICE._serialized_end=1503
+  _MSGCMDTYPE._serialized_end=1147
+  _MSGATTR._serialized_start=1149
+  _MSGATTR._serialized_end=1235
+  _MSGDEVICE._serialized_start=1238
+  _MSGDEVICE._serialized_end=1534
   _MSGNULL._serialized_start=319
   _MSGNULL._serialized_end=328
   _LUBAMSG._serialized_start=331

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/luba_msg_pb2.pyi

@@ -31,6 +31,7 @@ MSG_ATTR_REPORT: MsgAttr
 MSG_ATTR_REQ: MsgAttr
 MSG_ATTR_RESP: MsgAttr
 MSG_CMD_TYPE_APPLICATION: MsgCmdType
+MSG_CMD_TYPE_BASESTATION: MsgCmdType
 MSG_CMD_TYPE_EMBED_DRIVER: MsgCmdType
 MSG_CMD_TYPE_EMBED_MIDWARE: MsgCmdType
 MSG_CMD_TYPE_EMBED_OTA: MsgCmdType

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/luba_mul.proto

@@ -108,6 +108,10 @@ message MulSetWiperAck {
   MUL_WIPER_ERROR_CODE error_code = 1;
 }
 
+message MulSetEncode {
+  bool encode = 1;
+}
+
 message SocMul {
   oneof SubMul {
     MulSetAudio set_audio = 1;
@@ -120,5 +124,6 @@ message SocMul {
     SetHeadlamp set_lamp = 8;
     Setlamprsp set_lamp_rsp = 9;
     Getlamprsp get_lamp_rsp = 10;
+    MulSetEncode req_encode = 11;
   }
 }

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/luba_mul_pb2.py

@@ -13,27 +13,27 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n pymammotion/proto/luba_mul.proto\"o\n\x0bMulSetAudio\x12\x13\n\tat_switch\x18\x01 \x01(\x05H\x00\x12$\n\x0b\x61u_language\x18\x02 \x01(\x0e\x32\r.MUL_LANGUAGEH\x00\x12\x17\n\x03sex\x18\x03 \x01(\x0e\x32\x08.MUL_SEXH\x00\x42\x0c\n\nAudioCfg_u\"H\n\x0bMulSetVideo\x12&\n\x08position\x18\x01 \x01(\x0e\x32\x14.MUL_CAMERA_POSITION\x12\x11\n\tvi_switch\x18\x02 \x01(\x05\";\n\x0eMulSetVideoAck\x12)\n\nerror_code\x18\x01 \x01(\x0e\x32\x15.MUL_VIDEO_ERROR_CODE\"[\n\x0bMulAudioCfg\x12\x11\n\tau_switch\x18\x01 \x01(\x05\x12\"\n\x0b\x61u_language\x18\x02 \x01(\x0e\x32\r.MUL_LANGUAGE\x12\x15\n\x03sex\x18\x03 \x01(\x0e\x32\x08.MUL_SEX\"\x1c\n\x0bMulSetWiper\x12\r\n\x05round\x18\x01 \x01(\x05\"\x1e\n\x0bGetHeadlamp\x12\x0f\n\x07get_ids\x18\x01 \x01(\x05\"\xba\x01\n\x0bSetHeadlamp\x12\x0f\n\x07set_ids\x18\x01 \x01(\x05\x12\x17\n\x0flamp_power_ctrl\x18\x02 \x01(\x05\x12!\n\tlamp_ctrl\x18\x03 \x01(\x0e\x32\x0e.lamp_ctrl_sta\x12\x18\n\x10\x63trl_lamp_bright\x18\x04 \x01(\x08\x12\x13\n\x0blamp_bright\x18\x05 \x01(\x05\x12/\n\x10lamp_manual_ctrl\x18\x06 \x01(\x0e\x32\x15.lamp_manual_ctrl_sta\"-\n\nSetlamprsp\x12\x0f\n\x07set_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\"\x96\x01\n\nGetlamprsp\x12\x0f\n\x07get_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\x12!\n\tlamp_ctrl\x18\x03 \x01(\x0e\x32\x0e.lamp_ctrl_sta\x12\x13\n\x0blamp_bright\x18\x04 \x01(\x05\x12/\n\x10lamp_manual_ctrl\x18\x05 \x01(\x0e\x32\x15.lamp_manual_ctrl_sta\";\n\x0eMulSetWiperAck\x12)\n\nerror_code\x18\x01 \x01(\x0e\x32\x15.MUL_WIPER_ERROR_CODE\"\x80\x03\n\x06SocMul\x12!\n\tset_audio\x18\x01 \x01(\x0b\x32\x0c.MulSetAudioH\x00\x12!\n\taudio_cfg\x18\x02 \x01(\x0b\x32\x0c.MulAudioCfgH\x00\x12!\n\tset_video\x18\x03 \x01(\x0b\x32\x0c.MulSetVideoH\x00\x12(\n\rset_video_ack\x18\x04 \x01(\x0b\x32\x0f.MulSetVideoAckH\x00\x12!\n\tset_wiper\x18\x05 \x01(\x0b\x32\x0c.MulSetWiperH\x00\x12(\n\rset_wiper_ack\x18\x06 \x01(\x0b\x32\x0f.MulSetWiperAckH\x00\x12 \n\x08get_lamp\x18\x07 \x01(\x0b\x32\x0c.GetHeadlampH\x00\x12 \n\x08set_lamp\x18\x08 \x01(\x0b\x32\x0c.SetHeadlampH\x00\x12#\n\x0cset_lamp_rsp\x18\t \x01(\x0b\x32\x0b.SetlamprspH\x00\x12#\n\x0cget_lamp_rsp\x18\n \x01(\x0b\x32\x0b.GetlamprspH\x00\x42\x08\n\x06SubMul*v\n\x0cMUL_LANGUAGE\x12\x0b\n\x07\x45NGLISH\x10\x00\x12\n\n\x06GERMAN\x10\x01\x12\n\n\x06\x46RENCH\x10\x02\x12\x0b\n\x07ITALIAN\x10\x03\x12\x0b\n\x07SPANISH\x10\x04\x12\x0e\n\nPORTUGUESE\x10\x05\x12\t\n\x05\x44UTCH\x10\x06\x12\x0c\n\x08NONE_LAN\x10\x07*+\n\x07MUL_SEX\x12\x07\n\x03MAN\x10\x00\x12\t\n\x05WOMAN\x10\x01\x12\x0c\n\x08NONE_SEX\x10\x02*=\n\x13MUL_CAMERA_POSITION\x12\x08\n\x04LEFT\x10\x00\x12\t\n\x05RIGHT\x10\x01\x12\x08\n\x04REAR\x10\x02\x12\x07\n\x03\x41LL\x10\x03*\x9d\x01\n\x14MUL_VIDEO_ERROR_CODE\x12\x0b\n\x07SUCCESS\x10\x00\x12\x15\n\x11\x41\x43TIVATION_FAILED\x10\x01\x12\x19\n\x15NETWORK_NOT_AVAILABLE\x10\x02\x12\x19\n\x15\x43REATE_CHANNEL_FAILED\x10\x03\x12\x11\n\rPARAM_INVAILD\x10\x04\x12\x18\n\x14\x43\x45LLULAR_RESTRICTION\x10\x05*Q\n\x14MUL_WIPER_ERROR_CODE\x12\x0f\n\x0bSET_SUCCESS\x10\x00\x12\x0c\n\x08HW_ERROR\x10\x01\x12\x1a\n\x16NAVIGATION_WORK_FORBID\x10\x02*?\n\rlamp_ctrl_sta\x12\r\n\tpower_off\x10\x00\x12\x0c\n\x08power_on\x10\x01\x12\x11\n\rpower_ctrl_on\x10\x02*A\n\x14lamp_manual_ctrl_sta\x12\x14\n\x10manual_power_off\x10\x00\x12\x13\n\x0fmanual_power_on\x10\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n pymammotion/proto/luba_mul.proto\"o\n\x0bMulSetAudio\x12\x13\n\tat_switch\x18\x01 \x01(\x05H\x00\x12$\n\x0b\x61u_language\x18\x02 \x01(\x0e\x32\r.MUL_LANGUAGEH\x00\x12\x17\n\x03sex\x18\x03 \x01(\x0e\x32\x08.MUL_SEXH\x00\x42\x0c\n\nAudioCfg_u\"H\n\x0bMulSetVideo\x12&\n\x08position\x18\x01 \x01(\x0e\x32\x14.MUL_CAMERA_POSITION\x12\x11\n\tvi_switch\x18\x02 \x01(\x05\";\n\x0eMulSetVideoAck\x12)\n\nerror_code\x18\x01 \x01(\x0e\x32\x15.MUL_VIDEO_ERROR_CODE\"[\n\x0bMulAudioCfg\x12\x11\n\tau_switch\x18\x01 \x01(\x05\x12\"\n\x0b\x61u_language\x18\x02 \x01(\x0e\x32\r.MUL_LANGUAGE\x12\x15\n\x03sex\x18\x03 \x01(\x0e\x32\x08.MUL_SEX\"\x1c\n\x0bMulSetWiper\x12\r\n\x05round\x18\x01 \x01(\x05\"\x1e\n\x0bGetHeadlamp\x12\x0f\n\x07get_ids\x18\x01 \x01(\x05\"\xba\x01\n\x0bSetHeadlamp\x12\x0f\n\x07set_ids\x18\x01 \x01(\x05\x12\x17\n\x0flamp_power_ctrl\x18\x02 \x01(\x05\x12!\n\tlamp_ctrl\x18\x03 \x01(\x0e\x32\x0e.lamp_ctrl_sta\x12\x18\n\x10\x63trl_lamp_bright\x18\x04 \x01(\x08\x12\x13\n\x0blamp_bright\x18\x05 \x01(\x05\x12/\n\x10lamp_manual_ctrl\x18\x06 \x01(\x0e\x32\x15.lamp_manual_ctrl_sta\"-\n\nSetlamprsp\x12\x0f\n\x07set_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\"\x96\x01\n\nGetlamprsp\x12\x0f\n\x07get_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\x12!\n\tlamp_ctrl\x18\x03 \x01(\x0e\x32\x0e.lamp_ctrl_sta\x12\x13\n\x0blamp_bright\x18\x04 \x01(\x05\x12/\n\x10lamp_manual_ctrl\x18\x05 \x01(\x0e\x32\x15.lamp_manual_ctrl_sta\";\n\x0eMulSetWiperAck\x12)\n\nerror_code\x18\x01 \x01(\x0e\x32\x15.MUL_WIPER_ERROR_CODE\"\x1e\n\x0cMulSetEncode\x12\x0e\n\x06\x65ncode\x18\x01 \x01(\x08\"\xa5\x03\n\x06SocMul\x12!\n\tset_audio\x18\x01 \x01(\x0b\x32\x0c.MulSetAudioH\x00\x12!\n\taudio_cfg\x18\x02 \x01(\x0b\x32\x0c.MulAudioCfgH\x00\x12!\n\tset_video\x18\x03 \x01(\x0b\x32\x0c.MulSetVideoH\x00\x12(\n\rset_video_ack\x18\x04 \x01(\x0b\x32\x0f.MulSetVideoAckH\x00\x12!\n\tset_wiper\x18\x05 \x01(\x0b\x32\x0c.MulSetWiperH\x00\x12(\n\rset_wiper_ack\x18\x06 \x01(\x0b\x32\x0f.MulSetWiperAckH\x00\x12 \n\x08get_lamp\x18\x07 \x01(\x0b\x32\x0c.GetHeadlampH\x00\x12 \n\x08set_lamp\x18\x08 \x01(\x0b\x32\x0c.SetHeadlampH\x00\x12#\n\x0cset_lamp_rsp\x18\t \x01(\x0b\x32\x0b.SetlamprspH\x00\x12#\n\x0cget_lamp_rsp\x18\n \x01(\x0b\x32\x0b.GetlamprspH\x00\x12#\n\nreq_encode\x18\x0b \x01(\x0b\x32\r.MulSetEncodeH\x00\x42\x08\n\x06SubMul*v\n\x0cMUL_LANGUAGE\x12\x0b\n\x07\x45NGLISH\x10\x00\x12\n\n\x06GERMAN\x10\x01\x12\n\n\x06\x46RENCH\x10\x02\x12\x0b\n\x07ITALIAN\x10\x03\x12\x0b\n\x07SPANISH\x10\x04\x12\x0e\n\nPORTUGUESE\x10\x05\x12\t\n\x05\x44UTCH\x10\x06\x12\x0c\n\x08NONE_LAN\x10\x07*+\n\x07MUL_SEX\x12\x07\n\x03MAN\x10\x00\x12\t\n\x05WOMAN\x10\x01\x12\x0c\n\x08NONE_SEX\x10\x02*=\n\x13MUL_CAMERA_POSITION\x12\x08\n\x04LEFT\x10\x00\x12\t\n\x05RIGHT\x10\x01\x12\x08\n\x04REAR\x10\x02\x12\x07\n\x03\x41LL\x10\x03*\x9d\x01\n\x14MUL_VIDEO_ERROR_CODE\x12\x0b\n\x07SUCCESS\x10\x00\x12\x15\n\x11\x41\x43TIVATION_FAILED\x10\x01\x12\x19\n\x15NETWORK_NOT_AVAILABLE\x10\x02\x12\x19\n\x15\x43REATE_CHANNEL_FAILED\x10\x03\x12\x11\n\rPARAM_INVAILD\x10\x04\x12\x18\n\x14\x43\x45LLULAR_RESTRICTION\x10\x05*Q\n\x14MUL_WIPER_ERROR_CODE\x12\x0f\n\x0bSET_SUCCESS\x10\x00\x12\x0c\n\x08HW_ERROR\x10\x01\x12\x1a\n\x16NAVIGATION_WORK_FORBID\x10\x02*?\n\rlamp_ctrl_sta\x12\r\n\tpower_off\x10\x00\x12\x0c\n\x08power_on\x10\x01\x12\x11\n\rpower_ctrl_on\x10\x02*A\n\x14lamp_manual_ctrl_sta\x12\x14\n\x10manual_power_off\x10\x00\x12\x13\n\x0fmanual_power_on\x10\x01\x62\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'pymammotion.proto.luba_mul_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-  _MUL_LANGUAGE._serialized_start=1276
-  _MUL_LANGUAGE._serialized_end=1394
-  _MUL_SEX._serialized_start=1396
-  _MUL_SEX._serialized_end=1439
-  _MUL_CAMERA_POSITION._serialized_start=1441
-  _MUL_CAMERA_POSITION._serialized_end=1502
-  _MUL_VIDEO_ERROR_CODE._serialized_start=1505
-  _MUL_VIDEO_ERROR_CODE._serialized_end=1662
-  _MUL_WIPER_ERROR_CODE._serialized_start=1664
-  _MUL_WIPER_ERROR_CODE._serialized_end=1745
-  _LAMP_CTRL_STA._serialized_start=1747
-  _LAMP_CTRL_STA._serialized_end=1810
-  _LAMP_MANUAL_CTRL_STA._serialized_start=1812
-  _LAMP_MANUAL_CTRL_STA._serialized_end=1877
+  _MUL_LANGUAGE._serialized_start=1345
+  _MUL_LANGUAGE._serialized_end=1463
+  _MUL_SEX._serialized_start=1465
+  _MUL_SEX._serialized_end=1508
+  _MUL_CAMERA_POSITION._serialized_start=1510
+  _MUL_CAMERA_POSITION._serialized_end=1571
+  _MUL_VIDEO_ERROR_CODE._serialized_start=1574
+  _MUL_VIDEO_ERROR_CODE._serialized_end=1731
+  _MUL_WIPER_ERROR_CODE._serialized_start=1733
+  _MUL_WIPER_ERROR_CODE._serialized_end=1814
+  _LAMP_CTRL_STA._serialized_start=1816
+  _LAMP_CTRL_STA._serialized_end=1879
+  _LAMP_MANUAL_CTRL_STA._serialized_start=1881
+  _LAMP_MANUAL_CTRL_STA._serialized_end=1946
   _MULSETAUDIO._serialized_start=36
   _MULSETAUDIO._serialized_end=147
   _MULSETVIDEO._serialized_start=149
@@ -54,6 +54,8 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _GETLAMPRSP._serialized_end=826
   _MULSETWIPERACK._serialized_start=828
   _MULSETWIPERACK._serialized_end=887
-  _SOCMUL._serialized_start=890
-  _SOCMUL._serialized_end=1274
+  _MULSETENCODE._serialized_start=889
+  _MULSETENCODE._serialized_end=919
+  _SOCMUL._serialized_start=922
+  _SOCMUL._serialized_end=1343
 # @@protoc_insertion_point(module_scope)

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/luba_mul_pb2.pyi

@@ -74,6 +74,12 @@ class MulSetAudio(_message.Message):
     sex: MUL_SEX
     def __init__(self, at_switch: _Optional[int] = ..., au_language: _Optional[_Union[MUL_LANGUAGE, str]] = ..., sex: _Optional[_Union[MUL_SEX, str]] = ...) -> None: ...
 
+class MulSetEncode(_message.Message):
+    __slots__ = ["encode"]
+    ENCODE_FIELD_NUMBER: _ClassVar[int]
+    encode: bool
+    def __init__(self, encode: bool = ...) -> None: ...
+
 class MulSetVideo(_message.Message):
     __slots__ = ["position", "vi_switch"]
     POSITION_FIELD_NUMBER: _ClassVar[int]
@@ -125,10 +131,11 @@ class Setlamprsp(_message.Message):
     def __init__(self, set_ids: _Optional[int] = ..., result: _Optional[int] = ...) -> None: ...
 
 class SocMul(_message.Message):
-    __slots__ = ["audio_cfg", "get_lamp", "get_lamp_rsp", "set_audio", "set_lamp", "set_lamp_rsp", "set_video", "set_video_ack", "set_wiper", "set_wiper_ack"]
+    __slots__ = ["audio_cfg", "get_lamp", "get_lamp_rsp", "req_encode", "set_audio", "set_lamp", "set_lamp_rsp", "set_video", "set_video_ack", "set_wiper", "set_wiper_ack"]
     AUDIO_CFG_FIELD_NUMBER: _ClassVar[int]
     GET_LAMP_FIELD_NUMBER: _ClassVar[int]
     GET_LAMP_RSP_FIELD_NUMBER: _ClassVar[int]
+    REQ_ENCODE_FIELD_NUMBER: _ClassVar[int]
     SET_AUDIO_FIELD_NUMBER: _ClassVar[int]
     SET_LAMP_FIELD_NUMBER: _ClassVar[int]
     SET_LAMP_RSP_FIELD_NUMBER: _ClassVar[int]
@@ -139,6 +146,7 @@ class SocMul(_message.Message):
     audio_cfg: MulAudioCfg
     get_lamp: GetHeadlamp
     get_lamp_rsp: Getlamprsp
+    req_encode: MulSetEncode
     set_audio: MulSetAudio
     set_lamp: SetHeadlamp
     set_lamp_rsp: Setlamprsp
@@ -146,7 +154,7 @@ class SocMul(_message.Message):
     set_video_ack: MulSetVideoAck
     set_wiper: MulSetWiper
     set_wiper_ack: MulSetWiperAck
-    def __init__(self, set_audio: _Optional[_Union[MulSetAudio, _Mapping]] = ..., audio_cfg: _Optional[_Union[MulAudioCfg, _Mapping]] = ..., set_video: _Optional[_Union[MulSetVideo, _Mapping]] = ..., set_video_ack: _Optional[_Union[MulSetVideoAck, _Mapping]] = ..., set_wiper: _Optional[_Union[MulSetWiper, _Mapping]] = ..., set_wiper_ack: _Optional[_Union[MulSetWiperAck, _Mapping]] = ..., get_lamp: _Optional[_Union[GetHeadlamp, _Mapping]] = ..., set_lamp: _Optional[_Union[SetHeadlamp, _Mapping]] = ..., set_lamp_rsp: _Optional[_Union[Setlamprsp, _Mapping]] = ..., get_lamp_rsp: _Optional[_Union[Getlamprsp, _Mapping]] = ...) -> None: ...
+    def __init__(self, set_audio: _Optional[_Union[MulSetAudio, _Mapping]] = ..., audio_cfg: _Optional[_Union[MulAudioCfg, _Mapping]] = ..., set_video: _Optional[_Union[MulSetVideo, _Mapping]] = ..., set_video_ack: _Optional[_Union[MulSetVideoAck, _Mapping]] = ..., set_wiper: _Optional[_Union[MulSetWiper, _Mapping]] = ..., set_wiper_ack: _Optional[_Union[MulSetWiperAck, _Mapping]] = ..., get_lamp: _Optional[_Union[GetHeadlamp, _Mapping]] = ..., set_lamp: _Optional[_Union[SetHeadlamp, _Mapping]] = ..., set_lamp_rsp: _Optional[_Union[Setlamprsp, _Mapping]] = ..., get_lamp_rsp: _Optional[_Union[Getlamprsp, _Mapping]] = ..., req_encode: _Optional[_Union[MulSetEncode, _Mapping]] = ...) -> None: ...
 
 class MUL_LANGUAGE(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     __slots__ = []

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/mctrl_driver.proto

@@ -1,5 +1,19 @@
 syntax = "proto3";
 
+enum CollectMotorState {
+  COLLECT_CLOSE = 0;
+  COLLECT_OPEN = 1;
+  COLLECT_STUCK = 2;
+  COLLECT_ABNORMAL = 3;
+}
+
+enum UnloadMotorState {
+  UNLOAD_CLOSE = 0;
+  UNLOAD_OPEN = 1;
+  UNLOAD_STOP = 2;
+  UNLOAD_RUNNING = 3;
+}
+
 message DrvMotionCtrl {
   int32 setLinearSpeed = 1;
   int32 setAngularSpeed = 2;
@@ -22,6 +36,12 @@ message DrvKnifeChangeReport {
   int32 is_start = 1;
   int32 start_high = 2;
   int32 end_high = 3;
+  int32 cur_high = 4;
+}
+
+message DrvCollectCtrlByHand {
+  int32 collect_ctrl = 1;
+  int32 unload_ctrl = 2;
 }
 
 message DrvMowCtrlByHand {
@@ -63,5 +83,6 @@ message MctlDriver {
     rtk_sys_mask_query_t rtk_sys_mask_query = 9;
     rtk_sys_mask_query_ack_t rtk_sys_mask_query_ack = 10;
     DrvKnifeChangeReport toapp_knife_status_change = 11;
+    DrvCollectCtrlByHand collect_ctrl_by_hand = 12;
   }
 }

pymammotion-0.4.45/pymammotion/proto/mctrl_driver_pb2.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: pymammotion/proto/mctrl_driver.proto
+"""Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$pymammotion/proto/mctrl_driver.proto\"@\n\rDrvMotionCtrl\x12\x16\n\x0esetLinearSpeed\x18\x01 \x01(\x05\x12\x17\n\x0fsetAngularSpeed\x18\x02 \x01(\x05\"%\n\x0e\x44rvKnifeHeight\x12\x13\n\x0bknifeHeight\x18\x01 \x01(\x05\"\'\n\nDrvSrSpeed\x12\n\n\x02rw\x18\x01 \x01(\x05\x12\r\n\x05speed\x18\x02 \x01(\x02\"&\n\x0e\x44rvKnifeStatus\x12\x14\n\x0cknife_status\x18\x01 \x01(\x05\"`\n\x14\x44rvKnifeChangeReport\x12\x10\n\x08is_start\x18\x01 \x01(\x05\x12\x12\n\nstart_high\x18\x02 \x01(\x05\x12\x10\n\x08\x65nd_high\x18\x03 \x01(\x05\x12\x10\n\x08\x63ur_high\x18\x04 \x01(\x05\"A\n\x14\x44rvCollectCtrlByHand\x12\x14\n\x0c\x63ollect_ctrl\x18\x01 \x01(\x05\x12\x13\n\x0bunload_ctrl\x18\x02 \x01(\x05\"n\n\x10\x44rvMowCtrlByHand\x12\x11\n\tmain_ctrl\x18\x01 \x01(\x05\x12\x16\n\x0e\x63ut_knife_ctrl\x18\x02 \x01(\x05\x12\x18\n\x10\x63ut_knife_height\x18\x03 \x01(\x05\x12\x15\n\rmax_run_Speed\x18\x04 \x01(\x02\"4\n\rrtk_cfg_req_t\x12\x12\n\ncmd_length\x18\x01 \x01(\x05\x12\x0f\n\x07\x63md_req\x18\x02 \x01(\t\"=\n\x11rtk_cfg_req_ack_t\x12\x12\n\ncmd_length\x18\x01 \x01(\x05\x12\x14\n\x0c\x63md_response\x18\x02 \x01(\t\"*\n\x14rtk_sys_mask_query_t\x12\x12\n\nsat_system\x18\x01 \x01(\r\"H\n\x18rtk_sys_mask_query_ack_t\x12\x12\n\nsat_system\x18\x01 \x01(\r\x12\x18\n\x10system_mask_bits\x18\x02 \x03(\r\"\xfa\x04\n\nMctlDriver\x12.\n\x14todev_devmotion_ctrl\x18\x01 \x01(\x0b\x32\x0e.DrvMotionCtrlH\x00\x12\x31\n\x16todev_knife_height_set\x18\x02 \x01(\x0b\x32\x0f.DrvKnifeHeightH\x00\x12,\n\x15\x62idire_speed_read_set\x18\x03 \x01(\x0b\x32\x0b.DrvSrSpeedH\x00\x12\x35\n\x1a\x62idire_knife_height_report\x18\x04 \x01(\x0b\x32\x0f.DrvKnifeHeightH\x00\x12-\n\x12toapp_knife_status\x18\x05 \x01(\x0b\x32\x0f.DrvKnifeStatusH\x00\x12-\n\x10mow_ctrl_by_hand\x18\x06 \x01(\x0b\x32\x11.DrvMowCtrlByHandH\x00\x12%\n\x0brtk_cfg_req\x18\x07 \x01(\x0b\x32\x0e.rtk_cfg_req_tH\x00\x12-\n\x0frtk_cfg_req_ack\x18\x08 \x01(\x0b\x32\x12.rtk_cfg_req_ack_tH\x00\x12\x33\n\x12rtk_sys_mask_query\x18\t \x01(\x0b\x32\x15.rtk_sys_mask_query_tH\x00\x12;\n\x16rtk_sys_mask_query_ack\x18\n \x01(\x0b\x32\x19.rtk_sys_mask_query_ack_tH\x00\x12:\n\x19toapp_knife_status_change\x18\x0b \x01(\x0b\x32\x15.DrvKnifeChangeReportH\x00\x12\x35\n\x14\x63ollect_ctrl_by_hand\x18\x0c \x01(\x0b\x32\x15.DrvCollectCtrlByHandH\x00\x42\x0b\n\tSubDrvMsg*a\n\x11\x43ollectMotorState\x12\x11\n\rCOLLECT_CLOSE\x10\x00\x12\x10\n\x0c\x43OLLECT_OPEN\x10\x01\x12\x11\n\rCOLLECT_STUCK\x10\x02\x12\x14\n\x10\x43OLLECT_ABNORMAL\x10\x03*Z\n\x10UnloadMotorState\x12\x10\n\x0cUNLOAD_CLOSE\x10\x00\x12\x0f\n\x0bUNLOAD_OPEN\x10\x01\x12\x0f\n\x0bUNLOAD_STOP\x10\x02\x12\x12\n\x0eUNLOAD_RUNNING\x10\x03\x62\x06proto3')
+
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'pymammotion.proto.mctrl_driver_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  _COLLECTMOTORSTATE._serialized_start=1375
+  _COLLECTMOTORSTATE._serialized_end=1472
+  _UNLOADMOTORSTATE._serialized_start=1474
+  _UNLOADMOTORSTATE._serialized_end=1564
+  _DRVMOTIONCTRL._serialized_start=40
+  _DRVMOTIONCTRL._serialized_end=104
+  _DRVKNIFEHEIGHT._serialized_start=106
+  _DRVKNIFEHEIGHT._serialized_end=143
+  _DRVSRSPEED._serialized_start=145
+  _DRVSRSPEED._serialized_end=184
+  _DRVKNIFESTATUS._serialized_start=186
+  _DRVKNIFESTATUS._serialized_end=224
+  _DRVKNIFECHANGEREPORT._serialized_start=226
+  _DRVKNIFECHANGEREPORT._serialized_end=322
+  _DRVCOLLECTCTRLBYHAND._serialized_start=324
+  _DRVCOLLECTCTRLBYHAND._serialized_end=389
+  _DRVMOWCTRLBYHAND._serialized_start=391
+  _DRVMOWCTRLBYHAND._serialized_end=501
+  _RTK_CFG_REQ_T._serialized_start=503
+  _RTK_CFG_REQ_T._serialized_end=555
+  _RTK_CFG_REQ_ACK_T._serialized_start=557
+  _RTK_CFG_REQ_ACK_T._serialized_end=618
+  _RTK_SYS_MASK_QUERY_T._serialized_start=620
+  _RTK_SYS_MASK_QUERY_T._serialized_end=662
+  _RTK_SYS_MASK_QUERY_ACK_T._serialized_start=664
+  _RTK_SYS_MASK_QUERY_ACK_T._serialized_end=736
+  _MCTLDRIVER._serialized_start=739
+  _MCTLDRIVER._serialized_end=1373
+# @@protoc_insertion_point(module_scope)

{pymammotion-0.4.44 → pymammotion-0.4.45}/pymammotion/proto/mctrl_driver_pb2.pyi

@@ -1,19 +1,38 @@
 from google.protobuf.internal import containers as _containers
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
+COLLECT_ABNORMAL: CollectMotorState
+COLLECT_CLOSE: CollectMotorState
+COLLECT_OPEN: CollectMotorState
+COLLECT_STUCK: CollectMotorState
 DESCRIPTOR: _descriptor.FileDescriptor
+UNLOAD_CLOSE: UnloadMotorState
+UNLOAD_OPEN: UnloadMotorState
+UNLOAD_RUNNING: UnloadMotorState
+UNLOAD_STOP: UnloadMotorState
+
+class DrvCollectCtrlByHand(_message.Message):
+    __slots__ = ["collect_ctrl", "unload_ctrl"]
+    COLLECT_CTRL_FIELD_NUMBER: _ClassVar[int]
+    UNLOAD_CTRL_FIELD_NUMBER: _ClassVar[int]
+    collect_ctrl: int
+    unload_ctrl: int
+    def __init__(self, collect_ctrl: _Optional[int] = ..., unload_ctrl: _Optional[int] = ...) -> None: ...
 
 class DrvKnifeChangeReport(_message.Message):
-    __slots__ = ["end_high", "is_start", "start_high"]
+    __slots__ = ["cur_high", "end_high", "is_start", "start_high"]
+    CUR_HIGH_FIELD_NUMBER: _ClassVar[int]
     END_HIGH_FIELD_NUMBER: _ClassVar[int]
     IS_START_FIELD_NUMBER: _ClassVar[int]
     START_HIGH_FIELD_NUMBER: _ClassVar[int]
+    cur_high: int
     end_high: int
     is_start: int
     start_high: int
-    def __init__(self, is_start: _Optional[int] = ..., start_high: _Optional[int] = ..., end_high: _Optional[int] = ...) -> None: ...
+    def __init__(self, is_start: _Optional[int] = ..., start_high: _Optional[int] = ..., end_high: _Optional[int] = ..., cur_high: _Optional[int] = ...) -> None: ...
 
 class DrvKnifeHeight(_message.Message):
     __slots__ = ["knifeHeight"]
@@ -56,9 +75,10 @@ class DrvSrSpeed(_message.Message):
     def __init__(self, rw: _Optional[int] = ..., speed: _Optional[float] = ...) -> None: ...
 
 class MctlDriver(_message.Message):
-    __slots__ = ["bidire_knife_height_report", "bidire_speed_read_set", "mow_ctrl_by_hand", "rtk_cfg_req", "rtk_cfg_req_ack", "rtk_sys_mask_query", "rtk_sys_mask_query_ack", "toapp_knife_status", "toapp_knife_status_change", "todev_devmotion_ctrl", "todev_knife_height_set"]
+    __slots__ = ["bidire_knife_height_report", "bidire_speed_read_set", "collect_ctrl_by_hand", "mow_ctrl_by_hand", "rtk_cfg_req", "rtk_cfg_req_ack", "rtk_sys_mask_query", "rtk_sys_mask_query_ack", "toapp_knife_status", "toapp_knife_status_change", "todev_devmotion_ctrl", "todev_knife_height_set"]
     BIDIRE_KNIFE_HEIGHT_REPORT_FIELD_NUMBER: _ClassVar[int]
     BIDIRE_SPEED_READ_SET_FIELD_NUMBER: _ClassVar[int]
+    COLLECT_CTRL_BY_HAND_FIELD_NUMBER: _ClassVar[int]
     MOW_CTRL_BY_HAND_FIELD_NUMBER: _ClassVar[int]
     RTK_CFG_REQ_ACK_FIELD_NUMBER: _ClassVar[int]
     RTK_CFG_REQ_FIELD_NUMBER: _ClassVar[int]
@@ -70,6 +90,7 @@ class MctlDriver(_message.Message):
     TODEV_KNIFE_HEIGHT_SET_FIELD_NUMBER: _ClassVar[int]
     bidire_knife_height_report: DrvKnifeHeight
     bidire_speed_read_set: DrvSrSpeed
+    collect_ctrl_by_hand: DrvCollectCtrlByHand
     mow_ctrl_by_hand: DrvMowCtrlByHand
     rtk_cfg_req: rtk_cfg_req_t
     rtk_cfg_req_ack: rtk_cfg_req_ack_t
@@ -79,7 +100,7 @@ class MctlDriver(_message.Message):
     toapp_knife_status_change: DrvKnifeChangeReport
     todev_devmotion_ctrl: DrvMotionCtrl
     todev_knife_height_set: DrvKnifeHeight
-    def __init__(self, todev_devmotion_ctrl: _Optional[_Union[DrvMotionCtrl, _Mapping]] = ..., todev_knife_height_set: _Optional[_Union[DrvKnifeHeight, _Mapping]] = ..., bidire_speed_read_set: _Optional[_Union[DrvSrSpeed, _Mapping]] = ..., bidire_knife_height_report: _Optional[_Union[DrvKnifeHeight, _Mapping]] = ..., toapp_knife_status: _Optional[_Union[DrvKnifeStatus, _Mapping]] = ..., mow_ctrl_by_hand: _Optional[_Union[DrvMowCtrlByHand, _Mapping]] = ..., rtk_cfg_req: _Optional[_Union[rtk_cfg_req_t, _Mapping]] = ..., rtk_cfg_req_ack: _Optional[_Union[rtk_cfg_req_ack_t, _Mapping]] = ..., rtk_sys_mask_query: _Optional[_Union[rtk_sys_mask_query_t, _Mapping]] = ..., rtk_sys_mask_query_ack: _Optional[_Union[rtk_sys_mask_query_ack_t, _Mapping]] = ..., toapp_knife_status_change: _Optional[_Union[DrvKnifeChangeReport, _Mapping]] = ...) -> None: ...
+    def __init__(self, todev_devmotion_ctrl: _Optional[_Union[DrvMotionCtrl, _Mapping]] = ..., todev_knife_height_set: _Optional[_Union[DrvKnifeHeight, _Mapping]] = ..., bidire_speed_read_set: _Optional[_Union[DrvSrSpeed, _Mapping]] = ..., bidire_knife_height_report: _Optional[_Union[DrvKnifeHeight, _Mapping]] = ..., toapp_knife_status: _Optional[_Union[DrvKnifeStatus, _Mapping]] = ..., mow_ctrl_by_hand: _Optional[_Union[DrvMowCtrlByHand, _Mapping]] = ..., rtk_cfg_req: _Optional[_Union[rtk_cfg_req_t, _Mapping]] = ..., rtk_cfg_req_ack: _Optional[_Union[rtk_cfg_req_ack_t, _Mapping]] = ..., rtk_sys_mask_query: _Optional[_Union[rtk_sys_mask_query_t, _Mapping]] = ..., rtk_sys_mask_query_ack: _Optional[_Union[rtk_sys_mask_query_ack_t, _Mapping]] = ..., toapp_knife_status_change: _Optional[_Union[DrvKnifeChangeReport, _Mapping]] = ..., collect_ctrl_by_hand: _Optional[_Union[DrvCollectCtrlByHand, _Mapping]] = ...) -> None: ...
 
 class rtk_cfg_req_ack_t(_message.Message):
     __slots__ = ["cmd_length", "cmd_response"]
@@ -110,3 +131,9 @@ class rtk_sys_mask_query_t(_message.Message):
     SAT_SYSTEM_FIELD_NUMBER: _ClassVar[int]
     sat_system: int
     def __init__(self, sat_system: _Optional[int] = ...) -> None: ...
+
+class CollectMotorState(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []
+
+class UnloadMotorState(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []