pymammotion 0.2.69__tar.gz → 0.2.70__tar.gz

{pymammotion-0.2.69 → pymammotion-0.2.70}/PKG-INFO

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

{pymammotion-0.2.69 → pymammotion-0.2.70}/pymammotion/bluetooth/ble.py

@@ -7,9 +7,6 @@ from pymammotion.bluetooth.const import (
 )
 from pymammotion.event.event import BleNotificationEvent
 
-# TODO setup for each Luba
-address = "90:38:0C:6E:EE:9E"
-
 
 class MammotionBLE:
     client: BleakClient
@@ -24,9 +21,7 @@ class MammotionBLE:
             # TODO: do something with incoming data
             print(device)
             print(advertising_data)
-            if device.address == "90:38:0C:6E:EE:9E":
-                return True
-            if advertising_data.local_name and "Luba-" 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-0.2.69 → pymammotion-0.2.70}/pymammotion/bluetooth/ble_message.py

@@ -54,6 +54,7 @@ class BleMessage:
         self.mReadSequence = itertools.count(start=0)
         self.mAck = queue.Queue()
         self.notification = BlufiNotifyData()
+        self._write_char = client.services.get_characteristic(UUID_WRITE_CHARACTERISTIC)
 
     async def get_task(self) -> None:
         hash_map = {"pver": 1, "subCmd": 2, "result": 0}
@@ -128,7 +129,7 @@ class BleMessage:
         await self.post_custom_data(serialize(executeBorder))
 
     async def gatt_write(self, data: bytes) -> None:
-        await self.client.write_gatt_char(UUID_WRITE_CHARACTERISTIC, data, True)
+        await self.client.write_gatt_char(self._write_char, data, True)
 
     def parseNotification(self, response: bytearray):
         dataOffset = None

{pymammotion-0.2.69 → pymammotion-0.2.70}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -97,9 +97,10 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self._device = device
 
     async def _ble_sync(self) -> None:
-        _LOGGER.debug("BLE SYNC")
-        command_bytes = self._commands.send_todev_ble_sync(2)
-        await self._message.post_custom_data_bytes(command_bytes)
+        if self._client is not None and self._client.is_connected:
+            _LOGGER.debug("BLE SYNC")
+            command_bytes = self._commands.send_todev_ble_sync(2)
+            await self._message.post_custom_data_bytes(command_bytes)
 
     async def run_periodic_sync_task(self) -> None:
         """Send ble sync to robot."""
@@ -323,6 +324,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
                 _LOGGER.exception("Error parsing message %s", data)
             finally:
                 self._message.clearNotification()
+                data = b''
 
             _LOGGER.debug("%s: Received notification: %s", self.name, data)
         else:
@@ -379,11 +381,9 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         """Resolve characteristics."""
         self._read_char = services.get_characteristic(READ_CHAR_UUID)
         if not self._read_char:
-            self._read_char = READ_CHAR_UUID
             _LOGGER.error(CharacteristicMissingError(READ_CHAR_UUID))
         self._write_char = services.get_characteristic(WRITE_CHAR_UUID)
         if not self._write_char:
-            self._write_char = WRITE_CHAR_UUID
             _LOGGER.error(CharacteristicMissingError(WRITE_CHAR_UUID))
 
     def _reset_disconnect_timer(self) -> None:

{pymammotion-0.2.69 → pymammotion-0.2.70}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.69"
+version     = "0.2.70"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.69"
+version     = "0.2.70"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -61,7 +61,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.2.69"
+current_version = "0.2.70"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true