Add garnet 709BT voltage

Author: Ernst79

custom_components/ble_monitor/ble_parser/oras.py

@@ -1,4 +1,4 @@
-"""Parser for Oras BLE advertisements."""
+"""Parser for Oras/Garnet BLE advertisements."""
 import logging
 
 from .helpers import to_mac, to_unformatted_mac
@@ -7,25 +7,50 @@
 
 
 def parse_oras(self, data: bytes, mac: str):
-    """Parser for Oras toothbrush."""
+    """Parser for Oras toothbrush or Garnet tank."""
     msg_length = len(data)
-    firmware = "Oras"
-    result = {"firmware": firmware}
-    if msg_length == 22:
+    result = {"mac": to_unformatted_mac(mac)}
+
+    if msg_length == 18:
+        firmware = "Garnet"
+        device_type = "Garnet 709BT"
+
+        sensor_id = data[7]
+        sensor_data = data[8:11].decode("ASCII")
+        sensor_volume = data[11:14].decode("ASCII")
+        sensor_total = data[14:17].decode("ASCII")
+        sensor_alarm = chr(data[17])
+
+        # remove later
+        result.update({
+            "sensor_id": sensor_id,
+            "sensor_data": sensor_data,
+            "sensor_volume": sensor_volume,
+            "sensor_total": sensor_total,
+            "sensor_alarm": sensor_alarm,
+        })
+        _LOGGER.info(
+            "BLE ADV from Oras DEVICE: %s, result: %s",
+            device_type,
+            result
+        )
+        if sensor_id == 13:
+            result.update({"voltage": int(sensor_data) / 10})
+    elif msg_length == 22:
+        firmware = "Oras"
         device_type = "Electra Washbasin Faucet"
         battery = data[5]
         result.update({"battery": battery})
     else:
-        if self.report_unknown == "Oras":
+        if self.report_unknown in ["Oras", "Garnet"]:
             _LOGGER.info(
-                "BLE ADV from UNKNOWN Oras DEVICE: MAC: %s, ADV: %s",
+                "BLE ADV from UNKNOWN Oras/Garnet DEVICE: MAC: %s, ADV: %s",
                 to_mac(mac),
                 data.hex()
             )
         return None
 
     result.update({
-        "mac": to_unformatted_mac(mac),
         "type": device_type,
         "packet": "no packet id",
         "firmware": firmware,

custom_components/ble_monitor/const.py

@@ -1922,6 +1922,7 @@ class BLEMonitorBinarySensorEntityDescription(
     'Blustream'               : 'Blustream',
     'BTHome'                  : 'BTHome',
     'CQ60'                    : 'Chef iQ',
+    'Garnet 709BT'            : 'Garnet',
     'MI401'                   : 'Grundfos',
     'HHCCJCY10'               : 'HHCC',
     'HolyIOT BLE tracker'     : 'HolyIOT',
@@ -2067,6 +2068,7 @@ class BLEMonitorBinarySensorEntityDescription(
     "Blustream",
     "BTHome",
     'Chef iQ',
+    "Garnet",
     "Govee",
     "Grundfos",
     "HHCC",

custom_components/ble_monitor/test/test_oras.py

@@ -19,3 +19,19 @@ def test_oras_faucet(self):
         assert sensor_msg["data"]
         assert sensor_msg["battery"] == 100
         assert sensor_msg["rssi"] == -52
+
+    def test_garmet_battery(self):
+        """Test Oras parser for Garnet 709BT battery sensor."""
+        data_string = "043E2102010000adb9a538c1a41502010611ff31010c464e0d31333230303030303030CC"
+        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"] == "Garnet"
+        assert sensor_msg["type"] == "Garnet 709BT"
+        assert sensor_msg["mac"] == "A4C138A5B9AD"
+        assert sensor_msg["packet"] == "no packet id"
+        assert sensor_msg["data"]
+        assert sensor_msg["voltage"] == 13.2
+        assert sensor_msg["rssi"] == -52