pymammotion 0.0.51__tar.gz → 0.0.53__tar.gz

{pymammotion-0.0.51 → pymammotion-0.0.53}/PKG-INFO

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

{pymammotion-0.0.51 → pymammotion-0.0.53}/pymammotion/data/model/device.py

@@ -2,8 +2,6 @@
 
 from dataclasses import dataclass
 
-import betterproto
-
 from pymammotion.data.model import HashList
 from pymammotion.data.model.location import Location
 from pymammotion.proto.dev_net import DevNet
@@ -127,7 +125,10 @@ class DevNetData:
     net: dict
 
     def __init__(self, net: DevNet):
-        self.net = net.to_dict()
+        if isinstance(net, dict):
+            self.net = net
+        else:
+            self.net = net.to_dict()
 
     def __getattr__(self, item):
         """Intercept call to get net in dict and return a betterproto dataclass."""
@@ -147,7 +148,10 @@ class SysData:
     sys: dict
 
     def __init__(self, sys: MctlSys):
-        self.sys = sys.to_dict()
+        if isinstance(sys, dict):
+            self.sys = sys
+        else:
+            self.sys = sys.to_dict()
 
     def __getattr__(self, item):
         """Intercept call to get sys in dict and return a betterproto dataclass."""
@@ -167,7 +171,10 @@ class NavData:
     nav: dict
 
     def __init__(self, nav: MctlNav):
-        self.nav = nav.to_dict()
+        if isinstance(nav, dict):
+            self.nav = nav
+        else:
+            self.nav = nav.to_dict()
 
     def __getattr__(self, item):
         """Intercept call to get nav in dict and return a betterproto dataclass."""
@@ -187,7 +194,10 @@ class DriverData:
     driver: dict
 
     def __init__(self, driver: MctlDriver):
-        self.driver = driver.to_dict()
+        if isinstance(driver, dict):
+            self.driver = driver
+        else:
+            self.driver = driver.to_dict()
 
     def __getattr__(self, item):
         """Intercept call to get driver in dict and return a betterproto dataclass."""
@@ -207,7 +217,10 @@ class MulData:
     mul: dict
 
     def __init__(self, mul: SocMul):
-        self.mul = mul.to_dict()
+        if isinstance(mul, dict):
+            self.mul = mul
+        else:
+            self.mul = mul.to_dict()
 
     def __getattr__(self, item):
         """Intercept call to get mul in dict and return a betterproto dataclass."""
@@ -227,7 +240,10 @@ class OtaData:
     ota: dict
 
     def __init__(self, ota: MctlOta):
-        self.ota = ota.to_dict()
+        if isinstance(ota, dict):
+            self.ota = ota
+        else:
+            self.ota = ota.to_dict()
 
     def __getattr__(self, item):
         """Intercept call to get ota in dict and return a betterproto dataclass."""
@@ -247,7 +263,10 @@ class PeptData:
     pept: dict
 
     def __init__(self, pept: MctlPept):
-        self.pept = pept.to_dict()
+        if isinstance(pept, dict):
+            self.pept = pept
+        else:
+            self.pept = pept.to_dict()
 
     def __getattr__(self, item):
         """Intercept call to get pept in dict and return a betterproto dataclass."""

{pymammotion-0.0.51 → pymammotion-0.0.53}/pymammotion/mammotion/devices/mammotion.py

@@ -192,8 +192,6 @@ class MammotionBaseDevice:
             region_data.current_frame = current_frame
             await self._send_command_with_args("get_regional_data", regional_data=region_data)
 
-
-
     def _update_raw_data(self, data: bytes) -> None:
         """Update raw and model data from notifications."""
         tmp_msg = LubaMsg().parse(data)
@@ -487,6 +485,8 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
             )
             self._reset_disconnect_timer()
             await self._start_notify()
+            command_bytes = self._commands.send_todev_ble_sync(2)
+            await self._message.post_custom_data_bytes(command_bytes)
             self.schedule_ble_sync()
 
     async def _send_command_locked(self, key: str, command: bytes) -> bytes:

{pymammotion-0.0.51 → pymammotion-0.0.53}/pyproject.toml

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