pymammotion 0.2.72__py3-none-any.whl → 0.2.74__py3-none-any.whl

pymammotion/bluetooth/ble.py

@@ -21,7 +21,9 @@ class MammotionBLE:
             # TODO: do something with incoming data
             print(device)
             print(advertising_data)
-            if advertising_data.local_name and ("Luba-" in advertising_data.local_name or "Yuka-" in advertising_data.local_name):
+            if advertising_data.local_name and (
+                "Luba-" in advertising_data.local_name or "Yuka-" in advertising_data.local_name
+            ):
                 return True
             return False
 

pymammotion/data/model/device_config.py

@@ -36,33 +36,28 @@ class OperationSettings(DataClassORJSONMixin):
     toward: int = 0  # is just angle
     toward_included_angle: int = 90
     toward_mode: int = 0  # angle type relative etc
-    border_mode: int = 1  # border laps
     obstacle_laps: int = 1
-    mowing_laps: int = 1
+    mowing_laps: int = 1 # border laps
     start_progress: int = 0
     areas: list[int] = field(default_factory=list)
 
 
 def create_path_order(operation_mode: OperationSettings, device_name: str) -> str:
-    i = 8
+    # TODO add scheduling logic from getReserved() WorkSettingViewModel.java
+    i2 = 0
     bArr = bytearray(8)
-    bArr[0] = operation_mode.border_mode
+    bArr[0] = operation_mode.mowing_laps
     bArr[1] = operation_mode.obstacle_laps
     bArr[3] = int(operation_mode.start_progress)
     bArr[2] = 0
-
     if not DeviceType.is_luba1(device_name):
         bArr[4] = 0
         if DeviceType.is_yuka(device_name):
-            i = calculate_yuka_mode(operation_mode)
-        elif not DeviceType.is_luba_2(device_name):
-            i = 0
-        bArr[5] = i
-        if operation_mode.is_dump:
-            b = int(operation_mode.collect_grass_frequency)
+            bArr[5] = calculate_yuka_mode(operation_mode)
         else:
-            b = 10
-        bArr[6] = b
+            bArr[5] = 8 if DeviceType.is_luba_2(device_name) else 0
+
+        bArr[6] = int(operation_mode.collect_grass_frequency) if operation_mode.is_dump else 10
     if DeviceType.is_luba1(device_name):
         bArr[4] = operation_mode.toward_mode
     return bArr.decode()

pymammotion/data/model/mowing_modes.py

@@ -33,8 +33,8 @@ class ObstacleLapsMode(IntEnum):
 class MowOrder(IntEnum):
     """path_order"""
 
-    border_first = 0
-    grid_first = 1
+    grid_first = 0
+    border_first = 1
 
 
 class BypassStrategy(IntEnum):

pymammotion/data/mqtt/event.py

@@ -75,7 +75,7 @@ class DeviceBizReqEventValue(DataClassORJSONMixin):
 class GeneralParams(DataClassORJSONMixin):
     groupIdList: list[str]
     groupId: str
-    categoryKey: Literal["LawnMower"]
+    categoryKey: Literal["LawnMower", "Tracker"]
     batchId: str
     gmtCreate: int
     productKey: str

pymammotion/mammotion/commands/mammotion_command.py

@@ -42,11 +42,11 @@ class MammotionCommand(
     def move_left(self, angular: float) -> bytes:
         """Move forward. values 0.0 1.0."""
         angular_percent = get_percent(abs(angular * 100))
-        (linear_speed, angular_speed) = transform_both_speeds(0.0, 0.0, 0.0, angular_percent)
+        (linear_speed, angular_speed) = transform_both_speeds(0.0, 180.0, 0.0, angular_percent)
         return self.send_movement(linear_speed=linear_speed, angular_speed=angular_speed)
 
     def move_right(self, angular: float) -> bytes:
         """Move back. values 0.0 1.0."""
         angular_percent = get_percent(abs(angular * 100))
-        (linear_speed, angular_speed) = transform_both_speeds(0.0, 180.0, 0.0, angular_percent)
+        (linear_speed, angular_speed) = transform_both_speeds(0.0, 0.0, 0.0, angular_percent)
         return self.send_movement(linear_speed=linear_speed, angular_speed=angular_speed)

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -322,7 +322,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
                 self._update_raw_data(data)
             except (KeyError, ValueError, IndexError, UnicodeDecodeError):
                 _LOGGER.exception("Error parsing message %s", data)
-                data = b''
+                data = b""
             finally:
                 self._message.clearNotification()
 

pymammotion/proto/mctrl_nav.proto

@@ -174,7 +174,7 @@ message NavGetCommDataAck {
 
 message NavReqCoverPath {
   int32 pver = 1;
-  int64 jobId = 2;
+  fixed64 jobId = 2;
   int32 jobVer = 3;
   int32 jobMode = 4;
   int32 subCmd = 5;
@@ -195,7 +195,7 @@ message NavReqCoverPath {
 
 message NavUploadZigZagResult {
   int32 pver = 1;
-  int64 jobId = 2;
+  fixed64 jobId = 2;
   int32 jobVer = 3;
   int32 result = 4;
   int32 area = 5;

{pymammotion-0.2.72.dist-info → pymammotion-0.2.74.dist-info}/METADATA

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

{pymammotion-0.2.72.dist-info → pymammotion-0.2.74.dist-info}/RECORD

@@ -11,7 +11,7 @@ pymammotion/aliyun/model/session_by_authcode_response.py,sha256=qW0pnnRXfyEuMbb9
 pymammotion/aliyun/model/stream_subscription_response.py,sha256=po765WASQDboVCosbPEfDHNlanBf-3WMrA6iV3ezooY,357
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
-pymammotion/bluetooth/ble.py,sha256=sIY0vtUazXDWd_YjIFk9QEbOh_NQ9y5fVrQIemDhKd8,2374
+pymammotion/bluetooth/ble.py,sha256=Z2cO1EV2ndORKoJMzc2RdUdYbUe_PIzxCZICJg0_V24,2404
 pymammotion/bluetooth/ble_message.py,sha256=toPhMOgmHEdHzvaOsgCUfrkjdI38oeS4Av0E-I8X0_s,14952
 pymammotion/bluetooth/const.py,sha256=CCqyHsYbB0BAYjwdhXt_n6eWWxmhlUrAFjvVv57mbvE,1749
 pymammotion/bluetooth/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,7 +23,7 @@ pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
 pymammotion/data/model/device.py,sha256=uta1BzfCIKd7Z0naw7JcEGy273yMdcAJ7pjidfpGhKQ,12315
-pymammotion/data/model/device_config.py,sha256=SMBrG-rjN58Z59V-ok3wQ0721BQxM9zSdYXI3Q8GFdY,2828
+pymammotion/data/model/device_config.py,sha256=eP3Bq8GvhkeDzbImT5nIxOwmakZpXvo-zDQQHL9aTcw,2826
 pymammotion/data/model/device_info.py,sha256=ahz2xILdSYdX6SIVuVzz8QCfSQLefbQnpXrsiDpBDbY,585
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
@@ -31,13 +31,13 @@ pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTG
 pymammotion/data/model/generate_route_information.py,sha256=MkUBoqGtCAKmiVQ4Q1pEoDVHZs5uLIo7vhfWT4nGbtY,801
 pymammotion/data/model/hash_list.py,sha256=ZPg5d1hy4bPMgPw5JkHujT06LIoEmXn7qSdQW79FF3A,6257
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
-pymammotion/data/model/mowing_modes.py,sha256=5TrHSijUyPtIDWpNtgzx_vFQukRJWRz4gIrUaXggKPw,827
+pymammotion/data/model/mowing_modes.py,sha256=F7ah4QtYBBeXXJKdQVeQQMBjynQU8RQzIev7-v6t14c,827
 pymammotion/data/model/plan.py,sha256=mcadkSL7fQXy0iJ0q786I3GEQY4i6kmQXfW6Ri69lcQ,2906
 pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9PGIDA8Ls,1251
 pymammotion/data/model/region_data.py,sha256=OTV15vRyn9JORXsQPjWMNF1ZujuNhsOKl25KeqwMObA,3007
 pymammotion/data/model/report_info.py,sha256=m3T2P2mLfy5wDDpyjM2q1y9zCKJJKIItNX0M-Ge1ijg,2577
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pymammotion/data/mqtt/event.py,sha256=z6j8t-ZOjEeKjFt7S0wV8vV5L0-iHD3RbwI9hCfzGTY,5044
+pymammotion/data/mqtt/event.py,sha256=pEOQcjnv5XKosSPD8UmVAgCAaI8vLuIhGECZcU4xKjk,5055
 pymammotion/data/mqtt/properties.py,sha256=kvphcjrDuJHuX8Az98-wKeFv_rSmu2Fz9YKLGodGSj0,3759
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
 pymammotion/data/state_manager.py,sha256=vtBT28-5DY58hJMi_kqOUKnOq6rJ4fx1zX8yU7N96A8,5357
@@ -49,7 +49,7 @@ pymammotion/http/model/http.py,sha256=1NJP4hkBulcnpbD7Rcwltd8Ry9lnZzQVFJN8Oo7MKe
 pymammotion/mammotion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/abstract_message.py,sha256=l2Wcyg7tIEjRGyQAk9T2rQVOLwilxG1hXTNf7811jGA,727
-pymammotion/mammotion/commands/mammotion_command.py,sha256=cjbetadbNWBBfhzxuT34jfmzfpYYa1CnsCeQZkANVG4,2510
+pymammotion/mammotion/commands/mammotion_command.py,sha256=PM9UCuBCKp_TWDfkeVJsBelSbRrKosRa2LvHA-By1k8,2510
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/messages/driver.py,sha256=DlOAC_yi1ycO5hKr5rfCpLmrqao6Mb6Fv1JWwMISnKE,3766
 pymammotion/mammotion/commands/messages/media.py,sha256=l-m4l2Vp1ZOHPHyJTceuLaLvdgHOEfmykkbDncCDUI4,1359
@@ -63,7 +63,7 @@ pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3T
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
 pymammotion/mammotion/devices/base.py,sha256=F_L5aDtY6rgRkk7Q4CwilLenTANW6cBe9zIU3a9HRmA,10020
 pymammotion/mammotion/devices/mammotion.py,sha256=hSO184o1q4ftfLPx9froFPIXk428wGg8Ayw160W3z7c,12482
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=3qC2AhXP1ua1pmUaK1iH8sonEIbLPfDLCbsU9H6VsPY,18903
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=ZsLsMlsgGG8uNlgoYvifxSRrUsoM0-9UlyY3f77ZmRI,18903
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=7xbSZmC1PUG6ZfF5LtiELkQE61lybHoJcBUzz76VvLg,12074
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
@@ -93,7 +93,7 @@ pymammotion/proto/mctrl_driver.proto,sha256=I0BncdAa3laeqT17Sn95r_1HuBD3dSc9IVu9
 pymammotion/proto/mctrl_driver.py,sha256=sseY2MxUtaQZvg7fvbA_gNvtqx9MVDW_rvUcfA2CWVs,2971
 pymammotion/proto/mctrl_driver_pb2.py,sha256=bfLwZb5Hehb6OIkgFrZMkQ0oTBXoOBxpruszKz-UM1U,3785
 pymammotion/proto/mctrl_driver_pb2.pyi,sha256=9_rcQELsSeOfeIQMTEFIpeXICpDe3arQeA4kAYWNSWw,5860
-pymammotion/proto/mctrl_nav.proto,sha256=eA7oOZw3Uiy4yAeybYjHkWr-FUjqJ498tsYsChm7rpg,12449
+pymammotion/proto/mctrl_nav.proto,sha256=g7Mh9tqhA2bA7LRn9Cmgb9zTngO4ghUDPFTAGo2z_i8,12453
 pymammotion/proto/mctrl_nav.py,sha256=okOznE_1dCi1yE5sSdQNKWkgI8CpbGRxMAISL5zqiT4,25040
 pymammotion/proto/mctrl_nav_pb2.py,sha256=LAHfEmGfNVZCN6vuLSZF6s2wd1Qk-siaWe4mdPWPdxc,24213
 pymammotion/proto/mctrl_nav_pb2.pyi,sha256=qmGYfKh2o63e5ppl9QIWnwDbmGVUVOf7EqhC9ApE5fg,51336
@@ -119,7 +119,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.2.72.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.72.dist-info/METADATA,sha256=geZWSxd2FMiag9xaKKz4mKvws3XwUo-lhTiu6EDsd-s,3896
-pymammotion-0.2.72.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.72.dist-info/RECORD,,
+pymammotion-0.2.74.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.74.dist-info/METADATA,sha256=ULnp2FFjMAMqTa2GtNl8CSwIIgxnYqqaZ7UPpOTj3C8,3896
+pymammotion-0.2.74.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.74.dist-info/RECORD,,