sok-ble 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

sok_ble/sok_bluetooth_device.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from contextlib import asynccontextmanager
 from typing import AsyncIterator, Optional
+import asyncio
+import struct
 import logging
 import statistics
 
@@ -65,32 +67,55 @@ class SokBluetoothDevice:
             await client.disconnect()
             logger.debug("Disconnected from %s", self._ble_device.address)
 
+    async def _send_command(
+        self, client: BleakClientWithServiceCache, cmd: int, expected: int
+    ) -> bytes:
+        """Send a command and return the response bytes with the given header."""
+
+        # If the client supports notifications (real BLE client), prefer that
+        start_notify = getattr(client, "start_notify", None)
+        if start_notify is None:
+            await client.write_gatt_char(UUID_TX, _sok_command(cmd))
+            data = bytes(await client.read_gatt_char(UUID_RX))
+            return data
+
+        queue: asyncio.Queue[bytes] = asyncio.Queue()
+
+        def handler(_: int, data: bytearray) -> None:
+            queue.put_nowait(bytes(data))
+
+        await client.start_notify(UUID_RX, handler)
+        try:
+            await client.write_gatt_char(UUID_TX, _sok_command(cmd))
+            while True:
+                data = await asyncio.wait_for(queue.get(), 5.0)
+                if struct.unpack_from(">H", data)[0] == expected:
+                    return data
+        finally:
+            await client.stop_notify(UUID_RX)
+
     async def async_update(self) -> None:
         """Poll the device for all telemetry and update attributes."""
         responses: dict[int, bytes] = {}
         async with self._connect() as client:
             logger.debug("Send C1")
-            await client.write_gatt_char(UUID_TX, _sok_command(0xC1))
-            data = bytes(await client.read_gatt_char(UUID_RX))
-            logger.debug("Recv 0xCCF0: %s", data.hex())
+            data = await self._send_command(client, 0xC1, 0xCCF0)
+            logger.debug("Recv 0x%04X: %s", struct.unpack_from(">H", data)[0], data.hex())
             responses[0xCCF0] = data
 
             logger.debug("Send C1")
-            await client.write_gatt_char(UUID_TX, _sok_command(0xC1))
-            data = bytes(await client.read_gatt_char(UUID_RX))
-            logger.debug("Recv 0xCCF2: %s", data.hex())
+            data = await self._send_command(client, 0xC1, 0xCCF2)
+            logger.debug("Recv 0x%04X: %s", struct.unpack_from(">H", data)[0], data.hex())
             responses[0xCCF2] = data
 
             logger.debug("Send C2")
-            await client.write_gatt_char(UUID_TX, _sok_command(0xC2))
-            data = bytes(await client.read_gatt_char(UUID_RX))
-            logger.debug("Recv 0xCCF3: %s", data.hex())
+            data = await self._send_command(client, 0xC2, 0xCCF3)
+            logger.debug("Recv 0x%04X: %s", struct.unpack_from(">H", data)[0], data.hex())
             responses[0xCCF3] = data
 
             logger.debug("Send C2")
-            await client.write_gatt_char(UUID_TX, _sok_command(0xC2))
-            data = bytes(await client.read_gatt_char(UUID_RX))
-            logger.debug("Recv 0xCCF4: %s", data.hex())
+            data = await self._send_command(client, 0xC2, 0xCCF4)
+            logger.debug("Recv 0x%04X: %s", struct.unpack_from(">H", data)[0], data.hex())
             responses[0xCCF4] = data
 
         parsed = SokParser.parse_all(responses)

sok_ble/sok_parser.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import logging
 import struct
+import statistics
 from typing import Dict, Sequence
 
 from sok_ble.exceptions import InvalidResponseError
@@ -43,27 +44,19 @@ class SokParser:
 
     @staticmethod
     def parse_info(buf: bytes) -> Dict[str, float | int]:
-        """Parse the information frame for voltage, current and SOC."""
+        """Parse the information frame for current, SOC and cycles."""
         logger.debug("parse_info input: %s", buf.hex())
-        if len(buf) < 18:
+        if len(buf) < 20:
             raise InvalidResponseError("Info buffer too short")
 
-        cells = [
-            get_le_ushort(buf, 0),
-            get_le_ushort(buf, 2),
-            get_le_ushort(buf, 4),
-            get_le_ushort(buf, 6),
-        ]
-        voltage = (sum(cells) / len(cells) * 4) / 1000
-
-        current = get_le_int3(buf, 8) / 10
-
-        soc = struct.unpack_from('<H', buf, 16)[0]
+        current = get_le_int3(buf, 5) / 1000
+        num_cycles = get_le_ushort(buf, 14)
+        soc = get_le_ushort(buf, 16)
 
         result = {
-            "voltage": voltage,
             "current": current,
             "soc": soc,
+            "num_cycles": num_cycles,
         }
         logger.debug("parse_info result: %s", result)
         return result
@@ -72,27 +65,23 @@ class SokParser:
     def parse_temps(buf: bytes) -> float:
         """Parse the temperature from the temperature frame."""
         logger.debug("parse_temps input: %s", buf.hex())
-        if len(buf) < 7:
+        if len(buf) < 20:
             raise InvalidResponseError("Temp buffer too short")
 
-        temperature = get_le_short(buf, 5) / 10
+        temperature = get_le_short(buf, 5)
         logger.debug("parse_temps result: %s", temperature)
         return temperature
 
     @staticmethod
     def parse_capacity_cycles(buf: bytes) -> Dict[str, float | int]:
-        """Parse rated capacity and cycle count."""
+        """Parse rated capacity."""
         logger.debug("parse_capacity_cycles input: %s", buf.hex())
-        if len(buf) < 6:
+        if len(buf) < 20:
             raise InvalidResponseError("Capacity buffer too short")
 
-        capacity = get_le_ushort(buf, 0) / 100
-        num_cycles = get_le_ushort(buf, 4)
+        capacity = get_be_uint3(buf, 5) / 128
 
-        result = {
-            "capacity": capacity,
-            "num_cycles": num_cycles,
-        }
+        result = {"capacity": capacity}
         logger.debug("parse_capacity_cycles result: %s", result)
         return result
 
@@ -100,15 +89,13 @@ class SokParser:
     def parse_cells(buf: bytes) -> list[float]:
         """Parse individual cell voltages."""
         logger.debug("parse_cells input: %s", buf.hex())
-        if len(buf) < 8:
+        if len(buf) < 20:
             raise InvalidResponseError("Cells buffer too short")
 
-        cells = [
-            get_le_ushort(buf, 0) / 1000,
-            get_le_ushort(buf, 2) / 1000,
-            get_le_ushort(buf, 4) / 1000,
-            get_le_ushort(buf, 6) / 1000,
-        ]
+        cells = [0.0, 0.0, 0.0, 0.0]
+        for x in range(4):
+            cell_idx = buf[2 + x * 4]
+            cells[cell_idx - 1] = get_le_ushort(buf, 3 + x * 4) / 1000
         logger.debug("parse_cells result: %s", cells)
         return cells
 
@@ -125,10 +112,15 @@ class SokParser:
         capacity_info = cls.parse_capacity_cycles(responses[0xCCF3])
         cells = cls.parse_cells(responses[0xCCF4])
 
+        voltage = statistics.mean(cells) * 4
+
         result = {
-            **info,
+            "voltage": voltage,
+            "current": info["current"],
+            "soc": info["soc"],
             "temperature": temperature,
-            **capacity_info,
+            "capacity": capacity_info["capacity"],
+            "num_cycles": info["num_cycles"],
             "cell_voltages": cells,
         }
         logger.debug("parse_all result: %s", result)

{sok_ble-0.1.0.dist-info → sok_ble-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sok-ble
-Version: 0.1.0
+Version: 0.1.1
 Summary: SOK BLE battery interface library
 Author-email: Mitchell Carlson <mitchell.carlson.pro@gmail.com>
 License: Apache-2.0

sok_ble-0.1.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+sok_ble/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sok_ble/const.py,sha256=mHtJTbWz_dG3v1lhZrLDzMf-QAG9v5QWlHU9ZKsyYdg,998
+sok_ble/exceptions.py,sha256=7H1yUqqnrKyi3LwxRCMF7RkuGp_rgdy9j35nrMOgz44,247
+sok_ble/sok_bluetooth_device.py,sha256=ig11wLwjZFC6HEFi7hzB7_Jy1T8syyNDOTYWUbkJR4Y,6353
+sok_ble/sok_parser.py,sha256=KXYxsR4868vWFs2AAI7o7XfzjNZiDgfpsmz3dFgjLco,4323
+sok_ble-0.1.1.dist-info/METADATA,sha256=Hub0gJn6lH2WJVXpSFaiYQ2vKv4nVdDvypZyNITBN2g,1233
+sok_ble-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sok_ble-0.1.1.dist-info/top_level.txt,sha256=WTVtlZ2sADYAxKEBkDJPUn4hFAH9NfIZ9Q2HP2RKpbw,8
+sok_ble-0.1.1.dist-info/RECORD,,

sok_ble-0.1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-sok_ble/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sok_ble/const.py,sha256=mHtJTbWz_dG3v1lhZrLDzMf-QAG9v5QWlHU9ZKsyYdg,998
-sok_ble/exceptions.py,sha256=7H1yUqqnrKyi3LwxRCMF7RkuGp_rgdy9j35nrMOgz44,247
-sok_ble/sok_bluetooth_device.py,sha256=-dMuHzM0FtBh_fu2MURiriOVhOGaLDM2ZQIRk6zDC84,5384
-sok_ble/sok_parser.py,sha256=zyrZwjOc4yeFfQWo_1B3VFxEGXLJBX7UQPL9e5ag1jQ,4441
-sok_ble-0.1.0.dist-info/METADATA,sha256=u1fvysxad3Cg-N2ipnnuhB2V4N8iVQEzel4-INBRpnU,1233
-sok_ble-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sok_ble-0.1.0.dist-info/top_level.txt,sha256=WTVtlZ2sADYAxKEBkDJPUn4hFAH9NfIZ9Q2HP2RKpbw,8
-sok_ble-0.1.0.dist-info/RECORD,,