add first test for reslib WH52

Author: Ernst

custom_components/ble_monitor/ble_parser/__init__.py

@@ -202,6 +202,10 @@ def parse_advertisement(
                     uuid16 = (service_data[3] << 8) | service_data[2]
                     if uuid16 == 0x1809:
                         # UUID16 = Health Thermometer service (used by Relsib)
+                        if len(service_data_list) == 3:
+                            uuid16_2 = (service_data_list[1][3] << 8) | service_data_list[1][2]
+                            if uuid16_2 == 0x181A:
+                                service_data = b"".join(service_data_list)
                         sensor_data = parse_relsib(self, service_data, mac)
                         break
                     if uuid16 == 0x181A:

custom_components/ble_monitor/ble_parser/helpers.py

@@ -7,11 +7,11 @@ def to_uuid(uuid: str) -> str:
     return str(UUID(''.join(f'{i:02X}' for i in uuid)))
 
 
-def to_mac(addr: str) -> str:
+def to_mac(addr: bytes) -> str:
     """Return formatted MAC address"""
     return ':'.join(f'{i:02X}' for i in addr)
 
 
-def to_unformatted_mac(addr: str) -> str:
+def to_unformatted_mac(addr: bytes) -> str:
     """Return unformatted MAC address"""
     return ''.join(f'{i:02X}' for i in addr[:])

custom_components/ble_monitor/ble_parser/relsib.py

@@ -7,7 +7,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-def parse_relsib(self, data: bytes, mac: str):
+def parse_relsib(self, data: bytes, mac: bytes):
     """Relsib parser"""
     msg_length = len(data)
     uuid16 = (data[3] << 8) | data[2]
@@ -43,6 +43,14 @@ def parse_relsib(self, data: bytes, mac: str):
                 result.update({"battery": 100})
             else:
                 result.update({"battery": battery & 0b01111111})
+    elif uuid16 in [0x1809] and msg_length == 22:
+        device_type = "WH52"
+        try:
+            temp = round((int.from_bytes(data[4:6], byteorder='big') / 65535) * 175 - 45, 2)
+            humi = round((int.from_bytes(data[10:11], byteorder='big') / 65535) * 175 - 45, 2)
+            result.update({"temperature": temp, "humidity": humi})
+        except ValueError:
+            device_type = None
     elif uuid16 in [0x1809] and msg_length == 10:
         device_type = "WT51"
         try:

custom_components/ble_monitor/const.py

@@ -2165,6 +2165,7 @@ class BLEMonitorBinarySensorEntityDescription(
     'CGP23W'                  : 'Qingping',
     'EClerk Eco'              : 'Relsib',
     'WT51'                    : 'Relsib',
+    'WH52'                    : 'Relsib',
     'Blue Puck T'             : 'Teltonika',
     'Blue Coin T'             : 'Teltonika',
     'Blue Puck RHT'           : 'Teltonika',

custom_components/ble_monitor/manifest.json

@@ -14,5 +14,5 @@
     "btsocket>=0.2.0",
     "pyric>=0.1.6.3"
   ],
-  "version": "12.17.0"
+  "version": "12.18.0"
 }

custom_components/ble_monitor/test/test_relsib.py

@@ -105,3 +105,20 @@ def test_relsib_WT51(self):
         assert sensor_msg["data"]
         assert sensor_msg["temperature"] == 23.5
         assert sensor_msg["rssi"] == -62
+
+    def test_relsib_WH52(self):
+        """Test Relsib parser for Relsib WH52."""
+        data_string = "043b230201030130ddf27cb6fa14051609184dea05161a18b14c0716a2aa30333531c2"
+        data = bytes(bytearray.fromhex(data_string))
+        # pylint: disable=unused-variable
+        ble_parser = BleParser()
+        sensor_msg, tracker_msg = ble_parser.parse_raw_data(data)
+
+        assert sensor_msg["firmware"] == "Relsib"
+        assert sensor_msg["type"] == "WH52"
+        assert sensor_msg["mac"] == "FAB67CF2DD30"
+        assert sensor_msg["packet"] == "no packet id"
+        assert sensor_msg["data"]
+        assert sensor_msg["temperature"] == 8.26
+        assert sensor_msg["humidity"] == 76.2
+        assert sensor_msg["rssi"] == -62