bleparser 3.6.0__tar.gz → 3.7.3__tar.gz

{bleparser-3.6.0 → bleparser-3.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bleparser
-Version: 3.6.0
+Version: 3.7.3
 Summary: Parser for passive BLE advertisements
 Home-page: https://github.com/Ernst79/bleparser
 Author: Ernst79
@@ -12,6 +12,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pycryptodomex
+Dynamic: license-file
 
 # BLE parser for passive BLE advertisements
 
@@ -29,18 +31,17 @@ Supported sensor brands
 
 - Acconeer
 - Air Mentor
-- Almendo bluSensor
-- AltBeacon
+- Amazfit
 - ATC (custom firmware for Xiaomi/Qingping sensors)
 - BlueMaestro
 - Brifit
+- BTHome
 - b-parasite
 - Govee
-- HA BLE
 - HHCC
-- iBeacon
 - Inkbird
 - iNode
+- Jaalee
 - Jinou
 - Kegtron
 - KKM
@@ -52,6 +53,7 @@ Supported sensor brands
 - Ruuvitag
 - Sensirion
 - SensorPush
+- SmartDry
 - Switchbot
 - Teltonika
 - Thermoplus
@@ -101,11 +103,11 @@ sensor_data, tracker_data = self.parse_advertisement(
 )
 ```
 
-`service_data_list` and `man_spec_data_list` have to be in a list, as a BKE advertisement can contain multiple service data/manufacturer specific data packets. 
+`service_data_list` and `man_spec_data_list` have to be in a list, as a BLE advertisement can contain multiple service data/manufacturer specific data packets. 
 
 **report_unknown**
 
-Report unknown sensors. Can be set to `ATC`, `b-parasite`, `BlueMaestro`, `Brifit`, `Govee`, `Inkbird`, `iNode`, `Jinou`, `Kegtron`, `KKM`, `Mikrotik`, `Moat`, `Mi Scale`, `Oral-B`, `Qingping`, `Ruuvitag`, `SensorPush`, `Sensirion`, `Teltonika`, `Thermoplus`, `Thermopro`, `Xiaogui` or `Xiaomi` to report unknown sensors of a specific brand to the logger. You can set it to `Other` to report all unknown advertisements to the logger. Default: `False`
+Report unknown sensors. Can be set to `Acconeer`, `Air Mentor`, `Amazfit`, `ATC`, `b-parasite`, `BlueMaestro`, `Brifit`, `BTHome`, `Govee`, `HHCC`, `Inkbird`, `iNode`, `Jaalee`, `Jinou`, `Kegtron`, `KKM`, `Mikrotik`, `Moat`, `Mi Scale`, `Oral-B`, `Qingping`, `Relsib`, `Ruuvitag`, `SensorPush`, `Sensirion`, `SmartDry`, `Switchbot`, `Teltonika`, `Thermoplus`, `Thermopro`, `Tilt`, `Xiaogui` or `Xiaomi` to report unknown sensors of a specific brand to the logger. You can set it to `Other` to report all unknown advertisements to the logger. Default: `False`
 
 **discovery**
 
@@ -119,6 +121,11 @@ Boolean. Most sensors send multipe advertisements with the exact same data, to i
 
 List with MAC addresses or UUIDs of devices that are being parsed, if `discovery` is set to `False`. If `discovery` is set to `True`, all supported sensors will be parsed. Default: `[]`
 
+The MAC addresses should be in bytes. 
+```python
+    sensor_whitelist=[bytes.fromhex("A4:C1:38:56:53:84".replace(":", ""))],
+```
+
 **tracker_whitelist**
 
 List with devices (MAC addresses or UUIDs) to track. Default: `[]`
@@ -127,6 +134,11 @@ List with devices (MAC addresses or UUIDs) to track. Default: `[]`
 
 Dictionary with mac + encryption key pairs, for sensors that require an encryption key to decrypt the payload. Default: `{}`
 
+The mac and encryption key pairs should be in bytes. 
+```python
+    aeskeys={bytes.fromhex("A4:C1:38:56:53:84".replace(":", "")): bytes.fromhex("a115210eed7a88e50ad52662e732a9fb") for mac, aeskey in AESKEYS.items()},
+```
+
 ## Result
 
 The parser result are two two dictionaries, one with sensor data (e.g. temperature readings) and one with tracking data.

{bleparser-3.6.0 → bleparser-3.7.3}/README.md

@@ -14,18 +14,17 @@ Supported sensor brands
 
 - Acconeer
 - Air Mentor
-- Almendo bluSensor
-- AltBeacon
+- Amazfit
 - ATC (custom firmware for Xiaomi/Qingping sensors)
 - BlueMaestro
 - Brifit
+- BTHome
 - b-parasite
 - Govee
-- HA BLE
 - HHCC
-- iBeacon
 - Inkbird
 - iNode
+- Jaalee
 - Jinou
 - Kegtron
 - KKM
@@ -37,6 +36,7 @@ Supported sensor brands
 - Ruuvitag
 - Sensirion
 - SensorPush
+- SmartDry
 - Switchbot
 - Teltonika
 - Thermoplus
@@ -86,11 +86,11 @@ sensor_data, tracker_data = self.parse_advertisement(
 )
 ```
 
-`service_data_list` and `man_spec_data_list` have to be in a list, as a BKE advertisement can contain multiple service data/manufacturer specific data packets. 
+`service_data_list` and `man_spec_data_list` have to be in a list, as a BLE advertisement can contain multiple service data/manufacturer specific data packets. 
 
 **report_unknown**
 
-Report unknown sensors. Can be set to `ATC`, `b-parasite`, `BlueMaestro`, `Brifit`, `Govee`, `Inkbird`, `iNode`, `Jinou`, `Kegtron`, `KKM`, `Mikrotik`, `Moat`, `Mi Scale`, `Oral-B`, `Qingping`, `Ruuvitag`, `SensorPush`, `Sensirion`, `Teltonika`, `Thermoplus`, `Thermopro`, `Xiaogui` or `Xiaomi` to report unknown sensors of a specific brand to the logger. You can set it to `Other` to report all unknown advertisements to the logger. Default: `False`
+Report unknown sensors. Can be set to `Acconeer`, `Air Mentor`, `Amazfit`, `ATC`, `b-parasite`, `BlueMaestro`, `Brifit`, `BTHome`, `Govee`, `HHCC`, `Inkbird`, `iNode`, `Jaalee`, `Jinou`, `Kegtron`, `KKM`, `Mikrotik`, `Moat`, `Mi Scale`, `Oral-B`, `Qingping`, `Relsib`, `Ruuvitag`, `SensorPush`, `Sensirion`, `SmartDry`, `Switchbot`, `Teltonika`, `Thermoplus`, `Thermopro`, `Tilt`, `Xiaogui` or `Xiaomi` to report unknown sensors of a specific brand to the logger. You can set it to `Other` to report all unknown advertisements to the logger. Default: `False`
 
 **discovery**
 
@@ -104,6 +104,11 @@ Boolean. Most sensors send multipe advertisements with the exact same data, to i
 
 List with MAC addresses or UUIDs of devices that are being parsed, if `discovery` is set to `False`. If `discovery` is set to `True`, all supported sensors will be parsed. Default: `[]`
 
+The MAC addresses should be in bytes. 
+```python
+    sensor_whitelist=[bytes.fromhex("A4:C1:38:56:53:84".replace(":", ""))],
+```
+
 **tracker_whitelist**
 
 List with devices (MAC addresses or UUIDs) to track. Default: `[]`
@@ -112,6 +117,11 @@ List with devices (MAC addresses or UUIDs) to track. Default: `[]`
 
 Dictionary with mac + encryption key pairs, for sensors that require an encryption key to decrypt the payload. Default: `{}`
 
+The mac and encryption key pairs should be in bytes. 
+```python
+    aeskeys={bytes.fromhex("A4:C1:38:56:53:84".replace(":", "")): bytes.fromhex("a115210eed7a88e50ad52662e732a9fb") for mac, aeskey in AESKEYS.items()},
+```
+
 ## Result
 
 The parser result are two two dictionaries, one with sensor data (e.g. temperature readings) and one with tracking data.

{bleparser-3.6.0 → bleparser-3.7.3}/package/bleparser/__init__.py

@@ -6,18 +6,20 @@ from .acconeer import parse_acconeer
 from .airmentor import parse_airmentor
 from .almendo import parse_almendo
 from .altbeacon import parse_altbeacon
+from .amazfit import parse_amazfit
 from .atc import parse_atc
 from .bluemaestro import parse_bluemaestro
 from .bparasite import parse_bparasite
 from .brifit import parse_brifit
+from .bthome import parse_bthome
 from .const import TILT_TYPES
 from .govee import parse_govee
 from .helpers import to_mac, to_unformatted_mac
-from .ha_ble import parse_ha_ble
 from .hhcc import parse_hhcc
 from .ibeacon import parse_ibeacon
 from .inkbird import parse_inkbird
 from .inode import parse_inode
+from .jaalee import parse_jaalee
 from .jinou import parse_jinou
 from .kegtron import parse_kegtron
 from .kkm import parse_kkm
@@ -196,13 +198,21 @@ class BleParser:
                         sensor_data = parse_miscale(self, service_data, mac, rssi)
                         break
                     elif uuid16 in [0x181C, 0x181E]:
-                        # UUID16 = User Data and Bond Management (used by BLE HA)
-                        sensor_data = parse_ha_ble(self, service_data, uuid16, mac, rssi)
+                        # UUID16 = User Data and Bond Management (used by BTHome V1)
+                        sensor_data = parse_bthome(self, service_data, uuid16, mac, rssi)
                         break
                     elif uuid16 in [0xAA20, 0xAA21, 0xAA22] and local_name == "ECo":
                         # UUID16 = Relsib
                         sensor_data = parse_relsib(self, service_data, mac, rssi)
                         break
+                    elif uuid16 == 0xF525:
+                        # UUID16 = Jaalee
+                        sensor_data = parse_jaalee(self, service_data, mac, rssi)
+                        break
+                    elif uuid16 == 0xFCD2:
+                        # UUID16 = Allterco Robotics ltd (BTHome V2)
+                        sensor_data = parse_bthome(self, service_data, uuid16, mac, rssi)
+                        break
                     elif uuid16 in [0xFD3D, 0x0D00]:
                         # UUID16 = unknown (used by Switchbot)
                         sensor_data = parse_switchbot(self, service_data, mac, rssi)
@@ -228,6 +238,10 @@ class BleParser:
                             # UUID16 = Google (used by Ruuvitag V2/V4)
                             sensor_data = parse_ruuvitag(self, service_data, mac, rssi)
                             break
+                    elif uuid16 == 0xFEE0:
+                        # UUID16 = Anhui Huami Information Technology Co., Ltd. (Amazfit)
+                        sensor_data = parse_amazfit(self, service_data, mac, rssi)
+                        break
                     elif uuid16 == 0xFFF9:
                         # UUID16 = FIDO (used by Cleargrass)
                         sensor_data = parse_qingping(self, service_data, mac, rssi)
@@ -289,7 +303,7 @@ class BleParser:
                         # Sensirion
                         sensor_data = parse_sensirion(self, man_spec_data, local_name, mac, rssi)
                         break
-                    elif comp_id in [0x2121, 0x2122] and data_len == 0x0B:
+                    elif comp_id in [0x2111, 0x2112, 0x2121, 0x2122] and data_len == 0x0B:
                         # Air Mentor
                         sensor_data = parse_airmentor(self, man_spec_data, mac, rssi)
                         break
@@ -348,11 +362,11 @@ class BleParser:
                         sensor_data = parse_govee(self, man_spec_data, mac, rssi)
                         break
                     elif service_class_uuid16 == 0xF0FF:
-                        if comp_id in [0x0010, 0x0011, 0x0015] and data_len in [0x15, 0x17]:
+                        if comp_id in [0x0010, 0x0011, 0x0015, 0x0018] and data_len in [0x15, 0x17]:
                             # Thermoplus
                             sensor_data = parse_thermoplus(self, man_spec_data, mac, rssi)
                             break
-                        elif (comp_id in [0x0000, 0x0001] or local_name in ["iBBQ", "sps", "tps"]) and (
+                        elif (comp_id in [0x0000, 0x0001] or local_name in ["iBBQ", "xBBQ", "sps", "tps"]) and (
                             data_len in [0x0A, 0x0D, 0x0F, 0x13, 0x17]
                         ):
                             # Inkbird

{bleparser-3.6.0 → bleparser-3.7.3}/package/bleparser/airmentor.py

@@ -20,7 +20,7 @@ def parse_airmentor(self, data, source_mac, rssi):
         airmentor_mac = source_mac
         msg_type = data[2]
         xvalue = data[4:]
-        if msg_type == 0x22:
+        if msg_type in [0x12, 0x22]:
             (tvoc, temp, temp_cal, humi, aqi) = unpack(">HHBBH", xvalue)
             temperature = (temp - 4000) * 0.01
             temperature_calibrated = temperature - temp_cal * 0.1
@@ -47,7 +47,7 @@ def parse_airmentor(self, data, source_mac, rssi):
                 "aqi": aqi,
                 "air quality": air_quality
             }
-        if msg_type == 0x21:
+        if msg_type in [0x11, 0x21]:
             (co2, pm25, pm10, co, o3) = unpack(">HHHBB", xvalue)
             # CO and O3 are not used
             result = {
@@ -68,7 +68,7 @@ def parse_airmentor(self, data, source_mac, rssi):
         return None
 
     # check for MAC presence in sensor whitelist, if needed
-    if self.discovery is False and airmentor_mac.lower() not in self.sensor_whitelist:
+    if self.discovery is False and airmentor_mac not in self.sensor_whitelist:
         _LOGGER.debug("Discovery is disabled. MAC: %s is not whitelisted!", to_mac(airmentor_mac))
         return None
 

bleparser-3.7.3/package/bleparser/amazfit.py

@@ -0,0 +1,67 @@
+"""Parser for Amazfit BLE advertisements"""
+import logging
+from struct import unpack
+
+from .helpers import (
+    to_mac,
+    to_unformatted_mac,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def parse_amazfit(self, data, source_mac, rssi):
+    """Parse Amazfit BLE advertisements"""
+    msg_length = len(data)
+
+    if msg_length == 24:
+        device_type = "Amazfit Smart Scale"
+        firmware = "Amazfit"
+        xvalue = data[4:25]
+        # Not all info is known
+        # byte 0-4: unknown
+        # byte 5-6: impedance / 10
+        # byte 7-8: weight / 200
+        # byte 9-11: unknown, used now as "if 000000 than non-stabilized weight"
+        # byte 12: pulse
+        # byte 13: unknown
+        # byte 14-19: user information, not used yet
+        (impedance, weight, unk_1, unk_2, pulse) = unpack("<5xHHBHB1x6x", xvalue)
+        if unk_1 == 0 and unk_2 == 0:
+            result = {
+                "non-stabilized weight": weight / 200,
+                "stabilized": 0,
+                "weight unit": 'kg',
+            }
+        else:
+            result = {
+                "non-stabilized weight": weight / 200,
+                "stabilized": 1,
+                "weight": weight / 200,
+                "impedance": impedance / 10,
+                "pulse": pulse,
+                "weight unit": 'kg',
+            }
+    else:
+        if self.report_unknown == "Amazfit":
+            _LOGGER.info(
+                "BLE ADV from UNKNOWN Amazfit Scale DEVICE: MAC: %s, ADV: %s",
+                to_mac(source_mac),
+                data.hex()
+            )
+        return None
+
+    # check for MAC presence in sensor whitelist, if needed
+    if self.discovery is False and source_mac.lower() not in self.sensor_whitelist:
+        _LOGGER.debug("Discovery is disabled. MAC: %s is not whitelisted!", to_mac(source_mac))
+        return None
+
+    result.update({
+        "type": device_type,
+        "firmware": firmware,
+        "mac": to_unformatted_mac(source_mac),
+        "packet": 'no packet id',
+        "rssi": rssi,
+        "data": True,
+    })
+    return result

{bleparser-3.6.0 → bleparser-3.7.3}/package/bleparser/brifit.py

@@ -23,7 +23,7 @@ def parse_brifit(self, data, source_mac, rssi):
 
         brifit_mac = data[6:12]
         xvalue = data[12:19]
-        (volt, temp, humi, batt) = unpack(">hHHB", xvalue)
+        (volt, temp, humi, batt) = unpack(">HhHB", xvalue)
         result = {
             "temperature": temp / 100,
             "humidity": humi / 100,

bleparser-3.7.3/package/bleparser/bthome.py

@@ -0,0 +1,355 @@
+"""Parser for BTHome (DIY sensors) advertisements"""
+import logging
+import struct
+from typing import Any
+from Cryptodome.Cipher import AES
+
+from .bthome_const import MEAS_TYPES
+from .helpers import (
+    to_mac,
+    to_unformatted_mac,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def parse_uint(data_obj: bytes, factor: float = 1.0) -> float:
+    """Convert bytes (as unsigned integer) and factor to float."""
+    decimal_places = -int(f"{factor:e}".split("e")[-1])
+    return round(
+        int.from_bytes(data_obj, "little", signed=False) * factor, decimal_places
+    )
+
+
+def parse_int(data_obj: bytes, factor: float = 1.0) -> float:
+    """Convert bytes (as signed integer) and factor to float."""
+    decimal_places = -int(f"{factor:e}".split("e")[-1])
+    return round(
+        int.from_bytes(data_obj, "little", signed=True) * factor, decimal_places
+    )
+
+
+def parse_float(data_obj: bytes, factor: float = 1.0):
+    """Convert bytes (as float) and factor to float."""
+    decimal_places = -int(f"{factor:e}".split("e")[-1])
+    if len(data_obj) == 2:
+        [val] = struct.unpack("e", data_obj)
+    elif len(data_obj) == 4:
+        [val] = struct.unpack("f", data_obj)
+    elif len(data_obj) == 8:
+        [val] = struct.unpack("d", data_obj)
+    else:
+        _LOGGER.error("only 2, 4 or 8 byte long floats are supported in BTHome BLE")
+        return None
+    return round(val * factor, decimal_places)
+
+
+def parse_string(data_obj: bytes) -> str:
+    """Convert bytes to string."""
+    return data_obj.decode("UTF-8")
+
+
+dispatch = {
+    0x00: parse_uint,
+    0x01: parse_int,
+    0x02: parse_float,
+    0x03: parse_string,
+}
+
+
+def parse_bthome(self, data, uuid16, source_mac, rssi):
+    """BTHome BLE parser"""
+    self.uuid16 = uuid16
+    self.bthome_mac = source_mac
+    self.rssi = rssi
+
+    if self.uuid16 == 0xFCD2:
+        # BTHome V2 format
+        return parse_bthome_v2(self, data)
+    elif self.uuid16 in [0x181C, 0x181E]:
+        # BTHome V1 format
+        return parse_bthome_v1(self, data)
+    else:
+        return None
+
+
+def parse_bthome_v1(self, data):
+    "Parse data in BTHome V1 format"
+    self.device_type = "BTHome"
+    self.packet_id = None
+    sw_version = 1
+    payload = data[4:]
+    if self.uuid16 == 0x181C:
+        # Non-encrypted BTHome V1 format
+        self.firmware = "BTHome V1"
+        self.packet_id = None
+    elif self.uuid16 == 0x181E:
+        # Encrypted BTHome V1 format
+        self.firmware = "BTHome V1 (encrypted)"
+        try:
+            payload, count_id = decrypt_data(self, payload, sw_version)
+        except (ValueError, TypeError):
+            return None
+
+        self.packet_id = parse_uint(count_id)
+    else:
+        return None
+
+    return parse_payload(self, payload, sw_version)
+
+
+def parse_bthome_v2(self, data):
+    "Parse data in BTHome V2 format"
+    self.device_type = "BTHome"
+    self.packet_id = None
+
+    adv_info = data[4]
+
+    # Determine if encryption is used and check BTHome version
+    encryption = adv_info & (1 << 0)  # bit 0
+    sw_version = (adv_info >> 5) & 7  # 3 bits (5-7)
+    if sw_version == 2:
+        if encryption == 1:
+            self.firmware = f"BTHome V{sw_version} (encrypted)"
+        else:
+            self.firmware = f"BTHome V{sw_version}"
+    else:
+        _LOGGER.error(
+            "Sensor is set to use BTHome version %s, which is not existing. "
+            "Please modify the version in the first byte of the service data",
+            sw_version,
+        )
+        return False
+
+    payload = data[5:]
+
+    if encryption == 1:
+        try:
+            payload, count_id = decrypt_data(self, payload, sw_version)
+        except (ValueError, TypeError):
+            return None
+
+        self.packet_id = parse_uint(count_id)
+
+    return parse_payload(self, payload, sw_version)
+
+
+def parse_payload(self, payload, sw_version):
+    "Parse the payload"
+    payload_length = len(payload)
+    next_obj_start = 0
+    prev_obj_meas_type = 0
+    result = {}
+    measurements: list[dict[str, Any]] = []
+    postfix_dict: dict[int, int] = {}
+    obj_data_format: str | int
+
+    # Create a list with all individual objects
+    while payload_length >= next_obj_start + 1:
+        obj_start = next_obj_start
+
+        if sw_version == 1:
+            # BTHome V1
+            obj_meas_type = payload[obj_start + 1]
+            obj_data_unit = MEAS_TYPES[obj_meas_type].unit_of_measurement
+            obj_control_byte = payload[obj_start]
+            obj_data_length = (obj_control_byte >> 0) & 31  # 5 bits (0-4)
+            obj_data_format = (obj_control_byte >> 5) & 7  # 3 bits (5-7)
+            obj_data_start = obj_start + 2
+            next_obj_start = obj_start + obj_data_length + 1
+        else:
+            # BTHome V2
+            obj_meas_type = payload[obj_start]
+            if prev_obj_meas_type > obj_meas_type:
+                _LOGGER.warning(
+                    "BTHome device is not sending object ids in numerical order (from low to "
+                    "high object id). This can cause issues with your BTHome receiver, "
+                    "payload: %s",
+                    payload.hex(),
+                )
+            if obj_meas_type not in MEAS_TYPES:
+                _LOGGER.debug(
+                    "Invalid Object ID found in payload: %s",
+                    payload.hex(),
+                )
+                break
+            prev_obj_meas_type = obj_meas_type
+            obj_data_length = MEAS_TYPES[obj_meas_type].data_length
+            obj_data_format = MEAS_TYPES[obj_meas_type].data_format
+            obj_data_unit = MEAS_TYPES[obj_meas_type].unit_of_measurement
+            obj_data_start = obj_start + 1
+            next_obj_start = obj_start + obj_data_length + 1
+
+        if obj_data_length == 0:
+            _LOGGER.debug(
+                "Invalid payload data length found with length 0, payload: %s",
+                payload.hex(),
+            )
+            continue
+
+        if payload_length < next_obj_start:
+            _LOGGER.debug("Invalid payload data length, payload: %s", payload.hex())
+            break
+        measurements.append(
+            {
+                "data format": obj_data_format,
+                "data unit": obj_data_unit,
+                "data length": obj_data_length,
+                "measurement type": obj_meas_type,
+                "measurement data": payload[obj_data_start:next_obj_start],
+                "device id": None,
+            }
+        )
+
+    # Get a list of measurement types that are included more than once.
+    seen_meas_types = set()
+    dup_meas_types = set()
+    for meas in measurements:
+        if meas["measurement type"] in seen_meas_types:
+            dup_meas_types.add(meas["measurement type"])
+        else:
+            seen_meas_types.add(meas["measurement type"])
+
+    # Parse each object into readable information
+    for meas in measurements:
+        if meas["measurement type"] not in MEAS_TYPES:
+            _LOGGER.debug(
+                "UNKNOWN measurement type %s in BTHome BLE payload! Adv: %s",
+                meas["measurement type"],
+                payload.hex(),
+            )
+            continue
+
+        # Old Shelly buttons send 0xFE when held, rather than 0x80.
+        if (
+            MEAS_TYPES[meas["measurement type"]].meas_format == "button" and
+            meas["measurement data"] == b"\xFE"
+        ):
+            meas["measurement data"] = b'\x80'
+
+        if meas["measurement type"] in dup_meas_types:
+            # Add a postfix for advertisements with multiple measurements of the same type
+            postfix_counter = postfix_dict.get(meas["measurement type"], 0) + 1
+            postfix_dict[meas["measurement type"]] = postfix_counter
+            postfix = f"_{postfix_counter}"
+        else:
+            postfix = ""
+
+        meas_type = MEAS_TYPES[meas["measurement type"]]
+        meas_unit = meas_type.unit_of_measurement
+        meas_format = f"{meas_type.meas_format}{postfix}"
+        meas_factor = meas_type.factor
+        value: None | str | int | float
+
+        if meas["data format"] == 0 or meas["data format"] == "unsigned_integer":
+            value = parse_uint(meas["measurement data"], meas_factor)
+        elif meas["data format"] == 1 or meas["data format"] == "signed_integer":
+            value = parse_int(meas["measurement data"], meas_factor)
+        elif meas["data format"] == 2 or meas["data format"] == "float":
+            value = parse_float(meas["measurement data"], meas_factor)
+        elif meas["data format"] == 3 or meas["data format"] == "string":
+            value = parse_string(meas["measurement data"])
+        else:
+            _LOGGER.error(
+                "UNKNOWN dataobject in BTHome BLE payload! Adv: %s",
+                payload.hex(),
+            )
+            continue
+
+        if value is not None:
+            result.update({meas_format: value})
+            if meas_unit == "lbs":
+                # Weight measurement with non-standard unit of measurement (lb)
+                result.update({"weight unit": meas_unit})
+
+    if not result:
+        if self.report_unknown == "BTHome":
+            _LOGGER.info(
+                "BLE ADV from UNKNOWN Home Assistant BLE DEVICE: RSSI: %s, MAC: %s, ADV: %s",
+                self.rssi,
+                to_mac(self.bthome_mac),
+                payload.hex()
+            )
+        return None
+
+    # Check for packet id in payload
+    if result.get("packet"):
+        self.packet_id = result["packet"]
+
+    # Check for duplicate messages
+    if self.packet_id:
+        try:
+            prev_packet = self.lpacket_ids[self.bthome_mac]
+        except KeyError:
+            # start with empty first packet
+            prev_packet = None
+        if prev_packet == self.packet_id:
+            # only process new messages
+            if self.filter_duplicates is True:
+                return None
+        self.lpacket_ids[self.bthome_mac] = self.packet_id
+    else:
+        self.packet_id = "no packet id"
+
+    # check for MAC presence in sensor whitelist, if needed
+    if self.discovery is False and self.bthome_mac not in self.sensor_whitelist:
+        _LOGGER.debug("Discovery is disabled. MAC: %s is not whitelisted!", to_mac(self.bthome_mac))
+        return None
+
+    result.update({
+        "rssi": self.rssi,
+        "mac": to_unformatted_mac(self.bthome_mac),
+        "packet": self.packet_id,
+        "type": self.device_type,
+        "firmware": self.firmware,
+        "data": True
+    })
+    return result
+
+
+def decrypt_data(self, data: bytes, sw_version: int):
+    """Decrypt encrypted BTHome advertisements"""
+    # check for minimum length of encrypted advertisement
+    if len(data) < (15 if sw_version == 1 else 14):
+        _LOGGER.debug("Invalid data length (for decryption), adv: %s", data.hex())
+    # try to find encryption key for current device
+    try:
+        key = self.aeskeys[self.bthome_mac]
+        if len(key) != 16:
+            _LOGGER.error("Encryption key should be 16 bytes (32 characters) long")
+            return None, None
+    except KeyError:
+        # no encryption key found
+        _LOGGER.error("No encryption key found for device with MAC %s", to_mac(self.bthome_mac))
+        return None, None
+
+    # prepare the data for decryption
+    if sw_version == 1:
+        uuid = b"\x1e\x18"
+    else:
+        uuid = b"\xd2\xfc\x41"
+    encrypted_payload = data[:-8]
+    count_id = data[-8:-4]
+    mic = data[-4:]
+
+    # nonce: mac [6], uuid16 [2 (v1) or 3 (v2)], count_id [4]
+    nonce = b"".join([self.bthome_mac, uuid, count_id])
+    cipher = AES.new(key, AES.MODE_CCM, nonce=nonce, mac_len=4)
+    if sw_version == 1:
+        cipher.update(b"\x11")
+
+    try:
+        decrypted_payload = cipher.decrypt_and_verify(encrypted_payload, mic)
+    except ValueError as error:
+        _LOGGER.warning("Decryption failed: %s", error)
+        _LOGGER.debug("mic: %s", mic.hex())
+        _LOGGER.debug("nonce: %s", nonce.hex())
+        _LOGGER.debug("encrypted_payload: %s", encrypted_payload.hex())
+        return None
+    if decrypted_payload is None:
+        _LOGGER.error(
+            "Decryption failed for %s, decrypted payload is None",
+            to_mac(self.bthome_mac),
+        )
+        return None, None
+    return decrypted_payload, count_id