pymammotion 0.0.45__tar.gz → 0.0.47__tar.gz

{pymammotion-0.0.45 → pymammotion-0.0.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.0.45
+Version: 0.0.47
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.0.45 → pymammotion-0.0.47}/pymammotion/data/model/hash_list.py

@@ -19,21 +19,24 @@ class HashList:
     path: dict  # type 2
     obstacle: dict  # type 1
 
-    def update(self, hash_data: NavGetCommDataAck):
+    def update(self, hash_data: NavGetCommDataAck) -> bool:
         """Update the map data."""
         if hash_data.type == 0:
-            self._add_hash_data(self.area, hash_data)
+            return self._add_hash_data(self.area, hash_data)
 
         if hash_data.type == 1:
-            self._add_hash_data(self.obstacle, hash_data)
+            return self._add_hash_data(self.obstacle, hash_data)
 
         if hash_data.type == 2:
-            self._add_hash_data(self.path, hash_data)
+            return self._add_hash_data(self.path, hash_data)
 
     @staticmethod
-    def _add_hash_data(hash_dict: dict, hash_data: NavGetCommDataAck) -> None:
+    def _add_hash_data(hash_dict: dict, hash_data: NavGetCommDataAck) -> bool:
         if hash_dict.get(hash_data.hash) is None:
             hash_dict[hash_data.hash] = FrameList(total_frame=hash_data.total_frame, data=[hash_data])
+            return True
 
         if hash_data not in hash_dict[hash_data.hash].data:
-            hash_dict[hash_data.hash].data.append(hash_data)
+            hash_dict[hash_data.hash].data.append(hash_data)
+            return True
+        return False

{pymammotion-0.0.45 → pymammotion-0.0.47}/pymammotion/data/state_manager.py

@@ -5,6 +5,7 @@ import betterproto
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.event.event import DataEvent
 from pymammotion.proto.luba_msg import LubaMsg
+from pymammotion.proto.mctrl_nav import NavGetCommDataAck
 
 
 class StateManager:
@@ -50,25 +51,23 @@ class StateManager:
         nav_msg = betterproto.which_one_of(message.nav, "SubNavMsg")
         match nav_msg[0]:
             case "toapp_gethash_ack":
-                # call callback to handle this data
-                print(nav_msg[1])
+                self._device.map.obstacle = dict()
+                self._device.map.area = dict()
+                self._device.map.path = dict()
                 await self.gethash_ack_callback.data_event(nav_msg[1])
             case "toapp_get_commondata_ack":
-                # callback to additional method
-                print(nav_msg[1])
-                self._device.map.update(nav_msg[1])
-                await self.get_commondata_ack_callback.data_event(nav_msg[1])
+                common_data: NavGetCommDataAck = nav_msg[1]
+                updated = self._device.map.update(common_data)
+                if updated:
+                    await self.get_commondata_ack_callback.data_event(common_data)
 
     def _update_sys_data(self, message):
         """Update system."""
         sys_msg = betterproto.which_one_of(message.sys, "SubSysMsg")
         match sys_msg[0]:
             case "system_update_buf":
-                # call callback to handle this data
-                print(sys_msg[1])
                 self._device.buffer(sys_msg[1])
             case "toapp_report_data":
-                # data for sensors
                 pass
 
     def _update_driver_data(self, message):
@@ -81,4 +80,4 @@ class StateManager:
         pass
 
     def _update_ota_data(self, message):
-        pass
+        pass

{pymammotion-0.0.45 → pymammotion-0.0.47}/pymammotion/mammotion/devices/mammotion.py

@@ -79,6 +79,21 @@ def slashescape(err):
 codecs.register_error("slashescape", slashescape)
 
 
+def find_next_integer(lst: list[int], current_int: int) -> int | None:
+    try:
+        # Find the index of the current integer
+        current_index = lst.index(current_int)
+
+        # Check if there is a next integer in the list
+        if current_index + 1 < len(lst):
+            return lst[current_index + 1]
+        else:
+            return None  # Or raise an exception or handle it in some other way
+    except ValueError:
+        # Handle the case where current_int is not in the list
+        return None  # Or raise an exception or handle it in some other way
+
+
 def _handle_timeout(fut: asyncio.Future[None]) -> None:
     """Handle a timeout."""
     if not fut.done():
@@ -143,30 +158,41 @@ class MammotionBaseDevice:
 
     async def datahash_response(self, hash_ack: NavGetHashListAck):
         """Handle datahash responses."""
-        for data_hash in hash_ack.data_couple:
+        result_hash = 0
+        while hash_ack.data_couple[0] != result_hash:
+            data = await self._send_command_with_args("synchronize_hash_data", hash_num=hash_ack.data_couple[0])
+            msg = LubaMsg().parse(data)
+            if betterproto.serialized_on_wire(msg.nav.toapp_get_commondata_ack):
+                result_hash = msg.nav.toapp_get_commondata_ack.hash
+
+    async def commdata_response(self, common_data: NavGetCommDataAck):
+        """Handle common data responses."""
+        total_frame = common_data.total_frame
+        current_frame = common_data.current_frame
+
+        if total_frame == current_frame:
+            # get next in hash ack list
+
+            data_hash = find_next_integer(self.luba_msg.nav.toapp_gethash_ack.data_couple, common_data.hash)
+            if data_hash is None:
+                return
             result_hash = 0
             while data_hash != result_hash:
                 data = await self._send_command_with_args("synchronize_hash_data", hash_num=data_hash)
                 msg = LubaMsg().parse(data)
                 if betterproto.serialized_on_wire(msg.nav.toapp_get_commondata_ack):
                     result_hash = msg.nav.toapp_get_commondata_ack.hash
-                else:
-                    await asyncio.sleep(0.5)
-
-    async def commdata_response(self, common_data: NavGetCommDataAck):
-        """Handle common data responses."""
-        # TODO check if the hash exists and whether or not to call get regional
-        total_frame = common_data.total_frame
-        current_frame = 1
-        while current_frame <= total_frame:
+        else:
+            # check if we have the data already first
             region_data = RegionData()
-            region_data.hash = common_data.data_hash
+            region_data.hash = common_data.hash
             region_data.action = common_data.action
             region_data.type = common_data.type
             region_data.total_frame = total_frame
             region_data.current_frame = current_frame
             await self._send_command_with_args("get_regional_data", regional_data=region_data)
-            current_frame += 1
+
+
 
     def _update_raw_data(self, data: bytes) -> None:
         """Update raw and model data from notifications."""
@@ -242,7 +268,7 @@ class MammotionBaseDevice:
         return self._raw_data
 
     @property
-    def luba_msg(self) -> LubaMsg:
+    def luba_msg(self) -> MowingDevice:
         """Get the LubaMsg of the device."""
         return self._luba_msg
 

{pymammotion-0.0.45 → pymammotion-0.0.47}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.0.45"
+version     = "0.0.47"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -49,7 +49,7 @@ pre-commit = "^3.7.1"
 
 
 [tool.bumpver]
-current_version = "0.0.42"
+current_version = "0.0.47"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true