pymammotion 0.2.62__py3-none-any.whl → 0.5.51__py3-none-any.whl

pymammotion/mammotion/commands/messages/media.py

@@ -2,33 +2,86 @@
 from abc import ABC
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.proto import luba_msg_pb2, luba_mul_pb2
-from pymammotion.proto.luba_msg import MsgCmdType, MsgDevice
-from pymammotion.proto.luba_mul import MUL_LANGUAGE
+from pymammotion.proto import (
+    GetHeadlamp,
+    LampCtrlSta,
+    LampManualCtrlSta,
+    LubaMsg,
+    MsgAttr,
+    MsgCmdType,
+    MsgDevice,
+    MulLanguage,
+    MulSetAudio,
+    MulSetWiper,
+    MulSex,
+    SetHeadlamp,
+    SocMul,
+)
 
 
 class MessageMedia(AbstractMessage, ABC):
     def send_order_msg_media(self, mul):
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MSG_CMD_TYPE_MUL,
-            sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
-            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
-            seqs=1,
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.MUL,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=self.get_msg_device(MsgCmdType.MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
+            msgattr=MsgAttr.REQ,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             mul=mul,
         )
 
         return luba_msg.SerializeToString()
 
     def set_car_volume(self, volume: int):
-        return self.send_order_msg_media(luba_mul_pb2.SocMul(set_audio=luba_mul_pb2.MulSetAudio(at_switch=volume)))
+        """Set the car volume. 0 - 100"""
+        return self.send_order_msg_media(SocMul(set_audio=MulSetAudio(at_switch=volume)))
 
-    def set_car_voice_language(self, language_type: MUL_LANGUAGE | str | None):
+    def set_car_voice_language(self, language_type: MulLanguage | str | None):
+        return self.send_order_msg_media(SocMul(set_audio=MulSetAudio(au_language=language_type)))
+
+    def set_car_volume_sex(self, sex: MulSex):
+        return self.send_order_msg_media(SocMul(set_audio=MulSetAudio(sex=sex)))
+
+    def set_car_wiper(self, round_num: int):
+        """Set mower wiper."""
+        # 2
+        return self.send_order_msg_media(SocMul(set_wiper=MulSetWiper(round=round_num)))
+
+    def get_car_light(self, ids: int):
+        """Get mower light settings.
+        1126 for manual
+        1123 for night time settings
+        """
+        return self.send_order_msg_media(SocMul(get_lamp=GetHeadlamp(get_ids=ids)))
+
+    def set_car_light(self, on_off: bool = False):
+        """Set mower light.
+
+        set whether light is on during the night during mowing
+        auto night on true, id=1121, power_ctrl=1
+        auto night off false, id=1121, power_ctrl=1
+        """
+
+        ctrl_state = LampCtrlSta.power_ctrl_on if on_off else LampCtrlSta.power_off
         return self.send_order_msg_media(
-            luba_mul_pb2.SocMul(set_audio=luba_mul_pb2.MulSetAudio(au_language=language_type))
+            SocMul(
+                set_lamp=SetHeadlamp(
+                    set_ids=1121, lamp_power_ctrl=1, lamp_ctrl=ctrl_state, ctrl_lamp_bright=False, lamp_bright=0
+                )
+            )
         )
 
-    def set_car_wiper(self, round_num: int):
-        return self.send_order_msg_media(luba_mul_pb2.SocMul(set_wiper=luba_mul_pb2.MulSetWiper(round=round_num)))
+    def set_car_manual_light(self, manual_ctrl: bool = False):
+        """Set mower light.
+
+        set whether light is on manually
+        manual on: true, id=1125, power_ctrl=2
+        manual off: false, id=1127, power_ctrl=2
+        """
+        ids = 1125 if manual_ctrl else 1127
+        manual_light_ctrl = LampManualCtrlSta.manual_power_on if manual_ctrl else LampManualCtrlSta.manual_power_off
+        return self.send_order_msg_media(
+            SocMul(set_lamp=SetHeadlamp(set_ids=ids, lamp_power_ctrl=2, lamp_manual_ctrl=manual_light_ctrl))
+        )

pymammotion/mammotion/commands/messages/navigation.py

@@ -1,16 +1,19 @@
 # === sendOrderMsg_Nav ===
+from abc import ABC
 import logging
 import time
-from abc import ABC
 
 from pymammotion.data.model import GenerateRouteInformation
-from pymammotion.data.model.plan import Plan
+from pymammotion.data.model.hash_list import Plan
 from pymammotion.data.model.region_data import RegionData
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.proto.luba_msg import LubaMsg, MsgAttr, MsgCmdType, MsgDevice
-from pymammotion.proto.mctrl_nav import (
+from pymammotion.proto import (
     AppRequestCoverPathsT,
+    LubaMsg,
     MctlNav,
+    MsgAttr,
+    MsgCmdType,
+    MsgDevice,
     NavGetCommData,
     NavGetHashList,
     NavMapNameMsg,
@@ -30,24 +33,24 @@ logger = logging.getLogger(__name__)
 
 
 class MessageNavigation(AbstractMessage, ABC):
-    def send_order_msg_nav(self, build) -> bytes:
+    def send_order_msg_nav(self, build: MctlNav) -> bytes:
         luba_msg = LubaMsg(
-            msgtype=MsgCmdType.MSG_CMD_TYPE_NAV,
+            msgtype=MsgCmdType.NAV,
             sender=MsgDevice.DEV_MOBILEAPP,
-            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_NAV, MsgDevice.DEV_MAINCTL),
-            msgattr=MsgAttr.MSG_ATTR_REQ,
-            seqs=1,
+            rcver=self.get_msg_device(MsgCmdType.NAV, MsgDevice.DEV_MAINCTL),
+            msgattr=MsgAttr.REQ,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             nav=build,
             timestamp=round(time.time() * 1000),
         )
 
         return luba_msg.SerializeToString()
 
-    def allpowerfull_rw_adapter_x3(self, id: int, context: int, rw: int) -> bytes:
-        build = MctlNav(nav_sys_param_cmd=NavSysParamMsg(id=id, context=context, rw=rw))
-        logger.debug(f"Send command--9 general read and write command id={id}, context={context}, rw={rw}")
+    def allpowerfull_rw_adapter_x3(self, rw_id: int, context: int, rw: int) -> bytes:
+        build = MctlNav(nav_sys_param_cmd=NavSysParamMsg(id=rw_id, context=context, rw=rw))
+        logger.debug(f"Send command--x3 general read and write command id={rw_id}, context={context}, rw={rw}")
         return self.send_order_msg_nav(build)
 
     def along_border(self) -> bytes:
@@ -203,9 +206,9 @@ class MessageNavigation(AbstractMessage, ABC):
             reserved=plan_bean.reserved,
             weeks=plan_bean.weeks,
             start_date=plan_bean.start_date,
-            trigger_type=plan_bean.job_type,
-            day=plan_bean.interval_days,
-            toward_included_angle=plan_bean.demond_angle,
+            trigger_type=plan_bean.trigger_type,
+            day=plan_bean.day,
+            toward_included_angle=plan_bean.toward_included_angle,
             toward_mode=0,
         )
         logger.debug(f"Send read job plan command planBean={plan_bean}")
@@ -242,6 +245,35 @@ class MessageNavigation(AbstractMessage, ABC):
         logger.debug(f"Send command--Read plan time {sub_cmd}")
         return self.send_order_msg_nav(build2)
 
+    def read_job_not_not_disturb(self) -> bytes:
+        build = NavUnableTimeSet(sub_cmd=2)
+        build2 = MctlNav(todev_unable_time_set=build)
+        logger.debug(f"Send command--Read job dnd {2}")
+        return self.send_order_msg_nav(build2)
+
+    def job_animal_protect_read(self) -> bytes:
+        """Read animal protection settings."""
+        build = NavUnableTimeSet(sub_cmd=2, trigger=99)
+        build2 = MctlNav(todev_unable_time_set=build)
+        logger.debug(f"Send command - Read job do not disturb time subCmd2 {build}")
+        return self.send_order_msg_nav(build2)
+
+    def job_do_not_disturb(self, unable_start_time: str, unable_end_time: str) -> bytes:
+        """Set do not disturb time period."""
+        build = MctlNav(
+            todev_unable_time_set=NavUnableTimeSet(
+                sub_cmd=1, trigger=1, unable_start_time=unable_start_time, unable_end_time=unable_end_time
+            )
+        )
+        logger.debug(f"Send command - Set job do not disturb time: {unable_start_time} - {unable_end_time}")
+        return self.send_order_msg_nav(build)
+
+    def job_do_not_disturb_del(self) -> bytes:
+        """Delete do not disturb settings."""
+        build = MctlNav(todev_unable_time_set=NavUnableTimeSet(sub_cmd=1, trigger=0))
+        logger.debug("Send command - Turn off do not disturb time")
+        return self.send_order_msg_nav(build)
+
     def query_job_history(self) -> bytes:
         return self.send_order_msg_nav(MctlNav(todev_work_report_update_cmd=WorkReportUpdateCmd(sub_cmd=1)))
 
@@ -259,7 +291,7 @@ class MessageNavigation(AbstractMessage, ABC):
             toapp_map_name_msg=NavMapNameMsg(
                 hash=0,
                 result=0,
-                device_id=device_id,  # iotId or ???
+                device_id=device_id,  # iot_id
                 rw=0,
             )
         )
@@ -268,7 +300,7 @@ class MessageNavigation(AbstractMessage, ABC):
         logger.debug("Send command--Get area name list")
         return self.send_order_msg_nav(mctl_nav)
 
-    def set_area_name(self, device_id, hash_id: int, name: str) -> bytes:
+    def set_area_name(self, device_id: str, hash_id: int, name: str) -> bytes:
         # Build the NavMapNameMsg with the specified parameters
         mctl_nav = MctlNav(
             toapp_map_name_msg=NavMapNameMsg(hash=hash_id, name=name, result=0, device_id=device_id, rw=1)
@@ -280,7 +312,7 @@ class MessageNavigation(AbstractMessage, ABC):
 
     def get_all_boundary_hash_list(self, sub_cmd: int) -> bytes:
         build = MctlNav(todev_gethash=NavGetHashList(pver=1, sub_cmd=sub_cmd))
-        logger.debug(f"Area loading=====================:Get area hash list++Bluetooth:{sub_cmd}")
+        logger.debug(f"Area loading=====================:Get area hash list:{sub_cmd}")
         return self.send_order_msg_nav(build)
 
     def get_hash_response(self, total_frame: int, current_frame: int) -> bytes:
@@ -294,7 +326,7 @@ class MessageNavigation(AbstractMessage, ABC):
 
     def synchronize_hash_data(self, hash_num: int) -> bytes:
         build = MctlNav(todev_get_commondata=NavGetCommData(pver=1, action=8, hash=hash_num, sub_cmd=1))
-        logger.debug(f"Send command--209,hash synchronize area data hash:{hash}")
+        logger.debug(f"Send command--209,hash synchronize area data hash:{hash_num}")
         return self.send_order_msg_nav(build)
 
     def get_area_to_be_transferred(self) -> bytes:
@@ -327,9 +359,9 @@ class MessageNavigation(AbstractMessage, ABC):
         logger.debug(f"Send command--Send tool command id={param_id},values={values}")
         return self.send_order_msg_nav(build)
 
-    def end_draw_border(self, type: int) -> bytes:
+    def end_draw_border(self, type: int) -> bytes | None:
         if type == -1:
-            return
+            return None
         build = MctlNav(todev_get_commondata=NavGetCommData(pver=1, action=1, type=type))
         logger.debug(f"Send command--End drawing boundary, obstacle, channel command type={type}")
         return self.send_order_msg_nav(build)
@@ -339,9 +371,9 @@ class MessageNavigation(AbstractMessage, ABC):
         logger.debug("Send command--Cancel current recording (boundary, obstacle)")
         return self.send_order_msg_nav(build)
 
-    def delete_map_elements(self, type: int, hash_num: int) -> bytes:
+    def delete_map_elements(self, type: int, hash_num: int) -> bytes | None:
         if type == -1:
-            return
+            return None
         build = MctlNav(todev_get_commondata=NavGetCommData(pver=1, action=6, type=type, hash=hash_num))
         logger.debug(f"Send command--Delete boundary or obstacle or channel command type={type},hash={hash}")
         return self.send_order_msg_nav(build)
@@ -387,7 +419,7 @@ class MessageNavigation(AbstractMessage, ABC):
         generate_route_information}")
         return self.send_order_msg_nav(MctlNav(bidire_reqconver_path=build))
 
-    def modify_generate_route_information(self, generate_route_information: GenerateRouteInformation) -> bytes:
+    def modify_route_information(self, generate_route_information: GenerateRouteInformation) -> bytes:
         logger.debug(f"Generate route data source: {generate_route_information}")
         build = NavReqCoverPath(
             pver=1,
@@ -429,7 +461,11 @@ class MessageNavigation(AbstractMessage, ABC):
         return self.send_order_msg_nav(build)
 
     def get_line_info_list(self, hash_list: list[int], transaction_id: int) -> bytes:
+        """Get route information (mow path) corresponding to the specified hash list based on time.
+        e.g transaction_id = int(time.time() * 1000)
+        """
         logger.debug(f"Sending==========Get route command: {hash_list}")
+
         build = MctlNav(
             app_request_cover_paths=AppRequestCoverPathsT(
                 pver=1, hash_list=hash_list, transaction_id=transaction_id, sub_cmd=0

pymammotion/mammotion/commands/messages/network.py

@@ -1,60 +1,81 @@
 # === sendOrderMsg_Net  ===
-from pymammotion import logger
-from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
-from pymammotion.proto import dev_net_pb2, luba_msg_pb2
-
-
-class MessageNetwork:
-    messageNavigation: MessageNavigation = MessageNavigation()
+from abc import ABC
+import time
 
-    @staticmethod
-    def send_order_msg_net(build) -> bytes:
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MSG_CMD_TYPE_ESP,
-            sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=luba_msg_pb2.DEV_COMM_ESP,
-            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
-            seqs=1,
+from pymammotion import logger
+from pymammotion.mammotion.commands.abstract_message import AbstractMessage
+from pymammotion.proto import (
+    DevNet,
+    DrvDebugDdsZmq,
+    DrvDevInfoReq,
+    DrvDevInfoReqId,
+    DrvUploadFileCancel,
+    DrvUploadFileReq,
+    DrvUploadFileToAppReq,
+    DrvWifiList,
+    DrvWifiSet,
+    DrvWifiUpload,
+    GetNetworkInfoReq,
+    IotConctrlType,
+    LubaMsg,
+    MnetCfg,
+    MsgAttr,
+    MsgCmdType,
+    MsgDevice,
+    NetType,
+    SetMnetCfgReq,
+)
+
+
+class MessageNetwork(AbstractMessage, ABC):
+    def send_order_msg_net(self, build: DevNet) -> bytes:
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.ESP,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=MsgDevice.DEV_COMM_ESP,
+            msgattr=MsgAttr.REQ,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             net=build,
+            timestamp=round(time.time() * 1000),
         )
 
         return luba_msg.SerializeToString()
 
     def send_todev_ble_sync(self, sync_type: int) -> bytes:
-        comm_esp = dev_net_pb2.DevNet(todev_ble_sync=sync_type)
+        comm_esp = DevNet(todev_ble_sync=sync_type)
         return self.send_order_msg_net(comm_esp)
 
-    def get_device_base_info(self) -> bytes:
-        net = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
-        net.todev_devinfo_req.req_ids.add(id=1, type=6)
+    def get_device_version_main(self) -> bytes:
+        net = DevNet(todev_devinfo_req=DrvDevInfoReq())
+        net.todev_devinfo_req.req_ids.append(DrvDevInfoReqId(id=1, type=6))
 
         return self.send_order_msg_net(net)
 
-    def get_device_version_main(self) -> bytes:
-        net = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
+    def get_device_base_info(self) -> bytes:
+        net = DevNet(todev_devinfo_req=DrvDevInfoReq())
 
         for i in range(1, 8):
             if i == 1:
-                net.todev_devinfo_req.req_ids.add(id=i, type=6)
-            net.todev_devinfo_req.req_ids.add(id=i, type=3)
+                net.todev_devinfo_req.req_ids.append(DrvDevInfoReqId(id=i, type=6))
+            net.todev_devinfo_req.req_ids.append(DrvDevInfoReqId(id=i, type=3))
 
         return self.send_order_msg_net(net)
 
     def get_4g_module_info(self) -> bytes:
-        build = dev_net_pb2.DevNet(todev_get_mnet_cfg_req=dev_net_pb2.DevNet().todev_get_mnet_cfg_req)
+        build = DevNet(todev_get_mnet_cfg_req=DevNet().todev_get_mnet_cfg_req)
         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)
+        build = DevNet(todev_mnet_info_req=DevNet().todev_mnet_info_req)
         logger.debug("Send command -- Get device 4G network information")
         return self.send_order_msg_net(build)
 
     def set_zmq_enable(self) -> bytes:
-        build = dev_net_pb2.DevNet(
-            todev_set_dds2zmq=dev_net_pb2.DrvDebugDdsZmq(
+        build = DevNet(
+            todev_set_dds2_zmq=DrvDebugDdsZmq(
                 is_enable=True,
                 rx_topic_name="perception_post_result",
                 tx_zmq_url="tcp://0.0.0.0:5555",
@@ -63,8 +84,8 @@ class MessageNetwork:
         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)
+    def set_iot_setting(self, iot_control_type: IotConctrlType) -> bytes:
+        build = DevNet(todev_set_iot_offline_req=iot_control_type)
         logger.debug("Send command -- Device re-online")
         return self.send_order_msg_net(build)
 
@@ -77,18 +98,18 @@ class MessageNetwork:
         number: int,
         type: int,
     ) -> bytes:
-        build = dev_net_pb2.DrvUploadFileToAppReq(
-            bizId=request_id,
+        build = DrvUploadFileToAppReq(
+            biz_id=request_id,
             operation=operation,
-            serverIp=server_ip,
-            serverPort=server_port,
+            server_ip=server_ip,
+            server_port=server_port,
             num=number,
             type=type,
         )
         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))
+        return self.send_order_msg_net(DevNet(todev_ble_sync=1, todev_uploadfile_req=build))
 
     def set_device_socket_request(
         self,
@@ -100,51 +121,49 @@ class MessageNetwork:
         type: int,
     ) -> bytes:
         """Set device socket request (bluetooth only)."""
-        build = dev_net_pb2.DrvUploadFileToAppReq(
-            bizId=request_id,
+        build = DrvUploadFileToAppReq(
+            biz_id=request_id,
             operation=operation,
-            serverIp=server_ip,
-            serverPort=server_port,
+            server_ip=server_ip,
+            server_port=server_port,
             num=number,
             type=type,
         )
         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))
+        return self.send_order_msg_net(DevNet(todev_ble_sync=1, todev_uploadfile_req=build))
 
     def get_device_log_info(self, biz_id: str, type: int, log_url: str) -> bytes:
         """Get device log info (bluetooth only)."""
         return self.send_order_msg_net(
-            dev_net_pb2.DevNet(
+            DevNet(
                 todev_ble_sync=1,
-                todev_req_log_info=dev_net_pb2.DrvUploadFileReq(
-                    bizId=biz_id,
+                todev_req_log_info=DrvUploadFileReq(
+                    biz_id=biz_id,
                     type=type,
                     url=log_url,
                     num=0,
-                    userId="",  # TODO supply user id
+                    user_id="",  # TODO supply user id
                 ),
             )
         )
 
     def cancel_log_update(self, biz_id: str) -> bytes:
         """Cancel log update (bluetooth only)."""
-        return self.send_order_msg_net(
-            dev_net_pb2.DevNet(todev_log_data_cancel=dev_net_pb2.DrvUploadFileCancel(bizId=biz_id))
-        )
+        return self.send_order_msg_net(DevNet(todev_log_data_cancel=DrvUploadFileCancel(biz_id=biz_id)))
 
     def get_device_network_info(self) -> bytes:
-        build = dev_net_pb2.DevNet(todev_networkinfo_req=dev_net_pb2.GetNetworkInfoReq(req_ids=1))
+        build = DevNet(todev_networkinfo_req=GetNetworkInfoReq(req_ids=1))
         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:
-        build = dev_net_pb2.DevNet(
+        build = DevNet(
             todev_ble_sync=1,
-            todev_set_mnet_cfg_req=dev_net_pb2.SetMnetCfgReq(
-                cfg=dev_net_pb2.MnetCfg(
-                    type=dev_net_pb2.NET_TYPE_WIFI,
+            todev_set_mnet_cfg_req=SetMnetCfgReq(
+                cfg=MnetCfg(
+                    type=NetType.WIFI,
                     inet_enable=new_4g_status,
                     mnet_enable=new_4g_status,
                 )
@@ -155,58 +174,32 @@ class MessageNetwork:
         return self.send_order_msg_net(build)
 
     def set_device_wifi_enable_status(self, new_wifi_status: bool) -> bytes:
-        build = dev_net_pb2.DevNet(
+        build = DevNet(
             todev_ble_sync=1,
-            todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(configParam=4, wifi_enable=new_wifi_status),
+            todev_wifi_configuration=DrvWifiSet(config_param=4, wifi_enable=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:
+    def wifi_connectinfo_update(self) -> bytes:
+        build = DevNet(
+            todev_ble_sync=1,
+            todev_wifi_msg_upload=DrvWifiUpload(wifi_msg_upload=1),
+        )
+        logger.debug("Send command - get Wifi connection information")
+        return self.send_order_msg_net(build)
+
+    def get_record_wifi_list(self) -> bytes:
+        build = DevNet(todev_ble_sync=1, todev_wifi_list_upload=DrvWifiList())
+        logger.debug("Send command - get memorized WiFi list upload command")
+        return self.send_order_msg_net(build)
+
+    def close_clear_connect_current_wifi(self, ssid: str, status: int) -> bytes:
+        build = DevNet(
+            todev_ble_sync=1,
+            todev_wifi_configuration=DrvWifiSet(config_param=status, confssid=ssid),
+        )
         logger.debug(
-            f"Send command - get Wifi connection information.wifiConnectinfoUpdate().deviceName={device_name}.isBinary={is_binary}"
+            f"Send command - set network (disconnect, direct connect, forget, no operation reconnect) operation command (downlink ssid={ssid}, status={status})"
         )
-        if is_binary:
-            build = dev_net_pb2.DevNet(
-                todev_ble_sync=1,
-                todev_WifiMsgUpload=dev_net_pb2.DrvWifiUpload(wifi_msg_upload=1),
-            )
-            logger.debug("Send command - get Wifi connection information")
-            return self.send_order_msg_net(build)
-        self.wifi_connectinfo_update2()
-
-    def wifi_connectinfo_update2(self) -> None:
-        hash_map = {"getMsgCmd": 1}
-        # self.post_custom_data(self.get_json_string(
-        #     68, hash_map))  # ToDo: Fix this
-
-    def get_record_wifi_list(self, is_binary: bool) -> bytes:
-        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())
-            logger.debug("Send command - get memorized WiFi list upload command")
-            return self.send_order_msg_net(build)
-        self.get_record_wifi_list2()
-
-    def get_record_wifi_list2(self) -> None:
-        pass
-        # self.messageNavigation.post_custom_data(
-        #     self.get_json_string(69))  # ToDo: Fix this
-
-    def close_clear_connect_current_wifi(self, ssid: str, status: int, is_binary: bool) -> bytes:
-        if is_binary:
-            build = dev_net_pb2.DevNet(
-                todev_ble_sync=1,
-                todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(configParam=status, Confssid=ssid),
-            )
-            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)
-        self.close_clear_connect_current_wifi2(ssid, status)
-
-    def close_clear_connect_current_wifi2(self, ssid: str, get_msg_cmd: int) -> None:
-        data = {"ssid": ssid, "getMsgCmd": get_msg_cmd}
-        # self.messageNavigation.post_custom_data(
-        # ToDo: Fix this
-        # self.get_json_string(bleOrderCmd.close_clear_connect_current_wifi, data).encode())
+        return self.send_order_msg_net(build)

pymammotion/mammotion/commands/messages/ota.py

@@ -1,38 +1,38 @@
 # === sendOrderMsg_Ota ===
 from abc import ABC
+import logging
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.proto import luba_msg_pb2, mctrl_ota_pb2
-from pymammotion.proto.luba_msg import MsgCmdType, MsgDevice
+from pymammotion.proto import GetInfoReq, InfoType, LubaMsg, MctlOta, MsgAttr, MsgCmdType, MsgDevice
+
+_LOGGER = logging.getLogger(__name__)
 
 
 class MessageOta(AbstractMessage, ABC):
+    """Message OTA class."""
+
     def send_order_msg_ota(self, ota):
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MSG_CMD_TYPE_EMBED_OTA,
-            sender=luba_msg_pb2.DEV_MOBILEAPP,
-            rcver=self.get_msg_device(MsgCmdType.MSG_CMD_TYPE_EMBED_OTA, MsgDevice.DEV_MAINCTL),
-            msgattr=luba_msg_pb2.MSG_ATTR_REQ,
-            seqs=1,
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.EMBED_OTA,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=self.get_msg_device(MsgCmdType.EMBED_OTA, MsgDevice.DEV_MAINCTL),
+            msgattr=MsgAttr.REQ,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             ota=ota,
         )
 
         return luba_msg.SerializeToString()
 
     def get_device_ota_info(self, log_type: int):
-        todev_get_info_req = mctrl_ota_pb2.MctlOta(
-            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_OTA)
-        )
+        todev_get_info_req = MctlOta(todev_get_info_req=GetInfoReq(type=InfoType.IT_OTA))
 
-        print("===Send command to get upgrade details===logType:" + str(log_type))
+        _LOGGER.debug("===Send command to get upgrade details===logType:" + str(log_type))
         return self.send_order_msg_ota(todev_get_info_req)
 
-    def get_device_info_new(self):
+    def get_device_info_new(self) -> bytes:
         """New device call for OTA upgrade information."""
-        todev_get_info_req = mctrl_ota_pb2.MctlOta(
-            todev_get_info_req=mctrl_ota_pb2.getInfoReq(type=mctrl_ota_pb2.IT_BASE)
-        )
-        print("Send to get OTA upgrade information", "Get device information")
+        todev_get_info_req = MctlOta(todev_get_info_req=GetInfoReq(type=InfoType.IT_BASE))
+        _LOGGER.debug("Send to get OTA upgrade information", "Get device information")
         return self.send_order_msg_ota(todev_get_info_req)