pymammotion 0.5.12__py3-none-any.whl → 0.5.14__py3-none-any.whl

pymammotion/mammotion/devices/mammotion.py

@@ -139,11 +139,13 @@ class MammotionDeviceManager:
         if mammotion_device.has_ble():
             exists.replace_ble(mammotion_device.ble())
 
+    def has_device(self, mammotion_device_name: str) -> bool:
+        if self.devices.get(mammotion_device_name, None) is not None:
+            return True
+        return False
+
     def get_device(self, mammotion_device_name: str) -> MammotionMixedDeviceManager:
-        if device := self.devices[mammotion_device_name]:
-            return device
-        else:
-            raise KeyError
+        return self.devices[mammotion_device_name]
 
     async def remove_device(self, name: str) -> None:
         """Remove a device."""
@@ -231,8 +233,8 @@ class Mammotion:
     def add_cloud_devices(self, mqtt_client: MammotionCloud) -> None:
         """Add devices from cloud."""
         for device in mqtt_client.cloud_client.devices_by_account_response.data.data:
-            mower_device = self.device_manager.get_device(device.deviceName)
-            if device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device is None:
+            has_device = self.device_manager.has_device(device.deviceName)
+            if device.deviceName.startswith(("Luba-", "Yuka-")) and not has_device:
                 mixed_device = MammotionMixedDeviceManager(
                     name=device.deviceName,
                     iot_id=device.iotId,
@@ -246,7 +248,8 @@ class Mammotion:
                     device.productName if device.productModel is None else device.productModel
                 )
                 self.device_manager.add_device(mixed_device)
-            elif device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device:
+            elif device.deviceName.startswith(("Luba-", "Yuka-")) and has_device:
+                mower_device = self.device_manager.get_device(device.deviceName)
                 if mower_device.cloud() is None:
                     mower_device.add_cloud(mqtt=mqtt_client)
                 else:
@@ -284,8 +287,8 @@ class Mammotion:
         return self.device_manager.get_device(name)
 
     def get_or_create_device_by_name(self, device: Device, mqtt_client: MammotionCloud) -> MammotionMixedDeviceManager:
-        if mow_device := self.device_manager.get_device(device.deviceName):
-            return mow_device
+        if self.device_manager.has_device(device.deviceName):
+            return self.device_manager.get_device(device.deviceName)
         mow_device = MammotionMixedDeviceManager(
             name=device.deviceName,
             iot_id=device.iotId,

pymammotion/proto/mctrl_driver.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 enum CutterWorkMode {
   CUTTER_STANDARD = 0;
-  CUTTER_PERFORMANCE = 1;
-  CUTTER_ECONOMIC = 2;
+  CUTTER_ECONOMIC = 1;
+  CUTTER_PERFORMANCE = 2;
 }
 
 enum CollectMotorState {

{pymammotion-0.5.12.dist-info → pymammotion-0.5.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.5.12
+Version: 0.5.14
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.5.12.dist-info → pymammotion-0.5.14.dist-info}/RECORD

@@ -73,7 +73,7 @@ pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
 pymammotion/mammotion/devices/base.py,sha256=qDh7P7fnakDKgxTqjNLcQg8eE-6gHJaXAV0ONjhy_IU,12038
-pymammotion/mammotion/devices/mammotion.py,sha256=BJtlukiRqi5GLO4cQ5QgMxQRKtMO0bBmpHWM_27hyYI,15601
+pymammotion/mammotion/devices/mammotion.py,sha256=uk0mM6JSOzr84qkf8lECvlmTLX0UEQDXyowSeHZydek,15801
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=mbZlbm3lAx5uLtHOR7rZ_hp4l9XPb2DnSzz4v8tdmKg,19352
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=USYgv3ENplzy0dWu0JttBy9Ldl06yUkuhxI2dW0GfTQ,16527
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
@@ -98,7 +98,7 @@ pymammotion/proto/luba_msg_pb2.pyi,sha256=_pTiOzssrVbEty_yIjHpnQWbTNtFfKfqSC_wvp
 pymammotion/proto/luba_mul.proto,sha256=jAJN9Sts0PfqmLYDdte5NIY36oOrMP0bbqat6RuigYI,2135
 pymammotion/proto/luba_mul_pb2.py,sha256=MDZotppPPglKfTuBuWNjw6iHXbUVAH_PXPyl9VVF7sc,5724
 pymammotion/proto/luba_mul_pb2.pyi,sha256=KsTOSGRTvcO1qO7wxuu827zRT7Eb7xnUN-KRd7dgm6s,7713
-pymammotion/proto/mctrl_driver.proto,sha256=jbsPcPjbAc28TPQgTZWsR-AWi6eJ5iKXMk03aa7Hs5s,2181
+pymammotion/proto/mctrl_driver.proto,sha256=zu_9xKSPV3O1B1aB2tN1QwtDLiInpsKaa8xaDXl0Inc,2181
 pymammotion/proto/mctrl_driver_pb2.py,sha256=stUvD3hzZALsdmTJVl7giD2O4nded60zKbew-d1eFrI,5512
 pymammotion/proto/mctrl_driver_pb2.pyi,sha256=z8UgWQxXT1GLVRCrI6wuV6coerMvPbVCAGSskL5QLAU,8494
 pymammotion/proto/mctrl_nav.proto,sha256=sPAVCyIn5MZiQbp0wFk5KKJacSRUOy3zEiExa4ebikQ,12806
@@ -125,7 +125,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.5.12.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.12.dist-info/METADATA,sha256=s4Bqz8X821VmOlMZ3XdeyHRwuZwg4qVsqy5zD2McPLo,3871
-pymammotion-0.5.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.12.dist-info/RECORD,,
+pymammotion-0.5.14.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.14.dist-info/METADATA,sha256=weuRuWkfNiqMtabHEayET8buw26T_jewaEvmowc1Axc,3871
+pymammotion-0.5.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.14.dist-info/RECORD,,