Merge pull request #76 from zweckj/fix/bt

bugfix: BT improvements
zweckj · Dec 30, 2024 · ad6a4fc · ad6a4fc
2 parents efd2f34 + 07f6f13
commit ad6a4fc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/pylamarzocco/clients/bluetooth.py b/pylamarzocco/clients/bluetooth.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import base64
 import json
 import logging
@@ -134,18 +135,24 @@ async def authenticate() -> None:
                     await client.write_gatt_char(
                         char_specifier=AUTH_CHARACTERISTIC,
                         data=auth_string,
+                        response=False,
                     )
                 except (BleakError, TimeoutError) as e:
                     raise BluetoothConnectionFailed(
                         f"Failed to connect to machine with Bluetooth: {e}"
                     ) from e
 
             await authenticate()
+            await asyncio.sleep(0.1)
             _logger.debug(
                 "Sending bluetooth message: %s to %s", message, characteristic
             )
 
-            await client.write_gatt_char(char_specifier=characteristic, data=message)
+            await client.write_gatt_char(
+                char_specifier=characteristic,
+                data=message,
+                response=False,
+            )
 
     async def _write_bluetooth_json_message(
         self,

diff --git a/pylamarzocco/clients/local.py b/pylamarzocco/clients/local.py
@@ -118,7 +118,7 @@ async def websocket_connect(
             ) as ws:
                 self.websocket = ws
                 if self.websocket_disconnected:
-                    _LOGGER.debug("Websocket reconnected")
+                    _LOGGER.warning("Websocket reconnected")
                     self.websocket_disconnected = False
                 async for msg in ws:
                     if msg.type in (WSMsgType.CLOSING, WSMsgType.CLOSED):

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "pylamarzocco"
-version = "1.4.4"
+version = "1.4.5"
 license = { text = "MIT" }
 description = "A Python implementation of the new La Marzocco API"
 readme = "README.md"

diff --git a/tests/test_bluetooth.py b/tests/test_bluetooth.py
@@ -21,11 +21,13 @@ async def test_bluetooth_set_power(
     mock_bleak.write_gatt_char.assert_any_call(  # type: ignore[attr-defined]
         char_specifier=AUTH_CHARACTERISTIC,
         data=b"dXNlcm5hbWU6c2VyaWFs@dG9rZW4=",
+        response=False,
     )
 
     mock_bleak.write_gatt_char.assert_called_with(  # type: ignore[attr-defined]
         char_specifier=SETTINGS_CHARACTERISTIC,
         data=b'{"name":"MachineChangeMode","parameter":{"mode":"BrewingMode"}}\x00',
+        response=False,
     )
 
 
@@ -39,11 +41,13 @@ async def test_bluetooth_set_steam(
     mock_bleak.write_gatt_char.assert_any_call(  # type: ignore[attr-defined]
         char_specifier=AUTH_CHARACTERISTIC,
         data=b"dXNlcm5hbWU6c2VyaWFs@dG9rZW4=",
+        response=False,
     )
 
     mock_bleak.write_gatt_char.assert_called_with(  # type: ignore[attr-defined]
         char_specifier=SETTINGS_CHARACTERISTIC,
         data=b'{"name":"SettingBoilerEnable","parameter":{"identifier":"SteamBoiler","state":true}}\x00',
+        response=False,
     )
 
 
@@ -57,9 +61,11 @@ async def test_bluetooth_set_temperature(
     mock_bleak.write_gatt_char.assert_any_call(  # type: ignore[attr-defined]
         char_specifier=AUTH_CHARACTERISTIC,
         data=b"dXNlcm5hbWU6c2VyaWFs@dG9rZW4=",
+        response=False,
     )
 
     mock_bleak.write_gatt_char.assert_called_with(  # type: ignore[attr-defined]
         char_specifier=SETTINGS_CHARACTERISTIC,
         data=b'{"name":"SettingBoilerTarget","parameter":{"identifier":"SteamBoiler","value":131}}\x00',
+        response=False,
     )