pymammotion 0.4.0a9__py3-none-any.whl → 0.4.0b2__py3-none-any.whl

pymammotion/data/model/device_info.py

@@ -35,4 +35,3 @@ class DeviceFirmwares(DataClassORJSONMixin):
     right_motor_driver: str = ""
     rtk_rover_station: str = ""
     rtk_version: str = ""
-    version: str = ""

pymammotion/data/state_manager.py

@@ -12,10 +12,10 @@ from pymammotion.data.model.device_info import SideLight
 from pymammotion.data.model.hash_list import AreaHashNameList
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
-from pymammotion.proto.dev_net import DrvDevInfoResp, WifiIotStatusReport
+from pymammotion.proto.dev_net import DrvDevInfoResp, DrvDevInfoResult, WifiIotStatusReport
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck, SvgMessageAckT
-from pymammotion.proto.mctrl_sys import DeviceProductTypeInfoT, TimeCtrlLight
+from pymammotion.proto.mctrl_sys import DeviceFwInfo, DeviceProductTypeInfoT, TimeCtrlLight
 
 logger = logging.getLogger(__name__)
 
@@ -25,13 +25,22 @@ class StateManager:
 
     _device: MowingDevice
     last_updated_at: datetime = datetime.now()
+    cloud_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
+    cloud_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+    cloud_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
+
+    # possibly don't need anymore
+    cloud_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
+
+    ble_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
+    ble_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+    ble_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
+
+    # possibly don't need anymore
+    ble_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
 
     def __init__(self, device: MowingDevice) -> None:
         self._device = device
-        self.gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
-        self.get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
-        self.on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
-        self.queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
         self.last_updated_at = datetime.now()
 
     def get_device(self) -> MowingDevice:
@@ -42,13 +51,13 @@ class StateManager:
         """Set device."""
         self._device = device
 
-    async def properties(self, properties: ThingPropertiesMessage) -> None:
-        self._device.mqtt_properties = properties
+    def properties(self, thing_properties: ThingPropertiesMessage) -> None:
+        self._device.mqtt_properties = thing_properties
 
-    async def status(self, status: ThingStatusMessage) -> None:
+    def status(self, thing_status: ThingStatusMessage) -> None:
         if not self._device.online:
             self._device.online = True
-        self._device.status_properties = status
+        self._device.status_properties = thing_status
 
     @property
     def online(self) -> bool:
@@ -58,6 +67,24 @@ class StateManager:
     def online(self, value: bool) -> None:
         self._device.online = value
 
+    async def gethash_ack_callback(self, msg: NavGetHashListAck) -> None:
+        if self.cloud_gethash_ack_callback:
+            await self.cloud_gethash_ack_callback(msg)
+        if self.ble_gethash_ack_callback:
+            await self.ble_gethash_ack_callback(msg)
+
+    async def on_notification_callback(self, res: tuple[str, Any | None]) -> None:
+        if self.cloud_on_notification_callback:
+            await self.cloud_on_notification_callback(res)
+        if self.ble_on_notification_callback:
+            await self.ble_on_notification_callback(res)
+
+    async def get_commondata_ack_callback(self, comm_data: NavGetCommDataAck | SvgMessageAckT) -> None:
+        if self.cloud_get_commondata_ack_callback:
+            await self.cloud_get_commondata_ack_callback(comm_data)
+        if self.ble_get_commondata_ack_callback:
+            await self.ble_get_commondata_ack_callback(comm_data)
+
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""
         res = betterproto.which_one_of(message, "LubaSubMsg")
@@ -77,8 +104,7 @@ class StateManager:
             case "ota":
                 self._update_ota_data(message)
 
-        if self.on_notification_callback:
-            await self.on_notification_callback(res)
+        await self.on_notification_callback(res)
 
     async def _update_nav_data(self, message) -> None:
         """Update nav data."""
@@ -123,6 +149,10 @@ class StateManager:
             case "device_product_type_info":
                 device_product_type: DeviceProductTypeInfoT = sys_msg[1]
                 self._device.mower_state.model_id = device_product_type.main_product_type
+            case "toapp_dev_fw_info":
+                device_fw_info: DeviceFwInfo = sys_msg[1]
+                self._device.device_firmwares.device_version = device_fw_info.version
+                self._device.mower_state.swversion = device_fw_info.version
 
     def _update_driver_data(self, message) -> None:
         pass
@@ -136,7 +166,7 @@ class StateManager:
             case "toapp_devinfo_resp":
                 toapp_devinfo_resp: DrvDevInfoResp = net_msg[1]
                 for resp in toapp_devinfo_resp.resp_ids:
-                    if resp.res == "DRV_RESULT_SUC":
+                    if resp.res == DrvDevInfoResult.DRV_RESULT_SUC and resp.id == 1 and resp.type == 6:
                         self._device.mower_state.swversion = resp.info
                         self._device.device_firmwares.device_version = resp.info
 

pymammotion/mammotion/commands/messages/video.py

@@ -5,6 +5,7 @@ import time
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import luba_msg_pb2, luba_mul_pb2
 from pymammotion.proto.luba_msg import MsgAttr, MsgCmdType, MsgDevice
+from pymammotion.proto.luba_mul import MUL_CAMERA_POSITION
 from pymammotion.utility.device_type import DeviceType
 
 
@@ -25,10 +26,6 @@ class MessageVideo(AbstractMessage, ABC):
         return luba_msg.SerializeToString()
 
     def device_agora_join_channel_with_position(self, enter_state: int):
-        position = (
-            luba_mul_pb2.MUL_CAMERA_POSITION.ALL
-            if DeviceType.is_yuka(self.get_device_name())
-            else luba_mul_pb2.MUL_CAMERA_POSITION.LEFT
-        )
+        position = MUL_CAMERA_POSITION.ALL if DeviceType.is_yuka(self.get_device_name()) else MUL_CAMERA_POSITION.LEFT
         mctl_sys = luba_mul_pb2.SocMul(set_video=luba_mul_pb2.MulSetVideo(position=position, vi_switch=enter_state))
         return self.send_order_msg_video(mctl_sys)

pymammotion/mammotion/devices/base.py

@@ -1,6 +1,5 @@
 from abc import abstractmethod
 import asyncio
-from collections.abc import Awaitable, Callable
 import logging
 from typing import Any
 
@@ -41,17 +40,9 @@ class MammotionBaseDevice:
         self._state_manager = state_manager
         self._raw_data = dict()
         self._raw_mower_data: RawMowerData = RawMowerData()
-        self._state_manager.gethash_ack_callback = self.datahash_response
-        self._state_manager.get_commondata_ack_callback = self.commdata_response
         self._notify_future: asyncio.Future[bytes] | None = None
         self._cloud_device = cloud_device
 
-    def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
-        self._state_manager.on_notification_callback = func
-
-    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
-        self._state_manager.queue_command_callback = func
-
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses."""
         current_frame = hash_ack.current_frame

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -1,4 +1,5 @@
 import asyncio
+from collections.abc import Awaitable, Callable
 import logging
 from typing import Any, cast
 from uuid import UUID
@@ -89,9 +90,17 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self._operation_lock = asyncio.Lock()
         self._key: str | None = None
         self.set_queue_callback(self.queue_command)
+        self._state_manager.ble_gethash_ack_callback = self.datahash_response
+        self._state_manager.ble_get_commondata_ack_callback = self.commdata_response
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
 
+    def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
+        self._state_manager.ble_on_notification_callback = func
+
+    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
+        self._state_manager.ble_queue_command_callback = func
+
     def update_device(self, device: BLEDevice) -> None:
         """Update the BLE device."""
         self.ble_device = device
@@ -342,6 +351,9 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         if self._notify_future and not self._notify_future.done():
             self._notify_future.set_result(data)
 
+        if self._execute_timed_disconnect is None:
+            await self._execute_forced_disconnect()
+
         self._reset_disconnect_timer()
         await self._state_manager.notification(new_msg)
 

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -172,6 +172,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.on_ready_event.add_subscribers(self.on_ready)
         self._mqtt.on_disconnected_event.add_subscribers(self.on_disconnect)
         self._mqtt.on_connected_event.add_subscribers(self.on_connect)
+        self._state_manager.cloud_gethash_ack_callback = self.datahash_response
+        self._state_manager.cloud_get_commondata_ack_callback = self.commdata_response
         self.set_queue_callback(self.queue_command)
 
         if self._mqtt.is_ready:
@@ -185,6 +187,12 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
 
+    def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
+        self._state_manager.cloud_on_notification_callback = func
+
+    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
+        self._state_manager.cloud_queue_command_callback = func
+
     async def on_ready(self) -> None:
         """Callback for when MQTT is subscribed to events."""
         if self.stopped:

{pymammotion-0.4.0a9.dist-info → pymammotion-0.4.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0a9
+Version: 0.4.0b2
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.0a9.dist-info → pymammotion-0.4.0b2.dist-info}/RECORD

@@ -25,7 +25,7 @@ pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
 pymammotion/data/model/device.py,sha256=lZEuWfEr4My0BUjY3OdIpUui91t9KbONhBc2t9oS2ro,6883
 pymammotion/data/model/device_config.py,sha256=wjayKnzoPDmBhqWZKTPDSueNEPCIWCB20tFEDSGIUsM,2602
-pymammotion/data/model/device_info.py,sha256=8FxHok09_uy99qBmgPiZw-MYbyqxXolF9eEw-8cQxSw,899
+pymammotion/data/model/device_info.py,sha256=p7fXL4ozWUF8rD4QSfrmyLK1Jv-uXXxcJ5mXiDjp6Fo,877
 pymammotion/data/model/device_limits.py,sha256=saW3iUvGq8WEn6CASn5hS5tVJpSeak4FDy_gnHtYqTQ,1955
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
@@ -43,7 +43,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
 pymammotion/data/mqtt/status.py,sha256=DuNC3JdewLPKNqNHx76_FPXRvheYSiM-CdiVTCCYY8s,1079
-pymammotion/data/state_manager.py,sha256=GrzKjBuz2CB70FGqnBdExgd3IHUheBTWH-FSR1N14nI,6140
+pymammotion/data/state_manager.py,sha256=J7QbfCge1mGlz2jzcRfqix560tybG1E1x2inVgVqt-I,7810
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -61,14 +61,14 @@ pymammotion/mammotion/commands/messages/navigation.py,sha256=BE5h8xN2XCkcfynb5cQ
 pymammotion/mammotion/commands/messages/network.py,sha256=vUjBvuiBhRkOA4nftqTFw6rFdXNjho-ZA9Y37hL2q5Q,7623
 pymammotion/mammotion/commands/messages/ota.py,sha256=g937HT_-OQXV6A3zUiZ53b45cOX6y-rzs5m-4b0IcTk,1473
 pymammotion/mammotion/commands/messages/system.py,sha256=CYf_Ju5nMK9cFd0r5jOzEJ_w4k70PzassdhE8xLeSJU,14371
-pymammotion/mammotion/commands/messages/video.py,sha256=OtuSCy_5TQQx460etLvIu30FrjlnCug5tseicgAsNS8,1319
+pymammotion/mammotion/commands/messages/video.py,sha256=JBPyK1C9gZ6B3QcNe3IUTUnn0QWNXR4Pwj9W0qNO9Ps,1304
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=ZWQVOZu4R_ERXubE3kNx7-zAUxeuaAVX1VsdivlWhUg,10790
+pymammotion/mammotion/devices/base.py,sha256=evNKt1PDDGPkm4wleIEC2dtHuyDP_nHRCg35nrQg6qg,10260
 pymammotion/mammotion/devices/mammotion.py,sha256=-x9hf_M-_3fp5srHGBuMmO5DBsSDnwVGMyEiAEz5dW8,12685
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=HUOKnjYUWTGjksyQDCPKF_u3dWo2ddgrWCBXnJ2VkwA,18963
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=8DrVNs9QbUuH7VMs-Wi1HgHkyMLzLNIV_emnqjVSjXE,13329
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=G7gprsdvKiBHr4S2myRuLL-PWldtsnlLIsiW8yWvpP0,19613
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=nd1Uj6rF8UKHJbHC6nlPRrNQPggPXxfpydT0o0cWbMM,13835
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
@@ -127,7 +127,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.4.0a9.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.0a9.dist-info/METADATA,sha256=-U5a_GhF8fugM_IcnsvR7zsHyH5oX55wduoZIvKum-s,3886
-pymammotion-0.4.0a9.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pymammotion-0.4.0a9.dist-info/RECORD,,
+pymammotion-0.4.0b2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.0b2.dist-info/METADATA,sha256=_g95yCpcFO-w6GISykIZO69Jo-COe2h7-GD6dVTOkCk,3886
+pymammotion-0.4.0b2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pymammotion-0.4.0b2.dist-info/RECORD,,