pymammotion 0.2.68__tar.gz → 0.2.69__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.68
+Version: 0.2.69
 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 → pymammotion-0.2.69}/README.md

@@ -36,7 +36,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 → pymammotion-0.2.69}/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__)
@@ -145,7 +143,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 +154,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 +248,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 +303,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-0.2.68 → pymammotion-0.2.69}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.68"
+version     = "0.2.69"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.68"
+version     = "0.2.69"
 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.68"
+current_version = "0.2.69"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true