pymammotion 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

pymammotion/data/model/device.py

@@ -7,12 +7,14 @@ from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
 from pymammotion.data.model.device_info import DeviceFirmwares, DeviceNonWorkingHours, MowerInfo
+from pymammotion.data.model.errors import DeviceErrors
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.model.work import CurrentTaskSettings
+from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
-from pymammotion.http.model.http import CheckDeviceVersion, ErrorInfo
+from pymammotion.http.model.http import CheckDeviceVersion
 from pymammotion.proto import DeviceFwInfo, MowToAppInfoT, ReportInfoData, SystemRapidStateTunnelMsg, SystemUpdateBufMsg
 from pymammotion.utility.constant import WorkMode
 from pymammotion.utility.conversions import parse_double
@@ -30,15 +32,14 @@ class MowingDevice(DataClassORJSONMixin):
     mower_state: MowerInfo = field(default_factory=MowerInfo)
     mqtt_properties: ThingPropertiesMessage | None = None
     status_properties: ThingStatusMessage | None = None
+    device_event: ThingEventMessage | None = None
     map: HashList = field(default_factory=HashList)
     work: CurrentTaskSettings = field(default_factory=CurrentTaskSettings)
     location: Location = field(default_factory=Location)
     mowing_state: RapidState = field(default_factory=RapidState)
     report_data: ReportData = field(default_factory=ReportData)
     device_firmwares: DeviceFirmwares = field(default_factory=DeviceFirmwares)
-    err_code_list: list = field(default_factory=list)
-    err_code_list_time: list | None = field(default_factory=list)
-    error_codes: dict[str, ErrorInfo] = field(default_factory=dict)
+    errors: DeviceErrors = field(default_factory=DeviceErrors)
     non_work_hours: DeviceNonWorkingHours = field(default_factory=DeviceNonWorkingHours)
 
     def buffer(self, buffer_list: SystemUpdateBufMsg) -> None:
@@ -54,9 +55,9 @@ class MowingDevice(DataClassORJSONMixin):
                     self.location.dock.longitude = parse_double(buffer_list.update_buf_data[8], 4.0)
                     self.location.dock.rotation = buffer_list.update_buf_data[3] + 180
             case 2:
-                self.err_code_list.clear()
-                self.err_code_list_time.clear()
-                self.err_code_list.extend(
+                self.errors.err_code_list.clear()
+                self.errors.err_code_list_time.clear()
+                self.errors.err_code_list.extend(
                     [
                         buffer_list.update_buf_data[3],
                         buffer_list.update_buf_data[5],
@@ -70,7 +71,7 @@ class MowingDevice(DataClassORJSONMixin):
                         buffer_list.update_buf_data[21],
                     ]
                 )
-                self.err_code_list_time.extend(
+                self.errors.err_code_list_time.extend(
                     [
                         buffer_list.update_buf_data[4],
                         buffer_list.update_buf_data[6],
@@ -86,6 +87,7 @@ class MowingDevice(DataClassORJSONMixin):
                 )
 
     def update_report_data(self, toapp_report_data: ReportInfoData) -> None:
+        """Set report data for the mower."""
         coordinate_converter = CoordinateConverter(self.location.RTK.latitude, self.location.RTK.longitude)
         for index, location in enumerate(toapp_report_data.locations):
             if index == 0 and location.real_pos_y != 0:
@@ -111,6 +113,7 @@ class MowingDevice(DataClassORJSONMixin):
         self.report_data.update(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
 
     def run_state_update(self, rapid_state: SystemRapidStateTunnelMsg) -> None:
+        """Set lat long, work zone of RTK and robot."""
         coordinate_converter = CoordinateConverter(self.location.RTK.latitude, self.location.RTK.longitude)
         self.mowing_state = RapidState().from_raw(rapid_state.rapid_state_data)
         self.location.position_type = self.mowing_state.pos_type
@@ -124,13 +127,13 @@ class MowingDevice(DataClassORJSONMixin):
             )
 
     def mow_info(self, toapp_mow_info: MowToAppInfoT) -> None:
-        pass
+        """Set mow info."""
 
     def report_missing_data(self) -> None:
         """Report missing data so we can refetch it."""
 
     def update_device_firmwares(self, fw_info: DeviceFwInfo) -> None:
-        """Sets firmware versions on all parts of the robot or RTK."""
+        """Set firmware versions on all parts of the robot or RTK."""
         for mod in fw_info.mod:
             match mod.type:
                 case 1:

pymammotion/data/state_manager.py

@@ -12,6 +12,7 @@ from pymammotion.data.model.device_info import SideLight
 from pymammotion.data.model.enums import ConnectionPreference
 from pymammotion.data.model.hash_list import AreaHashNameList, NavGetCommData, NavGetHashListData, Plan, SvgMessage
 from pymammotion.data.model.work import CurrentTaskSettings
+from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.event.event import DataEvent
@@ -62,6 +63,7 @@ class StateManager:
 
         self.properties_callback = DataEvent()
         self.status_callback = DataEvent()
+        self.device_event_callback = DataEvent()
 
     def get_device(self) -> MowingDevice:
         """Get device."""
@@ -84,6 +86,10 @@ class StateManager:
             self._device.mower_state.product_key = thing_status.params.productKey
         await self.on_status_callback(thing_status)
 
+    async def device_event(self, device_event: ThingEventMessage) -> None:
+        self._device.mqtt_device_event = device_event
+        await self.on_device_event_callback(device_event)
+
     @property
     def online(self) -> bool:
         return self._device.online
@@ -114,6 +120,11 @@ class StateManager:
         if self.status_callback:
             await self.status_callback.data_event(thing_status)
 
+    async def on_device_event_callback(self, device_event: ThingEventMessage) -> None:
+        """Execute the status callback if it is set."""
+        if self.device_event_callback:
+            await self.device_event_callback.data_event(device_event)
+
     async def get_commondata_ack_callback(self, comm_data: NavGetCommDataAck | SvgMessageAckT) -> None:
         """Asynchronously calls the appropriate callback based on available handlers."""
         if self.cloud_get_commondata_ack_callback:

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -31,6 +31,7 @@ class MammotionCloud:
     """Per account MQTT cloud."""
 
     def __init__(self, mqtt_client: MammotionMQTT, cloud_client: CloudIOTGateway) -> None:
+        """Initialize MammotionCloud."""
         self.cloud_client = cloud_client
         self.loop = asyncio.get_event_loop()
         self.is_ready = False
@@ -39,6 +40,7 @@ class MammotionCloud:
         self.mqtt_message_event = DataEvent()
         self.mqtt_properties_event = DataEvent()
         self.mqtt_status_event = DataEvent()
+        self.mqtt_device_event = DataEvent()
         self.on_ready_event = DataEvent()
         self.on_disconnected_event = DataEvent()
         self.on_connected_event = DataEvent()
@@ -49,9 +51,6 @@ class MammotionCloud:
         self._mqtt_client.on_message = self._on_mqtt_message
         self._mqtt_client.on_ready = self.on_ready
 
-        # temporary for testing only
-        # self._start_sync_task = self.loop.call_later(30, lambda: asyncio.ensure_future(self.start_sync(0)))
-
     async def on_ready(self) -> None:
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
@@ -129,6 +128,8 @@ class MammotionCloud:
                 _LOGGER.debug("Protobuf event")
                 # Call the callbacks for each cloudDevice
                 await self.mqtt_message_event.data_event(event)
+            if event.method == "thing.events":
+                await self.mqtt_device_event.data_event(event)
             if event.method == "thing.properties":
                 await self.mqtt_properties_event.data_event(event)
                 _LOGGER.debug(event)
@@ -170,6 +171,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.mqtt_message_event.add_subscribers(self._parse_message_for_device)
         self._mqtt.mqtt_properties_event.add_subscribers(self._parse_message_properties_for_device)
         self._mqtt.mqtt_status_event.add_subscribers(self._parse_message_status_for_device)
+        self._mqtt.mqtt_device_event.add_subscribers(self._parse_device_event_for_device)
         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)
@@ -188,6 +190,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         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._mqtt.mqtt_device_event.remove_subscribers(self._parse_device_event_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
@@ -319,6 +322,11 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             return
         await self.state_manager.status(status)
 
+    async def _parse_device_event_for_device(self, status: ThingStatusMessage) -> None:
+        if status.params.iotId != self.iot_id:
+            return
+        await self.state_manager.device_event(status)
+
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
         params = event.params
         new_msg = LubaMsg()

{pymammotion-0.5.5.dist-info → pymammotion-0.5.7.dist-info}/METADATA

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

{pymammotion-0.5.5.dist-info → pymammotion-0.5.7.dist-info}/RECORD

@@ -25,7 +25,7 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=UVRbSXGOjYnWv30ZEvzT5QRpdVqAbyeToo-t0QBWyi4,292
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=TnG2jYeQLFNZ7iA1_I4BS59A_XVlA2qSBl8sMvZfgx4,7722
+pymammotion/data/model/device.py,sha256=eu0GA_2FJFgrm_qB2U0Y_LU7xMmLH41kVN9nNlIzcPM,7892
 pymammotion/data/model/device_config.py,sha256=DTnoePsMwJrKVXqGeKvbZQjs8Zab61U5T3b-c-w0WlM,2654
 pymammotion/data/model/device_info.py,sha256=Q5PbPdTfd948ZWc8EHjN5zwU6pha5MCr47ZEXzCYKNY,1148
 pymammotion/data/model/device_limits.py,sha256=m8HdxD-RaAkPm7jHYb9GLxMEH9IfzBPz0ZypmsLnId4,1946
@@ -45,7 +45,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=C8TGRJs9wNxwg9FFmr9qcsweDnl5v5kcVcwiHxtYzJw,5384
 pymammotion/data/mqtt/properties.py,sha256=laud9rE-JqBHWKZ44Dov2yMkp3Ld8ghpBwlZ4_3g9uQ,4321
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
-pymammotion/data/state_manager.py,sha256=Q0WTI-ehXH50bQEroXibzGK5MLRx5OThGZ86NNCPJjc,11508
+pymammotion/data/state_manager.py,sha256=K3o__YsjBS5C5tEujANnxI-lgQpbXhPMUIy3sgVc3QI,12056
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=Z8WYxv_-5khEqKjL1w4c_Et24G1Kdm8QFuIBylD3h3U,3021
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -74,7 +74,7 @@ pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_A
 pymammotion/mammotion/devices/base.py,sha256=qDh7P7fnakDKgxTqjNLcQg8eE-6gHJaXAV0ONjhy_IU,12038
 pymammotion/mammotion/devices/mammotion.py,sha256=dvFNLJvYS_Fu3JFkrJE3ljhECzewNJYMIPGuTAeFYHY,15170
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=dSDw8xLUfAU2c9vKX65w87Rm2E78284WjJ72CKniPt4,19349
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=Pd4aOIhcjVZznJfa0ANYTdG3QWO47maM2eB_qE8SR4U,14904
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=aJ_SS2KgQsdD_qpSaHmGfhOyENPwatA6ae2Me41F8UI,15344
 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
@@ -124,7 +124,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.5.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.5.dist-info/METADATA,sha256=OoAgAEjBHXz8XRebg4rgZAUHx4nPIx4mXvUyLXwdHzI,3870
-pymammotion-0.5.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.5.dist-info/RECORD,,
+pymammotion-0.5.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.7.dist-info/METADATA,sha256=UAJpuhAZxf_jnb5I0uxjVpG-n05QuyduCKc9faQOdTo,3870
+pymammotion-0.5.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.7.dist-info/RECORD,,