pymammotion 0.4.56__py3-none-any.whl → 0.5.0__py3-none-any.whl

pymammotion/mammotion/devices/mammotion.py

@@ -32,7 +32,6 @@ class MammotionMixedDeviceManager:
         name: str,
         iot_id: str,
         cloud_client: CloudIOTGateway,
-        mammotion_http: MammotionHTTP,
         cloud_device: Device,
         ble_device: BLEDevice | None = None,
         mqtt: MammotionCloud | None = None,
@@ -48,16 +47,22 @@ class MammotionMixedDeviceManager:
         self._device: Device = cloud_device
         self.add_ble(ble_device)
         self.add_cloud(mqtt)
-        self.mammotion_http = mammotion_http
+        self.mammotion_http = cloud_client.mammotion_http
         self.preference = preference
         self._state_manager.preference = preference
 
     @property
-    def mower_state(self):
+    def state_manager(self) -> StateManager:
+        """Return the state manager."""
+        return self._state_manager
+
+    @property
+    def state(self):
+        """Return the state of the device."""
         return self._state_manager.get_device()
 
-    @mower_state.setter
-    def mower_state(self, value: MowingDevice) -> None:
+    @state.setter
+    def state(self, value: MowingDevice) -> None:
         self._state_manager.set_device(value)
 
     def ble(self) -> MammotionBaseBLEDevice | None:
@@ -219,13 +224,12 @@ class Mammotion:
                     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,
                     preference=ConnectionPreference.WIFI,
                 )
-                mixed_device.mower_state.mower_state.product_key = device.productKey
-                mixed_device.mower_state.mower_state.model = (
+                mixed_device.state.mower_state.product_key = device.productKey
+                mixed_device.state.mower_state.model = (
                     device.productName if device.productModel is None else device.productModel
                 )
                 self.device_manager.add_device(mixed_device)
@@ -266,6 +270,18 @@ class Mammotion:
     def get_device_by_name(self, name: str) -> MammotionMixedDeviceManager:
         return self.device_manager.get_device(name)
 
+    def get_or_create_device_by_name(self, device: Device, mqtt_client: MammotionCloud) -> MammotionMixedDeviceManager:
+        if mow_device := self.device_manager.get_device(device.deviceName):
+            return mow_device
+        return MammotionMixedDeviceManager(
+            name=device.deviceName,
+            iot_id=device.iotId,
+            cloud_client=mqtt_client.cloud_client,
+            mqtt=mqtt_client,
+            cloud_device=device,
+            ble_device=None,
+        )
+
     async def send_command(self, name: str, key: str):
         """Send a command to the device."""
         device = self.get_device_by_name(name)
@@ -275,6 +291,7 @@ class Mammotion:
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().command(key)
             # TODO work with both with EITHER
+        return None
 
     async def send_command_with_args(self, name: str, key: str, **kwargs: Any):
         """Send a command with args to the device."""
@@ -285,6 +302,7 @@ class Mammotion:
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().command(key, **kwargs)
             # TODO work with both with EITHER
+        return None
 
     async def start_sync(self, name: str, retry: int):
         device = self.get_device_by_name(name)
@@ -294,6 +312,7 @@ class Mammotion:
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().start_sync(retry)
             # TODO work with both with EITHER
+        return None
 
     async def start_map_sync(self, name: str):
         device = self.get_device_by_name(name)
@@ -303,6 +322,7 @@ class Mammotion:
             if device.preference is ConnectionPreference.WIFI:
                 return await device.cloud().start_map_sync()
             # TODO work with both with EITHER
+        return None
 
     async def get_stream_subscription(self, name: str, iot_id: str) -> Response[StreamSubscriptionResponse] | Any:
         device = self.get_device_by_name(name)
@@ -329,4 +349,5 @@ class Mammotion:
     def mower(self, name: str) -> MowingDevice | None:
         device = self.get_device_by_name(name)
         if device:
-            return device.mower_state
+            return device.state
+        return None

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -2,7 +2,7 @@ import asyncio
 from collections.abc import Awaitable, Callable
 import logging
 import time
-from typing import Any, cast
+from typing import Any
 from uuid import UUID
 
 import betterproto
@@ -100,11 +100,20 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
 
+    def __del__(self) -> None:
+        """Cleanup."""
+        if self._disconnect_timer:
+            self._disconnect_timer.cancel()
+        if self._ble_sync_task:
+            self._ble_sync_task.cancel()
+
+        self._state_manager.ble_queue_command_callback.remove_subscribers(self.queue_command)
+
     def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
-        self._state_manager.ble_on_notification_callback = func
+        self._state_manager.ble_on_notification_callback.add_subscribers(func)
 
-    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
-        self._state_manager.ble_queue_command_callback = func
+    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[None]]) -> None:
+        self._state_manager.ble_queue_command_callback.add_subscribers(func)
 
     def update_device(self, device: BLEDevice) -> None:
         """Update the BLE device."""
@@ -136,7 +145,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         if self._client is not None and self._client.is_connected:
             await self._client.disconnect()
 
-    async def queue_command(self, key: str, **kwargs: Any) -> bytes | None:
+    async def queue_command(self, key: str, **kwargs: Any) -> None:
         # Create a future to hold the result
         _LOGGER.debug("Queueing command: %s", key)
         future = asyncio.Future()
@@ -144,7 +153,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         command_bytes = getattr(self._commands, key)(**kwargs)
         await self.command_queue.put((key, command_bytes, future))
         # Wait for the future to be resolved
-        return await future
+        await future
         # return await self._send_command_with_args(key, **kwargs)
 
     async def process_queue(self) -> None:
@@ -233,10 +242,12 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
     @property
     def rssi(self) -> int:
         """Return RSSI of device."""
-        try:
-            return cast(self.mower.sys.toapp_report_data.connect.ble_rssi, int)
-        finally:
-            return 0
+        return self.mower.report_data.connect.ble_rssi
+
+    @property
+    def client(self) -> BleakClientWithServiceCache | None:
+        """Return client."""
+        return self._client
 
     async def _ensure_connected(self) -> None:
         """Ensure connection to device is established."""

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -133,6 +133,9 @@ class MammotionCloud:
         elif topic.endswith("/app/down/thing/status"):
             status = ThingStatusMessage.from_dict(payload)
             await self.mqtt_status_event.data_event(status)
+        elif topic.endswith("app/down/thing/properties"):
+            property_event = ThingPropertiesMessage.from_dict(payload)
+            await self.mqtt_properties_event.data_event(property_event)
 
     def _disconnect(self) -> None:
         """Disconnect the MQTT client."""
@@ -159,7 +162,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._command_futures = {}
         self._commands: MammotionCommand = MammotionCommand(
             cloud_device.deviceName,
-            int(mqtt.cloud_client.mammotion_http.response.data.get("userInformation").get("userAccount")),
+            int(mqtt.cloud_client.mammotion_http.response.data.userInformation.userAccount),
         )
         self.currentID = ""
         self._mqtt.mqtt_message_event.add_subscribers(self._parse_message_for_device)
@@ -181,17 +184,23 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.on_disconnected_event.remove_subscribers(self.on_disconnect)
         self._mqtt.on_connected_event.remove_subscribers(self.on_connect)
         self._mqtt.mqtt_message_event.remove_subscribers(self._parse_message_for_device)
+        self._mqtt.mqtt_properties_event.remove_subscribers(self._parse_message_properties_for_device)
+        self._mqtt.mqtt_status_event.remove_subscribers(self._parse_message_status_for_device)
         self._state_manager.cloud_gethash_ack_callback = None
         self._state_manager.cloud_get_commondata_ack_callback = None
         self._state_manager.cloud_get_plan_callback = None
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
 
+    def __del__(self) -> None:
+        """Cleanup."""
+        self._state_manager.cloud_queue_command_callback.remove_subscribers(self.queue_command)
+
     def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
-        self._state_manager.cloud_on_notification_callback = func
+        self._state_manager.cloud_on_notification_callback.add_subscribers(func)
 
-    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
-        self._state_manager.cloud_queue_command_callback = func
+    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[None]]) -> None:
+        self._state_manager.cloud_queue_command_callback.add_subscribers(func)
 
     async def on_ready(self) -> None:
         """Callback for when MQTT is subscribed to events."""

pymammotion/proto/__init__.py

@@ -290,10 +290,6 @@ class ResponseBasestationInfoT(betterproto.Message):
 @dataclass(eq=False, repr=False)
 class AppToBaseMqttRtkT(betterproto.Message):
     rtk_switch: int = betterproto.int32_field(1)
-    rtk_url: str = betterproto.string_field(2)
-    rtk_port: int = betterproto.int32_field(3)
-    rtk_username: str = betterproto.string_field(4)
-    rtk_password: str = betterproto.string_field(5)
 
 
 @dataclass(eq=False, repr=False)
@@ -680,8 +676,8 @@ class DrvKnifeStatus(betterproto.Message):
 @dataclass(eq=False, repr=False)
 class DrvKnifeChangeReport(betterproto.Message):
     is_start: int = betterproto.int32_field(1)
-    start_high: int = betterproto.int32_field(2)
-    end_high: int = betterproto.int32_field(3)
+    start_height: int = betterproto.int32_field(2)
+    end_height: int = betterproto.int32_field(3)
 
 
 @dataclass(eq=False, repr=False)

pymammotion/proto/basestation.proto

@@ -4,6 +4,13 @@ message request_basestation_info_t {
     uint32 request_type = 1;
 }
 
+message base_score {
+    uint32 base_score = 1;
+    uint32 base_leve = 2;
+    uint32 base_moved = 3;
+    uint32 base_moving = 4;
+}
+
 message response_basestation_info_t {
     uint64 system_status = 1;
     uint32 app_connect_type = 2;
@@ -19,6 +26,7 @@ message response_basestation_info_t {
     int32 mqtt_rtk_status = 12;
     int32 rtk_channel = 13;
     int32 rtk_switch = 14;
+    base_score score_info = 15;
 }
 
 message app_to_base_mqtt_rtk_t {

pymammotion/proto/basestation_pb2.py

@@ -13,7 +13,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#pymammotion/proto/basestation.proto\"2\n\x1arequest_basestation_info_t\x12\x14\n\x0crequest_type\x18\x01 \x01(\r\"\xc5\x02\n\x1bresponse_basestation_info_t\x12\x15\n\rsystem_status\x18\x01 \x01(\x04\x12\x18\n\x10\x61pp_connect_type\x18\x02 \x01(\r\x12\x10\n\x08\x62le_rssi\x18\x03 \x01(\x05\x12\x11\n\twifi_rssi\x18\x04 \x01(\x05\x12\x10\n\x08sats_num\x18\x05 \x01(\x04\x12\x11\n\tlora_scan\x18\x06 \x01(\x03\x12\x14\n\x0clora_channel\x18\x07 \x01(\x03\x12\x12\n\nlora_locid\x18\x08 \x01(\x03\x12\x12\n\nlora_netid\x18\t \x01(\x03\x12\x12\n\nrtk_status\x18\n \x01(\x04\x12\x17\n\x0flowpower_status\x18\x0b \x01(\x05\x12\x17\n\x0fmqtt_rtk_status\x18\x0c \x01(\x05\x12\x13\n\x0brtk_channel\x18\r \x01(\x05\x12\x12\n\nrtk_switch\x18\x0e \x01(\x05\"{\n\x16\x61pp_to_base_mqtt_rtk_t\x12\x12\n\nrtk_switch\x18\x01 \x01(\x05\x12\x0f\n\x07rtk_url\x18\x02 \x01(\t\x12\x10\n\x08rtk_port\x18\x03 \x01(\x05\x12\x14\n\x0crtk_username\x18\x04 \x01(\t\x12\x14\n\x0crtk_password\x18\x05 \x01(\t\"3\n\x16\x62\x61se_to_app_mqtt_rtk_t\x12\x19\n\x11rtk_switch_status\x18\x01 \x01(\x05\"\xfc\x01\n\x0b\x42\x61seStation\x12-\n\x06to_dev\x18\x01 \x01(\x0b\x32\x1b.request_basestation_info_tH\x00\x12.\n\x06to_app\x18\x02 \x01(\x0b\x32\x1c.response_basestation_info_tH\x00\x12;\n\x18\x61pp_to_base_mqtt_rtk_msg\x18\x03 \x01(\x0b\x32\x17.app_to_base_mqtt_rtk_tH\x00\x12;\n\x18\x62\x61se_to_app_mqtt_rtk_msg\x18\x04 \x01(\x0b\x32\x17.base_to_app_mqtt_rtk_tH\x00\x42\x14\n\x12\x42\x61seStationSubTypeb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#pymammotion/proto/basestation.proto\"2\n\x1arequest_basestation_info_t\x12\x14\n\x0crequest_type\x18\x01 \x01(\r\"\\\n\nbase_score\x12\x12\n\nbase_score\x18\x01 \x01(\r\x12\x11\n\tbase_leve\x18\x02 \x01(\r\x12\x12\n\nbase_moved\x18\x03 \x01(\r\x12\x13\n\x0b\x62\x61se_moving\x18\x04 \x01(\r\"\xe6\x02\n\x1bresponse_basestation_info_t\x12\x15\n\rsystem_status\x18\x01 \x01(\x04\x12\x18\n\x10\x61pp_connect_type\x18\x02 \x01(\r\x12\x10\n\x08\x62le_rssi\x18\x03 \x01(\x05\x12\x11\n\twifi_rssi\x18\x04 \x01(\x05\x12\x10\n\x08sats_num\x18\x05 \x01(\x04\x12\x11\n\tlora_scan\x18\x06 \x01(\x03\x12\x14\n\x0clora_channel\x18\x07 \x01(\x03\x12\x12\n\nlora_locid\x18\x08 \x01(\x03\x12\x12\n\nlora_netid\x18\t \x01(\x03\x12\x12\n\nrtk_status\x18\n \x01(\x04\x12\x17\n\x0flowpower_status\x18\x0b \x01(\x05\x12\x17\n\x0fmqtt_rtk_status\x18\x0c \x01(\x05\x12\x13\n\x0brtk_channel\x18\r \x01(\x05\x12\x12\n\nrtk_switch\x18\x0e \x01(\x05\x12\x1f\n\nscore_info\x18\x0f \x01(\x0b\x32\x0b.base_score\"{\n\x16\x61pp_to_base_mqtt_rtk_t\x12\x12\n\nrtk_switch\x18\x01 \x01(\x05\x12\x0f\n\x07rtk_url\x18\x02 \x01(\t\x12\x10\n\x08rtk_port\x18\x03 \x01(\x05\x12\x14\n\x0crtk_username\x18\x04 \x01(\t\x12\x14\n\x0crtk_password\x18\x05 \x01(\t\"3\n\x16\x62\x61se_to_app_mqtt_rtk_t\x12\x19\n\x11rtk_switch_status\x18\x01 \x01(\x05\"\xfc\x01\n\x0b\x42\x61seStation\x12-\n\x06to_dev\x18\x01 \x01(\x0b\x32\x1b.request_basestation_info_tH\x00\x12.\n\x06to_app\x18\x02 \x01(\x0b\x32\x1c.response_basestation_info_tH\x00\x12;\n\x18\x61pp_to_base_mqtt_rtk_msg\x18\x03 \x01(\x0b\x32\x17.app_to_base_mqtt_rtk_tH\x00\x12;\n\x18\x62\x61se_to_app_mqtt_rtk_msg\x18\x04 \x01(\x0b\x32\x17.base_to_app_mqtt_rtk_tH\x00\x42\x14\n\x12\x42\x61seStationSubTypeb\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'pymammotion.proto.basestation_pb2', globals())
@@ -22,12 +22,14 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _REQUEST_BASESTATION_INFO_T._serialized_start=39
   _REQUEST_BASESTATION_INFO_T._serialized_end=89
-  _RESPONSE_BASESTATION_INFO_T._serialized_start=92
-  _RESPONSE_BASESTATION_INFO_T._serialized_end=417
-  _APP_TO_BASE_MQTT_RTK_T._serialized_start=419
-  _APP_TO_BASE_MQTT_RTK_T._serialized_end=542
-  _BASE_TO_APP_MQTT_RTK_T._serialized_start=544
-  _BASE_TO_APP_MQTT_RTK_T._serialized_end=595
-  _BASESTATION._serialized_start=598
-  _BASESTATION._serialized_end=850
+  _BASE_SCORE._serialized_start=91
+  _BASE_SCORE._serialized_end=183
+  _RESPONSE_BASESTATION_INFO_T._serialized_start=186
+  _RESPONSE_BASESTATION_INFO_T._serialized_end=544
+  _APP_TO_BASE_MQTT_RTK_T._serialized_start=546
+  _APP_TO_BASE_MQTT_RTK_T._serialized_end=669
+  _BASE_TO_APP_MQTT_RTK_T._serialized_start=671
+  _BASE_TO_APP_MQTT_RTK_T._serialized_end=722
+  _BASESTATION._serialized_start=725
+  _BASESTATION._serialized_end=977
 # @@protoc_insertion_point(module_scope)

pymammotion/proto/basestation_pb2.pyi

@@ -30,6 +30,18 @@ class app_to_base_mqtt_rtk_t(_message.Message):
     rtk_username: str
     def __init__(self, rtk_switch: _Optional[int] = ..., rtk_url: _Optional[str] = ..., rtk_port: _Optional[int] = ..., rtk_username: _Optional[str] = ..., rtk_password: _Optional[str] = ...) -> None: ...
 
+class base_score(_message.Message):
+    __slots__ = ["base_leve", "base_moved", "base_moving", "base_score"]
+    BASE_LEVE_FIELD_NUMBER: _ClassVar[int]
+    BASE_MOVED_FIELD_NUMBER: _ClassVar[int]
+    BASE_MOVING_FIELD_NUMBER: _ClassVar[int]
+    BASE_SCORE_FIELD_NUMBER: _ClassVar[int]
+    base_leve: int
+    base_moved: int
+    base_moving: int
+    base_score: int
+    def __init__(self, base_score: _Optional[int] = ..., base_leve: _Optional[int] = ..., base_moved: _Optional[int] = ..., base_moving: _Optional[int] = ...) -> None: ...
+
 class base_to_app_mqtt_rtk_t(_message.Message):
     __slots__ = ["rtk_switch_status"]
     RTK_SWITCH_STATUS_FIELD_NUMBER: _ClassVar[int]
@@ -43,7 +55,7 @@ class request_basestation_info_t(_message.Message):
     def __init__(self, request_type: _Optional[int] = ...) -> None: ...
 
 class response_basestation_info_t(_message.Message):
-    __slots__ = ["app_connect_type", "ble_rssi", "lora_channel", "lora_locid", "lora_netid", "lora_scan", "lowpower_status", "mqtt_rtk_status", "rtk_channel", "rtk_status", "rtk_switch", "sats_num", "system_status", "wifi_rssi"]
+    __slots__ = ["app_connect_type", "ble_rssi", "lora_channel", "lora_locid", "lora_netid", "lora_scan", "lowpower_status", "mqtt_rtk_status", "rtk_channel", "rtk_status", "rtk_switch", "sats_num", "score_info", "system_status", "wifi_rssi"]
     APP_CONNECT_TYPE_FIELD_NUMBER: _ClassVar[int]
     BLE_RSSI_FIELD_NUMBER: _ClassVar[int]
     LORA_CHANNEL_FIELD_NUMBER: _ClassVar[int]
@@ -56,6 +68,7 @@ class response_basestation_info_t(_message.Message):
     RTK_STATUS_FIELD_NUMBER: _ClassVar[int]
     RTK_SWITCH_FIELD_NUMBER: _ClassVar[int]
     SATS_NUM_FIELD_NUMBER: _ClassVar[int]
+    SCORE_INFO_FIELD_NUMBER: _ClassVar[int]
     SYSTEM_STATUS_FIELD_NUMBER: _ClassVar[int]
     WIFI_RSSI_FIELD_NUMBER: _ClassVar[int]
     app_connect_type: int
@@ -70,6 +83,7 @@ class response_basestation_info_t(_message.Message):
     rtk_status: int
     rtk_switch: int
     sats_num: int
+    score_info: base_score
     system_status: int
     wifi_rssi: int
-    def __init__(self, system_status: _Optional[int] = ..., app_connect_type: _Optional[int] = ..., ble_rssi: _Optional[int] = ..., wifi_rssi: _Optional[int] = ..., sats_num: _Optional[int] = ..., lora_scan: _Optional[int] = ..., lora_channel: _Optional[int] = ..., lora_locid: _Optional[int] = ..., lora_netid: _Optional[int] = ..., rtk_status: _Optional[int] = ..., lowpower_status: _Optional[int] = ..., mqtt_rtk_status: _Optional[int] = ..., rtk_channel: _Optional[int] = ..., rtk_switch: _Optional[int] = ...) -> None: ...
+    def __init__(self, system_status: _Optional[int] = ..., app_connect_type: _Optional[int] = ..., ble_rssi: _Optional[int] = ..., wifi_rssi: _Optional[int] = ..., sats_num: _Optional[int] = ..., lora_scan: _Optional[int] = ..., lora_channel: _Optional[int] = ..., lora_locid: _Optional[int] = ..., lora_netid: _Optional[int] = ..., rtk_status: _Optional[int] = ..., lowpower_status: _Optional[int] = ..., mqtt_rtk_status: _Optional[int] = ..., rtk_channel: _Optional[int] = ..., rtk_switch: _Optional[int] = ..., score_info: _Optional[_Union[base_score, _Mapping]] = ...) -> None: ...

pymammotion/proto/dev_net.proto

@@ -150,6 +150,7 @@ message DrvUpgradeReport {
   int32 result = 5;
   string message = 6;
   string properties = 7;
+  int32 recv_cnt = 8;
 }
 
 message WifiIotStatusReport {
@@ -195,6 +196,7 @@ message MnetInfo {
   int32 rssi = 7;
   mnet_inet_status inet = 8;
   string iccid = 9;
+  string operator = 10;
 }
 
 message GetMnetInfoReq {

pymammotion/proto/dev_net_pb2.py

@@ -13,29 +13,29 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fpymammotion/proto/dev_net.proto\"(\n\rDrvWifiUpload\x12\x17\n\x0fwifi_msg_upload\x18\x01 \x01(\x05\"&\n\x0b\x44rvWifiList\x12\x17\n\x0fnvs_wifi_upload\x18\x01 \x01(\x05\"H\n\nDrvWifiSet\x12\x13\n\x0b\x63onfigParam\x18\x01 \x01(\x05\x12\x10\n\x08\x43onfssid\x18\x02 \x01(\t\x12\x13\n\x0bwifi_enable\x18\x03 \x01(\x08\"\xa8\x01\n\nDrvWifiMsg\x12\x0f\n\x07status1\x18\x01 \x01(\x08\x12\x0f\n\x07status2\x18\x02 \x01(\x08\x12\n\n\x02ip\x18\x03 \x01(\t\x12\x0f\n\x07msgssid\x18\x04 \x01(\t\x12\x10\n\x08password\x18\x05 \x01(\t\x12\x0c\n\x04rssi\x18\x06 \x01(\x05\x12\x12\n\nproductkey\x18\x07 \x01(\t\x12\x12\n\ndevicename\x18\x08 \x01(\t\x12\x13\n\x0bwifi_enable\x18\t \x01(\x08\"?\n\x0b\x44rvWifiConf\x12\x10\n\x08succFlag\x18\x01 \x01(\x08\x12\x0c\n\x04\x63ode\x18\x02 \x01(\x05\x12\x10\n\x08\x43onfssid\x18\x03 \x01(\t\"\\\n\rDrvListUpload\x12\x0b\n\x03sum\x18\x01 \x01(\x05\x12\x0f\n\x07\x63urrent\x18\x02 \x01(\x05\x12\x0e\n\x06status\x18\x03 \x01(\x05\x12\x0f\n\x07Memssid\x18\x04 \x01(\t\x12\x0c\n\x04rssi\x18\x05 \x01(\x05\"Y\n\x10\x44rvUploadFileReq\x12\r\n\x05\x62izId\x18\x01 \x01(\t\x12\x0b\n\x03url\x18\x02 \x01(\t\x12\x0e\n\x06userId\x18\x03 \x01(\t\x12\x0b\n\x03num\x18\x04 \x01(\x05\x12\x0c\n\x04type\x18\x05 \x01(\x05\"$\n\x13\x44rvUploadFileCancel\x12\r\n\x05\x62izId\x18\x01 \x01(\t\"z\n\x15\x44rvUploadFileToAppReq\x12\r\n\x05\x62izId\x18\x01 \x01(\t\x12\x11\n\toperation\x18\x02 \x01(\x05\x12\x10\n\x08serverIp\x18\x03 \x01(\x07\x12\x12\n\nserverPort\x18\x04 \x01(\x05\x12\x0b\n\x03num\x18\x05 \x01(\x05\x12\x0c\n\x04type\x18\x06 \x01(\x05\"I\n\x15\x44rvUploadFileToAppRsp\x12\r\n\x05\x62izId\x18\x01 \x01(\t\x12\x11\n\toperation\x18\x02 \x01(\x05\x12\x0e\n\x06result\x18\x03 \x01(\x05\"+\n\x0f\x44rvDevInfoReqId\x12\n\n\x02id\x18\x01 \x01(\x05\x12\x0c\n\x04type\x18\x02 \x01(\x05\"Z\n\x10\x44rvDevInfoRespId\x12\n\n\x02id\x18\x01 \x01(\x05\x12\x0c\n\x04type\x18\x02 \x01(\x05\x12\x1e\n\x03res\x18\x03 \x01(\x0e\x32\x11.DrvDevInfoResult\x12\x0c\n\x04info\x18\x04 \x01(\t\"2\n\rDrvDevInfoReq\x12!\n\x07req_ids\x18\x01 \x03(\x0b\x32\x10.DrvDevInfoReqId\"5\n\x0e\x44rvDevInfoResp\x12#\n\x08resp_ids\x18\x01 \x03(\x0b\x32\x11.DrvDevInfoRespId\"\x8a\x01\n\x10\x44rvUpgradeReport\x12\x0f\n\x07\x64\x65vname\x18\x01 \x01(\t\x12\r\n\x05otaid\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\x12\x10\n\x08progress\x18\x04 \x01(\x05\x12\x0e\n\x06result\x18\x05 \x01(\x05\x12\x0f\n\x07message\x18\x06 \x01(\t\x12\x12\n\nproperties\x18\x07 \x01(\t\"l\n\x13WifiIotStatusReport\x12\x16\n\x0ewifi_connected\x18\x01 \x01(\x08\x12\x15\n\riot_connected\x18\x02 \x01(\x08\x12\x12\n\nproductkey\x18\x03 \x01(\t\x12\x12\n\ndevicename\x18\x04 \x01(\t\"*\n\x0c\x42leTestBytes\x12\x0c\n\x04seqs\x18\x01 \x01(\x05\x12\x0c\n\x04\x64\x61ta\x18\x02 \x03(\x07\"$\n\x11GetNetworkInfoReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\"\x87\x01\n\x11GetNetworkInfoRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x11\n\twifi_ssid\x18\x02 \x01(\t\x12\x10\n\x08wifi_mac\x18\x03 \x01(\t\x12\x11\n\twifi_rssi\x18\x04 \x01(\x05\x12\n\n\x02ip\x18\x05 \x01(\x07\x12\x0c\n\x04mask\x18\x06 \x01(\x07\x12\x0f\n\x07gateway\x18\x07 \x01(\x07\"N\n\x10mnet_inet_status\x12\x0f\n\x07\x63onnect\x18\x01 \x01(\x08\x12\n\n\x02ip\x18\x02 \x01(\x07\x12\x0c\n\x04mask\x18\x03 \x01(\x07\x12\x0f\n\x07gateway\x18\x04 \x01(\x07\"\xc5\x01\n\x08MnetInfo\x12\r\n\x05model\x18\x01 \x01(\t\x12\x10\n\x08revision\x18\x02 \x01(\t\x12\x0c\n\x04imei\x18\x03 \x01(\t\x12\x1a\n\x03sim\x18\x04 \x01(\x0e\x32\r.sim_card_sta\x12\x0c\n\x04imsi\x18\x05 \x01(\t\x12\"\n\tlink_type\x18\x06 \x01(\x0e\x32\x0f.mnet_link_type\x12\x0c\n\x04rssi\x18\x07 \x01(\x05\x12\x1f\n\x04inet\x18\x08 \x01(\x0b\x32\x11.mnet_inet_status\x12\r\n\x05iccid\x18\t \x01(\t\"!\n\x0eGetMnetInfoReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\"J\n\x0eGetMnetInfoRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\x12\x17\n\x04mnet\x18\x03 \x01(\x0b\x32\t.MnetInfo\"}\n\x07MnetApn\x12\x0b\n\x03\x63id\x18\x01 \x01(\x05\x12\x11\n\tapn_alias\x18\x02 \x01(\t\x12\x10\n\x08\x61pn_name\x18\x03 \x01(\t\x12\x1c\n\x04\x61uth\x18\x04 \x01(\x0e\x32\x0e.apn_auth_type\x12\x10\n\x08username\x18\x05 \x01(\t\x12\x10\n\x08password\x18\x06 \x01(\t\"9\n\nMnetApnCfg\x12\x14\n\x0c\x61pn_used_idx\x18\x01 \x01(\x05\x12\x15\n\x03\x61pn\x18\x02 \x03(\x0b\x32\x08.MnetApn\">\n\rMnetApnSetCfg\x12\x13\n\x0buse_default\x18\x01 \x01(\x08\x12\x18\n\x03\x63\x66g\x18\x02 \x01(\x0b\x32\x0b.MnetApnCfg\"~\n\x07MnetCfg\x12\x13\n\x0bmnet_enable\x18\x01 \x01(\x08\x12\x13\n\x0binet_enable\x18\x02 \x01(\x08\x12\x17\n\x04type\x18\x03 \x01(\x0e\x32\t.net_type\x12\x1b\n\x03\x61pn\x18\x04 \x01(\x0b\x32\x0e.MnetApnSetCfg\x12\x13\n\x0b\x61uto_select\x18\x05 \x01(\x08\" \n\rGetMnetCfgReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\"G\n\rGetMnetCfgRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\x12\x15\n\x03\x63\x66g\x18\x03 \x01(\x0b\x32\x08.MnetCfg\"7\n\rSetMnetCfgReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x15\n\x03\x63\x66g\x18\x02 \x01(\x0b\x32\x08.MnetCfg\"0\n\rSetMnetCfgRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\"N\n\x0e\x44rvDebugDdsZmq\x12\x11\n\tis_enable\x18\x01 \x01(\x08\x12\x15\n\rrx_topic_name\x18\x02 \x01(\t\x12\x12\n\ntx_zmq_url\x18\x03 \x01(\t\"!\n\x0cSetDrvBleMTU\x12\x11\n\tmtu_count\x18\x01 \x01(\x05\">\n\x0f\x42leSignatureReq\x12\x16\n\x0esignature_data\x18\x01 \x01(\t\x12\x13\n\x0brandom_data\x18\x02 \x01(\t\"\xb0\x01\n\x1a\x42leLogUploadUpdateProgress\x12\x0b\n\x03ver\x18\x01 \x01(\x05\x12\x0e\n\x06status\x18\x02 \x01(\x05\x12\r\n\x05\x62izId\x18\x03 \x01(\t\x12\x0c\n\x04prog\x18\x04 \x01(\x05\x12\x0f\n\x07subProg\x18\x05 \x01(\x05\x12\x0c\n\x04\x66Num\x18\x06 \x01(\x05\x12\r\n\x05speed\x18\x07 \x01(\x05\x12\x0c\n\x04\x66Idx\x18\x08 \x01(\x05\x12\r\n\x05\x66Path\x18\t \x01(\t\x12\r\n\x05\x66Size\x18\n \x01(\x05\"\xcb\x0b\n\x06\x44\x65vNet\x12\x18\n\x0etodev_ble_sync\x18\x01 \x01(\x05H\x00\x12\'\n\x0etodev_ConfType\x18\x02 \x01(\x0e\x32\r.WifiConfTypeH\x00\x12-\n\x13todev_WifiMsgUpload\x18\x03 \x01(\x0b\x32\x0e.DrvWifiUploadH\x00\x12,\n\x14todev_WifiListUpload\x18\x04 \x01(\x0b\x32\x0c.DrvWifiListH\x00\x12/\n\x18todev_Wifi_Configuration\x18\x05 \x01(\x0b\x32\x0b.DrvWifiSetH\x00\x12$\n\rtoapp_WifiMsg\x18\x06 \x01(\x0b\x32\x0b.DrvWifiMsgH\x00\x12&\n\x0etoapp_WifiConf\x18\x07 \x01(\x0b\x32\x0c.DrvWifiConfH\x00\x12*\n\x10toapp_ListUpload\x18\x08 \x01(\x0b\x32\x0e.DrvListUploadH\x00\x12/\n\x12todev_req_log_info\x18\t \x01(\x0b\x32\x11.DrvUploadFileReqH\x00\x12\x35\n\x15todev_log_data_cancel\x18\n \x01(\x0b\x32\x14.DrvUploadFileCancelH\x00\x12+\n\x11todev_devinfo_req\x18\x0b \x01(\x0b\x32\x0e.DrvDevInfoReqH\x00\x12-\n\x12toapp_devinfo_resp\x18\x0c \x01(\x0b\x32\x0f.DrvDevInfoRespH\x00\x12\x31\n\x14toapp_upgrade_report\x18\r \x01(\x0b\x32\x11.DrvUpgradeReportH\x00\x12\x35\n\x15toapp_wifi_iot_status\x18\x0e \x01(\x0b\x32\x14.WifiIotStatusReportH\x00\x12\x36\n\x14todev_uploadfile_req\x18\x0f \x01(\x0b\x32\x16.DrvUploadFileToAppReqH\x00\x12\x36\n\x14toapp_uploadfile_rsp\x18\x10 \x01(\x0b\x32\x16.DrvUploadFileToAppRspH\x00\x12\x33\n\x15todev_networkinfo_req\x18\x11 \x01(\x0b\x32\x12.GetNetworkInfoReqH\x00\x12\x33\n\x15toapp_networkinfo_rsp\x18\x12 \x01(\x0b\x32\x12.GetNetworkInfoRspH\x00\x12%\n\x0c\x62ir_testdata\x18\x13 \x01(\x0b\x32\r.BleTestBytesH\x00\x12.\n\x13todev_mnet_info_req\x18\x14 \x01(\x0b\x32\x0f.GetMnetInfoReqH\x00\x12.\n\x13toapp_mnet_info_rsp\x18\x15 \x01(\x0b\x32\x0f.GetMnetInfoRspH\x00\x12\x30\n\x16todev_get_mnet_cfg_req\x18\x16 \x01(\x0b\x32\x0e.GetMnetCfgReqH\x00\x12\x30\n\x16toapp_get_mnet_cfg_rsp\x18\x17 \x01(\x0b\x32\x0e.GetMnetCfgRspH\x00\x12\x30\n\x16todev_set_mnet_cfg_req\x18\x18 \x01(\x0b\x32\x0e.SetMnetCfgReqH\x00\x12\x30\n\x16toapp_set_mnet_cfg_rsp\x18\x19 \x01(\x0b\x32\x0e.SetMnetCfgRspH\x00\x12,\n\x11todev_set_dds2zmq\x18\x1a \x01(\x0b\x32\x0f.DrvDebugDdsZmqH\x00\x12*\n\x11todev_set_ble_mtu\x18\x1b \x01(\x0b\x32\r.SetDrvBleMTUH\x00\x12\x36\n\x19todev_set_iot_offline_req\x18\x1c \x01(\x0e\x32\x11.iot_conctrl_typeH\x00\x12\x36\n\x1atodev_verify_signature_req\x18\x1d \x01(\x0b\x32\x10.BleSignatureReqH\x00\x12G\n toapp_log_upload_update_progress\x18\x1e \x01(\x0b\x32\x1b.BleLogUploadUpdateProgressH\x00\x42\x0c\n\nNetSubType*l\n\x0cWifiConfType\x12\x12\n\x0e\x44isconnectWifi\x10\x00\x12\x0e\n\nForgetWifi\x10\x01\x12\x15\n\x11\x44irectConnectWifi\x10\x02\x12\x11\n\rReconnectWifi\x10\x03\x12\x0e\n\nset_enable\x10\x04*l\n\x15\x44rvUploadFileFileType\x12\x11\n\rFILE_TYPE_ALL\x10\x00\x12\x14\n\x10\x46ILE_TYPE_SYSLOG\x10\x01\x12\x14\n\x10\x46ILE_TYPE_NAVLOG\x10\x02\x12\x14\n\x10\x46ILE_TYPE_RTKLOG\x10\x03*R\n\x10\x44rvDevInfoResult\x12\x13\n\x0f\x44RV_RESULT_FAIL\x10\x00\x12\x12\n\x0e\x44RV_RESULT_SUC\x10\x01\x12\x15\n\x11\x44RV_RESULT_NOTSUP\x10\x02*p\n\x0csim_card_sta\x12\x0c\n\x08SIM_NONE\x10\x00\x12\x0f\n\x0bSIM_NO_CARD\x10\x01\x12\x0f\n\x0bSIM_INVALID\x10\x02\x12\x11\n\rSIM_INPUT_PIN\x10\x03\x12\x11\n\rSIM_INPUT_PUK\x10\x04\x12\n\n\x06SIM_OK\x10\x05*Z\n\x0emnet_link_type\x12\x12\n\x0eMNET_LINK_NONE\x10\x00\x12\x10\n\x0cMNET_LINK_2G\x10\x01\x12\x10\n\x0cMNET_LINK_3G\x10\x02\x12\x10\n\x0cMNET_LINK_4G\x10\x03*^\n\rapn_auth_type\x12\x11\n\rAPN_AUTH_NONE\x10\x00\x12\x10\n\x0c\x41PN_AUTH_PAP\x10\x01\x12\x11\n\rAPN_AUTH_CHAP\x10\x02\x12\x15\n\x11\x41PN_AUTH_PAP_CHAP\x10\x03*0\n\x08net_type\x12\x11\n\rNET_TYPE_WIFI\x10\x00\x12\x11\n\rNET_TYPE_MNET\x10\x01*Q\n\x10iot_conctrl_type\x12\x14\n\x10IOT_TYPE_OFFLINE\x10\x00\x12\x13\n\x0fIOT_TYPE_ONLINE\x10\x01\x12\x12\n\x0eIOT_TYPE_RESET\x10\x02\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fpymammotion/proto/dev_net.proto\"(\n\rDrvWifiUpload\x12\x17\n\x0fwifi_msg_upload\x18\x01 \x01(\x05\"&\n\x0b\x44rvWifiList\x12\x17\n\x0fnvs_wifi_upload\x18\x01 \x01(\x05\"H\n\nDrvWifiSet\x12\x13\n\x0b\x63onfigParam\x18\x01 \x01(\x05\x12\x10\n\x08\x43onfssid\x18\x02 \x01(\t\x12\x13\n\x0bwifi_enable\x18\x03 \x01(\x08\"\xa8\x01\n\nDrvWifiMsg\x12\x0f\n\x07status1\x18\x01 \x01(\x08\x12\x0f\n\x07status2\x18\x02 \x01(\x08\x12\n\n\x02ip\x18\x03 \x01(\t\x12\x0f\n\x07msgssid\x18\x04 \x01(\t\x12\x10\n\x08password\x18\x05 \x01(\t\x12\x0c\n\x04rssi\x18\x06 \x01(\x05\x12\x12\n\nproductkey\x18\x07 \x01(\t\x12\x12\n\ndevicename\x18\x08 \x01(\t\x12\x13\n\x0bwifi_enable\x18\t \x01(\x08\"?\n\x0b\x44rvWifiConf\x12\x10\n\x08succFlag\x18\x01 \x01(\x08\x12\x0c\n\x04\x63ode\x18\x02 \x01(\x05\x12\x10\n\x08\x43onfssid\x18\x03 \x01(\t\"\\\n\rDrvListUpload\x12\x0b\n\x03sum\x18\x01 \x01(\x05\x12\x0f\n\x07\x63urrent\x18\x02 \x01(\x05\x12\x0e\n\x06status\x18\x03 \x01(\x05\x12\x0f\n\x07Memssid\x18\x04 \x01(\t\x12\x0c\n\x04rssi\x18\x05 \x01(\x05\"Y\n\x10\x44rvUploadFileReq\x12\r\n\x05\x62izId\x18\x01 \x01(\t\x12\x0b\n\x03url\x18\x02 \x01(\t\x12\x0e\n\x06userId\x18\x03 \x01(\t\x12\x0b\n\x03num\x18\x04 \x01(\x05\x12\x0c\n\x04type\x18\x05 \x01(\x05\"$\n\x13\x44rvUploadFileCancel\x12\r\n\x05\x62izId\x18\x01 \x01(\t\"z\n\x15\x44rvUploadFileToAppReq\x12\r\n\x05\x62izId\x18\x01 \x01(\t\x12\x11\n\toperation\x18\x02 \x01(\x05\x12\x10\n\x08serverIp\x18\x03 \x01(\x07\x12\x12\n\nserverPort\x18\x04 \x01(\x05\x12\x0b\n\x03num\x18\x05 \x01(\x05\x12\x0c\n\x04type\x18\x06 \x01(\x05\"I\n\x15\x44rvUploadFileToAppRsp\x12\r\n\x05\x62izId\x18\x01 \x01(\t\x12\x11\n\toperation\x18\x02 \x01(\x05\x12\x0e\n\x06result\x18\x03 \x01(\x05\"+\n\x0f\x44rvDevInfoReqId\x12\n\n\x02id\x18\x01 \x01(\x05\x12\x0c\n\x04type\x18\x02 \x01(\x05\"Z\n\x10\x44rvDevInfoRespId\x12\n\n\x02id\x18\x01 \x01(\x05\x12\x0c\n\x04type\x18\x02 \x01(\x05\x12\x1e\n\x03res\x18\x03 \x01(\x0e\x32\x11.DrvDevInfoResult\x12\x0c\n\x04info\x18\x04 \x01(\t\"2\n\rDrvDevInfoReq\x12!\n\x07req_ids\x18\x01 \x03(\x0b\x32\x10.DrvDevInfoReqId\"5\n\x0e\x44rvDevInfoResp\x12#\n\x08resp_ids\x18\x01 \x03(\x0b\x32\x11.DrvDevInfoRespId\"\x9c\x01\n\x10\x44rvUpgradeReport\x12\x0f\n\x07\x64\x65vname\x18\x01 \x01(\t\x12\r\n\x05otaid\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\x12\x10\n\x08progress\x18\x04 \x01(\x05\x12\x0e\n\x06result\x18\x05 \x01(\x05\x12\x0f\n\x07message\x18\x06 \x01(\t\x12\x12\n\nproperties\x18\x07 \x01(\t\x12\x10\n\x08recv_cnt\x18\x08 \x01(\x05\"l\n\x13WifiIotStatusReport\x12\x16\n\x0ewifi_connected\x18\x01 \x01(\x08\x12\x15\n\riot_connected\x18\x02 \x01(\x08\x12\x12\n\nproductkey\x18\x03 \x01(\t\x12\x12\n\ndevicename\x18\x04 \x01(\t\"*\n\x0c\x42leTestBytes\x12\x0c\n\x04seqs\x18\x01 \x01(\x05\x12\x0c\n\x04\x64\x61ta\x18\x02 \x03(\x07\"$\n\x11GetNetworkInfoReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\"\x87\x01\n\x11GetNetworkInfoRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x11\n\twifi_ssid\x18\x02 \x01(\t\x12\x10\n\x08wifi_mac\x18\x03 \x01(\t\x12\x11\n\twifi_rssi\x18\x04 \x01(\x05\x12\n\n\x02ip\x18\x05 \x01(\x07\x12\x0c\n\x04mask\x18\x06 \x01(\x07\x12\x0f\n\x07gateway\x18\x07 \x01(\x07\"N\n\x10mnet_inet_status\x12\x0f\n\x07\x63onnect\x18\x01 \x01(\x08\x12\n\n\x02ip\x18\x02 \x01(\x07\x12\x0c\n\x04mask\x18\x03 \x01(\x07\x12\x0f\n\x07gateway\x18\x04 \x01(\x07\"\xd7\x01\n\x08MnetInfo\x12\r\n\x05model\x18\x01 \x01(\t\x12\x10\n\x08revision\x18\x02 \x01(\t\x12\x0c\n\x04imei\x18\x03 \x01(\t\x12\x1a\n\x03sim\x18\x04 \x01(\x0e\x32\r.sim_card_sta\x12\x0c\n\x04imsi\x18\x05 \x01(\t\x12\"\n\tlink_type\x18\x06 \x01(\x0e\x32\x0f.mnet_link_type\x12\x0c\n\x04rssi\x18\x07 \x01(\x05\x12\x1f\n\x04inet\x18\x08 \x01(\x0b\x32\x11.mnet_inet_status\x12\r\n\x05iccid\x18\t \x01(\t\x12\x10\n\x08operator\x18\n \x01(\t\"!\n\x0eGetMnetInfoReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\"J\n\x0eGetMnetInfoRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\x12\x17\n\x04mnet\x18\x03 \x01(\x0b\x32\t.MnetInfo\"}\n\x07MnetApn\x12\x0b\n\x03\x63id\x18\x01 \x01(\x05\x12\x11\n\tapn_alias\x18\x02 \x01(\t\x12\x10\n\x08\x61pn_name\x18\x03 \x01(\t\x12\x1c\n\x04\x61uth\x18\x04 \x01(\x0e\x32\x0e.apn_auth_type\x12\x10\n\x08username\x18\x05 \x01(\t\x12\x10\n\x08password\x18\x06 \x01(\t\"9\n\nMnetApnCfg\x12\x14\n\x0c\x61pn_used_idx\x18\x01 \x01(\x05\x12\x15\n\x03\x61pn\x18\x02 \x03(\x0b\x32\x08.MnetApn\">\n\rMnetApnSetCfg\x12\x13\n\x0buse_default\x18\x01 \x01(\x08\x12\x18\n\x03\x63\x66g\x18\x02 \x01(\x0b\x32\x0b.MnetApnCfg\"~\n\x07MnetCfg\x12\x13\n\x0bmnet_enable\x18\x01 \x01(\x08\x12\x13\n\x0binet_enable\x18\x02 \x01(\x08\x12\x17\n\x04type\x18\x03 \x01(\x0e\x32\t.net_type\x12\x1b\n\x03\x61pn\x18\x04 \x01(\x0b\x32\x0e.MnetApnSetCfg\x12\x13\n\x0b\x61uto_select\x18\x05 \x01(\x08\" \n\rGetMnetCfgReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\"G\n\rGetMnetCfgRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\x12\x15\n\x03\x63\x66g\x18\x03 \x01(\x0b\x32\x08.MnetCfg\"7\n\rSetMnetCfgReq\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x15\n\x03\x63\x66g\x18\x02 \x01(\x0b\x32\x08.MnetCfg\"0\n\rSetMnetCfgRsp\x12\x0f\n\x07req_ids\x18\x01 \x01(\x05\x12\x0e\n\x06result\x18\x02 \x01(\x05\"N\n\x0e\x44rvDebugDdsZmq\x12\x11\n\tis_enable\x18\x01 \x01(\x08\x12\x15\n\rrx_topic_name\x18\x02 \x01(\t\x12\x12\n\ntx_zmq_url\x18\x03 \x01(\t\"!\n\x0cSetDrvBleMTU\x12\x11\n\tmtu_count\x18\x01 \x01(\x05\">\n\x0f\x42leSignatureReq\x12\x16\n\x0esignature_data\x18\x01 \x01(\t\x12\x13\n\x0brandom_data\x18\x02 \x01(\t\"\xb0\x01\n\x1a\x42leLogUploadUpdateProgress\x12\x0b\n\x03ver\x18\x01 \x01(\x05\x12\x0e\n\x06status\x18\x02 \x01(\x05\x12\r\n\x05\x62izId\x18\x03 \x01(\t\x12\x0c\n\x04prog\x18\x04 \x01(\x05\x12\x0f\n\x07subProg\x18\x05 \x01(\x05\x12\x0c\n\x04\x66Num\x18\x06 \x01(\x05\x12\r\n\x05speed\x18\x07 \x01(\x05\x12\x0c\n\x04\x66Idx\x18\x08 \x01(\x05\x12\r\n\x05\x66Path\x18\t \x01(\t\x12\r\n\x05\x66Size\x18\n \x01(\x05\"\xcb\x0b\n\x06\x44\x65vNet\x12\x18\n\x0etodev_ble_sync\x18\x01 \x01(\x05H\x00\x12\'\n\x0etodev_ConfType\x18\x02 \x01(\x0e\x32\r.WifiConfTypeH\x00\x12-\n\x13todev_WifiMsgUpload\x18\x03 \x01(\x0b\x32\x0e.DrvWifiUploadH\x00\x12,\n\x14todev_WifiListUpload\x18\x04 \x01(\x0b\x32\x0c.DrvWifiListH\x00\x12/\n\x18todev_Wifi_Configuration\x18\x05 \x01(\x0b\x32\x0b.DrvWifiSetH\x00\x12$\n\rtoapp_WifiMsg\x18\x06 \x01(\x0b\x32\x0b.DrvWifiMsgH\x00\x12&\n\x0etoapp_WifiConf\x18\x07 \x01(\x0b\x32\x0c.DrvWifiConfH\x00\x12*\n\x10toapp_ListUpload\x18\x08 \x01(\x0b\x32\x0e.DrvListUploadH\x00\x12/\n\x12todev_req_log_info\x18\t \x01(\x0b\x32\x11.DrvUploadFileReqH\x00\x12\x35\n\x15todev_log_data_cancel\x18\n \x01(\x0b\x32\x14.DrvUploadFileCancelH\x00\x12+\n\x11todev_devinfo_req\x18\x0b \x01(\x0b\x32\x0e.DrvDevInfoReqH\x00\x12-\n\x12toapp_devinfo_resp\x18\x0c \x01(\x0b\x32\x0f.DrvDevInfoRespH\x00\x12\x31\n\x14toapp_upgrade_report\x18\r \x01(\x0b\x32\x11.DrvUpgradeReportH\x00\x12\x35\n\x15toapp_wifi_iot_status\x18\x0e \x01(\x0b\x32\x14.WifiIotStatusReportH\x00\x12\x36\n\x14todev_uploadfile_req\x18\x0f \x01(\x0b\x32\x16.DrvUploadFileToAppReqH\x00\x12\x36\n\x14toapp_uploadfile_rsp\x18\x10 \x01(\x0b\x32\x16.DrvUploadFileToAppRspH\x00\x12\x33\n\x15todev_networkinfo_req\x18\x11 \x01(\x0b\x32\x12.GetNetworkInfoReqH\x00\x12\x33\n\x15toapp_networkinfo_rsp\x18\x12 \x01(\x0b\x32\x12.GetNetworkInfoRspH\x00\x12%\n\x0c\x62ir_testdata\x18\x13 \x01(\x0b\x32\r.BleTestBytesH\x00\x12.\n\x13todev_mnet_info_req\x18\x14 \x01(\x0b\x32\x0f.GetMnetInfoReqH\x00\x12.\n\x13toapp_mnet_info_rsp\x18\x15 \x01(\x0b\x32\x0f.GetMnetInfoRspH\x00\x12\x30\n\x16todev_get_mnet_cfg_req\x18\x16 \x01(\x0b\x32\x0e.GetMnetCfgReqH\x00\x12\x30\n\x16toapp_get_mnet_cfg_rsp\x18\x17 \x01(\x0b\x32\x0e.GetMnetCfgRspH\x00\x12\x30\n\x16todev_set_mnet_cfg_req\x18\x18 \x01(\x0b\x32\x0e.SetMnetCfgReqH\x00\x12\x30\n\x16toapp_set_mnet_cfg_rsp\x18\x19 \x01(\x0b\x32\x0e.SetMnetCfgRspH\x00\x12,\n\x11todev_set_dds2zmq\x18\x1a \x01(\x0b\x32\x0f.DrvDebugDdsZmqH\x00\x12*\n\x11todev_set_ble_mtu\x18\x1b \x01(\x0b\x32\r.SetDrvBleMTUH\x00\x12\x36\n\x19todev_set_iot_offline_req\x18\x1c \x01(\x0e\x32\x11.iot_conctrl_typeH\x00\x12\x36\n\x1atodev_verify_signature_req\x18\x1d \x01(\x0b\x32\x10.BleSignatureReqH\x00\x12G\n toapp_log_upload_update_progress\x18\x1e \x01(\x0b\x32\x1b.BleLogUploadUpdateProgressH\x00\x42\x0c\n\nNetSubType*l\n\x0cWifiConfType\x12\x12\n\x0e\x44isconnectWifi\x10\x00\x12\x0e\n\nForgetWifi\x10\x01\x12\x15\n\x11\x44irectConnectWifi\x10\x02\x12\x11\n\rReconnectWifi\x10\x03\x12\x0e\n\nset_enable\x10\x04*l\n\x15\x44rvUploadFileFileType\x12\x11\n\rFILE_TYPE_ALL\x10\x00\x12\x14\n\x10\x46ILE_TYPE_SYSLOG\x10\x01\x12\x14\n\x10\x46ILE_TYPE_NAVLOG\x10\x02\x12\x14\n\x10\x46ILE_TYPE_RTKLOG\x10\x03*R\n\x10\x44rvDevInfoResult\x12\x13\n\x0f\x44RV_RESULT_FAIL\x10\x00\x12\x12\n\x0e\x44RV_RESULT_SUC\x10\x01\x12\x15\n\x11\x44RV_RESULT_NOTSUP\x10\x02*p\n\x0csim_card_sta\x12\x0c\n\x08SIM_NONE\x10\x00\x12\x0f\n\x0bSIM_NO_CARD\x10\x01\x12\x0f\n\x0bSIM_INVALID\x10\x02\x12\x11\n\rSIM_INPUT_PIN\x10\x03\x12\x11\n\rSIM_INPUT_PUK\x10\x04\x12\n\n\x06SIM_OK\x10\x05*Z\n\x0emnet_link_type\x12\x12\n\x0eMNET_LINK_NONE\x10\x00\x12\x10\n\x0cMNET_LINK_2G\x10\x01\x12\x10\n\x0cMNET_LINK_3G\x10\x02\x12\x10\n\x0cMNET_LINK_4G\x10\x03*^\n\rapn_auth_type\x12\x11\n\rAPN_AUTH_NONE\x10\x00\x12\x10\n\x0c\x41PN_AUTH_PAP\x10\x01\x12\x11\n\rAPN_AUTH_CHAP\x10\x02\x12\x15\n\x11\x41PN_AUTH_PAP_CHAP\x10\x03*0\n\x08net_type\x12\x11\n\rNET_TYPE_WIFI\x10\x00\x12\x11\n\rNET_TYPE_MNET\x10\x01*Q\n\x10iot_conctrl_type\x12\x14\n\x10IOT_TYPE_OFFLINE\x10\x00\x12\x13\n\x0fIOT_TYPE_ONLINE\x10\x01\x12\x12\n\x0eIOT_TYPE_RESET\x10\x02\x62\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'pymammotion.proto.dev_net_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-  _WIFICONFTYPE._serialized_start=4391
-  _WIFICONFTYPE._serialized_end=4499
-  _DRVUPLOADFILEFILETYPE._serialized_start=4501
-  _DRVUPLOADFILEFILETYPE._serialized_end=4609
-  _DRVDEVINFORESULT._serialized_start=4611
-  _DRVDEVINFORESULT._serialized_end=4693
-  _SIM_CARD_STA._serialized_start=4695
-  _SIM_CARD_STA._serialized_end=4807
-  _MNET_LINK_TYPE._serialized_start=4809
-  _MNET_LINK_TYPE._serialized_end=4899
-  _APN_AUTH_TYPE._serialized_start=4901
-  _APN_AUTH_TYPE._serialized_end=4995
-  _NET_TYPE._serialized_start=4997
-  _NET_TYPE._serialized_end=5045
-  _IOT_CONCTRL_TYPE._serialized_start=5047
-  _IOT_CONCTRL_TYPE._serialized_end=5128
+  _WIFICONFTYPE._serialized_start=4427
+  _WIFICONFTYPE._serialized_end=4535
+  _DRVUPLOADFILEFILETYPE._serialized_start=4537
+  _DRVUPLOADFILEFILETYPE._serialized_end=4645
+  _DRVDEVINFORESULT._serialized_start=4647
+  _DRVDEVINFORESULT._serialized_end=4729
+  _SIM_CARD_STA._serialized_start=4731
+  _SIM_CARD_STA._serialized_end=4843
+  _MNET_LINK_TYPE._serialized_start=4845
+  _MNET_LINK_TYPE._serialized_end=4935
+  _APN_AUTH_TYPE._serialized_start=4937
+  _APN_AUTH_TYPE._serialized_end=5031
+  _NET_TYPE._serialized_start=5033
+  _NET_TYPE._serialized_end=5081
+  _IOT_CONCTRL_TYPE._serialized_start=5083
+  _IOT_CONCTRL_TYPE._serialized_end=5164
   _DRVWIFIUPLOAD._serialized_start=35
   _DRVWIFIUPLOAD._serialized_end=75
   _DRVWIFILIST._serialized_start=77
@@ -65,47 +65,47 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _DRVDEVINFORESP._serialized_start=1038
   _DRVDEVINFORESP._serialized_end=1091
   _DRVUPGRADEREPORT._serialized_start=1094
-  _DRVUPGRADEREPORT._serialized_end=1232
-  _WIFIIOTSTATUSREPORT._serialized_start=1234
-  _WIFIIOTSTATUSREPORT._serialized_end=1342
-  _BLETESTBYTES._serialized_start=1344
-  _BLETESTBYTES._serialized_end=1386
-  _GETNETWORKINFOREQ._serialized_start=1388
-  _GETNETWORKINFOREQ._serialized_end=1424
-  _GETNETWORKINFORSP._serialized_start=1427
-  _GETNETWORKINFORSP._serialized_end=1562
-  _MNET_INET_STATUS._serialized_start=1564
-  _MNET_INET_STATUS._serialized_end=1642
-  _MNETINFO._serialized_start=1645
-  _MNETINFO._serialized_end=1842
-  _GETMNETINFOREQ._serialized_start=1844
-  _GETMNETINFOREQ._serialized_end=1877
-  _GETMNETINFORSP._serialized_start=1879
-  _GETMNETINFORSP._serialized_end=1953
-  _MNETAPN._serialized_start=1955
-  _MNETAPN._serialized_end=2080
-  _MNETAPNCFG._serialized_start=2082
-  _MNETAPNCFG._serialized_end=2139
-  _MNETAPNSETCFG._serialized_start=2141
-  _MNETAPNSETCFG._serialized_end=2203
-  _MNETCFG._serialized_start=2205
-  _MNETCFG._serialized_end=2331
-  _GETMNETCFGREQ._serialized_start=2333
-  _GETMNETCFGREQ._serialized_end=2365
-  _GETMNETCFGRSP._serialized_start=2367
-  _GETMNETCFGRSP._serialized_end=2438
-  _SETMNETCFGREQ._serialized_start=2440
-  _SETMNETCFGREQ._serialized_end=2495
-  _SETMNETCFGRSP._serialized_start=2497
-  _SETMNETCFGRSP._serialized_end=2545
-  _DRVDEBUGDDSZMQ._serialized_start=2547
-  _DRVDEBUGDDSZMQ._serialized_end=2625
-  _SETDRVBLEMTU._serialized_start=2627
-  _SETDRVBLEMTU._serialized_end=2660
-  _BLESIGNATUREREQ._serialized_start=2662
-  _BLESIGNATUREREQ._serialized_end=2724
-  _BLELOGUPLOADUPDATEPROGRESS._serialized_start=2727
-  _BLELOGUPLOADUPDATEPROGRESS._serialized_end=2903
-  _DEVNET._serialized_start=2906
-  _DEVNET._serialized_end=4389
+  _DRVUPGRADEREPORT._serialized_end=1250
+  _WIFIIOTSTATUSREPORT._serialized_start=1252
+  _WIFIIOTSTATUSREPORT._serialized_end=1360
+  _BLETESTBYTES._serialized_start=1362
+  _BLETESTBYTES._serialized_end=1404
+  _GETNETWORKINFOREQ._serialized_start=1406
+  _GETNETWORKINFOREQ._serialized_end=1442
+  _GETNETWORKINFORSP._serialized_start=1445
+  _GETNETWORKINFORSP._serialized_end=1580
+  _MNET_INET_STATUS._serialized_start=1582
+  _MNET_INET_STATUS._serialized_end=1660
+  _MNETINFO._serialized_start=1663
+  _MNETINFO._serialized_end=1878
+  _GETMNETINFOREQ._serialized_start=1880
+  _GETMNETINFOREQ._serialized_end=1913
+  _GETMNETINFORSP._serialized_start=1915
+  _GETMNETINFORSP._serialized_end=1989
+  _MNETAPN._serialized_start=1991
+  _MNETAPN._serialized_end=2116
+  _MNETAPNCFG._serialized_start=2118
+  _MNETAPNCFG._serialized_end=2175
+  _MNETAPNSETCFG._serialized_start=2177
+  _MNETAPNSETCFG._serialized_end=2239
+  _MNETCFG._serialized_start=2241
+  _MNETCFG._serialized_end=2367
+  _GETMNETCFGREQ._serialized_start=2369
+  _GETMNETCFGREQ._serialized_end=2401
+  _GETMNETCFGRSP._serialized_start=2403
+  _GETMNETCFGRSP._serialized_end=2474
+  _SETMNETCFGREQ._serialized_start=2476
+  _SETMNETCFGREQ._serialized_end=2531
+  _SETMNETCFGRSP._serialized_start=2533
+  _SETMNETCFGRSP._serialized_end=2581
+  _DRVDEBUGDDSZMQ._serialized_start=2583
+  _DRVDEBUGDDSZMQ._serialized_end=2661
+  _SETDRVBLEMTU._serialized_start=2663
+  _SETDRVBLEMTU._serialized_end=2696
+  _BLESIGNATUREREQ._serialized_start=2698
+  _BLESIGNATUREREQ._serialized_end=2760
+  _BLELOGUPLOADUPDATEPROGRESS._serialized_start=2763
+  _BLELOGUPLOADUPDATEPROGRESS._serialized_end=2939
+  _DEVNET._serialized_start=2942
+  _DEVNET._serialized_end=4425
 # @@protoc_insertion_point(module_scope)

pymammotion/proto/dev_net_pb2.pyi

@@ -198,12 +198,13 @@ class DrvListUpload(_message.Message):
     def __init__(self, sum: _Optional[int] = ..., current: _Optional[int] = ..., status: _Optional[int] = ..., Memssid: _Optional[str] = ..., rssi: _Optional[int] = ...) -> None: ...
 
 class DrvUpgradeReport(_message.Message):
-    __slots__ = ["devname", "message", "otaid", "progress", "properties", "result", "version"]
+    __slots__ = ["devname", "message", "otaid", "progress", "properties", "recv_cnt", "result", "version"]
     DEVNAME_FIELD_NUMBER: _ClassVar[int]
     MESSAGE_FIELD_NUMBER: _ClassVar[int]
     OTAID_FIELD_NUMBER: _ClassVar[int]
     PROGRESS_FIELD_NUMBER: _ClassVar[int]
     PROPERTIES_FIELD_NUMBER: _ClassVar[int]
+    RECV_CNT_FIELD_NUMBER: _ClassVar[int]
     RESULT_FIELD_NUMBER: _ClassVar[int]
     VERSION_FIELD_NUMBER: _ClassVar[int]
     devname: str
@@ -211,9 +212,10 @@ class DrvUpgradeReport(_message.Message):
     otaid: str
     progress: int
     properties: str
+    recv_cnt: int
     result: int
     version: str
-    def __init__(self, devname: _Optional[str] = ..., otaid: _Optional[str] = ..., version: _Optional[str] = ..., progress: _Optional[int] = ..., result: _Optional[int] = ..., message: _Optional[str] = ..., properties: _Optional[str] = ...) -> None: ...
+    def __init__(self, devname: _Optional[str] = ..., otaid: _Optional[str] = ..., version: _Optional[str] = ..., progress: _Optional[int] = ..., result: _Optional[int] = ..., message: _Optional[str] = ..., properties: _Optional[str] = ..., recv_cnt: _Optional[int] = ...) -> None: ...
 
 class DrvUploadFileCancel(_message.Message):
     __slots__ = ["bizId"]
@@ -418,13 +420,14 @@ class MnetCfg(_message.Message):
     def __init__(self, mnet_enable: bool = ..., inet_enable: bool = ..., type: _Optional[_Union[net_type, str]] = ..., apn: _Optional[_Union[MnetApnSetCfg, _Mapping]] = ..., auto_select: bool = ...) -> None: ...
 
 class MnetInfo(_message.Message):
-    __slots__ = ["iccid", "imei", "imsi", "inet", "link_type", "model", "revision", "rssi", "sim"]
+    __slots__ = ["iccid", "imei", "imsi", "inet", "link_type", "model", "operator", "revision", "rssi", "sim"]
     ICCID_FIELD_NUMBER: _ClassVar[int]
     IMEI_FIELD_NUMBER: _ClassVar[int]
     IMSI_FIELD_NUMBER: _ClassVar[int]
     INET_FIELD_NUMBER: _ClassVar[int]
     LINK_TYPE_FIELD_NUMBER: _ClassVar[int]
     MODEL_FIELD_NUMBER: _ClassVar[int]
+    OPERATOR_FIELD_NUMBER: _ClassVar[int]
     REVISION_FIELD_NUMBER: _ClassVar[int]
     RSSI_FIELD_NUMBER: _ClassVar[int]
     SIM_FIELD_NUMBER: _ClassVar[int]
@@ -434,10 +437,11 @@ class MnetInfo(_message.Message):
     inet: mnet_inet_status
     link_type: mnet_link_type
     model: str
+    operator: str
     revision: str
     rssi: int
     sim: sim_card_sta
-    def __init__(self, model: _Optional[str] = ..., revision: _Optional[str] = ..., imei: _Optional[str] = ..., sim: _Optional[_Union[sim_card_sta, str]] = ..., imsi: _Optional[str] = ..., link_type: _Optional[_Union[mnet_link_type, str]] = ..., rssi: _Optional[int] = ..., inet: _Optional[_Union[mnet_inet_status, _Mapping]] = ..., iccid: _Optional[str] = ...) -> None: ...
+    def __init__(self, model: _Optional[str] = ..., revision: _Optional[str] = ..., imei: _Optional[str] = ..., sim: _Optional[_Union[sim_card_sta, str]] = ..., imsi: _Optional[str] = ..., link_type: _Optional[_Union[mnet_link_type, str]] = ..., rssi: _Optional[int] = ..., inet: _Optional[_Union[mnet_inet_status, _Mapping]] = ..., iccid: _Optional[str] = ..., operator: _Optional[str] = ...) -> None: ...
 
 class SetDrvBleMTU(_message.Message):
     __slots__ = ["mtu_count"]

pymammotion/proto/luba_mul.proto

@@ -8,7 +8,8 @@ enum MUL_LANGUAGE {
   SPANISH = 4;
   PORTUGUESE = 5;
   DUTCH = 6;
-  NONE_LAN = 7;
+  SWEDISH = 7;
+  NONE_LAN = 8;
 }
 
 enum MUL_SEX {
@@ -30,7 +31,6 @@ enum MUL_VIDEO_ERROR_CODE {
   NETWORK_NOT_AVAILABLE = 2;
   CREATE_CHANNEL_FAILED = 3;
   PARAM_INVAILD = 4;
-  CELLULAR_RESTRICTION = 5;
 }
 
 enum MUL_WIPER_ERROR_CODE {