From b76cbfab9ece1d987de9d61a7d62bdcbf772d418 Mon Sep 17 00:00:00 2001
From: Patrick Huesmann <info@patrick-huesmann.de>
Date: Thu, 15 Sep 2022 19:44:47 +0200
Subject: [PATCH 1/2] drivers: Recognize QDS/0x07/0x35 as qwater

---
 src/driver_qwater.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/driver_qwater.cc b/src/driver_qwater.cc
index bc1415a..7ef8791 100644
--- a/src/driver_qwater.cc
+++ b/src/driver_qwater.cc
@@ -44,6 +44,7 @@ static bool ok = registerDriver([](DriverInfo&di)
     di.addLinkMode(LinkMode::S1);
     di.addDetection(MANUFACTURER_QDS, 0x37,  0x33);
     di.addDetection(MANUFACTURER_QDS, 0x06,  0x18);
+    di.addDetection(MANUFACTURER_QDS, 0x07,  0x35);
 
     di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new MeterQWater(mi, di)); });
 });

From ed9f162b7c2688124748017eb0871264c6675a67 Mon Sep 17 00:00:00 2001
From: Patrick Huesmann <info@patrick-huesmann.de>
Date: Thu, 15 Sep 2022 20:22:45 +0200
Subject: [PATCH 2/2] ha-addon: Add discovery for qwater meter

---
 ha-addon/mqtt_discovery/qwater.json | 49 +++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 ha-addon/mqtt_discovery/qwater.json

diff --git a/ha-addon/mqtt_discovery/qwater.json b/ha-addon/mqtt_discovery/qwater.json
new file mode 100644
index 0000000..10775f4
--- /dev/null
+++ b/ha-addon/mqtt_discovery/qwater.json
@@ -0,0 +1,49 @@
+{
+    "total_m3": {
+        "component": "sensor",
+        "discovery_payload": {
+            "device": {
+                "identifiers": [
+                    "wmbusmeters_{id}"
+                ],
+                "manufacturer": "Qundis",
+                "model": "{driver}",
+                "name": "{name}",
+                "sw_version": "{id}"
+            },
+            "enabled_by_default": true,
+            "json_attributes_topic": "wmbusmeters/{name}",
+            "state_class": "total",
+            "name": "{name} total",
+            "state_topic": "wmbusmeters/{name}",
+            "unique_id": "wmbusmeters_{id}_{attribute}",
+            "unit_of_measurement": "m³",
+            "value_template": "{{ value_json.{attribute} }}",
+            "icon": "mdi:gauge"
+        }
+    },
+    "rssi_dbm": {
+        "component": "sensor",
+        "discovery_payload": {
+            "device": {
+                "identifiers": [
+                    "wmbusmeters_{id}"
+                ],
+                "manufacturer": "Qundis",
+                "model": "{driver}",
+                "name": "{name}",
+                "sw_version": "{id}"
+            },
+            "enabled_by_default": false,
+            "entity_category": "diagnostic",
+            "device_class": "signal_strength",
+            "state_class": "measurement",
+            "name": "{name} rssi",
+            "state_topic": "wmbusmeters/{name}",
+            "unique_id": "wmbusmeters_{id}_{attribute}",
+            "unit_of_measurement": "dbm",
+            "value_template": "{{ value_json.{attribute} }}",
+            "icon": "mdi:signal"
+        }
+    }
+}
\ No newline at end of file