Merge pull request #1318 from custom-components/jalee_uuid_f51c

Add new uuid for jaalee

Author: Ernst79

custom_components/ble_monitor/ble_parser/__init__.py

@@ -226,7 +226,7 @@ def parse_advertisement(
                         # UUID16 = Relsib
                         sensor_data = parse_relsib(self, service_data, mac)
                         break
-                    elif uuid16 == 0xF525:
+                    elif uuid16 in [0xF51C, 0xF525]:
                         # UUID16 = Jaalee
                         sensor_data = parse_jaalee(self, service_data, mac)
                         break

custom_components/ble_monitor/ble_parser/jaalee.py

@@ -26,7 +26,7 @@ def parse_jaalee(self, data: bytes, mac: str):
                 "battery": batt
             }
         )
-    elif msg_length == 15:
+    elif msg_length in [15, 16]:
         device_type = "JHT"
         batt = data[4]
         jaalee_mac_reversed = data[5:11]
@@ -40,7 +40,7 @@ def parse_jaalee(self, data: bytes, mac: str):
                 jaalee_mac,
             )
             return None
-        (temp, humi) = unpack(">HH", data[11:])
+        (temp, humi) = unpack(">HH", data[-4:])
         # data follows the iBeacon temperature and humidity definition
         temp = round(175 * temp / 65535 - 45, 2)
         humi = round(100 * humi / 65535, 2)

custom_components/ble_monitor/test/test_jaalee.py

@@ -57,3 +57,21 @@ def test_jaalee_jht_api_example(self):
         assert sensor_msg["humidity"] == 23.87
         assert sensor_msg["battery"] == 100
         assert sensor_msg["rssi"] == -41
+
+    def test_jaalee_jht_f51c(self):
+        """Test Jaalee parser for Jaalee JHT with UUID F51C."""
+        data_string = "043E3F0201000065e6aa4cb0c8330201041BFF4C000215EBEFD08370A247C89837E7B5634DF525632E5535CC6403031CF50F161CF56465E6AA4CB0C801632E5535CC"
+        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"] == "Jaalee"
+        assert sensor_msg["type"] == "JHT"
+        assert sensor_msg["mac"] == "C8B04CAAE665"
+        assert sensor_msg["packet"] == "no packet id"
+        assert sensor_msg["data"]
+        assert sensor_msg["temperature"] == 22.8
+        assert sensor_msg["humidity"] == 33.28
+        assert sensor_msg["battery"] == 100
+        assert sensor_msg["rssi"] == -52