pymammotion 0.4.30__tar.gz → 0.4.32__tar.gz

{pymammotion-0.4.30 → pymammotion-0.4.32}/PKG-INFO

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

{pymammotion-0.4.30 → pymammotion-0.4.32}/pymammotion/data/model/device.py

@@ -9,6 +9,7 @@ from pymammotion.data.model import HashList, RapidState
 from pymammotion.data.model.device_info import DeviceFirmwares, MowerInfo
 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.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.http.model.http import ErrorInfo
@@ -29,6 +30,7 @@ class MowingDevice(DataClassORJSONMixin):
     mqtt_properties: ThingPropertiesMessage | None = None
     status_properties: ThingStatusMessage | 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)

{pymammotion-0.4.30 → pymammotion-0.4.32}/pymammotion/data/state_manager.py

@@ -10,6 +10,7 @@ import betterproto
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.device_info import SideLight
 from pymammotion.data.model.hash_list import AreaHashNameList, NavGetCommData, NavGetHashListData, Plan, SvgMessage
+from pymammotion.data.model.work import CurrentTaskSettings
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.proto import (
@@ -22,6 +23,7 @@ from pymammotion.proto import (
     NavGetCommDataAck,
     NavGetHashListAck,
     NavPlanJobSet,
+    NavReqCoverPath,
     SvgMessageAckT,
     TimeCtrlLight,
     WifiIotStatusReport,
@@ -206,6 +208,11 @@ class StateManager:
                     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
+            case "bidire_reqconver_path":
+                work_settings: NavReqCoverPath = net_msg[1]
+                self._device.work = CurrentTaskSettings.from_dict(
+                    work_settings.to_dict(casing=betterproto.Casing.SNAKE)
+                )
 
     def _update_mul_data(self, message) -> None:
         pass

{pymammotion-0.4.30 → pymammotion-0.4.32}/pymammotion/mammotion/devices/base.py

@@ -90,12 +90,9 @@ class MammotionBaseDevice:
             await self.queue_command("get_regional_data", regional_data=region_data)
 
     async def plan_callback(self, plan: NavPlanJobSet) -> None:
-        if plan.plan_index != 0 and plan.total_plan_num - 1 != plan.plan_index:
-            index = plan.plan_index
-            while index in self.mower.map.plan and index < plan.total_plan_num:
-                index += 1
-            if index < plan.total_plan_num:
-                await self.queue_command("read_plan", plan_index=index)
+        if plan.plan_index < plan.total_plan_num - 1:
+            index = plan.plan_index + 1
+            await self.queue_command("read_plan", sub_cmd=2, plan_index=index)
 
     def _update_raw_data(self, data: bytes) -> None:
         """Update raw and model data from notifications."""
@@ -224,7 +221,9 @@ class MammotionBaseDevice:
         if self._cloud_device and len(self.mower.map.area_name) == 0 and not DeviceType.is_luba1(self.mower.name):
             await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
 
-        if len(self.mower.map.plan) == 0 or self.mower.map.plan[0].total_plan_num != len(self.mower.map.plan):
+        if len(self.mower.map.plan) == 0 or list(self.mower.map.plan.values())[0].total_plan_num != len(
+            self.mower.map.plan
+        ):
             await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
 
         for hash, frame in list(self.mower.map.area.items()):

{pymammotion-0.4.30 → pymammotion-0.4.32}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -297,7 +297,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
             await self._ble_sync()
             self.schedule_ble_sync()
 
-    async def _send_command_locked(self, key: str, command: bytes) -> bytes:
+    async def _send_command_locked(self, key: str, command: bytes) -> None:
         """Send command to device and read response."""
         await self._ensure_connected()
         try:
@@ -344,12 +344,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
                 if has_field(new_msg.net.toapp_wifi_iot_status) and self._commands.get_device_product_key() == "":
                     self._commands.set_device_product_key(new_msg.net.toapp_wifi_iot_status.productkey)
 
-                return
-
         await self._state_manager.notification(new_msg)
-        # may or may not be correct, some work could be done here to correctly match responses
-        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()
@@ -361,30 +356,12 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         _LOGGER.debug("%s: Subscribe to notifications; RSSI: %s", self.name, self.rssi)
         await self._client.start_notify(self._read_char, self._notification_handler)
 
-    async def _execute_command_locked(self, key: str, command: bytes) -> bytes:
+    async def _execute_command_locked(self, key: str, command: bytes) -> None:
         """Execute command and read response."""
         assert self._client is not None
-        self._notify_future = self.loop.create_future()
-        self._key = key
         _LOGGER.debug("%s: Sending command: %s", self.name, key)
         await self._message.post_custom_data_bytes(command)
 
-        timeout = 1
-        timeout_handle = self.loop.call_at(self.loop.time() + timeout, _handle_timeout, self._notify_future)
-        timeout_expired = False
-        try:
-            notify_msg = await self._notify_future
-        except asyncio.TimeoutError:
-            timeout_expired = True
-            notify_msg = b""
-        finally:
-            if not timeout_expired:
-                timeout_handle.cancel()
-            self._notify_future = None
-
-        _LOGGER.debug("%s: Notification received: %s", self.name, notify_msg.hex())
-        return notify_msg
-
     def get_address(self) -> str:
         """Return address of device."""
         return self.ble_device.address

{pymammotion-0.4.30 → pymammotion-0.4.32}/pymammotion/utility/device_type.py

@@ -275,10 +275,10 @@ class DeviceType(Enum):
             device_type = DeviceType.value_of_str(device_name, product_key)
 
         return (
-            DeviceType.RTK.get_value() != device_type.get_value()
-            and DeviceType.RTK3A0.get_value() != device_type.get_value()
-            and DeviceType.RTK3A1.get_value() != device_type.get_value()
-            and DeviceType.RTK3A2.get_value() != device_type.get_value()
+            DeviceType.RTK.get_value() == device_type.get_value()
+            or DeviceType.RTK3A0.get_value() == device_type.get_value()
+            or DeviceType.RTK3A1.get_value() == device_type.get_value()
+            or DeviceType.RTK3A2.get_value() == device_type.get_value()
         )
 
     @staticmethod

{pymammotion-0.4.30 → pymammotion-0.4.32}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.30"
+version     = "0.4.32"
 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.4.30"
+current_version = "0.4.32"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true