pymammotion 0.4.0b4__py3-none-any.whl → 0.4.0b6__py3-none-any.whl

pymammotion/bluetooth/ble.py

@@ -6,6 +6,8 @@ from pymammotion.event.event import BleNotificationEvent
 
 
 class MammotionBLE:
+    """Class for basic ble connections to mowers."""
+
     client: BleakClient
 
     def __init__(self, bleEvt: BleNotificationEvent) -> None:
@@ -57,5 +59,6 @@ class MammotionBLE:
             await self.client.start_notify(UUID_NOTIFICATION_CHARACTERISTIC, self.notification_handler)
             await self.client.start_notify(SERVICE_CHANGED_CHARACTERISTIC, self.service_changed_handler)
 
-    def getClient(self):
+    def get_client(self):
+        """Returns the ble client."""
         return self.client

pymammotion/data/model/device_info.py

@@ -23,6 +23,7 @@ class MowerInfo(DataClassORJSONMixin):
     swversion: str = ""
     product_key: str = ""
     model_id: str = ""
+    sub_model_id: str = ""
 
 
 @dataclass

pymammotion/data/state_manager.py

@@ -149,6 +149,7 @@ class StateManager:
             case "device_product_type_info":
                 device_product_type: DeviceProductTypeInfoT = sys_msg[1]
                 self._device.mower_state.model_id = device_product_type.main_product_type
+                self._device.mower_state.sub_model_id = device_product_type.sub_product_type
             case "toapp_dev_fw_info":
                 device_fw_info: DeviceFwInfo = sys_msg[1]
                 self._device.device_firmwares.device_version = device_fw_info.version

pymammotion/proto/luba_mul.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 enum MUL_LANGUAGE {
   ENGLISH = 0;
   GERMAN = 1;
+  UNRECOGNIZED = -1;
 }
 
 enum MUL_CAMERA_POSITION {

pymammotion/proto/luba_mul.py

@@ -9,6 +9,7 @@ import betterproto
 class MUL_LANGUAGE(betterproto.Enum):
     ENGLISH = 0
     GERMAN = 1
+    UNRECOGNIZED = -1
 
 
 class MUL_CAMERA_POSITION(betterproto.Enum):

pymammotion/utility/constant/device_constant.py

@@ -216,11 +216,7 @@ class WorkMode:
 def device_connection(connect: ConnectData) -> str:
     """Return string representation of device connection."""
 
-    if (
-        connect.connect_type == 2
-        or connect.used_net == "NET_USED_TYPE_WIFI"
-        or (connect.wifi_rssi != 0 and connect.ble_rssi != 0)
-    ):
+    if connect.wifi_rssi != 0 and connect.ble_rssi != 0:
         return "WIFI/BLE"
 
     if connect.connect_type == 2 or connect.used_net == "NET_USED_TYPE_WIFI" or connect.wifi_rssi != 0:

{pymammotion-0.4.0b4.dist-info → pymammotion-0.4.0b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0b4
+Version: 0.4.0b6
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.0b4.dist-info → pymammotion-0.4.0b6.dist-info}/RECORD

@@ -10,7 +10,7 @@ pymammotion/aliyun/model/session_by_authcode_response.py,sha256=naMDigtvmpf-Ikf5
 pymammotion/aliyun/model/stream_subscription_response.py,sha256=7d0i8cNMAMX7aQjd2yebMDdqQkugcCzk-SD6oVtf18M,333
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
-pymammotion/bluetooth/ble.py,sha256=HMBHdebocRm8je7fJ0PvWfb58ww8HUNwi-0kKTSEAtU,2391
+pymammotion/bluetooth/ble.py,sha256=k5o2BVXSF2vLZ75U3PsUE8NomWFirJkYDVWfQQs_P1I,2484
 pymammotion/bluetooth/ble_message.py,sha256=Uz64_PiQPqulEZIUhGg9g5ABr3wSVDChO8grfqsV4f8,18871
 pymammotion/bluetooth/const.py,sha256=CCqyHsYbB0BAYjwdhXt_n6eWWxmhlUrAFjvVv57mbvE,1749
 pymammotion/bluetooth/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,7 +25,7 @@ pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
 pymammotion/data/model/device.py,sha256=lZEuWfEr4My0BUjY3OdIpUui91t9KbONhBc2t9oS2ro,6883
 pymammotion/data/model/device_config.py,sha256=wjayKnzoPDmBhqWZKTPDSueNEPCIWCB20tFEDSGIUsM,2602
-pymammotion/data/model/device_info.py,sha256=p7fXL4ozWUF8rD4QSfrmyLK1Jv-uXXxcJ5mXiDjp6Fo,877
+pymammotion/data/model/device_info.py,sha256=Q0qJ6BflQycH_VFugwaFFXcvM69q2v9JAe2wWOcCggE,904
 pymammotion/data/model/device_limits.py,sha256=saW3iUvGq8WEn6CASn5hS5tVJpSeak4FDy_gnHtYqTQ,1955
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
@@ -43,7 +43,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
 pymammotion/data/mqtt/status.py,sha256=DuNC3JdewLPKNqNHx76_FPXRvheYSiM-CdiVTCCYY8s,1079
-pymammotion/data/state_manager.py,sha256=J7QbfCge1mGlz2jzcRfqix560tybG1E1x2inVgVqt-I,7810
+pymammotion/data/state_manager.py,sha256=wivC8GZCefIFhKwJGl0ZBQTDk2tiAl1GT1JHVUbKgsw,7903
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -89,8 +89,8 @@ pymammotion/proto/luba_msg.proto,sha256=KfEKnPy4HyI2msoFyE5tY2tp913PGyWuki9G6tuj
 pymammotion/proto/luba_msg.py,sha256=Q9I8R7xmhLuenn5r0XOmYzH3UmWrPk6KJF0xzkjfvDM,2473
 pymammotion/proto/luba_msg_pb2.py,sha256=tM_jjxnRcAL_PFbNSbY2i11YP27boXYxysB0VE1Rjdc,4514
 pymammotion/proto/luba_msg_pb2.pyi,sha256=u1YgUrGoqfuizHt2ckQUL1Y_u9tLOievwrJ2e_ySOss,4288
-pymammotion/proto/luba_mul.proto,sha256=YhzrsoILd14pM_MjuZLQIK08AoKMn_mYyL7CxZLp0-Q,1114
-pymammotion/proto/luba_mul.py,sha256=M-26YJDIAQLYNAmXb3CRAjrxeOGezbJQwRcTEM-4TqI,2061
+pymammotion/proto/luba_mul.proto,sha256=kHe_dfxCNR9Yu0-3xjjxMoDVNVWdLH_SWbVKBWxCHbc,1135
+pymammotion/proto/luba_mul.py,sha256=pAnz7MpGLhnsMcuWIltNwksxT-E9hL-bjZ-pc1cUBL0,2083
 pymammotion/proto/luba_mul_pb2.py,sha256=nJ25xWmuBldTQsAddTR5EImTEN-D2FSUCd_5vBUUTwA,3399
 pymammotion/proto/luba_mul_pb2.pyi,sha256=_ndK0hvvHtMOzsJ8rGSXZbp7fVEsiafycbYfWG1WPKo,3913
 pymammotion/proto/mctrl_driver.proto,sha256=I0BncdAa3laeqT17Sn95r_1HuBD3dSc9IVu9U3o0fU4,1385
@@ -115,7 +115,7 @@ pymammotion/proto/mctrl_sys_pb2.py,sha256=DYemb514mlC7c27t-k1YqqBif0xxhLmnIWk8rX
 pymammotion/proto/mctrl_sys_pb2.pyi,sha256=Dj_1UM86kZ5MfcVyNC76Z0gKrfl5YFsVWP2b-bKoZvk,38912
 pymammotion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/utility/constant/__init__.py,sha256=tcY0LDeD-qDDHx2LKt55KOyv9ZI0UfCNM6fknLCmm8s,110
-pymammotion/utility/constant/device_constant.py,sha256=nOzNgXc1c1mr4dpuqG0QYToa1q6ocY-G7pLi3z67mEc,8013
+pymammotion/utility/constant/device_constant.py,sha256=6uTZReQxMJvZxgHuJWAPYR9pQmK-VNz4FwJZJBjtIao,7906
 pymammotion/utility/conversions.py,sha256=v3YICy0zZwwBBzrUZgabI7GRfiDBnkiAX2qdtk3NxOY,89
 pymammotion/utility/datatype_converter.py,sha256=SPM_HuaaD_XOawlqEnA8qlRRZXGba3WjA8kGOZgeBlQ,4284
 pymammotion/utility/device_config.py,sha256=hHVyT8uSsHZB4_kuaN6K5wfsC2V5Ixevm1aFi2oYDFk,27956
@@ -124,7 +124,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.4.0b4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.0b4.dist-info/METADATA,sha256=9iDEs7KoCvtDGuiAEGd5sPOQTj1PcCI6jeX4CLIFE0Y,3938
-pymammotion-0.4.0b4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pymammotion-0.4.0b4.dist-info/RECORD,,
+pymammotion-0.4.0b6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.0b6.dist-info/METADATA,sha256=p7EMgarB_A4u9MHEfTrZbfq9dV6LWTSdLYrFBpbRISQ,3938
+pymammotion-0.4.0b6.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pymammotion-0.4.0b6.dist-info/RECORD,,