bleparser 3.7.1__tar.gz → 3.7.3__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bleparser
-Version: 3.7.1
+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
 
@@ -101,7 +103,7 @@ 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**
 
@@ -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.7.1 → bleparser-3.7.3}/README.md

@@ -86,7 +86,7 @@ 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**
 
@@ -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.7.1 → bleparser-3.7.3}/package/bleparser/bthome.py

@@ -220,6 +220,13 @@ def parse_payload(self, payload, sw_version):
             )
             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
@@ -230,7 +237,7 @@ def parse_payload(self, payload, sw_version):
 
         meas_type = MEAS_TYPES[meas["measurement type"]]
         meas_unit = meas_type.unit_of_measurement
-        meas_format = meas_type.meas_format
+        meas_format = f"{meas_type.meas_format}{postfix}"
         meas_factor = meas_type.factor
         value: None | str | int | float
 

{bleparser-3.7.1 → bleparser-3.7.3}/package/bleparser/bthome_const.py

@@ -205,6 +205,9 @@ MEAS_TYPES: dict[int, MeasTypes] = {
         meas_format="moisture",
         unit_of_measurement="%",
     ),
+    0x3A: MeasTypes(
+        meas_format="button",
+    ),
     0x3D: MeasTypes(
         meas_format="count",
         data_length=2,

{bleparser-3.7.1 → bleparser-3.7.3}/package/bleparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bleparser
-Version: 3.7.1
+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
 
@@ -101,7 +103,7 @@ 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**
 
@@ -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.7.1 → bleparser-3.7.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bleparser
-version = 3.7.1
+version = 3.7.3
 author = Ernst79
 author_email = e.klamer@gmail.com
 description = Parser for passive BLE advertisements