pymammotion 0.2.68__py3-none-any.whl → 0.2.70__py3-none-any.whl

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/bluetooth/ble_message.py

@@ -12,15 +12,13 @@ from jsonic.serializable import serialize
 
 from pymammotion.aliyun.tmp_constant import tmp_constant
 from pymammotion.bluetooth.const import UUID_WRITE_CHARACTERISTIC
-from pymammotion.bluetooth.data.convert import parse_custom_data
 from pymammotion.bluetooth.data.framectrldata import FrameCtrlData
 from pymammotion.bluetooth.data.notifydata import BlufiNotifyData
 from pymammotion.data.model.execute_boarder import ExecuteBorder
 from pymammotion.proto import (
     dev_net_pb2,
-    luba_msg_pb2,
 )
-from pymammotion.proto.luba_msg import MsgCmdType, LubaMsg, MsgDevice, MsgAttr
+from pymammotion.proto.luba_msg import LubaMsg, MsgAttr, MsgCmdType, MsgDevice
 from pymammotion.utility.constant.device_constant import bleOrderCmd
 
 _LOGGER = logging.getLogger(__name__)
@@ -56,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}
@@ -130,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
@@ -145,7 +144,6 @@ class BleMessage:
             _LOGGER.debug("parseNotification data length less than 4")
             return -2
 
-
         sequence = int(response[2])  # toInt
 
         # Compare with the second counter, mod 255
@@ -157,7 +155,7 @@ class BleMessage:
             )
 
             # Set the value for mReadSequence manually
-            self.mReadSequence = itertools.count(start=sequence)
+            self.mReadSequence = itertools.count(start=sequence - 1)
 
         # LogUtil.m7773e(self.mGatt.getDevice().getName() + "打印丢包率", self.mReadSequence_2 + "/" + self.mReadSequence_1);
         pkt_type = int(response[0])  # toInt
@@ -251,14 +249,8 @@ class BleMessage:
             #             return;
             case 19:
                 #             # com/agilexrobotics/utils/EspBleUtil$BlufiCallbackMain.smali
-                luba_msg = parse_custom_data(data)  # parse to protobuf message
-                # really need some sort of callback
-                if luba_msg.HasField("net"):
-                    if luba_msg.net.HasField("toapp_wifi_iot_status"):
-                        # await sleep(1.5)
-                        _LOGGER.debug("sending ble sync")
-                        # await self.send_todev_ble_sync(2)
-                return luba_msg
+                # luba_msg = parse_custom_data(data)  # parse to protobuf message
+                return data
 
     # private void parseCtrlData(int i, byte[] bArr) {
     #     if (i == 0) {
@@ -312,6 +304,7 @@ class BleMessage:
             # onPostCustomDataResult(status, data)
             # _LOGGER.debug(suc)
         except Exception as err:
+            await self.client.disconnect()
             _LOGGER.debug(err)
 
     async def post_custom_data(self, data_str: str) -> None:

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.68.dist-info → pymammotion-0.2.70.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.68
+Version: 0.2.70
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur
@@ -68,7 +68,7 @@ pip install pymammotion
 PyMammotion uses `betterproto` and `protoc` for generating protobuf models. To set up the development environment:
 
 1. Clone the repository
-2. ???
+2. poetry install --with=dev
 3. Profit
 
 ## Contributing 🤝

{pymammotion-0.2.68.dist-info → pymammotion-0.2.70.dist-info}/RECORD

@@ -11,8 +11,8 @@ 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=C7H7j71fhsvBfI8QEa9PlY3Ugm2CK1CXI7CXqranM48,2470
-pymammotion/bluetooth/ble_message.py,sha256=k9yJBfZXA352rzA3csEQgk2prMNuM-r-0NPL1s1_f2c,15320
+pymammotion/bluetooth/ble.py,sha256=sIY0vtUazXDWd_YjIFk9QEbOh_NQ9y5fVrQIemDhKd8,2374
+pymammotion/bluetooth/ble_message.py,sha256=bVgrSnl6882hjGfv117SpV5BFvPkKcShti-CTC8DOOU,15032
 pymammotion/bluetooth/const.py,sha256=CCqyHsYbB0BAYjwdhXt_n6eWWxmhlUrAFjvVv57mbvE,1749
 pymammotion/bluetooth/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/bluetooth/data/convert.py,sha256=6DMwvzVr9FWCoQFIKSI2poFXjISc_m6X59g8FlVO0-o,800
@@ -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=P4cJEfntCPcaGlrGGZSWEApM5D5cwCk4MbukfStSP3Q,18889
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=YL_865BZ_DzosiZ1I85l4ro_DTZVQWZT0SLIjAmSyCU,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
@@ -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.68.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.68.dist-info/METADATA,sha256=GPRAhITGV9-PrjCNA6PGJWm32nKPm_cHw5T-PqVbJwk,3874
-pymammotion-0.2.68.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.68.dist-info/RECORD,,
+pymammotion-0.2.70.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.70.dist-info/METADATA,sha256=Vi-ttJuh4fzMfWA11xLx0O5KGHrNO7Cf3kmGbr73Y2Y,3896
+pymammotion-0.2.70.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.70.dist-info/RECORD,,