pymammotion 0.2.67__py3-none-any.whl → 0.2.69__py3-none-any.whl

pymammotion/bluetooth/ble.py

@@ -33,6 +33,7 @@ class MammotionBLE:
         device = await scanner.find_device_by_filter(scanCallback)
         if device is not None:
             return await self.create_client(device)
+        return False
 
     async def create_client(self, device: BLEDevice):
         self.client = BleakClient(device.address)

pymammotion/bluetooth/ble_message.py

@@ -12,14 +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 LubaMsg, MsgAttr, MsgCmdType, MsgDevice
 from pymammotion.utility.constant.device_constant import bleOrderCmd
 
 _LOGGER = logging.getLogger(__name__)
@@ -51,8 +50,8 @@ class BleMessage:
 
     def __init__(self, client: BleakClient) -> None:
         self.client = client
-        self.mSendSequence = itertools.count()
-        self.mReadSequence = itertools.count()
+        self.mSendSequence = itertools.count(start=0)
+        self.mReadSequence = itertools.count(start=0)
         self.mAck = queue.Queue()
         self.notification = BlufiNotifyData()
 
@@ -87,11 +86,11 @@ class BleMessage:
 
     async def send_device_info(self) -> None:
         """Currently not called"""
-        luba_msg = luba_msg_pb2.LubaMsg(
-            msgtype=luba_msg_pb2.MsgCmdType.MSG_CMD_TYPE_ESP,
-            sender=luba_msg_pb2.MsgDevice.DEV_MOBILEAPP,
-            rcver=luba_msg_pb2.MsgDevice.DEV_COMM_ESP,
-            msgattr=luba_msg_pb2.MsgAttr.MSG_ATTR_REQ,
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.MSG_CMD_TYPE_ESP,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=MsgDevice.DEV_COMM_ESP,
+            msgattr=MsgAttr.MSG_ATTR_REQ,
             seqs=1,
             version=1,
             subtype=1,
@@ -140,69 +139,73 @@ class BleMessage:
         # if (this.mPrintDebug):
         #     Log.d(TAG, "parseNotification Notification= " + Arrays.toString(response));
         # }
-        if len(response) >= 4:
-            # sequence = int(response[2])  # toInt
-            # if sequence != next(self.mReadSequence):
-            #     _LOGGER.debug(
-            #         "parseNotification read sequence wrong",
-            #         sequence,
-            #         self.mReadSequence,
-            #     )
-            #     self.mReadSequence = itertools.count(start=sequence)
-            # this is questionable
-            # self.mReadSequence = sequence
-            # self.mReadSequence_2.incrementAndGet()
-
-            # LogUtil.m7773e(self.mGatt.getDevice().getName() + "打印丢包率", self.mReadSequence_2 + "/" + self.mReadSequence_1);
-            pkt_type = int(response[0])  # toInt
-            pkgType = self._getPackageType(pkt_type)
-            subType = self._getSubType(pkt_type)
-            self.notification.setType(pkt_type)
-            self.notification.setPkgType(pkgType)
-            self.notification.setSubType(subType)
-            frameCtrl = int(response[1])  # toInt
-            # _LOGGER.debug("frame ctrl")
-            # _LOGGER.debug(frameCtrl)
-            # _LOGGER.debug(response)
-            # _LOGGER.debug(f"pktType {pkt_type} pkgType {pkgType} subType {subType}")
-            self.notification.setFrameCtrl(frameCtrl)
-            frameCtrlData = FrameCtrlData(frameCtrl)
-            dataLen = int(response[3])  # toInt specifies length of data
-
-            try:
-                dataBytes = response[4 : 4 + dataLen]
-                if frameCtrlData.isEncrypted():
-                    _LOGGER.debug("is encrypted")
-                #     BlufiAES aes = new BlufiAES(self.mAESKey, AES_TRANSFORMATION, generateAESIV(sequence));
-                #     dataBytes = aes.decrypt(dataBytes);
-                # }
-                if frameCtrlData.isChecksum():
-                    _LOGGER.debug("checksum")
-                #     int respChecksum1 = toInt(response[response.length - 1]);
-                #     int respChecksum2 = toInt(response[response.length - 2]);
-                #     int crc = BlufiCRC.calcCRC(BlufiCRC.calcCRC(0, new byte[]{(byte) sequence, (byte) dataLen}), dataBytes);
-                #     int calcChecksum1 = (crc >> 8) & 255;
-                #     int calcChecksum2 = crc & 255;
-                #     if (respChecksum1 != calcChecksum1 || respChecksum2 != calcChecksum2) {
-                #         Log.w(TAG, "parseNotification: read invalid checksum");
-                #         if (self.mPrintDebug) {
-                #             Log.d(TAG, "expect   checksum: " + respChecksum1 + ", " + respChecksum2);
-                #             Log.d(TAG, "received checksum: " + calcChecksum1 + ", " + calcChecksum2);
-                #             return -4;
-                #         }
-                #         return -4;
-                #     }
-                # }
-                if frameCtrlData.hasFrag():
-                    dataOffset = 2
-                else:
-                    dataOffset = 0
-
-                self.notification.addData(dataBytes, dataOffset)
-                return 1 if frameCtrlData.hasFrag() else 0
-            except Exception as e:
-                _LOGGER.debug(e)
-                return -100
+        if len(response) < 4:
+            _LOGGER.debug("parseNotification data length less than 4")
+            return -2
+
+        sequence = int(response[2])  # toInt
+
+        # Compare with the second counter, mod 255
+        if sequence != (next(self.mReadSequence) & 255):
+            _LOGGER.debug(
+                "parseNotification read sequence wrong %s %s",
+                sequence,
+                self.mReadSequence,
+            )
+
+            # Set the value for mReadSequence manually
+            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
+        pkgType = self._getPackageType(pkt_type)
+        subType = self._getSubType(pkt_type)
+        self.notification.setType(pkt_type)
+        self.notification.setPkgType(pkgType)
+        self.notification.setSubType(subType)
+        frameCtrl = int(response[1])  # toInt
+        # _LOGGER.debug("frame ctrl")
+        # _LOGGER.debug(frameCtrl)
+        # _LOGGER.debug(response)
+        # _LOGGER.debug(f"pktType {pkt_type} pkgType {pkgType} subType {subType}")
+        self.notification.setFrameCtrl(frameCtrl)
+        frameCtrlData = FrameCtrlData(frameCtrl)
+        dataLen = int(response[3])  # toInt specifies length of data
+
+        try:
+            dataBytes = response[4 : 4 + dataLen]
+            if frameCtrlData.isEncrypted():
+                _LOGGER.debug("is encrypted")
+            #     BlufiAES aes = new BlufiAES(self.mAESKey, AES_TRANSFORMATION, generateAESIV(sequence));
+            #     dataBytes = aes.decrypt(dataBytes);
+            # }
+            if frameCtrlData.isChecksum():
+                _LOGGER.debug("checksum")
+            #     int respChecksum1 = toInt(response[response.length - 1]);
+            #     int respChecksum2 = toInt(response[response.length - 2]);
+            #     int crc = BlufiCRC.calcCRC(BlufiCRC.calcCRC(0, new byte[]{(byte) sequence, (byte) dataLen}), dataBytes);
+            #     int calcChecksum1 = (crc >> 8) & 255;
+            #     int calcChecksum2 = crc & 255;
+            #     if (respChecksum1 != calcChecksum1 || respChecksum2 != calcChecksum2) {
+            #         Log.w(TAG, "parseNotification: read invalid checksum");
+            #         if (self.mPrintDebug) {
+            #             Log.d(TAG, "expect   checksum: " + respChecksum1 + ", " + respChecksum2);
+            #             Log.d(TAG, "received checksum: " + calcChecksum1 + ", " + calcChecksum2);
+            #             return -4;
+            #         }
+            #         return -4;
+            #     }
+            # }
+            if frameCtrlData.hasFrag():
+                dataOffset = 2
+            else:
+                dataOffset = 0
+
+            self.notification.addData(dataBytes, dataOffset)
+            return 1 if frameCtrlData.hasFrag() else 0
+        except Exception as e:
+            _LOGGER.debug(e)
+            return -100
 
         # Log.w(TAG, "parseNotification data length less than 4");
         return -2
@@ -245,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) {
@@ -306,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/mammotion/commands/messages/network.py

@@ -162,36 +162,23 @@ class MessageNetwork:
         logger.debug(f"szNetwork: Send command - set network (on/off status). newWifiStatus={new_wifi_status}")
         return self.send_order_msg_net(build)
 
-    def wifi_connectinfo_update(self, device_name: str, is_binary: bool) -> bytes:
-        logger.debug(
-            f"Send command - get Wifi connection information.wifiConnectinfoUpdate().deviceName={device_name}.isBinary={is_binary}"
+    def wifi_connectinfo_update(self) -> bytes:
+        build = dev_net_pb2.DevNet(
+            todev_ble_sync=1,
+            todev_WifiMsgUpload=dev_net_pb2.DrvWifiUpload(wifi_msg_upload=1),
         )
-        if is_binary:
-            build = dev_net_pb2.DevNet(
-                todev_ble_sync=1,
-                todev_WifiMsgUpload=dev_net_pb2.DrvWifiUpload(wifi_msg_upload=1),
-            )
-            logger.debug("Send command - get Wifi connection information")
-            return self.send_order_msg_net(build)
-        self.wifi_connectinfo_update2()
+        logger.debug("Send command - get Wifi connection information")
+        return self.send_order_msg_net(build)
 
     def wifi_connectinfo_update2(self) -> None:
         hash_map = {"getMsgCmd": 1}
         # self.post_custom_data(self.get_json_string(
         #     68, hash_map))  # ToDo: Fix this
 
-    def get_record_wifi_list(self, is_binary: bool) -> bytes:
-        logger.debug(f"getRecordWifiList().isBinary={is_binary}")
-        if is_binary:
-            build = dev_net_pb2.DevNet(todev_ble_sync=1, todev_WifiListUpload=dev_net_pb2.DrvWifiList())
-            logger.debug("Send command - get memorized WiFi list upload command")
-            return self.send_order_msg_net(build)
-        self.get_record_wifi_list2()
-
-    def get_record_wifi_list2(self) -> None:
-        pass
-        # self.messageNavigation.post_custom_data(
-        #     self.get_json_string(69))  # ToDo: Fix this
+    def get_record_wifi_list(self) -> bytes:
+        build = dev_net_pb2.DevNet(todev_ble_sync=1, todev_WifiListUpload=dev_net_pb2.DrvWifiList())
+        logger.debug("Send command - get memorized WiFi list upload command")
+        return self.send_order_msg_net(build)
 
     def close_clear_connect_current_wifi(self, ssid: str, status: int, is_binary: bool) -> bytes:
         if is_binary:
@@ -205,8 +192,8 @@ class MessageNetwork:
             return self.send_order_msg_net(build)
         self.close_clear_connect_current_wifi2(ssid, status)
 
-    def close_clear_connect_current_wifi2(self, ssid: str, get_msg_cmd: int) -> None:
-        data = {"ssid": ssid, "getMsgCmd": get_msg_cmd}
-        # self.messageNavigation.post_custom_data(
-        # ToDo: Fix this
-        # self.get_json_string(bleOrderCmd.close_clear_connect_current_wifi, data).encode())
+    # def close_clear_connect_current_wifi2(self, ssid: str, get_msg_cmd: int) -> None:
+    #     data = {"ssid": ssid, "getMsgCmd": get_msg_cmd}
+    # self.messageNavigation.post_custom_data(
+    # ToDo: Fix this
+    # self.get_json_string(bleOrderCmd.close_clear_connect_current_wifi, data).encode())

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -405,7 +405,6 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self._cancel_disconnect_timer()
         self._client = None
 
-
     def _disconnect_from_timer(self) -> None:
         """Disconnect from device."""
         if self._operation_lock.locked() and self._client.is_connected:

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -200,6 +200,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         if self._ble_sync_task is None or self._ble_sync_task.cancelled():
             await self.run_periodic_sync_task()
         self.stopped = False
+        self._mqtt.on_ready_event.add_subscribers(self.on_ready)
         self.mqtt.connect_async()
 
     async def _ble_sync(self) -> None:
@@ -286,7 +287,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             if fut is None:
                 return
             while fut.fut.cancelled() and len(self._mqtt.waiting_queue) > 0:
-                fut: MammotionFuture = self.dequeue_by_iot_id(self._mqtt.waiting_queue, self.iot_id)
+                fut = self.dequeue_by_iot_id(self._mqtt.waiting_queue, self.iot_id)
             if not fut.fut.cancelled():
                 fut.resolve(cast(bytes, binary_data))
         await self._state_manager.notification(new_msg)

{pymammotion-0.2.67.dist-info → pymammotion-0.2.69.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.67
+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.67.dist-info → pymammotion-0.2.69.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=YfkfEK3TLJ8BaidjAXfUVFv8reLCu6U_lYa3Bo0pddw,2449
-pymammotion/bluetooth/ble_message.py,sha256=XzsXcKv29GbGAnivYvZLfDOiMVAWsilk70N4TVwFl50,15448
+pymammotion/bluetooth/ble.py,sha256=C7H7j71fhsvBfI8QEa9PlY3Ugm2CK1CXI7CXqranM48,2470
+pymammotion/bluetooth/ble_message.py,sha256=toPhMOgmHEdHzvaOsgCUfrkjdI38oeS4Av0E-I8X0_s,14952
 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
@@ -54,7 +54,7 @@ pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 pymammotion/mammotion/commands/messages/driver.py,sha256=DlOAC_yi1ycO5hKr5rfCpLmrqao6Mb6Fv1JWwMISnKE,3766
 pymammotion/mammotion/commands/messages/media.py,sha256=l-m4l2Vp1ZOHPHyJTceuLaLvdgHOEfmykkbDncCDUI4,1359
 pymammotion/mammotion/commands/messages/navigation.py,sha256=Z6RQK-pMh8o7_K_1yTENx3lkNBFQTU_ojunolSre0oM,23241
-pymammotion/mammotion/commands/messages/network.py,sha256=ooBiXgJC71lrkMeS_DLc3_pp7S8VGgyq7ZAmna-jKXw,8516
+pymammotion/mammotion/commands/messages/network.py,sha256=HjB6oz4_g_vgYybuTuzCxIXmy83mgTAl9A0CBNuLTfI,7901
 pymammotion/mammotion/commands/messages/ota.py,sha256=g937HT_-OQXV6A3zUiZ53b45cOX6y-rzs5m-4b0IcTk,1473
 pymammotion/mammotion/commands/messages/system.py,sha256=pUdV8z-pnoXvDM29DQbfAi2mG6uK7EHQzJL2sWZLHrc,12843
 pymammotion/mammotion/commands/messages/video.py,sha256=ne1YSuQChaDFfmHgMO5Jc9_O_7vkt5yV1EXVEh3LTbg,1141
@@ -63,8 +63,8 @@ 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=ggufoV_KMNaWspHHvXQCOqxUpmNRQYu5jNQSjxviVSM,18890
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=NM7BKVNPzQXm7DQs1fl5cQHwd_W9DGWwLzB-DaoLKX8,12026
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=P4cJEfntCPcaGlrGGZSWEApM5D5cwCk4MbukfStSP3Q,18889
+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
 pymammotion/mqtt/mammotion_mqtt.py,sha256=LaySave_hf0gU3crUTLqzpdQtxIwK8vu5DM8F8fbU2Y,8748
@@ -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.67.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.67.dist-info/METADATA,sha256=DZQuVb2_ihRfYgQASyewZvppsMlAoFop88WYADKFpME,3874
-pymammotion-0.2.67.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.67.dist-info/RECORD,,
+pymammotion-0.2.69.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.69.dist-info/METADATA,sha256=WB0DIDd6a9UIsShP0cBubzGQVOZJjvXNHNkOeMpfQnc,3896
+pymammotion-0.2.69.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.69.dist-info/RECORD,,