pymammotion 0.4.0a2__py3-none-any.whl → 0.5.51__py3-none-any.whl

pymammotion/proto/message_pool.py

@@ -0,0 +1,3 @@
+import betterproto2
+
+default_message_pool = betterproto2.MessagePool()

pymammotion/utility/constant/device_constant.py

@@ -1,5 +1,7 @@
 from enum import IntEnum
 
+from pymammotion.data.model.report_info import ConnectData
+
 
 class bleOrderCmd:
     allpowerfullRW = 67
@@ -211,15 +213,35 @@ class WorkMode:
     MODE_CHARGING_PAUSE = 39
 
 
-def device_connection(value: int, mnet_type: str) -> str:
+NO_REQUEST_MODES = (
+    WorkMode.MODE_JOB_DRAW,
+    WorkMode.MODE_OBSTACLE_DRAW,
+    WorkMode.MODE_CHANNEL_DRAW,
+    WorkMode.MODE_ERASER_DRAW,
+    WorkMode.MODE_UPDATING,
+    WorkMode.MODE_EDIT_BOUNDARY,
+    WorkMode.MODE_UPDATING,
+    WorkMode.MODE_LOCK,
+    WorkMode.MODE_MANUAL_MOWING,
+)
+
+
+def device_connection(connect: ConnectData) -> str:
     """Return string representation of device connection."""
-    if value == 1:
-        return "BLE"
 
-    if mnet_type == "NET_USED_TYPE_WIFI":
+    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:
         return "WIFI"
 
-    return "3G/4G"
+    if connect.connect_type == 1 or connect.used_net == "NET_USED_TYPE_MNET":
+        return "3G/4G"
+
+    if connect.ble_rssi != 0:
+        return "BLE"
+
+    return "None"
 
 
 def device_mode(value: int) -> str:
@@ -277,6 +299,8 @@ class PosType(IntEnum):
     CHARGE_ON = 5
     DUMPING_AREA_INSIDE = 8
     DUMPING_OUTSIDE = 10
+    ABNORMAL_POSITIONING = 11
+    NO_AREAS = 100
     OBS_ON = 2
     TURN_AREA_INSIDE = 4
     VIRTUAL_INSIDE = 6

pymammotion/utility/datatype_converter.py

@@ -2,7 +2,7 @@ import base64
 
 
 class DatatypeConverter:
-    encode_map = None
+    encode_map: list[str | int] | None = None
 
     @staticmethod
     def init_encode_map():
@@ -20,24 +20,25 @@ class DatatypeConverter:
         """
 
         if DatatypeConverter.encode_map is None:
-            cArr: list[str | int] = [0] * 64
+            c_arr: list[str | int] = [0] * 64
             for num in range(26):
-                cArr[num] = chr(num + 65)
+                c_arr[num] = chr(num + 65)
             for num_2 in range(26, 52):
-                cArr[num_2] = chr(num_2 - 26 + 97)
+                c_arr[num_2] = chr(num_2 - 26 + 97)
             for num_3 in range(52, 62):
-                cArr[num_3] = chr(num_3 - 52 + 48)
-            cArr[62] = "+"
-            cArr[63] = "/"
-            DatatypeConverter.encode_map = cArr
+                c_arr[num_3] = chr(num_3 - 52 + 48)
+            c_arr[62] = "+"
+            c_arr[63] = "/"
+            DatatypeConverter.encode_map = c_arr
         return DatatypeConverter.encode_map
 
     @staticmethod
-    def parseBase64Binary(s):
+    def parseBase64Binary(s: str) -> bytes:
         return base64.b64decode(s)
 
     @staticmethod
-    def printBase64Binary(bArr):
+    def printBase64Binary(bArr: bytes) -> str:
+        """Print the Base64 str representation of a byte array."""
         return DatatypeConverter._printBase64Binary(bArr)
 
     @staticmethod
@@ -45,7 +46,7 @@ class DatatypeConverter:
         return DatatypeConverter.encode_map[i & 63]
 
     @staticmethod
-    def _printBase64Binary(bArr: bytes, i: int = 0, i2=None):
+    def _printBase64Binary(bArr: bytes, i: int = 0, i2=None) -> str:
         """Print the Base64 binary representation of a byte array.
 
         This function takes a byte array and optional start and end indices to
@@ -68,7 +69,7 @@ class DatatypeConverter:
         return "".join(cArr)
 
     @staticmethod
-    def _printBase64Binary_core(bArr: bytes, i, i2, cArr, i3):
+    def _printBase64Binary_core(bArr: bytes, i, i2, cArr, i3) -> int:
         """Encode binary data into Base64 format.
 
         This function encodes binary data into Base64 format following the