pymammotion 0.2.60__py3-none-any.whl → 0.2.62__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -664,7 +664,6 @@ class CloudIOTGateway:
                 "args": {"content": self.converter.printBase64Binary(command)},
                 "identifier": "device_protobuf_sync_service",
                 "iotId": f"{iot_id}",
-                "identityId": f"{self._session_by_authcode_response.data.identityId}"
             },
             request=request,
             version="1.0",

pymammotion/data/model/device.py

@@ -8,6 +8,7 @@ from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
 from pymammotion.data.model.device_config import DeviceLimits
+from pymammotion.data.model.device_info import MowerInfo
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
@@ -34,7 +35,8 @@ from pymammotion.utility.map import CoordinateConverter
 class MowingDevice(DataClassORJSONMixin):
     """Wraps the betterproto dataclasses, so we can bypass the groups for keeping all data."""
 
-    mqtt_properties: ThingPropertiesMessage | None = None
+    mower_state: MowerInfo = field(default_factory=MowerInfo)
+    mqtt_properties: ThingPropertiesMessage = field(default_factory=ThingPropertiesMessage)
     map: HashList = field(default_factory=HashList)
     location: Location = field(default_factory=Location)
     mowing_state: RapidState = field(default_factory=RapidState)

pymammotion/data/model/device_info.py

@@ -0,0 +1,25 @@
+from dataclasses import dataclass, field
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+
+@dataclass
+class SideLight(DataClassORJSONMixin):
+    operate: int = 0
+    enable: int = 0
+    start_hour: int = 0
+    start_min: int = 0
+    end_hour: int = 0
+    end_min: int = 0
+    action: int = 0
+
+
+@dataclass
+class MowerInfo(DataClassORJSONMixin):
+    blade_status: bool = False
+    side_led: SideLight = field(default_factory=SideLight)
+    collector_installation_status: bool = False
+    model: str = ""
+    swversion: str = ""
+    product_key: str = ""
+    model_id: str = ""

pymammotion/data/model/report_info.py

@@ -10,6 +10,18 @@ class ConnectData(DataClassORJSONMixin):
     wifi_rssi: int = 0
 
 
+@dataclass
+class CollectorStatus(DataClassORJSONMixin):
+    collector_installation_status: int = 0
+
+
+@dataclass
+class MnetInfo(DataClassORJSONMixin):
+    model: str = ""
+    revision: str = ""
+    imei: str = ""
+
+
 @dataclass
 class DeviceData(DataClassORJSONMixin):
     sys_status: int = 0
@@ -18,6 +30,8 @@ class DeviceData(DataClassORJSONMixin):
     sensor_status: int = 0
     last_status: int = 0
     sys_time_stamp: str = ""
+    collector_status: CollectorStatus = field(default_factory=CollectorStatus)
+    mnet_info: MnetInfo = field(default_factory=MnetInfo)
 
 
 @dataclass

pymammotion/data/state_manager.py

@@ -6,12 +6,15 @@ from typing import Any, Awaitable, Callable, Optional
 
 import betterproto
 
+from pymammotion.proto.dev_net import WifiIotStatusReport
 from pymammotion.aliyun.cloud_gateway import SetupException
 from pymammotion.data.model.device import MowingDevice
+from pymammotion.data.model.device_info import SideLight
 from pymammotion.data.model.hash_list import AreaHashNameList
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck
+from pymammotion.proto.mctrl_sys import TimeCtrlLight, DeviceProductTypeInfoT
 from pymammotion.utility.constant import WorkMode
 
 logger = logging.getLogger(__name__)
@@ -102,12 +105,23 @@ class StateManager:
                 self._device.mow_info(sys_msg[1])
             case "system_tard_state_tunnel":
                 self._device.run_state_update(sys_msg[1])
+            case "todev_time_ctrl_light":
+                ctrl_light: TimeCtrlLight = sys_msg[1]
+                side_led: SideLight = SideLight.from_dict(ctrl_light.to_dict(casing=betterproto.Casing.SNAKE))
+                self._device.mower_state.side_led = side_led
+            case "device_product_type_info":
+                device_product_type: DeviceProductTypeInfoT = sys_msg[1]
+                self._device.mower_state.model_id = device_product_type.main_product_type
 
     def _update_driver_data(self, message) -> None:
         pass
 
     def _update_net_data(self, message) -> None:
-        pass
+        net_msg = betterproto.which_one_of(message.net, "NetSubType")
+        match net_msg[0]:
+            case "toapp_wifi_iot_status":
+                wifi_iot_status: WifiIotStatusReport = net_msg[1]
+                self._device.mower_state.product_key = wifi_iot_status.productkey
 
     def _update_mul_data(self, message) -> None:
         pass

pymammotion/proto/mctrl_nav.proto

@@ -461,8 +461,8 @@ message SvgMessageAckT {
     int32 sub_cmd = 2;       // Represents SUBCMD field
     int32 total_frame = 3;   // Represents TOTALFRAME field
     int32 current_frame = 4; // Represents CURRENTFRAME field
-    int64 data_hash = 5;     // Represents DATAHASH field
-    int64 paternal_hash_a = 6; // Represents PATERNALHASHA field
+    fixed64 data_hash = 5;     // Represents DATAHASH field
+    fixed64 paternal_hash_a = 6; // Represents PATERNALHASHA field
     int32 type = 7;          // Represents TYPE field
     int32 result = 8;        // Represents RESULT field
     svg_message_t svg_message = 9; // Represents SVG_MESSAGE field

pymammotion/proto/mctrl_nav.py

@@ -516,8 +516,8 @@ class SvgMessageAckT(betterproto.Message):
     sub_cmd: int = betterproto.int32_field(2)
     total_frame: int = betterproto.int32_field(3)
     current_frame: int = betterproto.int32_field(4)
-    data_hash: int = betterproto.int64_field(5)
-    paternal_hash_a: int = betterproto.int64_field(6)
+    data_hash: int = betterproto.fixed64_field(5)
+    paternal_hash_a: int = betterproto.fixed64_field(6)
     type: int = betterproto.int32_field(7)
     result: int = betterproto.int32_field(8)
     svg_message: "SvgMessageT" = betterproto.message_field(9)

{pymammotion-0.2.60.dist-info → pymammotion-0.2.62.dist-info}/METADATA

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

{pymammotion-0.2.60.dist-info → pymammotion-0.2.62.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=jHCQrpJaG1jAoID9T4RT3g4JsZc0JpJqIcqjnA7cXd0,1605
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=81el3sCj7bS02PnY3krOlwnlDvQiAr2G0nHsRJLN0tk,25743
+pymammotion/aliyun/cloud_gateway.py,sha256=m-cVJ0p3-v1mKM24lTKTj3t0PEseO5ca2FbyK_iT_S8,25657
 pymammotion/aliyun/cloud_service.py,sha256=px7dUKow5Z7VyebjYzuKkzkm77XbUXYiFiYO_2e-UQ0,2207
 pymammotion/aliyun/model/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
@@ -22,8 +22,9 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=hsN_NrrM_Kg1gbxcmSL3sVubGmeMxWHwnPiUN1-d8Eo,12196
+pymammotion/data/model/device.py,sha256=C0zi5rhmCXPuxpTh-ckzFkAhC1oGQcHUxNb0Li2N1ag,12349
 pymammotion/data/model/device_config.py,sha256=SMBrG-rjN58Z59V-ok3wQ0721BQxM9zSdYXI3Q8GFdY,2828
+pymammotion/data/model/device_info.py,sha256=ahz2xILdSYdX6SIVuVzz8QCfSQLefbQnpXrsiDpBDbY,585
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
@@ -34,12 +35,12 @@ pymammotion/data/model/mowing_modes.py,sha256=5TrHSijUyPtIDWpNtgzx_vFQukRJWRz4gI
 pymammotion/data/model/plan.py,sha256=mcadkSL7fQXy0iJ0q786I3GEQY4i6kmQXfW6Ri69lcQ,2906
 pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9PGIDA8Ls,1251
 pymammotion/data/model/region_data.py,sha256=OTV15vRyn9JORXsQPjWMNF1ZujuNhsOKl25KeqwMObA,3007
-pymammotion/data/model/report_info.py,sha256=AE2u64uKgcJtVooldJcxXBsEHfDyCvH5DnQFUQ5qWmk,2226
+pymammotion/data/model/report_info.py,sha256=m3T2P2mLfy5wDDpyjM2q1y9zCKJJKIItNX0M-Ge1ijg,2577
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=z6j8t-ZOjEeKjFt7S0wV8vV5L0-iHD3RbwI9hCfzGTY,5044
 pymammotion/data/mqtt/properties.py,sha256=kvphcjrDuJHuX8Az98-wKeFv_rSmu2Fz9YKLGodGSj0,3759
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
-pymammotion/data/state_manager.py,sha256=DjWi_ojheZFB_KfdMnOJgxMTQ46HpbwtATK2ebgwRHE,4634
+pymammotion/data/state_manager.py,sha256=Pj5cuaPJVBUkZS_IgGk5StD-gPXxHtrkTeIGe3z3Lik,5577
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=UzYnxV5DfvMDK3E06UvSzvzuBbaXOOUwO6xYt_zn9To,2034
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -92,8 +93,8 @@ pymammotion/proto/mctrl_driver.proto,sha256=I0BncdAa3laeqT17Sn95r_1HuBD3dSc9IVu9
 pymammotion/proto/mctrl_driver.py,sha256=sseY2MxUtaQZvg7fvbA_gNvtqx9MVDW_rvUcfA2CWVs,2971
 pymammotion/proto/mctrl_driver_pb2.py,sha256=bfLwZb5Hehb6OIkgFrZMkQ0oTBXoOBxpruszKz-UM1U,3785
 pymammotion/proto/mctrl_driver_pb2.pyi,sha256=9_rcQELsSeOfeIQMTEFIpeXICpDe3arQeA4kAYWNSWw,5860
-pymammotion/proto/mctrl_nav.proto,sha256=rti69pG6rKMhhX6dWGv0UwtUQkHwKc0r9tOQ78M-N7k,12374
-pymammotion/proto/mctrl_nav.py,sha256=xTsPmwhV_AwfoFWTGqpz2W4rVR7tHTHwNU4rS8QBLdc,24884
+pymammotion/proto/mctrl_nav.proto,sha256=FODYEh8AsCgyDVHU3xiFrkxyOjVubY0WRN5Ge2J1GLk,12378
+pymammotion/proto/mctrl_nav.py,sha256=_Nss6v10WkYS1z3D6v96L71WZ3FoRqk98s-dwEJpCpA,24888
 pymammotion/proto/mctrl_nav_pb2.py,sha256=LAHfEmGfNVZCN6vuLSZF6s2wd1Qk-siaWe4mdPWPdxc,24213
 pymammotion/proto/mctrl_nav_pb2.pyi,sha256=qmGYfKh2o63e5ppl9QIWnwDbmGVUVOf7EqhC9ApE5fg,51336
 pymammotion/proto/mctrl_ota.proto,sha256=4iHr-v1R0QiNndCnv3b6mhXiERLukB67ZzhTgt1iMc0,629
@@ -118,7 +119,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.2.60.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.60.dist-info/METADATA,sha256=j7Wek8S1oT8yaIKyoK6aKbqaLiboeMm1J--yDMwMyX0,3874
-pymammotion-0.2.60.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.60.dist-info/RECORD,,
+pymammotion-0.2.62.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.62.dist-info/METADATA,sha256=6UplkWzRMBFIE91ezexuQlA-QNGxHuTChMkbbTYWrEg,3874
+pymammotion-0.2.62.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.62.dist-info/RECORD,,