From 9d6586fb4f661e7c7eb504ba2b74761658d09963 Mon Sep 17 00:00:00 2001 From: Jeppe Hasseriis Date: Thu, 18 Jul 2024 21:01:12 +0200 Subject: [PATCH 1/6] Change path for drivers lib --- components/wmbus/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/wmbus/__init__.py b/components/wmbus/__init__.py index 84a050d..7ed1470 100755 --- a/components/wmbus/__init__.py +++ b/components/wmbus/__init__.py @@ -127,5 +127,5 @@ async def to_code(config): cg.add_library( None, None, - "https://github.com/SzczepanLeon/wmbus-drivers#1.3.12", + "https://github.com/cenobitedk/wmbus-drivers#dev/multical21", ) From a7952a6ef3ca2376faa336947a520af612217569 Mon Sep 17 00:00:00 2001 From: Jeppe Hasseriis Date: Thu, 18 Jul 2024 22:55:07 +0200 Subject: [PATCH 2/6] Support `external_temperature_c` --- components/wmbus/sensor/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/wmbus/sensor/__init__.py b/components/wmbus/sensor/__init__.py index 280fab1..41469fe 100755 --- a/components/wmbus/sensor/__init__.py +++ b/components/wmbus/sensor/__init__.py @@ -310,6 +310,13 @@ def my_key(value): state_class=STATE_CLASS_MEASUREMENT, icon="mdi:coolant-temperature", ), + cv.Optional("external_temperature_c"): sensor.sensor_schema( + accuracy_decimals=0, + unit_of_measurement=UNIT_CELSIUS, + device_class=DEVICE_CLASS_TEMPERATURE, + state_class=STATE_CLASS_MEASUREMENT, + icon="mdi:thermometer", + ), cv.Optional("voltage_at_phase_1_v"): sensor.sensor_schema( accuracy_decimals=0, unit_of_measurement=UNIT_VOLT, From f7d66dfdd401e3fef34475b6c301a7bb5ae3c387 Mon Sep 17 00:00:00 2001 From: Jeppe Hasseriis Date: Fri, 19 Jul 2024 20:09:07 +0200 Subject: [PATCH 3/6] Change branch for driver repo --- components/wmbus/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/wmbus/__init__.py b/components/wmbus/__init__.py index 7ed1470..13598e8 100755 --- a/components/wmbus/__init__.py +++ b/components/wmbus/__init__.py @@ -127,5 +127,5 @@ async def to_code(config): cg.add_library( None, None, - "https://github.com/cenobitedk/wmbus-drivers#dev/multical21", + "https://github.com/cenobitedk/wmbus-drivers#multical21", ) From 92bd193ba11bddca5b9ba8d916ceffb9ca7e0e7a Mon Sep 17 00:00:00 2001 From: Jeppe Hasseriis Date: Sat, 20 Jul 2024 21:18:56 +0200 Subject: [PATCH 4/6] Update lib version --- components/wmbus/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/wmbus/__init__.py b/components/wmbus/__init__.py index 13598e8..9c0c610 100755 --- a/components/wmbus/__init__.py +++ b/components/wmbus/__init__.py @@ -127,5 +127,5 @@ async def to_code(config): cg.add_library( None, None, - "https://github.com/cenobitedk/wmbus-drivers#multical21", + "https://github.com/SzczepanLeon/wmbus-drivers#1.3.13", ) From c1b671b0cfe203fa864179c0dcb3536c7fc77917 Mon Sep 17 00:00:00 2001 From: Jeppe Hasseriis Date: Sat, 20 Jul 2024 21:20:23 +0200 Subject: [PATCH 5/6] Update `version.h` --- components/wmbus/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/wmbus/version.h b/components/wmbus/version.h index 1d0be59..2a0e1b1 100755 --- a/components/wmbus/version.h +++ b/components/wmbus/version.h @@ -1,3 +1,3 @@ #ifndef MY_VERSION -#define MY_VERSION "3.2.2" +#define MY_VERSION "3.2.3" #endif From f990aa4c59dd427c8cc51e5b2adb1960fe9c72d9 Mon Sep 17 00:00:00 2001 From: Jeppe Hasseriis Date: Sat, 20 Jul 2024 21:21:20 +0200 Subject: [PATCH 6/6] Update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3a79954..f58714d 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,8 @@ Supported sensors (sensor_type) for meters: - `multical21` - total_water_m3 - target_water_m3 + - flow_temperature_c (depends on meter configuration) + - external_temperature_c (depends on meter configuration) - `qheat` - total_energy_consumption_kwh - `qwater`