pymammotion 0.4.21__tar.gz → 0.4.23__tar.gz

{pymammotion-0.4.21 → pymammotion-0.4.23}/PKG-INFO

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

{pymammotion-0.4.21 → pymammotion-0.4.23}/pymammotion/data/model/hash_list.py

@@ -86,27 +86,43 @@ class FrameList(DataClassORJSONMixin):
 
 @dataclass
 class Plan(DataClassORJSONMixin):
+    pver: int = 0
     sub_cmd: int = 2
+    area: int = 0
+    work_time: int = 0
     version: str = ""
+    id: str = ""
     user_id: str = ""
     device_id: str = ""
     plan_id: str = ""
     task_id: str = ""
-    start_time: str = "00:00"
+    job_id: str = ""
+    start_time: str = ""
+    end_time: str = ""
+    week: int = 0
     knife_height: int = 0
     model: int = 0
     edge_mode: int = 0
+    required_time: int = 0
+    route_angle: int = 0
     route_model: int = 0
     route_spacing: int = 0
     ultrasonic_barrier: int = 0
     total_plan_num: int = 0
+    plan_index: int = 0
+    result: int = 0
     speed: float = 0.0
     task_name: str = ""
-    zone_hashs: list[str] = field(default_factory=list)
+    job_name: str = ""
+    zone_hashs: list[int] = field(default_factory=list)
     reserved: str = ""
     start_date: str = ""
+    end_date: str = ""
     trigger_type: int = 0
-    remained_seconds: str = "-1"
+    day: int = 0
+    weeks: list[int] = field(default_factory=list)
+    remained_seconds: int = 0
+    toward_mode: int = 0
     toward_included_angle: int = 0
 
 
@@ -263,6 +279,9 @@ class HashList(DataClassORJSONMixin):
 
         return []
 
+    def update_plan(self, plan: Plan) -> None:
+        self.plan[plan.plan_index] = plan
+
     def update(self, hash_data: NavGetCommData | SvgMessage) -> bool:
         """Update the map data."""
 

{pymammotion-0.4.21 → pymammotion-0.4.23}/pymammotion/data/state_manager.py

@@ -9,7 +9,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, SvgMessage
+from pymammotion.data.model.hash_list import AreaHashNameList, NavGetCommData, NavGetHashListData, Plan, SvgMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.proto import (
@@ -21,6 +21,7 @@ from pymammotion.proto import (
     LubaMsg,
     NavGetCommDataAck,
     NavGetHashListAck,
+    NavPlanJobSet,
     SvgMessageAckT,
     TimeCtrlLight,
     WifiIotStatusReport,
@@ -36,6 +37,7 @@ class StateManager:
     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_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
     cloud_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
 
     # possibly don't need anymore
@@ -43,6 +45,7 @@ class StateManager:
 
     ble_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
     ble_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+    ble_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
     ble_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
 
     # possibly don't need anymore
@@ -97,6 +100,12 @@ class StateManager:
         elif self.ble_get_commondata_ack_callback:
             await self.ble_get_commondata_ack_callback(comm_data)
 
+    async def get_plan_callback(self, planjob: NavPlanJobSet) -> None:
+        if self.cloud_get_plan_callback:
+            await self.get_plan_callback(planjob)
+        elif self.ble_get_plan_callback:
+            await self.ble_get_plan_callback(planjob)
+
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""
         res = betterproto.which_one_of(message, "LubaSubMsg")
@@ -138,6 +147,11 @@ class StateManager:
                 )
                 if updated:
                     await self.get_commondata_ack_callback(common_data)
+            case "todev_planjob_set":
+                planjob: NavPlanJobSet = nav_msg[1]
+                self._device.map.update_plan(Plan.from_dict(planjob.to_dict(casing=betterproto.Casing.SNAKE)))
+                await self.get_plan_callback(planjob)
+
             case "toapp_svg_msg":
                 common_svg_data: SvgMessageAckT = nav_msg[1]
                 updated = self._device.map.update(

{pymammotion-0.4.21 → pymammotion-0.4.23}/pymammotion/mammotion/devices/base.py

@@ -10,7 +10,7 @@ from pymammotion.data.model import RegionData
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.raw_data import RawMowerData
 from pymammotion.data.state_manager import StateManager
-from pymammotion.proto import LubaMsg, NavGetCommDataAck, NavGetHashListAck, SvgMessageAckT
+from pymammotion.proto import LubaMsg, NavGetCommDataAck, NavGetHashListAck, NavPlanJobSet, SvgMessageAckT
 from pymammotion.utility.device_type import DeviceType
 
 _LOGGER = logging.getLogger(__name__)
@@ -89,6 +89,14 @@ class MammotionBaseDevice:
             region_data.current_frame = current_frame
             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)
+
     def _update_raw_data(self, data: bytes) -> None:
         """Update raw and model data from notifications."""
         tmp_msg = LubaMsg().parse(data)
@@ -216,7 +224,8 @@ 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)
 
-        await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
+        if len(self.mower.map.plan) == 0 or self.mower.map.plan[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()):
             missing_frames = self.mower.map.find_missing_frames(frame)

{pymammotion-0.4.21 → pymammotion-0.4.23}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -91,6 +91,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         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
+        self._state_manager.ble_get_plan_callback = self.plan_callback
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
 

{pymammotion-0.4.21 → pymammotion-0.4.23}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -167,6 +167,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         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._state_manager.cloud_get_plan_callback = self.plan_callback
         self.set_queue_callback(self.queue_command)
 
         if self._mqtt.is_ready:
@@ -227,6 +228,9 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         #     self.mqtt._mqtt_client.thing_on_thing_enable(None)
 
     async def _ble_sync(self) -> None:
+        if self.stopped or self._mqtt.is_connected is False:
+            return
+
         command_bytes = self._commands.send_todev_ble_sync(3)
         try:
             await self._mqtt.send_command(self.iot_id, command_bytes)

{pymammotion-0.4.21 → pymammotion-0.4.23}/pyproject.toml

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