v0.4.8

Author: dudanov

pyftms/client/errors.py

@@ -6,6 +6,11 @@ class FtmsError(Exception):
     """Base FTMS error"""
 
 
+class CharacteristicNotFound(FtmsError):
+    def __init__(self, name: str) -> None:
+        super().__init__(f"Mandatory characteristic '{name}' not found.")
+
+
 class NotFitnessMachineError(FtmsError):
     """
     An exception if the FTMS service is not supported by the Bluetooth device.

pyftms/client/properties/features.py

@@ -23,6 +23,7 @@
     TARGET_RESISTANCE,
     TARGET_SPEED,
 )
+from ..errors import CharacteristicNotFound
 from .machine_type import MachineType
 
 _LOGGER = logging.getLogger(__name__)
@@ -139,45 +140,62 @@ class SettingRange(NamedTuple):
 
 
 async def read_features(
-    cli: BleakClient, mt: MachineType
+    cli: BleakClient,
+    mt: MachineType,
 ) -> tuple[MachineFeatures, MachineSettings]:
     _LOGGER.debug("Reading features and settings...")
 
-    try:
-        data = await cli.read_gatt_char(FEATURE_UUID)
-
-        assert len(data) == 8
+    if (c := cli.services.get_characteristic(FEATURE_UUID)) is None:
+        raise CharacteristicNotFound("Machine Feature")
 
-        bio, u4 = io.BytesIO(data), NumSerializer("u4")
+    assert len(data := await cli.read_gatt_char(c)) == 8
 
-        features = MachineFeatures(u4.deserialize(bio))
-        settings = MachineSettings(u4.deserialize(bio))
+    bio, u4 = io.BytesIO(data), NumSerializer("u4")
 
-    except Exception:
-        _LOGGER.exception("Failed reading machine features and settings.")
-        raise
+    features = MachineFeatures(u4.deserialize(bio))
+    settings = MachineSettings(u4.deserialize(bio))
 
     # Remove settings without ranges UUIDs
 
     if MachineSettings.SPEED in settings:
         if cli.services.get_characteristic(SPEED_RANGE_UUID) is None:
             settings &= ~MachineSettings.SPEED
+            _LOGGER.debug(
+                "Speed setting has been removed. "
+                "Characteristic with a range of acceptable values not found."
+            )
 
     if MachineSettings.INCLINE in settings:
         if cli.services.get_characteristic(INCLINATION_RANGE_UUID) is None:
             settings &= ~MachineSettings.INCLINE
+            _LOGGER.debug(
+                "Inclination setting has been removed. "
+                "Characteristic with a range of acceptable values not found."
+            )
 
     if MachineSettings.RESISTANCE in settings:
         if cli.services.get_characteristic(RESISTANCE_LEVEL_RANGE_UUID) is None:
             settings &= ~MachineSettings.RESISTANCE
+            _LOGGER.debug(
+                "Resistance setting has been removed. "
+                "Characteristic with a range of acceptable values not found."
+            )
 
     if MachineSettings.POWER in settings:
         if cli.services.get_characteristic(POWER_RANGE_UUID) is None:
             settings &= ~MachineSettings.POWER
+            _LOGGER.debug(
+                "Power setting has been removed. "
+                "Characteristic with a range of acceptable values not found."
+            )
 
     if MachineSettings.HEART_RATE in settings:
         if cli.services.get_characteristic(HEART_RATE_RANGE_UUID) is None:
             settings &= ~MachineSettings.HEART_RATE
+            _LOGGER.debug(
+                "Heart Rate setting has been removed. "
+                "Characteristic with a range of acceptable values not found."
+            )
 
     # Remove untypical settings
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyftms"
-version = "0.4.7"
+version = "0.4.8"
 description = "Python Fitness Machine Service client library."
 authors = ["Sergey V. DUDANOV <sergey.dudanov@gmail.com>"]
 readme = "README.md"