add tanks

Author: Ernst79

custom_components/ble_monitor/ble_parser/oras.py

@@ -5,6 +5,23 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+SENSOR_TYPE = {
+    0: "fresh tank",
+    1: "black tank",
+    2: "grey tank",
+    3: "LPG tank",
+    4: "LPG tank 2",
+    5: "galley tank",
+    6: "galley tank 2",
+    7: "temperature",
+    8: "temperature 2",
+    9: "temperature 3",
+    10: "temperature 4",
+    11: "chemical tank",
+    12: "chemical tank 2",
+    13: "voltage",
+}
+
 
 def parse_oras(self, data: bytes, mac: str):
     """Parser for Oras toothbrush or Garnet tank."""
@@ -13,7 +30,7 @@ def parse_oras(self, data: bytes, mac: str):
 
     if msg_length == 18:
         firmware = "Garnet"
-        device_type = "Garnet 709BT"
+        device_type = "SeeLevel II 709-BTP3"
 
         sensor_id = data[7]
         sensor_data = data[8:11].decode("ASCII")
@@ -34,7 +51,9 @@ def parse_oras(self, data: bytes, mac: str):
             device_type,
             result
         )
-        if sensor_id == 13:
+        if sensor_id <= 12:
+            result.update({SENSOR_TYPE[sensor_id]: int(sensor_data)})
+        elif sensor_id == 13:
             result.update({"voltage": int(sensor_data) / 10})
     elif msg_length == 22:
         firmware = "Oras"

custom_components/ble_monitor/const.py

@@ -1922,7 +1922,7 @@ class BLEMonitorBinarySensorEntityDescription(
     'Blustream'               : 'Blustream',
     'BTHome'                  : 'BTHome',
     'CQ60'                    : 'Chef iQ',
-    'Garnet 709BT'            : 'Garnet',
+    'SeeLevel II 709-BTP3'    : 'Garnet Instruments Ltd',
     'MI401'                   : 'Grundfos',
     'HHCCJCY10'               : 'HHCC',
     'HolyIOT BLE tracker'     : 'HolyIOT',

custom_components/ble_monitor/test/test_oras.py

@@ -20,7 +20,7 @@ def test_oras_faucet(self):
         assert sensor_msg["battery"] == 100
         assert sensor_msg["rssi"] == -52
 
-    def test_garmet_battery(self):
+    def test_garnet_battery(self):
         """Test Oras parser for Garnet 709BT battery sensor."""
         data_string = "043E2102010000adb9a538c1a41502010611ff31010c464e0d31333230303030303030CC"
         data = bytes(bytearray.fromhex(data_string))
@@ -29,9 +29,25 @@ def test_garmet_battery(self):
         sensor_msg, tracker_msg = ble_parser.parse_raw_data(data)
 
         assert sensor_msg["firmware"] == "Garnet"
-        assert sensor_msg["type"] == "Garnet 709BT"
+        assert sensor_msg["type"] == "SeeLevel II 709-BTP3"
         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
+
+    def test_garnet_black_tank(self):
+        """Test Oras parser for Garnet 709BT black tank sensor."""
+        data_string = "043E2102010000adb9a538c1a41502010611ff31010c464e0120373130303030303030CC"
+        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"] == "SeeLevel II 709-BTP3"
+        assert sensor_msg["mac"] == "A4C138A5B9AD"
+        assert sensor_msg["packet"] == "no packet id"
+        assert sensor_msg["data"]
+        assert sensor_msg["black tank"] == 71
+        assert sensor_msg["rssi"] == -52