Skip to content

feat: use changed_manufacturer_data from newer bluetooth-sensor-state-data #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 2 commits into from
Apr 30, 2025
Merged

feat: use changed_manufacturer_data from newer bluetooth-sensor-state-data #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5848366
feat: use changed_manufacturer_data from newer bluetooth-sensor-state…
bdraco Apr 30, 2025
40e07fa
chore: cleanups
bdraco Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 52 additions & 66 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ packages = [
"Changelog" = "https://github.com/bluetooth-devices/sensorpro-ble/blob/main/CHANGELOG.md"

[tool.poetry.dependencies]
python = ">=3.11,<4"
python = ">=3.11,<3.14"
habluetooth = {version = ">=3.42.0", python = ">=3.11,<3.14"}
bluetooth-data-tools = ">=1.28.0"

Expand All @@ -32,7 +32,7 @@ Sphinx = {version = ">=5,<7", optional = true}
sphinx-rtd-theme = {version = ">=1,<3", optional = true}
myst-parser = {version = ">=0.18,<1.1", optional = true}
sensor-state-data = ">=2.6.0"
bluetooth-sensor-state-data = ">=1.6.1"
bluetooth-sensor-state-data = ">=1.8.0"

[tool.poetry.extras]
docs = [
Expand Down
11 changes: 2 additions & 9 deletions src/sensorpro_ble/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import logging
from struct import unpack

from bluetooth_data_tools import parse_advertisement_data_bytes, short_address
from bluetooth_data_tools import short_address
from bluetooth_sensor_state_data import BluetoothData
from habluetooth import BluetoothServiceInfoBleak
from sensor_state_data import SensorLibrary
Expand All @@ -33,14 +33,7 @@ class SensorProBluetoothDeviceData(BluetoothData):
def _start_update(self, service_info: BluetoothServiceInfoBleak) -> None:
"""Update from BLE advertisement data."""
_LOGGER.debug("Parsing sensorpro BLE advertisement data: %s", service_info)
if service_info.raw:
# If we have the raw data we don't need to work out
# which one is the newest.
_, _, _, changed_manufacturer_data, _ = parse_advertisement_data_bytes(
service_info.raw
)
else:
changed_manufacturer_data = self.changed_manufacturer_data(service_info)
changed_manufacturer_data = self.changed_manufacturer_data(service_info)
if 43605 not in changed_manufacturer_data:
return
if not changed_manufacturer_data or len(changed_manufacturer_data) > 1:
Expand Down