pymammotion 0.0.40__tar.gz → 0.0.41__tar.gz

{pymammotion-0.0.40 → pymammotion-0.0.41}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.0.40
+Version: 0.0.41
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur
 Author-email: michael@jumblesoft.co.nz
-Requires-Python: >=3.11,<3.13
+Requires-Python: >=3.12.0,<3.13.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
 Requires-Dist: alibabacloud-apigateway-util (>=0.0.2,<0.0.3)
@@ -27,6 +26,7 @@ Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
 Requires-Dist: protobuf (>=4.23.1)
 Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
 Requires-Dist: pyjoystick (>=1.2.4,<2.0.0)
+Requires-Dist: pyproj (>=3.6.1,<4.0.0)
 Description-Content-Type: text/markdown
 
 # PyMammotion - Python API for Mammotion Mowers [![Discord](https://img.shields.io/discord/1247286396297678879)](https://discord.gg/vpZdWhJX8x)
@@ -35,7 +35,7 @@ Description-Content-Type: text/markdown
 [![PyPI Releases][img_pypi]][url_pypi]
 [![Supported Python Versions][img_pyversions]][url_pyversions]
 
-[img_version]: https://img.shields.io/static/v1.svg?label=SemVer&message=0.0.1&color=blue
+[img_version]: https://img.shields.io/static/v1.svg?label=SemVer&message=0.4.0&color=blue
 [url_version]: https://pypi.org/project/pymammotion/
 
 [img_pypi]: https://img.shields.io/badge/PyPI-wheels-green.svg
@@ -90,3 +90,9 @@ If you encounter any issues:
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
 
+
+## Trademark Notice
+
+The trademarks "Mammotion," "Luba," and "Yuka" referenced herein are registered trademarks of their respective owners. The author of this software repository is not affiliated with, endorsed by, or connected to these trademark owners in any way.
+
+

{pymammotion-0.0.40 → pymammotion-0.0.41}/README.md

@@ -4,7 +4,7 @@
 [![PyPI Releases][img_pypi]][url_pypi]
 [![Supported Python Versions][img_pyversions]][url_pyversions]
 
-[img_version]: https://img.shields.io/static/v1.svg?label=SemVer&message=0.0.1&color=blue
+[img_version]: https://img.shields.io/static/v1.svg?label=SemVer&message=0.4.0&color=blue
 [url_version]: https://pypi.org/project/pymammotion/
 
 [img_pypi]: https://img.shields.io/badge/PyPI-wheels-green.svg
@@ -58,3 +58,9 @@ If you encounter any issues:
 ## License 📄
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+
+## Trademark Notice
+
+The trademarks "Mammotion," "Luba," and "Yuka" referenced herein are registered trademarks of their respective owners. The author of this software repository is not affiliated with, endorsed by, or connected to these trademark owners in any way.
+

{pymammotion-0.0.40 → pymammotion-0.0.41}/pymammotion/__init__.py

@@ -14,7 +14,9 @@ from pymammotion.http.http import LubaHTTP, connect_http
 
 # TODO make a working device that will work outside HA too.
 from pymammotion.mammotion.devices import MammotionBaseBLEDevice
-from pymammotion.mqtt.mqtt import LubaMQTT, logger
+from pymammotion.mqtt import MammotionMQTT
+
+logger = logging.getLogger(__name__)
 
 # TODO provide interface to pick between mqtt/cloud/bluetooth
 
@@ -28,7 +30,7 @@ if __name__ == "__main__":
     CLIENT_ID = os.environ.get("CLIENT_ID")
     IOT_TOKEN = os.environ.get("IOT_TOKEN")
     REGION = os.environ.get("REGION")
-    luba = LubaMQTT(
+    luba = MammotionMQTT(
         iot_token=IOT_TOKEN,
         region_id=REGION,
         product_key=PRODUCT_KEY,

pymammotion-0.0.41/pymammotion/aliyun/__init__.py

@@ -0,0 +1 @@
+"""Aliyun API interfaces."""

{pymammotion-0.0.40 → pymammotion-0.0.41}/pymammotion/aliyun/cloud_gateway.py

@@ -1,3 +1,5 @@
+"""Module for interacting with Aliyun Cloud IoT Gateway."""
+
 import base64
 import hashlib
 import hmac
@@ -30,9 +32,6 @@ from pymammotion.utility.datatype_converter import DatatypeConverter
 
 logger = getLogger(__name__)
 
-# init client
-
-
 MOVE_HEADERS = (
     "x-ca-signature",
     "x-ca-signature-headers",
@@ -47,6 +46,8 @@ MOVE_HEADERS = (
 
 
 class CloudIOTGateway:
+    """Class for interacting with Aliyun Cloud IoT Gateway."""
+
     _client_id = ""
     _device_sn = ""
     _utdid = ""
@@ -61,19 +62,20 @@ class CloudIOTGateway:
     converter = DatatypeConverter()
 
     def __init__(self):
+        """Initialize the CloudIOTGateway."""
         self._app_key = APP_KEY
         self._app_secret = APP_SECRET
         self.domain = ALIYUN_DOMAIN
 
-        self._client_id = self.generate_hardware_string(8)  # 8 charatters
-        self._device_sn = self.generate_hardware_string(32)  # 32 charatters
-        self._utdid = self.generate_hardware_string(32)  # 32 charatters
+        self._client_id = self.generate_hardware_string(8)  # 8 characters
+        self._device_sn = self.generate_hardware_string(32)  # 32 characters
+        self._utdid = self.generate_hardware_string(32)  # 32 characters
 
     @staticmethod
     def generate_random_string(length):
+        """Generate a random string of specified length."""
         characters = string.ascii_letters + string.digits
-        random_string = "".join(random.choice(characters) for _ in range(length))
-        return random_string
+        return "".join(random.choice(characters) for _ in range(length))
 
     @staticmethod
     def generate_hardware_string(length) -> str:
@@ -82,28 +84,24 @@ class CloudIOTGateway:
         return "".join(itertools.islice(itertools.cycle(hashed_uuid), length))
 
     def sign(self, data):
+        """Generate signature for the given data."""
         keys = ["appKey", "clientId", "deviceSn", "timestamp"]
         concatenated_str = ""
         for key in keys:
             concatenated_str += f"{key}{data.get(key, '')}"
 
-        logger.debug(f"sign(), toSignStr = {concatenated_str}")
+        logger.debug("sign(), toSignStr = %s", concatenated_str)
 
-        sign = hmac.new(
+        return hmac.new(
             self._app_secret.encode("utf-8"),
             concatenated_str.encode("utf-8"),
             hashlib.sha1,
         ).hexdigest()
 
-        return sign
-
     def get_region(self, country_code: str, auth_code: str):
-        # shim out the regions?
-        #  https://api.link.aliyun.com/living/account/region/get?x-ca-request-id=59abc767-fbbc-4333-9127-e65d792133a8
-        # x-ca-request-id is a random UUID on each request
-
+        """Get the region based on country code and auth code."""
         config = Config(
-            app_key=self._app_key,  # correct
+            app_key=self._app_key,
             app_secret=self._app_secret,
             domain=self.domain,
         )
@@ -123,45 +121,42 @@ class CloudIOTGateway:
         )
 
         # send request
-        # possibly need to do this ourselves
-        response = client.do_request(
-            "/living/account/region/get", "https", "POST", None, body, RuntimeOptions()
-        )
+        response = client.do_request("/living/account/region/get", "https", "POST", None, body, RuntimeOptions())
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
         logger.debug(response.body)
 
-        # Decodifica il corpo della risposta
+        # Decode the response body
         response_body_str = response.body.decode("utf-8")
 
-        # Carica la stringa JSON in un dizionario
+        # Load the JSON string into a dictionary
         response_body_dict = json.loads(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error in getting regions: " + response_body_dict["msg"])
-        else:
-            self._region = RegionResponse.from_dict(response_body_dict)
-            logger.debug("Endpoint : " + self._region.data.mqttEndpoint)
+
+        self._region = RegionResponse.from_dict(response_body_dict)
+        logger.debug("Endpoint: %s", self._region.data.mqttEndpoint)
 
         return response.body
 
     def aep_handle(self):
-        # https://api.link.aliyun.com/app/aepauth/handle
+        """Handle AEP authentication."""
         aep_domain = self.domain
 
         if self._region.data.apiGatewayEndpoint is not None:
             aep_domain = self._region.data.apiGatewayEndpoint
 
         config = Config(
-            app_key=self._app_key,  # correct
+            app_key=self._app_key,
             app_secret=self._app_secret,
             domain=aep_domain,
         )
         client = Client(config)
 
         request = CommonParams(api_ver="1.0.0", language="en-US")
-        logger.debug("client id ", self._client_id)
+        logger.debug("client id %s", self._client_id)
         time_now = time.time()
         data_to_sign = {
             "appKey": self._app_key,
@@ -185,10 +180,7 @@ class CloudIOTGateway:
         )
 
         # send request
-        # possibly need to do this ourselves
-        response = client.do_request(
-            "/app/aepauth/handle", "https", "POST", None, body, RuntimeOptions()
-        )
+        response = client.do_request("/app/aepauth/handle", "https", "POST", None, body, RuntimeOptions())
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
@@ -199,19 +191,16 @@ class CloudIOTGateway:
         response_body_dict = json.loads(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
-            raise Exception(
-                "Error in getting mqtt credentials: " + response_body_dict["msg"]
-            )
-        else:
-            self._aep_response = AepResponse.from_dict(response_body_dict)
+            raise Exception("Error in getting mqtt credentials: " + response_body_dict["msg"])
+
+        self._aep_response = AepResponse.from_dict(response_body_dict)
 
         logger.debug(response_body_dict)
 
         return response.body
 
-    # returns vid
-
     async def connect(self):
+        """Connect to the Aliyun Cloud IoT Gateway."""
         region_url = "sdk.openaccount.aliyun.com"
         async with ClientSession() as session:
             headers = {
@@ -255,14 +244,12 @@ class CloudIOTGateway:
             header = "".join(f"{k}:{dic[k]}\n" for k in keys).strip()
 
             headers["x-ca-signature-headers"] = sign_headers
-            string_to_sign = (
-                "POST\n{}\n\n{}\n{}\n{}\n/api/prd/connect.json?request={}".format(
-                    headers["accept"],
-                    headers["content-type"],
-                    headers["date"],
-                    header,
-                    json.dumps(_bodyParam, separators=(",", ":")),
-                )
+            string_to_sign = "POST\n{}\n\n{}\n{}\n{}\n/api/prd/connect.json?request={}".format(
+                headers["accept"],
+                headers["content-type"],
+                headers["date"],
+                header,
+                json.dumps(_bodyParam, separators=(",", ":")),
             )
 
             hash_val = hmac.new(
@@ -276,15 +263,14 @@ class CloudIOTGateway:
             async with session.post(
                 f"https://{region_url}/api/prd/connect.json",
                 headers=headers,
-                params=dict(request=json.dumps(_bodyParam, separators=(",", ":"))),
+                params={"request": json.dumps(_bodyParam, separators=(",", ":"))},
             ) as resp:
                 data = await resp.json()
                 self._connect_response = ConnectResponse.from_dict(data)
                 logger.debug(data)
 
     async def login_by_oauth(self, country_code: str, auth_code: str):
-        """loginbyoauth.json."""
-
+        """Login by OAuth."""
         region_url = self._region.data.oaApiGatewayEndpoint
 
         async with ClientSession() as session:
@@ -345,24 +331,17 @@ class CloudIOTGateway:
             async with session.post(
                 f"https://{region_url}/api/prd/loginbyoauth.json",
                 headers=headers,
-                params=dict(
-                    loginByOauthRequest=json.dumps(_bodyParam, separators=(",", ":"))
-                ),
+                params={"loginByOauthRequest": json.dumps(_bodyParam, separators=(",", ":"))},
             ) as resp:
                 data = await resp.json()
                 logger.debug(data)
 
                 self._login_by_oauth_response = LoginByOAuthResponse.from_dict(data)
 
-        # self._region = response.body.data
-
-        # return response.body
-
-        # headers require sid vid or at a minimuim vid which comes from prd/connect.json
-
     def session_by_auth_code(self):
+        """Create a session by auth code."""
         config = Config(
-            app_key=self._app_key,  # correct
+            app_key=self._app_key,
             app_secret=self._app_secret,
             domain=self._region.data.apiGatewayEndpoint,
         )
@@ -384,7 +363,6 @@ class CloudIOTGateway:
         )
 
         # send request
-        # possibly need to do this ourselves
         response = client.do_request(
             "/account/createSessionByAuthCode",
             "https",
@@ -398,26 +376,25 @@ class CloudIOTGateway:
         logger.debug(response.status_code)
         logger.debug(response.body)
 
-        # Decodifica il corpo della risposta
+        # Decode the response body
         response_body_str = response.body.decode("utf-8")
 
-        # Carica la stringa JSON in un dizionario
+        # Load the JSON string into a dictionary
         response_body_dict = json.loads(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error in creating session: " + response_body_dict["msg"])
-        else:
-            self._session_by_authcode_response = SessionByAuthCodeResponse.from_dict(
-                response_body_dict
-            )
+
+        self._session_by_authcode_response = SessionByAuthCodeResponse.from_dict(response_body_dict)
 
         return response.body
 
     def check_or_refresh_session(self):
-        if self.load_saved_params() == False:
+        """Check or refresh the session."""
+        if self.load_saved_params() is False:
             return False
         config = Config(
-            app_key=self._app_key,  # correct
+            app_key=self._app_key,
             app_secret=self._app_secret,
             domain=self._region.data.apiGatewayEndpoint,
         )
@@ -457,11 +434,12 @@ class CloudIOTGateway:
         response_body_str = response.body.decode("utf-8")
 
         # Carica la stringa JSON in un dizionario
-        response_body_dict = json.loads(response_body_str)
+        json.loads(response_body_str)
 
     def list_binding_by_account(self):
+        """List bindings by account."""
         config = Config(
-            app_key=self._app_key,  # correct
+            app_key=self._app_key,
             app_secret=self._app_secret,
             domain=self._region.data.apiGatewayEndpoint,
         )
@@ -482,32 +460,27 @@ class CloudIOTGateway:
         )
 
         # send request
-        # possibly need to do this ourselves
-        response = client.do_request(
-            "/uc/listBindingByAccount", "https", "POST", None, body, RuntimeOptions()
-        )
+        response = client.do_request("/uc/listBindingByAccount", "https", "POST", None, body, RuntimeOptions())
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
         logger.debug(response.body)
 
-        # self._region = response.body.data
-        # Decodifica il corpo della risposta
+        # Decode the response body
         response_body_str = response.body.decode("utf-8")
 
-        # Carica la stringa JSON in un dizionario
+        # Load the JSON string into a dictionary
         response_body_dict = json.loads(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error in creating session: " + response_body_dict["msg"])
-        else:
-            self._listing_dev_by_account_response = (
-                ListingDevByAccountResponse.from_dict(response_body_dict)
-            )
 
-    def send_cloud_command(self, command: bytes):
+        self._listing_dev_by_account_response = ListingDevByAccountResponse.from_dict(response_body_dict)
+
+    def send_cloud_command(self, iot_id: str, command: bytes) -> str:
+        """Send a cloud command to the specified IoT device."""
         config = Config(
-            app_key=self._app_key,  # correct
+            app_key=self._app_key,
             app_secret=self._app_secret,
             domain=self._region.data.apiGatewayEndpoint,
         )
@@ -522,30 +495,36 @@ class CloudIOTGateway:
         )
 
         # TODO move to using  InvokeThingServiceRequest()
+
+        message_id = str(uuid.uuid4())
+
         body = IoTApiRequest(
-            id=str(uuid.uuid4()),
+            id=message_id,
             params={
                 "args": {"content": self.converter.printBase64Binary(command)},
                 "identifier": "device_protobuf_sync_service",
-                "iotId": "MbXcDE2X63CENA0lPGIo000000",  # TODO get iotId from listbybinding request
+                "iotId": f"{iot_id}",
             },
             request=request,
             version="1.0",
         )
 
         # send request
-        # possibly need to do this ourselves
-        response = client.do_request(
-            "/thing/service/invoke", "https", "POST", None, body, RuntimeOptions()
-        )
+        response = client.do_request("/thing/service/invoke", "https", "POST", None, body, RuntimeOptions())
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
         logger.debug(response.body)
 
-        # self._region = response.body.data
-        # Decodifica il corpo della risposta
         response_body_str = response.body.decode("utf-8")
-
-        # Carica la stringa JSON in un dizionario
         response_body_dict = json.loads(response_body_str)
+
+        if int(response_body_dict.get("code")) != 200:
+            logger.error(
+                "Error in sending cloud command: %s - %s",
+                str(response_body_dict.get("code")),
+                str(response_body_dict["msg"]),
+            )
+            return ""
+
+        return message_id

{pymammotion-0.0.40 → pymammotion-0.0.41}/pymammotion/aliyun/tmp_constant.py

@@ -143,9 +143,7 @@ class tmp_constant:
     URI_ALINK_SERVICE = "alink/service"  # deprecated
     URI_AUTH = "/auth"  # deprecated
     URI_AUTHEN_REGISTER = "/sys/{productKey}/{deviceName}/thing/authen/sub/register"
-    URI_AUTHEN_REGISTER_REPLY = (
-        "/sys/{productKey}/{deviceName}/thing/authen/sub/register_reply"
-    )
+    URI_AUTHEN_REGISTER_REPLY = "/sys/{productKey}/{deviceName}/thing/authen/sub/register_reply"
     URI_BLACKLIST_UPDATE_POST = "/thing/lan/blacklist/update"
     URI_BLACKLIST_UPDATE_REPLY_POST = "/thing/lan/blacklist/update_reply"
     URI_DEVICE = "/device/core/dev"
@@ -165,9 +163,7 @@ class tmp_constant:
     URI_TOPIC_LOCALDEVICE_STATECHANGE = "group/localstatechange"
     URI_TOPIC_REPLY_POST = "_reply"
     URI_UPDATE_DEVICE_INFO = "/sys/{productKey}/{deviceName}/thing/deviceinfo/update"
-    URI_UPDATE_DEVICE_INFO_REPLY = (
-        "/sys/{productKey}/{deviceName}/thing/deviceinfo/update_reply"
-    )
+    URI_UPDATE_DEVICE_INFO_REPLY = "/sys/{productKey}/{deviceName}/thing/deviceinfo/update_reply"
     URI_USER = "/user"
     VALUE_SHA256 = "sha256"
     VERSION = "1.0"

{pymammotion-0.0.40 → pymammotion-0.0.41}/pymammotion/bluetooth/ble.py

@@ -46,15 +46,11 @@ class LubaBLE:
         if self.client is not None:
             return await self.client.disconnect()
 
-    async def notification_handler(
-        self, _characteristic: BleakGATTCharacteristic, data: bytearray
-    ):
+    async def notification_handler(self, _characteristic: BleakGATTCharacteristic, data: bytearray):
         """Simple notification handler which prints the data received."""
         await self._bleEvt.BleNotification(data)
 
-    def service_changed_handler(
-        self, characteristic: BleakGATTCharacteristic, data: bytearray
-    ):
+    def service_changed_handler(self, characteristic: BleakGATTCharacteristic, data: bytearray):
         """Simple notification handler which prints the data received."""
         print(f"Response 2 {characteristic.description}: {data}")
         print(data.decode("utf-8"))
@@ -63,12 +59,8 @@ class LubaBLE:
 
     async def notifications(self):
         if self.client.is_connected:
-            await self.client.start_notify(
-                UUID_NOTIFICATION_CHARACTERISTIC, self.notification_handler
-            )
-            await self.client.start_notify(
-                SERVICE_CHANGED_CHARACTERISTIC, self.service_changed_handler
-            )
+            await self.client.start_notify(UUID_NOTIFICATION_CHARACTERISTIC, self.notification_handler)
+            await self.client.start_notify(SERVICE_CHANGED_CHARACTERISTIC, self.service_changed_handler)
 
     def getClient(self):
         return self.client

{pymammotion-0.0.40 → pymammotion-0.0.41}/pymammotion/bluetooth/ble_message.py

@@ -79,15 +79,11 @@ class BleMessage:
 
     async def get_task(self):
         hash_map = {"pver": 1, "subCmd": 2, "result": 0}
-        await self.messageNavigation.post_custom_data(
-            self.get_json_string(bleOrderCmd.task, hash_map)
-        )
+        await self.messageNavigation.post_custom_data(self.get_json_string(bleOrderCmd.task, hash_map))
 
     async def send_ble_alive(self):
         hash_map = {"ctrl": 1}
-        await self.messageNavigation.post_custom_data(
-            self.get_json_string(bleOrderCmd.bleAlive, hash_map)
-        )
+        await self.messageNavigation.post_custom_data(self.get_json_string(bleOrderCmd.bleAlive, hash_map))
 
     def clearNotification(self):
         self.notification = None
@@ -106,9 +102,7 @@ class BleMessage:
             seqs=1,
             version=1,
             subtype=1,
-            net=dev_net_pb2.DevNet(
-                todev_ble_sync=1, todev_devinfo_req=dev_net_pb2.DrvDevInfoReq()
-            ),
+            net=dev_net_pb2.DevNet(todev_ble_sync=1, todev_devinfo_req=dev_net_pb2.DrvDevInfoReq()),
         )
         byte_arr = luba_msg.SerializeToString()
         await self.post_custom_data_bytes(byte_arr)
@@ -117,9 +111,7 @@ class BleMessage:
         request = False
         type = self.messageNavigation.getTypeValue(0, 5)
         try:
-            request = await self.messageNavigation.post(
-                BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None
-            )
+            request = await self.messageNavigation.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
             # print(request)
         except Exception as err:
             # Log.w(TAG, "post requestDeviceStatus interrupted")
@@ -133,9 +125,7 @@ class BleMessage:
         request = False
         type = self.messageNavigation.getTypeValue(0, 7)
         try:
-            request = await self.messageNavigation.post(
-                BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None
-            )
+            request = await self.messageNavigation.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
             # print(request)
         except Exception as err:
             # Log.w(TAG, "post requestDeviceStatus interrupted")
@@ -318,9 +308,7 @@ class BleMessage:
             return
         type_val = self.getTypeValue(1, 19)
         try:
-            suc = await self.post(
-                self.mEncrypted, self.mChecksum, self.mRequireAck, type_val, data
-            )
+            suc = await self.post(self.mEncrypted, self.mChecksum, self.mRequireAck, type_val, data)
             # int status = suc ? 0 : BlufiCallback.CODE_WRITE_DATA_FAILED
             # onPostCustomDataResult(status, data)
             # print(suc)
@@ -333,9 +321,7 @@ class BleMessage:
             return
         type_val = self.getTypeValue(1, 19)
         try:
-            suc = await self.post(
-                self.mEncrypted, self.mChecksum, self.mRequireAck, type_val, data
-            )
+            suc = await self.post(self.mEncrypted, self.mChecksum, self.mRequireAck, type_val, data)
             # int status = suc ? 0 : BlufiCallback.CODE_WRITE_DATA_FAILED
             # onPostCustomDataResult(status, data)
         except Exception as err:
@@ -352,17 +338,11 @@ class BleMessage:
         if data is None:
             return await self.post_non_data(encrypt, checksum, require_ack, type_of)
 
-        return await self.post_contains_data(
-            encrypt, checksum, require_ack, type_of, data
-        )
+        return await self.post_contains_data(encrypt, checksum, require_ack, type_of, data)
 
-    async def post_non_data(
-        self, encrypt: bool, checksum: bool, require_ack: bool, type_of: int
-    ) -> bool:
+    async def post_non_data(self, encrypt: bool, checksum: bool, require_ack: bool, type_of: int) -> bool:
         sequence = self.generateSendSequence()
-        postBytes = self.getPostBytes(
-            type_of, encrypt, checksum, require_ack, False, sequence, None
-        )
+        postBytes = self.getPostBytes(type_of, encrypt, checksum, require_ack, False, sequence, None)
         posted = await self.gatt_write(postBytes)
         return posted and (not require_ack or self.receiveAck(sequence))
 
@@ -385,9 +365,7 @@ class BleMessage:
         for index, chunk in enumerate(chunks):
             frag = index != len(chunks) - 1
             sequence = self.generateSendSequence()
-            postBytes = self.getPostBytes(
-                type_of, encrypt, checksum, require_ack, frag, sequence, chunk
-            )
+            postBytes = self.getPostBytes(type_of, encrypt, checksum, require_ack, frag, sequence, chunk)
             # print("sequence")
             # print(sequence)
             posted = await self.gatt_write(postBytes)
@@ -415,9 +393,7 @@ class BleMessage:
     ) -> bytes:
         byteOS = BytesIO()
         dataLength = 0 if data == None else len(data)
-        frameCtrl = FrameCtrlData.getFrameCTRLValue(
-            encrypt, checksum, 0, require_ack, hasFrag
-        )
+        frameCtrl = FrameCtrlData.getFrameCTRLValue(encrypt, checksum, 0, require_ack, hasFrag)
         byteOS.write(type.to_bytes(1, sys.byteorder))
         byteOS.write(frameCtrl.to_bytes(1, sys.byteorder))
         byteOS.write(sequence.to_bytes(1, sys.byteorder))

{pymammotion-0.0.40 → pymammotion-0.0.41}/pymammotion/bluetooth/data/convert.py

@@ -19,9 +19,7 @@ def store_sys_data(sys):
         tard_state_data_list = sys.systemTardStateTunnel.tard_state_data
         longValue8 = tard_state_data_list[0]
         longValue9 = tard_state_data_list[1]
-        print(
-            "Device status report,deviceState:", longValue8, ",deviceName:", "Luba..."
-        )
+        print("Device status report,deviceState:", longValue8, ",deviceName:", "Luba...")
         chargeStateTemp = longValue9
         longValue10 = tard_state_data_list[6]
         longValue11 = tard_state_data_list[7]

{pymammotion-0.0.40 → pymammotion-0.0.41}/pymammotion/bluetooth/data/notifydata.py

@@ -59,5 +59,4 @@ class BlufiNotifyData:
     #  JADX INFO: Access modifiers changed from: package-private
     def getDataArray(self):
         """Generated source for method getDataArray"""
-        print("data Array")
         return self.mDataOS.getvalue()