pymammotion 0.4.47__tar.gz → 0.4.49__tar.gz

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

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

{pymammotion-0.4.47 → pymammotion-0.4.49}/pymammotion/aliyun/cloud_gateway.py

@@ -732,7 +732,7 @@ class CloudIOTGateway:
         logger.debug(iot_id)
 
         response_body_str = response.body.decode("utf-8")
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = json.loads(response_body_str) if response_body_str is not None else {}
 
         if int(response_body_dict.get("code")) != 200:
             logger.error(

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

@@ -6,7 +6,7 @@ import betterproto
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
-from pymammotion.data.model.device_info import DeviceFirmwares, MowerInfo
+from pymammotion.data.model.device_info import DeviceFirmwares, DeviceNonWorkingHours, MowerInfo
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.model.work import CurrentTaskSettings
@@ -38,6 +38,7 @@ class MowingDevice(DataClassORJSONMixin):
     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)
+    non_work_hours: DeviceNonWorkingHours = field(default_factory=DeviceNonWorkingHours)
 
     def buffer(self, buffer_list: SystemUpdateBufMsg) -> None:
         """Update the device based on which buffer we are reading from."""

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

@@ -2,8 +2,6 @@ from dataclasses import dataclass, field
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
-from pymammotion.data.model.mowing_modes import TraversalMode, TurningMode
-
 
 @dataclass
 class SideLight(DataClassORJSONMixin):
@@ -16,12 +14,18 @@ class SideLight(DataClassORJSONMixin):
     action: int = 0
 
 
+@dataclass
+class DeviceNonWorkingHours(DataClassORJSONMixin):
+    start_time: str = ""
+    end_time: str = ""
+
+
 @dataclass
 class MowerInfo(DataClassORJSONMixin):
     blade_status: bool = False
     rain_detection: bool = False
-    traversal_mode: TraversalMode = TraversalMode.direct
-    turning_mode: TurningMode = TurningMode.zero_turn
+    traversal_mode: int = 0
+    turning_mode: int = 0
     side_led: SideLight = field(default_factory=SideLight)
     collector_installation_status: bool = False
     model: str = ""
@@ -29,6 +33,8 @@ class MowerInfo(DataClassORJSONMixin):
     product_key: str = ""
     model_id: str = ""
     sub_model_id: str = ""
+    ble_mac: str = ""
+    wifi_mac: str = ""
 
 
 @dataclass

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

@@ -11,7 +11,6 @@ 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
@@ -21,12 +20,14 @@ from pymammotion.proto import (
     DeviceProductTypeInfoT,
     DrvDevInfoResp,
     DrvDevInfoResult,
+    GetNetworkInfoRsp,
     LubaMsg,
     NavGetCommDataAck,
     NavGetHashListAck,
     NavPlanJobSet,
     NavReqCoverPath,
     NavSysParamMsg,
+    NavUnableTimeSet,
     SvgMessageAckT,
     TimeCtrlLight,
     WifiIotStatusReport,
@@ -181,9 +182,13 @@ class StateManager:
                     case 3:
                         self._device.mower_state.rain_detection = bool(settings.context)
                     case 6:
-                        self._device.mower_state.turning_mode = TurningMode(settings.context)
+                        self._device.mower_state.turning_mode = settings.context
                     case 7:
-                        self._device.mower_state.traversal_mode = TraversalMode(settings.context)
+                        self._device.mower_state.traversal_mode = settings.context
+            case "todev_unable_time_set":
+                nav_non_work_time: NavUnableTimeSet = nav_msg[1]
+                self._device.non_work_hours.start_time = nav_non_work_time.unable_start_time
+                self._device.non_work_hours.end_time = nav_non_work_time.unable_end_time
 
     def _update_sys_data(self, message) -> None:
         """Update system."""
@@ -226,6 +231,9 @@ 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 "toapp_networkinfo_rsp":
+                get_network_info_resp: GetNetworkInfoRsp = net_msg[1]
+                self._device.mower_state.wifi_mac = get_network_info_resp.wifi_mac
 
     def _update_mul_data(self, message) -> None:
         pass

{pymammotion-0.4.47 → pymammotion-0.4.49}/pymammotion/mammotion/commands/messages/network.py

@@ -192,11 +192,6 @@ class MessageNetwork(AbstractMessage, ABC):
         logger.debug("Send command - get Wifi connection information")
         return self.send_order_msg_net(build)
 
-    def wifi_connectinfo_update2(self) -> None:
-        hash_map = {"getMsgCmd": 1}
-        # self.post_custom_data(self.get_json_string(
-        #     68, hash_map))  # TODO: Fix this
-
     def get_record_wifi_list(self) -> bytes:
         build = DevNet(todev_ble_sync=1, todev_wifi_list_upload=DrvWifiList())
         logger.debug("Send command - get memorized WiFi list upload command")

{pymammotion-0.4.47 → pymammotion-0.4.49}/pymammotion/mammotion/devices/mammotion.py

@@ -133,21 +133,22 @@ class MammotionDeviceManager:
         return self.devices.get(mammotion_device_name)
 
     async def remove_device(self, name: str) -> None:
-        device_for_removal = self.devices.pop(name)
-        loop = asyncio.get_running_loop()
-        if device_for_removal.has_cloud():
-            should_disconnect = {
-                device
-                for key, device in self.devices.items()
-                if device.cloud() is not None and device.cloud().mqtt == device_for_removal.cloud().mqtt
-            }
-            if len(should_disconnect) == 0:
-                await loop.run_in_executor(None, device_for_removal.cloud().mqtt.disconnect)
-            await device_for_removal.cloud().stop()
-        if device_for_removal.has_ble():
-            await device_for_removal.ble().stop()
-
-        del device_for_removal
+        if self.devices.get(name):
+            device_for_removal = self.devices.pop(name)
+            loop = asyncio.get_running_loop()
+            if device_for_removal.has_cloud():
+                should_disconnect = {
+                    device
+                    for key, device in self.devices.items()
+                    if device.cloud() is not None and device.cloud().mqtt == device_for_removal.cloud().mqtt
+                }
+                if len(should_disconnect) == 0:
+                    await loop.run_in_executor(None, device_for_removal.cloud().mqtt.disconnect)
+                await device_for_removal.cloud().stop()
+            if device_for_removal.has_ble():
+                await device_for_removal.ble().stop()
+
+            del device_for_removal
 
 
 class Mammotion:

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

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