Add other sensors and docs

Author: Ernst79

custom_components/ble_monitor/ble_parser/oras.py

@@ -9,14 +9,14 @@
     0: "fresh tank",
     1: "black tank",
     2: "grey tank",
-    3: "LPG tank",
-    4: "LPG tank 2",
+    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",
+    8: "temperature probe 2",
+    9: "temperature probe 3",
+    10: "temperature probe 4",
     11: "chemical tank",
     12: "chemical tank 2",
     13: "voltage",
@@ -54,25 +54,19 @@ def parse_oras(self, data: bytes, mac: str):
 
         sensor_volume = data[11:14].decode("ASCII")
         sensor_total = data[14:17].decode("ASCII")
-        sensor_alarm = chr(data[17])
+        sensor_alarm = data[17]
 
-        # remove later
         result.update({
-            "sensor_id": sensor_id,
-            "sensor_type": sensor_type,
-            "sensor_data": sensor_data,
-            "sensor_volume": sensor_volume,
-            "sensor_total": sensor_total,
-            "sensor_alarm": sensor_alarm,
+            sensor_type: sensor_data,
+            "problem": sensor_alarm,
         })
-        _LOGGER.info(
-            "BLE ADV from Oras DEVICE: %s, result: %s",
+        _LOGGER.debug(
+            "BLE ADV from Garnet DEVICE: %s, result: %s, not implemented volume %s, total %s",
             device_type,
-            result
+            result,
+            sensor_volume,
+            sensor_total
         )
-
-        result.update({sensor_type: sensor_data})
-
     elif msg_length == 22:
         firmware = "Oras"
         device_type = "Electra Washbasin Faucet"

custom_components/ble_monitor/const.py

@@ -1067,7 +1067,79 @@ class BLEMonitorBinarySensorEntityDescription(
         sensor_class="MeasuringSensor",
         update_behavior="Averaging",
         name="grey tank",
-        unique_id="gray_tank_",
+        unique_id="grey_tank_",
+        icon="mdi:storage-tank-outline",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=None,
+        suggested_display_precision=0,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    BLEMonitorSensorEntityDescription(
+        key="chemical tank",
+        sensor_class="MeasuringSensor",
+        update_behavior="Averaging",
+        name="chemical tank",
+        unique_id="chemical_tank_",
+        icon="mdi:chemical-weapon",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=None,
+        suggested_display_precision=0,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    BLEMonitorSensorEntityDescription(
+        key="chemical tank 2",
+        sensor_class="MeasuringSensor",
+        update_behavior="Averaging",
+        name="chemical tank 2",
+        unique_id="chemical_tank_2_",
+        icon="mdi:chemical-weapon",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=None,
+        suggested_display_precision=0,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    BLEMonitorSensorEntityDescription(
+        key="lpg tank",
+        sensor_class="MeasuringSensor",
+        update_behavior="Averaging",
+        name="lpg tank",
+        unique_id="lpg_tank_",
+        icon="mdi:gas-cylinder",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=None,
+        suggested_display_precision=0,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    BLEMonitorSensorEntityDescription(
+        key="lpg tank 2",
+        sensor_class="MeasuringSensor",
+        update_behavior="Averaging",
+        name="lpg tank 2",
+        unique_id="lpg_tank_2_",
+        icon="mdi:gas-cylinder",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=None,
+        suggested_display_precision=0,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    BLEMonitorSensorEntityDescription(
+        key="galley tank",
+        sensor_class="MeasuringSensor",
+        update_behavior="Averaging",
+        name="galley tank",
+        unique_id="galley_tank_",
+        icon="mdi:storage-tank-outline",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=None,
+        suggested_display_precision=0,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    BLEMonitorSensorEntityDescription(
+        key="galley tank 2",
+        sensor_class="MeasuringSensor",
+        update_behavior="Averaging",
+        name="galley tank 2",
+        unique_id="galley_tank_2_",
         icon="mdi:storage-tank-outline",
         native_unit_of_measurement=PERCENTAGE,
         device_class=None,
@@ -2038,6 +2110,8 @@ class BLEMonitorBinarySensorEntityDescription(
     "battery",
     "black tank",
     "button",
+    "chemical tank",
+    "chemical tank 2",
     "co2",
     "conductivity",
     "count",
@@ -2050,13 +2124,17 @@ class BLEMonitorBinarySensorEntityDescription(
     "energy",
     "flow",
     "fresh tank",
+    "galley tank",
+    "galley tank 2",
     "gas",
     "gravity",
     "grey tank",
     "gyroscope",
     "humidity",
     "illuminance",
     "impedance",
+    "lpg tank",
+    "lpg tank 2",
     "meat temperature",
     "moisture",
     "movement counter",

custom_components/ble_monitor/test/test_oras.py

@@ -34,6 +34,7 @@ def test_garnet_battery(self):
         assert sensor_msg["packet"] == "no packet id"
         assert sensor_msg["data"]
         assert sensor_msg["voltage"] == 13.2
+        assert sensor_msg["problem"] == 0
         assert sensor_msg["rssi"] == -52
 
     def test_garnet_black_tank(self):
@@ -50,4 +51,5 @@ def test_garnet_black_tank(self):
         assert sensor_msg["packet"] == "no packet id"
         assert sensor_msg["data"]
         assert sensor_msg["black tank"] == 71
+        assert sensor_msg["problem"] == 0
         assert sensor_msg["rssi"] == -52

docs/_devices/Garnet_SeeLevel_II_709-BTP3 .md

@@ -0,0 +1,21 @@
+---
+manufacturer: Garnet
+name: SeeLeveL II 709-BTP3 Tank Monitor
+model: SeeLevel II 709-BTP3
+image: Garnet_Seelevel_709-BTP3.png
+physical_description: Tank Monitor
+broadcasted_properties:
+  - tank
+  - temperature
+  - voltage
+  - rssi
+broadcasted_property_notes:
+  - property: tank
+    note: Level of the tank in percentage of the total volume
+broadcast_rate:
+active_scan:
+encryption_key: false
+custom_firmware:
+notes:
+    - The sensor also broadcasts volume and a total (per tank). These sensors are currently not implemented, as in tests these values stay 0 all the time. If you want to debug these sensors, you can make them visible by enabling debug logging. The values will be logged in the HA logs. Please report back here if these sensors actually report anything, such that we can implement them.
+---