pymammotion 0.5.20__tar.gz → 0.5.22__tar.gz

{pymammotion-0.5.20 → pymammotion-0.5.22}/PKG-INFO

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

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/mammotion/commands/messages/media.py

@@ -3,8 +3,6 @@ from abc import ABC
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import (
-    MUL_LANGUAGE,
-    MUL_SEX,
     GetHeadlamp,
     LampCtrlSta,
     LampManualCtrlSta,
@@ -12,8 +10,10 @@ from pymammotion.proto import (
     MsgAttr,
     MsgCmdType,
     MsgDevice,
+    MulLanguage,
     MulSetAudio,
     MulSetWiper,
+    MulSex,
     SetHeadlamp,
     SocMul,
 )
@@ -38,10 +38,10 @@ class MessageMedia(AbstractMessage, ABC):
         """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: MUL_SEX):
+    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):

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/mammotion/commands/messages/network.py

@@ -4,7 +4,6 @@ import time
 
 from pymammotion import logger
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
 from pymammotion.proto import (
     DevNet,
     DrvDebugDdsZmq,
@@ -29,8 +28,6 @@ from pymammotion.proto import (
 
 
 class MessageNetwork(AbstractMessage, ABC):
-    messageNavigation: MessageNavigation = MessageNavigation()
-
     def send_order_msg_net(self, build: DevNet) -> bytes:
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.ESP,

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/mammotion/commands/messages/video.py

@@ -3,7 +3,7 @@ from abc import ABC
 import time
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
-from pymammotion.proto import MUL_CAMERA_POSITION, LubaMsg, MsgAttr, MsgCmdType, MsgDevice, MulSetVideo, SocMul
+from pymammotion.proto import LubaMsg, MsgAttr, MsgCmdType, MsgDevice, MulCameraPosition, MulSetVideo, SocMul
 from pymammotion.utility.device_type import DeviceType
 
 
@@ -25,9 +25,9 @@ class MessageVideo(AbstractMessage, ABC):
 
     def device_agora_join_channel_with_position(self, enter_state: int):
         position = (
-            MUL_CAMERA_POSITION.ALL
+            MulCameraPosition.ALL
             if DeviceType.value_of_str(self.get_device_name()).get_value() == DeviceType.LUBA_YUKA.get_value()
-            else MUL_CAMERA_POSITION.LEFT
+            else MulCameraPosition.LEFT
         )
         soc_mul = SocMul(set_video=MulSetVideo(position=position, vi_switch=enter_state))
         return self.send_order_msg_video(soc_mul)

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -20,7 +20,7 @@ from pymammotion.bluetooth import BleMessage
 from pymammotion.data.state_manager import StateManager
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
-from pymammotion.proto import LubaMsg, has_field
+from pymammotion.proto import LubaMsg
 
 DBUS_ERROR_BACKOFF_TIME = 0.25
 
@@ -358,8 +358,8 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         new_msg = LubaMsg().parse(data)
         res = betterproto2.which_one_of(new_msg, "LubaSubMsg")
         if res[0] == "net":
-            if new_msg.net.todev_ble_sync != 0 or has_field(new_msg.net.toapp_wifi_iot_status):
-                if has_field(new_msg.net.toapp_wifi_iot_status) and self._commands.get_device_product_key() == "":
+            if new_msg.net.todev_ble_sync != 0 or new_msg.net.toapp_wifi_iot_status is not None:
+                if new_msg.net.toapp_wifi_iot_status is not None and self._commands.get_device_product_key() == "":
                     self._commands.set_device_product_key(new_msg.net.toapp_wifi_iot_status.productkey)
 
         await self._state_manager.notification(new_msg)

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -21,7 +21,7 @@ from pymammotion.data.state_manager import StateManager
 from pymammotion.event.event import DataEvent
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
-from pymammotion.proto import LubaMsg, has_field
+from pymammotion.proto import LubaMsg
 from pymammotion.utility.constant.device_constant import NO_REQUEST_MODES
 
 _LOGGER = logging.getLogger(__name__)
@@ -371,7 +371,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
         res = betterproto2.which_one_of(new_msg, "LubaSubMsg")
         if res[0] == "net":
-            if new_msg.net.todev_ble_sync != 0 or has_field(new_msg.net.toapp_wifi_iot_status):
+            if new_msg.net.todev_ble_sync != 0 or new_msg.net.toapp_wifi_iot_status is not None:
                 return
 
         await self._state_manager.notification(new_msg)

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/proto/__init__.py

@@ -1527,7 +1527,7 @@ class DrvMowCtrlByHand(betterproto2.Message):
 
     cut_knife_height: "int" = betterproto2.field(3, betterproto2.TYPE_INT32)
 
-    max_run_Speed: "float" = betterproto2.field(4, betterproto2.TYPE_FLOAT)
+    max_run_speed: "float" = betterproto2.field(4, betterproto2.TYPE_FLOAT)
 
 
 default_message_pool.register_message("", "DrvMowCtrlByHand", DrvMowCtrlByHand)

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/proto/mctrl_driver.proto

@@ -54,7 +54,7 @@ message DrvMowCtrlByHand {
   int32 main_ctrl = 1;
   int32 cut_knife_ctrl = 2;
   int32 cut_knife_height = 3;
-  float max_run_Speed = 4;
+  float max_run_speed = 4;
 }
 
 message rtk_cfg_req_t {

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/proto/mctrl_driver_pb2.py

@@ -13,7 +13,7 @@ _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\"f\n\x14\x44rvKnifeChangeReport\x12\x10\n\x08is_start\x18\x01 \x01(\x05\x12\x14\n\x0cstart_height\x18\x02 \x01(\x05\x12\x12\n\nend_height\x18\x03 \x01(\x05\x12\x12\n\ncur_height\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\"=\n\x14\x41ppSetCutterWorkMode\x12\x12\n\nCutterMode\x18\x01 \x01(\x05\x12\x11\n\tSetResult\x18\x02 \x01(\x05\"d\n\x14\x41ppGetCutterWorkMode\x12\x1b\n\x13\x63urrent_cutter_mode\x18\x01 \x01(\x05\x12\x1a\n\x12\x63urrent_cutter_rpm\x18\x02 \x01(\x05\x12\x13\n\x0bQueryResult\x18\x03 \x01(\x05\"\xeb\x05\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\x12\x39\n\x18\x63utter_mode_ctrl_by_hand\x18\r \x01(\x0b\x32\x15.AppSetCutterWorkModeH\x00\x12\x34\n\x13\x63urrent_cutter_mode\x18\x0e \x01(\x0b\x32\x15.AppGetCutterWorkModeH\x00\x42\x0b\n\tSubDrvMsg*R\n\x0e\x43utterWorkMode\x12\x13\n\x0f\x43UTTER_STANDARD\x10\x00\x12\x13\n\x0f\x43UTTER_ECONOMIC\x10\x01\x12\x16\n\x12\x43UTTER_PERFORMANCE\x10\x02*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')
+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\"f\n\x14\x44rvKnifeChangeReport\x12\x10\n\x08is_start\x18\x01 \x01(\x05\x12\x14\n\x0cstart_height\x18\x02 \x01(\x05\x12\x12\n\nend_height\x18\x03 \x01(\x05\x12\x12\n\ncur_height\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\"=\n\x14\x41ppSetCutterWorkMode\x12\x12\n\nCutterMode\x18\x01 \x01(\x05\x12\x11\n\tSetResult\x18\x02 \x01(\x05\"d\n\x14\x41ppGetCutterWorkMode\x12\x1b\n\x13\x63urrent_cutter_mode\x18\x01 \x01(\x05\x12\x1a\n\x12\x63urrent_cutter_rpm\x18\x02 \x01(\x05\x12\x13\n\x0bQueryResult\x18\x03 \x01(\x05\"\xeb\x05\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\x12\x39\n\x18\x63utter_mode_ctrl_by_hand\x18\r \x01(\x0b\x32\x15.AppSetCutterWorkModeH\x00\x12\x34\n\x13\x63urrent_cutter_mode\x18\x0e \x01(\x0b\x32\x15.AppGetCutterWorkModeH\x00\x42\x0b\n\tSubDrvMsg*R\n\x0e\x43utterWorkMode\x12\x13\n\x0f\x43UTTER_STANDARD\x10\x00\x12\x13\n\x0f\x43UTTER_ECONOMIC\x10\x01\x12\x16\n\x12\x43UTTER_PERFORMANCE\x10\x02*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())

{pymammotion-0.5.20 → pymammotion-0.5.22}/pymammotion/proto/mctrl_driver_pb2.pyi

@@ -76,7 +76,7 @@ class DrvMotionCtrl(_message.Message):
     def __init__(self, setLinearSpeed: _Optional[int] = ..., setAngularSpeed: _Optional[int] = ...) -> None: ...
 
 class DrvMowCtrlByHand(_message.Message):
-    __slots__ = ["cut_knife_ctrl", "cut_knife_height", "main_ctrl", "max_run_Speed"]
+    __slots__ = ["cut_knife_ctrl", "cut_knife_height", "main_ctrl", "max_run_speed"]
     CUT_KNIFE_CTRL_FIELD_NUMBER: _ClassVar[int]
     CUT_KNIFE_HEIGHT_FIELD_NUMBER: _ClassVar[int]
     MAIN_CTRL_FIELD_NUMBER: _ClassVar[int]
@@ -84,8 +84,8 @@ class DrvMowCtrlByHand(_message.Message):
     cut_knife_ctrl: int
     cut_knife_height: int
     main_ctrl: int
-    max_run_Speed: float
-    def __init__(self, main_ctrl: _Optional[int] = ..., cut_knife_ctrl: _Optional[int] = ..., cut_knife_height: _Optional[int] = ..., max_run_Speed: _Optional[float] = ...) -> None: ...
+    max_run_speed: float
+    def __init__(self, main_ctrl: _Optional[int] = ..., cut_knife_ctrl: _Optional[int] = ..., cut_knife_height: _Optional[int] = ..., max_run_speed: _Optional[float] = ...) -> None: ...
 
 class DrvSrSpeed(_message.Message):
     __slots__ = ["rw", "speed"]

{pymammotion-0.5.20 → pymammotion-0.5.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.5.20"
+version     = "0.5.22"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.5.20"
+current_version = "0.5.22"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true