pymammotion 0.2.13__tar.gz → 0.2.15__tar.gz

{pymammotion-0.2.13 → pymammotion-0.2.15}/PKG-INFO

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

{pymammotion-0.2.13 → pymammotion-0.2.15}/pymammotion/data/mqtt/event.py

@@ -95,9 +95,9 @@ class DeviceWarningEventParams(GeneralParams):
 
 @dataclass
 class ThingEventMessage(DataClassORJSONMixin):
-    method: Literal["thing.events"]
+    method: Literal["thing.events", "thing.properties"]
     id: str
-    params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams]
+    params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams, str]
     version: Literal["1.0"]
 
     @classmethod
@@ -114,6 +114,8 @@ class ThingEventMessage(DataClassORJSONMixin):
             params_obj = DeviceProtobufMsgEventParams(**params_dict)
         elif identifier == "device_warning_event":
             params_obj = DeviceWarningEventParams(**params_dict)
+        elif identifier == "device_config_req_event":
+            params_obj = payload.get("params", '')
         else:
             raise ValueError(f"Unknown identifier: {identifier}")
 

{pymammotion-0.2.13 → pymammotion-0.2.15}/pymammotion/mammotion/devices/mammotion.py

@@ -1147,7 +1147,10 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             _LOGGER.debug("Thing event received")
             event = ThingEventMessage.from_dicts(payload)
             params = event.params
-            if params.identifier == "device_protobuf_msg_event":
+            if isinstance(params, str):
+                _LOGGER.debug("config event %s", str)
+                return
+            if params.identifier == "device_protobuf_msg_event" and params.thingType == "thing.events":
                 _LOGGER.debug("Protobuf event")
                 binary_data = base64.b64decode(params.value.get("content", ""))
                 self._update_raw_data(cast(bytes, binary_data))
@@ -1168,6 +1171,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
                     if not fut.fut.cancelled():
                         fut.resolve(cast(bytes, binary_data))
                 await self._state_manager.notification(new_msg)
+            if params.thingType == "thing.properties":
+                _LOGGER.debug(event)
 
     async def _handle_mqtt_message(self, topic: str, payload: dict) -> None:
         """Async handler for incoming MQTT messages."""

{pymammotion-0.2.13 → pymammotion-0.2.15}/pymammotion/proto/mctrl_sys.proto

@@ -196,7 +196,7 @@ message LoraCfgRsp {
   int32 result = 1;
   int32 op = 2;
   string cfg = 3;
-  string fac_cfg = 4;
+  bytes fac_cfg = 4;
 }
 
 message mod_fw_info {

{pymammotion-0.2.13 → pymammotion-0.2.15}/pymammotion/proto/mctrl_sys.py

@@ -312,7 +312,7 @@ class LoraCfgRsp(betterproto.Message):
     result: int = betterproto.int32_field(1)
     op: int = betterproto.int32_field(2)
     cfg: str = betterproto.string_field(3)
-    fac_cfg: str = betterproto.string_field(4)
+    fac_cfg: bytes = betterproto.bytes_field(4)
 
 
 @dataclass

{pymammotion-0.2.13 → pymammotion-0.2.15}/pymammotion/proto/mctrl_sys_pb2.pyi

@@ -82,7 +82,7 @@ class LoraCfgRsp(_message.Message):
     OP_FIELD_NUMBER: _ClassVar[int]
     RESULT_FIELD_NUMBER: _ClassVar[int]
     cfg: str
-    fac_cfg: str
+    fac_cfg: bytes
     op: int
     result: int
     def __init__(self, result: _Optional[int] = ..., op: _Optional[int] = ..., cfg: _Optional[str] = ..., fac_cfg: _Optional[str] = ...) -> None: ...

{pymammotion-0.2.13 → pymammotion-0.2.15}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.13"
+version     = "0.2.15"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.13"
+version     = "0.2.15"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -53,7 +53,7 @@ mypy = "^1.10.0"
 pre-commit = "^3.7.1"
 
 [tool.bumpver]
-current_version = "0.2.13"
+current_version = "0.2.15"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true