pymammotion 0.0.50__py3-none-any.whl → 0.0.52__py3-none-any.whl

pymammotion/data/model/device.py

@@ -2,6 +2,8 @@
 
 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
@@ -122,95 +124,158 @@ class MowingDevice:
 class DevNetData:
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
-    net: DevNet
+    net: dict
+
+    def __init__(self, net: DevNet):
+        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."""
-        if not isinstance(self.net[item], dict):
-            return self.net[item]
+        if self.net.get(item) is None:
+            return DevNet().__getattribute__(item)
 
-        return DevNet().__getattribute__(item).from_dict(value=self.net[item])
+        if not isinstance(self.net.get(item), dict):
+            return self.net.get(item)
+
+        return DevNet().__getattribute__(item).from_dict(value=self.net.get(item))
 
 
 @dataclass
 class SysData:
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
-    sys: MctlSys
+    sys: dict
+
+    def __init__(self, sys: MctlSys):
+        if isinstance(sys, dict):
+            self.sys = sys
+        else:
+            self.sys = sys.to_dict()
 
     def __getattr__(self, item):
-        """Intercept call to get net in dict and return a betterproto dataclass."""
-        if not isinstance(self.sys[item], dict):
-            return self.sys[item]
+        """Intercept call to get sys in dict and return a betterproto dataclass."""
+        if self.sys.get(item) is None:
+            return MctlSys().__getattribute__(item)
+
+        if not isinstance(self.sys.get(item), dict):
+            return self.sys.get(item)
 
-        return MctlSys().__getattribute__(item).from_dict(value=self.sys[item])
+        return MctlSys().__getattribute__(item).from_dict(value=self.sys.get(item))
 
 
 @dataclass
 class NavData:
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
-    nav: MctlNav
+    nav: dict
+
+    def __init__(self, nav: MctlNav):
+        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."""
-        if not isinstance(self.nav[item], dict):
-            return self.nav[item]
+        if self.nav.get(item) is None:
+            return MctlNav().__getattribute__(item)
+
+        if not isinstance(self.nav.get(item), dict):
+            return self.nav.get(item)
 
-        return MctlNav().__getattribute__(item).from_dict(value=self.nav[item])
+        return MctlNav().__getattribute__(item).from_dict(value=self.nav.get(item))
 
 
 @dataclass
 class DriverData:
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
-    driver: MctlDriver
+    driver: dict
+
+    def __init__(self, driver: MctlDriver):
+        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."""
-        if not isinstance(self.driver[item], dict):
-            return self.driver[item]
+        if self.driver.get(item) is None:
+            return MctlDriver().__getattribute__(item)
+
+        if not isinstance(self.driver.get(item), dict):
+            return self.driver.get(item)
 
-        return MctlDriver().__getattribute__(item).from_dict(value=self.driver[item])
+        return MctlDriver().__getattribute__(item).from_dict(value=self.driver.get(item))
 
 
 @dataclass
 class MulData:
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
-    mul: SocMul
+    mul: dict
+
+    def __init__(self, mul: SocMul):
+        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."""
-        if not isinstance(self.mul[item], dict):
-            return self.mul[item]
+        if self.mul.get(item) is None:
+            return SocMul().__getattribute__(item)
+
+        if not isinstance(self.mul.get(item), dict):
+            return self.mul.get(item)
 
-        return SocMul().__getattribute__(item).from_dict(value=self.mul[item])
+        return SocMul().__getattribute__(item).from_dict(value=self.mul.get(item))
 
 
 @dataclass
 class OtaData:
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
-    ota: MctlOta
+    ota: dict
+
+    def __init__(self, ota: MctlOta):
+        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."""
-        if not isinstance(self.ota[item], dict):
-            return self.ota[item]
+        if self.ota.get(item) is None:
+            return MctlOta().__getattribute__(item)
+
+        if not isinstance(self.ota.get(item), dict):
+            return self.ota.get(item)
 
-        return MctlOta().__getattribute__(item).from_dict(value=self.ota[item])
+        return MctlOta().__getattribute__(item).from_dict(value=self.ota.get(item))
 
 
 @dataclass
 class PeptData:
     """Wrapping class around LubaMsg to return a dataclass from the raw dict."""
 
-    pept: MctlPept
+    pept: dict
+
+    def __init__(self, pept: MctlPept):
+        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."""
-        if not isinstance(self.pept[item], dict):
-            return self.pept[item]
+        if self.pept.get(item) is None:
+            return MctlPept().__getattribute__(item)
+
+        if not isinstance(self.pept.get(item), dict):
+            return self.pept.get(item)
 
-        return MctlPept().__getattribute__(item).from_dict(value=self.pept[item])
+        return MctlPept().__getattribute__(item).from_dict(value=self.pept.get(item))

pymammotion/mammotion/devices/mammotion.py

@@ -531,6 +531,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         if self._notify_future and not self._notify_future.done():
             self._notify_future.set_result(data)
 
+        self._reset_disconnect_timer()
         await self._state_manager.notification(new_msg)
 
     async def _start_notify(self) -> None:
@@ -663,7 +664,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         _LOGGER.debug("%s: Disconnecting", self.name)
         try:
             """We reset what command the robot last heard before disconnecting."""
-            if client.is_connected:
+            if client is not None and client.is_connected:
                 command_bytes = self._commands.send_todev_ble_sync(2)
                 await self._message.post_custom_data_bytes(command_bytes)
                 await client.stop_notify(self._read_char)

{pymammotion-0.0.50.dist-info → pymammotion-0.0.52.dist-info}/METADATA

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

{pymammotion-0.0.50.dist-info → pymammotion-0.0.52.dist-info}/RECORD

@@ -20,7 +20,7 @@ pymammotion/bluetooth/data/notifydata.py,sha256=N1bphpueWUWbsWUcpZmMGt2CyCgLcKAF
 pymammotion/const.py,sha256=3plR6t5sFVhx3LoUbW5PE2gqIANoD-fSm-T0q8uIwIU,336
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=d8FlIgCcWqoH3jJSpnm-IY-25RM-l2nbRwLtWjSHo74,222
-pymammotion/data/model/device.py,sha256=SoxmvxK3It5IKLiOybExQCIQo2WHCthsMaQdeRpCmuA,7325
+pymammotion/data/model/device.py,sha256=-Hb66EQbz2RXMx8dQ0kwqCmpn2fRtutoSwU4Xf0Y4hg,9139
 pymammotion/data/model/enums.py,sha256=tD_vYsxstOV_lUkYF9uWkrjVOgAJPNnGevy_xmiu3WE,1558
 pymammotion/data/model/excute_boarder_params.py,sha256=kadSth4y-VXlXIZ6R-Ng-kDvBbM-3YRr8bmR86qR0U0,1355
 pymammotion/data/model/execute_boarder.py,sha256=oDb2h5tFtOQIa8OCNYaDugqCgCZBLjQRzQTNVcJVAGQ,1072
@@ -55,7 +55,7 @@ pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=EWV20MMzQuhbLlNlXbsyZKSEpeM7x1CQL7saU4Pn0-g,6165
 pymammotion/mammotion/devices/__init__.py,sha256=T72jt0ejtMjo1rPmn_FeMF3pmp0LLeRRpc9WcDKEYYY,126
-pymammotion/mammotion/devices/mammotion.py,sha256=PggTIzyIlR95OlOyHhU3lX3bFe1C5orFvq5IZwD2t-U,29740
+pymammotion/mammotion/devices/mammotion.py,sha256=YlRPiVZfiXEB0U9H9f-Cgn4aXjoiyjyite4spUVf69E,29802
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_mqtt.py,sha256=EBnUwqah-mZNcAn5Hq2sV3NKXueIYWNhYPiaXwaXdHg,9084
 pymammotion/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -102,7 +102,7 @@ pymammotion/utility/datatype_converter.py,sha256=v6zym2Zu0upxQjR-xDqXwi3516zpntS
 pymammotion/utility/device_type.py,sha256=B_Y1WCRPlFMDOqC13H0ltInyPkbPMIxCoZccCC13fmc,8154
 pymammotion/utility/periodic.py,sha256=9wJMfwXPlx6Mbp3Fws7LLTI34ZDKphH1bva_Ggyk32g,3281
 pymammotion/utility/rocker_util.py,sha256=syPL0QN4zMzHiTIkUKS7RXBBptjdbkfNlPddwUD5V3A,7171
-pymammotion-0.0.50.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.0.50.dist-info/METADATA,sha256=r2B1jCcA634BsZQqbZyZMLT8OlthmdBXTwLEUttVlz0,3884
-pymammotion-0.0.50.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-pymammotion-0.0.50.dist-info/RECORD,,
+pymammotion-0.0.52.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.0.52.dist-info/METADATA,sha256=T_ZjjSw8nsBl5MU0MzTr-U6fVrfImiOP-VF21_adq6c,3884
+pymammotion-0.0.52.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+pymammotion-0.0.52.dist-info/RECORD,,