pymammotion 0.2.43__py3-none-any.whl → 0.2.45__py3-none-any.whl

pymammotion/data/model/device.py

@@ -111,7 +111,6 @@ class MowingDevice(DataClassORJSONMixin):
 
         self.report_data.update(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
 
-
     def run_state_update(self, rapid_state: SystemRapidStateTunnelMsg) -> None:
         coordinate_converter = CoordinateConverter(self.location.RTK.latitude, self.location.RTK.longitude)
         self.mowing_state = RapidState().from_raw(rapid_state.rapid_state_data)

pymammotion/data/model/report_info.py

@@ -70,15 +70,13 @@ class ReportData(DataClassORJSONMixin):
     locations: list[LocationData] = field(default_factory=list)
     work: WorkData = field(default_factory=WorkData)
 
-    def update(self, data: dict):
+    def update(self, data: dict) -> None:
         locations = self.locations
         if data.get("locations") is not None:
             locations = [LocationData.from_dict(loc) for loc in data.get("locations", [])]
 
-
-        self.connect=ConnectData.from_dict(data.get("connect", asdict(self.connect)))
-        self.dev=DeviceData.from_dict(data.get("dev", asdict(self.dev)))
-        self.rtk=RTKData.from_dict(data.get("rtk", asdict(self.rtk)))
-        self.locations=locations
-        self.work=WorkData.from_dict(data.get("work", asdict(self.work)))
-
+        self.connect = ConnectData.from_dict(data.get("connect", asdict(self.connect)))
+        self.dev = DeviceData.from_dict(data.get("dev", asdict(self.dev)))
+        self.rtk = RTKData.from_dict(data.get("rtk", asdict(self.rtk)))
+        self.locations = locations
+        self.work = WorkData.from_dict(data.get("work", asdict(self.work)))

pymammotion/mammotion/commands/mammotion_command.py

@@ -4,7 +4,7 @@ from pymammotion.mammotion.commands.messages.network import MessageNetwork
 from pymammotion.mammotion.commands.messages.ota import MessageOta
 from pymammotion.mammotion.commands.messages.system import MessageSystem
 from pymammotion.mammotion.commands.messages.video import MessageVideo
-from pymammotion.proto import dev_net_pb2, luba_msg_pb2
+from pymammotion.utility.movement import get_percent, transform_both_speeds
 
 
 class MammotionCommand(MessageSystem, MessageNavigation, MessageNetwork, MessageOta, MessageVideo, MessageDriver):
@@ -23,3 +23,27 @@ class MammotionCommand(MessageSystem, MessageNavigation, MessageNetwork, Message
 
     def set_device_product_key(self, product_key: str) -> None:
         self._product_key = product_key
+
+    def move_forward(self, linear: float) -> None:
+        """Move forward. values 0.0 1.0."""
+        linear_percent = get_percent(abs(linear * 100))
+        (linear_speed, angular_speed) = transform_both_speeds(90.0, 0.0, linear_percent, 0.0)
+        self.send_movement(linear_speed=linear_speed, angular_speed=angular_speed)
+
+    def move_back(self, linear: float) -> None:
+        """Move back. values 0.0 1.0."""
+        linear_percent = get_percent(abs(linear * 100))
+        (linear_speed, angular_speed) = transform_both_speeds(270.0, 0.0, linear_percent, 0.0)
+        self.send_movement(linear_speed=linear_speed, angular_speed=angular_speed)
+
+    def move_left(self, angular: float) -> None:
+        """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)
+        self.send_movement(linear_speed=linear_speed, angular_speed=angular_speed)
+
+    def move_right(self, angular: float) -> None:
+        """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)
+        self.send_movement(linear_speed=linear_speed, angular_speed=angular_speed)

pymammotion/mammotion/devices/base.py

@@ -12,7 +12,6 @@ from pymammotion.data.state_manager import StateManager
 from pymammotion.proto import has_field
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import NavGetCommDataAck, NavGetHashListAck
-from pymammotion.utility.movement import get_percent, transform_both_speeds
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -35,7 +34,6 @@ def find_next_integer(lst: list[int], current_hash: int) -> int | None:
 class MammotionBaseDevice:
     """Base class for Mammotion devices."""
 
-    _mower: MowingDevice
     _state_manager: StateManager
     _cloud_device: Device | None = None
 
@@ -43,8 +41,7 @@ class MammotionBaseDevice:
         """Initialize MammotionBaseDevice."""
         self.loop = asyncio.get_event_loop()
         self._raw_data = LubaMsg().to_dict(casing=betterproto.Casing.SNAKE)
-        self._mower = device
-        self._state_manager = StateManager(self._mower)
+        self._state_manager = StateManager(device)
         self._state_manager.gethash_ack_callback = self.datahash_response
         self._state_manager.get_commondata_ack_callback = self.commdata_response
         self._notify_future: asyncio.Future[bytes] | None = None
@@ -65,11 +62,11 @@ class MammotionBaseDevice:
         total_frame = common_data.total_frame
         current_frame = common_data.current_frame
 
-        missing_frames = self._mower.map.missing_frame(common_data)
+        missing_frames = self.mower.map.missing_frame(common_data)
         if len(missing_frames) == 0:
             # get next in hash ack list
 
-            data_hash = find_next_integer(self._mower.nav.toapp_gethash_ack.data_couple, common_data.hash)
+            data_hash = find_next_integer(self.mower.nav.toapp_gethash_ack.data_couple, common_data.hash)
             if data_hash is None:
                 return
 
@@ -104,7 +101,7 @@ class MammotionBaseDevice:
             case "ota":
                 self._update_ota_data(tmp_msg)
 
-        self._mower.update_raw(self._raw_data)
+        self.mower.update_raw(self._raw_data)
 
     def _update_nav_data(self, tmp_msg) -> None:
         """Update navigation data."""
@@ -180,7 +177,7 @@ class MammotionBaseDevice:
     @property
     def mower(self) -> MowingDevice:
         """Get the LubaMsg of the device."""
-        return self._mower
+        return self._state_manager.get_device()
 
     @abstractmethod
     async def queue_command(self, key: str, **kwargs: any) -> bytes | None:
@@ -207,7 +204,7 @@ class MammotionBaseDevice:
         try:
             # work out why this crashes sometimes for better proto
 
-            if self._cloud_device and len(self._mower.map.area_name) == 0:
+            if self._cloud_device and len(self.mower.map.area_name) == 0:
                 await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
         except Exception:
             """Do nothing for now."""
@@ -231,30 +228,10 @@ class MammotionBaseDevice:
         await self.queue_command("allpowerfull_rw", id=5, rw=1, context=2)
         await self.queue_command("allpowerfull_rw", id=5, rw=1, context=3)
 
-    async def move_forward(self, linear: float) -> None:
-        """Move forward. values 0.0 1.0."""
-        linear_percent = get_percent(abs(linear * 100))
-        (linear_speed, angular_speed) = transform_both_speeds(90.0, 0.0, linear_percent, 0.0)
-        await self.queue_command("send_movement", linear_speed=linear_speed, angular_speed=angular_speed)
-
-    async def move_back(self, linear: float) -> None:
-        """Move back. values 0.0 1.0."""
-        linear_percent = get_percent(abs(linear * 100))
-        (linear_speed, angular_speed) = transform_both_speeds(270.0, 0.0, linear_percent, 0.0)
-        await self.queue_command("send_movement", linear_speed=linear_speed, angular_speed=angular_speed)
-
-    async def move_left(self, angulur: float) -> None:
-        """Move forward. values 0.0 1.0."""
-        angular_percent = get_percent(abs(angulur * 100))
-        (linear_speed, angular_speed) = transform_both_speeds(0.0, 0.0, 0.0, angular_percent)
-        await self.queue_command("send_movement", linear_speed=linear_speed, angular_speed=angular_speed)
-
-    async def move_right(self, angulur: float) -> None:
-        """Move back. values 0.0 1.0."""
-        angular_percent = get_percent(abs(angulur * 100))
-        (linear_speed, angular_speed) = transform_both_speeds(0.0, 180.0, 0.0, angular_percent)
-        await self.queue_command("send_movement", linear_speed=linear_speed, angular_speed=angular_speed)
-
     async def command(self, key: str, **kwargs):
         """Send a command to the device."""
         return await self.queue_command(key, **kwargs)
+
+    @property
+    def state_manager(self):
+        return self._state_manager

pymammotion/mammotion/devices/mammotion.py

@@ -35,7 +35,6 @@ class ConnectionPreference(Enum):
 class MammotionMixedDeviceManager:
     _ble_device: MammotionBaseBLEDevice | None = None
     _cloud_device: MammotionBaseCloudDevice | None = None
-    _mowing_state: MowingDevice
     preference: ConnectionPreference
 
     def __init__(
@@ -46,15 +45,25 @@ class MammotionMixedDeviceManager:
         mqtt: MammotionCloud | None = None,
         preference: ConnectionPreference = ConnectionPreference.BLUETOOTH,
     ) -> None:
+        self._mower_state = None
         self.name = name
         self._mowing_state = MowingDevice()
         self.add_ble(ble_device)
         self.add_cloud(cloud_device, mqtt)
         self.preference = preference
 
+    @property
     def mower_state(self):
         return self._mowing_state
 
+    @mower_state.setter
+    def mower_state(self, value: MowingDevice) -> None:
+        if self._cloud_device:
+            self._cloud_device.state_manager.set_device(value)
+        if self._ble_device:
+            self._ble_device.state_manager.set_device(value)
+        self._mowing_state = value
+
     def ble(self) -> MammotionBaseBLEDevice | None:
         return self._ble_device
 
@@ -63,12 +72,12 @@ class MammotionMixedDeviceManager:
 
     def add_ble(self, ble_device: BLEDevice) -> None:
         if ble_device is not None:
-            self._ble_device = MammotionBaseBLEDevice(self._mowing_state, ble_device)
+            self._ble_device = MammotionBaseBLEDevice(self.mower_state, ble_device)
 
     def add_cloud(self, cloud_device: Device | None = None, mqtt: MammotionCloud | None = None) -> None:
         if cloud_device is not None:
             self._cloud_device = MammotionBaseCloudDevice(
-                mqtt, cloud_device=cloud_device, mowing_state=self._mowing_state
+                mqtt, cloud_device=cloud_device, mowing_state=self.mower_state
             )
 
     def replace_cloud(self, cloud_device: MammotionBaseCloudDevice) -> None:
@@ -284,13 +293,13 @@ class Mammotion:
 
     async def get_stream_subscription(self, name: str):
         device = self.get_device_by_name(name)
-        if self._preference is ConnectionPreference.WIFI:
+        if device.preference is ConnectionPreference.WIFI:
             if device.has_cloud():
-                _stream_response = await self.cloud().cloud_client.get_stream_subscription(device.cloud().iot_id)
+                _stream_response = await device.cloud().mqtt.cloud_client.get_stream_subscription(device.cloud().iot_id)
                 _LOGGER.debug(_stream_response)
                 return _stream_response
 
     def mower(self, name: str):
         device = self.get_device_by_name(name)
         if device:
-            return device.mower_state()
+            return device.mower_state

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -77,7 +77,6 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self._prev_notification = None
         self._interface = f"hci{interface}"
         self._device = device
-        self._mower = mowing_state
         self._client: BleakClientWithServiceCache | None = None
         self._read_char: BleakGATTCharacteristic | int | str | UUID = 0
         self._write_char: BleakGATTCharacteristic | int | str | UUID = 0
@@ -191,7 +190,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
     def rssi(self) -> int:
         """Return RSSI of device."""
         try:
-            return cast(self._mower.sys.toapp_report_data.connect.ble_rssi, int)
+            return cast(self.mower.sys.toapp_report_data.connect.ble_rssi, int)
         finally:
             return 0
 

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -155,7 +155,6 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt = mqtt
         self.iot_id = cloud_device.iotId
         self.device = cloud_device
-        self._mower = mowing_state
         self._command_futures = {}
         self._commands: MammotionCommand = MammotionCommand(cloud_device.deviceName)
         self.currentID = ""

pymammotion/mqtt/mammotion_mqtt.py

@@ -92,8 +92,6 @@ class MammotionMQTT:
         """Disconnect from MQTT Server."""
         logger.info("Disconnecting...")
 
-
-
         self._linkkit_client.disconnect()
 
     def _thing_on_thing_enable(self, user_data) -> None:

{pymammotion-0.2.43.dist-info → pymammotion-0.2.45.dist-info}/METADATA

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

{pymammotion-0.2.43.dist-info → pymammotion-0.2.45.dist-info}/RECORD

@@ -22,7 +22,7 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=s7S6Nicuk3acR8jxeeqZlVTZXB94DjYzo7gYdwjleUs,12071
+pymammotion/data/model/device.py,sha256=s8k43ZZBTnLtvh93pcbCVRirzt8xo08Wx0xht46e-7Q,12070
 pymammotion/data/model/device_config.py,sha256=RkEbnkubJQ8nXPfZpuGPe_h9mGZGtxCxDSc8mY7UCT8,2824
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
@@ -34,7 +34,7 @@ pymammotion/data/model/mowing_modes.py,sha256=5TrHSijUyPtIDWpNtgzx_vFQukRJWRz4gI
 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=gY3L4UGEH37PS314e8d7DWuIczQxTIMfcf66xoVe0sY,2210
+pymammotion/data/model/report_info.py,sha256=AE2u64uKgcJtVooldJcxXBsEHfDyCvH5DnQFUQ5qWmk,2226
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=plt53w3kHulB_MfbkxK9j7AfdQ5ahVU2s4kiQMoLio4,4612
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
@@ -48,7 +48,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=nw6r7694yzl7iJKqRqhLmAPRjd_TL_Xo_-JXq2_a_ug,222
-pymammotion/mammotion/commands/mammotion_command.py,sha256=84XxnatnBm_5WQ_KOa2N0ltydQOhSvCme3fFqkuyEhg,1056
+pymammotion/mammotion/commands/mammotion_command.py,sha256=tEAeG3FXMF-fbJGGx_NoNDMaKlxd3pmGIn5RGqxjYPY,2387
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/messages/driver.py,sha256=ANIOEtjF23k7W_R_Yfgzxmc7p1KSBCF-l-tijUtw0Yg,3709
 pymammotion/mammotion/commands/messages/media.py,sha256=ps0l06CXy5Ej--gTNCsyKttwo7yHLVrJUpn-wNJYecs,1150
@@ -60,13 +60,13 @@ pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=53of3422C6g0jiKX0X4uo-eRI1Du31NA4RWLdw2O5u8,11131
-pymammotion/mammotion/devices/mammotion.py,sha256=od4crY_1hbBwlDt5St_IV_QT0jOT_tlKv_iplf_CTu4,11966
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=Lu8-85fBa-rGzssARqiydfQbPuIeeTcV-1ROIoYBKKM,17512
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=H_O3LrEOSlKm1JB8AoF5of7olyyiDhZAzD2cBXULUlo,11317
+pymammotion/mammotion/devices/base.py,sha256=6g0q94h1RZDtmYEL85SsFkn1F5BegQy_WC5a9hn8kqQ,9665
+pymammotion/mammotion/devices/mammotion.py,sha256=UyIPKY7XMy7zlfwKXmZetIw70bY5Ob8crhF6A-pU5Wo,12283
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=nyO7pkKgAoRPs-28ESf6ee-y3G5JTYRO-MCp4wKPMlE,17476
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=Q1Il0nCxH-8utg_9AKAY3HxuuhB78uHZV4yVpZ4k1TI,11282
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=-n_GryLoyl-ioQUQRnth4syToh8MwWOj-pt2p41J0xQ,8750
+pymammotion/mqtt/mammotion_mqtt.py,sha256=LaySave_hf0gU3crUTLqzpdQtxIwK8vu5DM8F8fbU2Y,8748
 pymammotion/proto/__init__.py,sha256=v3_P1LOsYRBN9qCAhaWrWMX7GWHrox9XD3hdZQxcPZM,190
 pymammotion/proto/basestation.proto,sha256=_x5gAz3FkZXS1jtq4GgZgaDCuRU-UV-7HTFdsfQ3zbo,1034
 pymammotion/proto/basestation.py,sha256=js64_N2xQYRxWPRdVNEapO0qe7vBlfYnjW5sE8hi7hw,2026
@@ -118,7 +118,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.43.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.43.dist-info/METADATA,sha256=EG9s9oLqTmk_dzxkCpAAYxrCw9XP29gH_2N3L9yL_jM,4052
-pymammotion-0.2.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.43.dist-info/RECORD,,
+pymammotion-0.2.45.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.45.dist-info/METADATA,sha256=26Qrc6piAV_O7sCUmWMMfHnkZvammh7ZIAEfr2cpH2g,4052
+pymammotion-0.2.45.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.45.dist-info/RECORD,,