pymammotion 0.4.45__tar.gz → 0.4.47__tar.gz

{pymammotion-0.4.45 → pymammotion-0.4.47}/PKG-INFO

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

{pymammotion-0.4.45 → pymammotion-0.4.47}/pymammotion/data/model/device.py

@@ -43,12 +43,14 @@ class MowingDevice(DataClassORJSONMixin):
         """Update the device based on which buffer we are reading from."""
         match buffer_list.update_buf_data[0]:
             case 1:
-                # 4 speed
-                self.location.RTK.latitude = parse_double(buffer_list.update_buf_data[5], 8.0)
-                self.location.RTK.longitude = parse_double(buffer_list.update_buf_data[6], 8.0)
-                self.location.dock.latitude = parse_double(buffer_list.update_buf_data[7], 4.0)
-                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
+                # 4 speed?
+                if buffer_list.update_buf_data[5] != 0:
+                    self.location.RTK.latitude = parse_double(buffer_list.update_buf_data[5], 8.0)
+                    self.location.RTK.longitude = parse_double(buffer_list.update_buf_data[6], 8.0)
+                if buffer_list.update_buf_data[7] != 0:
+                    self.location.dock.latitude = parse_double(buffer_list.update_buf_data[7], 4.0)
+                    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()
@@ -94,6 +96,12 @@ class MowingDevice(DataClassORJSONMixin):
                     self.location.work_zone = (
                         location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
                     )
+                # if location.bol_hash:
+                #     for loc in toapp_report_data.locations:
+                #         if loc.bol_hash:
+                #             if loc.bol_hash != location.bol_hash:
+                #                 self.map = HashList()
+                # MurMurHashUtil.hash_unsigned_list(list(self.map.area.keys()))
 
         if toapp_report_data.fw_info:
             self.update_device_firmwares(toapp_report_data.fw_info)

{pymammotion-0.4.45 → pymammotion-0.4.47}/pymammotion/data/model/device_info.py

@@ -2,6 +2,8 @@ from dataclasses import dataclass, field
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
+from pymammotion.data.model.mowing_modes import TraversalMode, TurningMode
+
 
 @dataclass
 class SideLight(DataClassORJSONMixin):
@@ -17,6 +19,9 @@ class SideLight(DataClassORJSONMixin):
 @dataclass
 class MowerInfo(DataClassORJSONMixin):
     blade_status: bool = False
+    rain_detection: bool = False
+    traversal_mode: TraversalMode = TraversalMode.direct
+    turning_mode: TurningMode = TurningMode.zero_turn
     side_led: SideLight = field(default_factory=SideLight)
     collector_installation_status: bool = False
     model: str = ""

{pymammotion-0.4.45 → pymammotion-0.4.47}/pymammotion/data/model/mowing_modes.py

@@ -47,8 +47,8 @@ class TraversalMode(IntEnum):
 class TurningMode(IntEnum):
     """Turning mode on corners."""
 
-    multipoint = 0
-    zero_turn = 1
+    zero_turn = 0
+    multipoint = 1
 
 
 class DetectionStrategy(IntEnum):

{pymammotion-0.4.45 → pymammotion-0.4.47}/pymammotion/data/state_manager.py

@@ -11,6 +11,7 @@ from pymammotion.data.model.device import MowingDevice
 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.mowing_modes import TraversalMode, TurningMode
 from pymammotion.data.model.work import CurrentTaskSettings
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
@@ -25,6 +26,7 @@ from pymammotion.proto import (
     NavGetHashListAck,
     NavPlanJobSet,
     NavReqCoverPath,
+    NavSysParamMsg,
     SvgMessageAckT,
     TimeCtrlLight,
     WifiIotStatusReport,
@@ -168,6 +170,21 @@ class StateManager:
                 converted_list = [AreaHashNameList(name=item.name, hash=item.hash) for item in hash_names.hashnames]
                 self._device.map.area_name = converted_list
 
+            case "bidire_reqconver_path":
+                work_settings: NavReqCoverPath = nav_msg[1]
+                self._device.work = CurrentTaskSettings.from_dict(
+                    work_settings.to_dict(casing=betterproto.Casing.SNAKE)
+                )
+            case "nav_sys_param_cmd":
+                settings: NavSysParamMsg = nav_msg[1]
+                match settings.id:
+                    case 3:
+                        self._device.mower_state.rain_detection = bool(settings.context)
+                    case 6:
+                        self._device.mower_state.turning_mode = TurningMode(settings.context)
+                    case 7:
+                        self._device.mower_state.traversal_mode = TraversalMode(settings.context)
+
     def _update_sys_data(self, message) -> None:
         """Update system."""
         sys_msg = betterproto.which_one_of(message.sys, "SubSysMsg")
@@ -209,11 +226,6 @@ 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.45 → pymammotion-0.4.47}/pymammotion/mammotion/commands/messages/system.py

@@ -125,14 +125,6 @@ class MessageSystem(AbstractMessage, ABC):
             return self.messageNavigation.allpowerfull_rw_adapter_x3(rw_id, context, rw)
         build = MctlSys(bidire_comm_cmd=SysCommCmd(id=rw_id, context=context, rw=rw))
         logger.debug(f"Send command - 9 general read and write command id={rw_id}, context={context}, rw={rw}")
-        if rw_id == 5:
-            # TODO investigate if the original code makes any difference to this call.
-            """
-            LubaMsgOuterClass.LubaMsg.Builder protoBufBuilderSet = getProtoBufBuilderSet(LubaMsgOuterClass.MsgCmdType.EMBED_SYS, LubaMsgOuterClass.MsgDevice.DEV_MAINCTL, LubaMsgOuterClass.MsgAttr.REQ);
-            protoBufBuilderSet.setSys(build);
-            sendMsg(protoBufBuilderSet, 122, true, "发送指令--9通用读写命令id=" + i + ",context=" + i2 + ",rw=" + i3);
-            """
-            return self.send_order_msg_sys(build)
         return self.send_order_msg_sys(build)
 
     def traverse_mode(self, context: int) -> bytes:
@@ -145,8 +137,8 @@ class MessageSystem(AbstractMessage, ABC):
     def turning_mode(self, context: int) -> bytes:
         """Sets the traversal mode back to charger."""
         # setTurnAroundMode
-        # 0 multipoint turn
-        # 1 zero turn
+        # 0 zero turn
+        # 1 multipoint turn
         return self.allpowerfull_rw(6, context, 1)
 
     # Commented out as not needed and too many refs to try fix up

{pymammotion-0.4.45 → pymammotion-0.4.47}/pymammotion/mammotion/devices/base.py

@@ -262,8 +262,11 @@ class MammotionBaseDevice:
 
     async def async_read_settings(self) -> None:
         """Read settings from device."""
+        # no cutting in rain nav_sys_param_cmd (id 3 context 1/0)
         await self.queue_command("allpowerfull_rw", rw_id=3, context=1, rw=0)
+        # ??
         await self.queue_command("allpowerfull_rw", rw_id=4, context=1, rw=0)
+        # turning mode nav_sys_param_cmd (id 6, context 1/0)
         await self.queue_command("allpowerfull_rw", rw_id=6, context=1, rw=0)
         # traversal mode
         await self.queue_command("allpowerfull_rw", rw_id=7, context=1, rw=0)

{pymammotion-0.4.45 → pymammotion-0.4.47}/pyproject.toml

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