From a9c04a241f6535e76eb48d4727c7886050fd0f98 Mon Sep 17 00:00:00 2001
From: Thom Wiggers <thom@thomwiggers.nl>
Date: Tue, 1 Oct 2024 13:00:53 +0200
Subject: [PATCH] Expose thermal sensors in DSMR component

Adds the thermal MBUS id configuration option and the thermal sensor.
---
 esphome/components/dsmr/__init__.py | 5 ++++-
 esphome/components/dsmr/sensor.py   | 7 +++++++
 esphome/const.py                    | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/dsmr/__init__.py b/esphome/components/dsmr/__init__.py
index 9f56dc3465..9e00ed9d4e 100644
--- a/esphome/components/dsmr/__init__.py
+++ b/esphome/components/dsmr/__init__.py
@@ -20,6 +20,7 @@ CONF_DECRYPTION_KEY = "decryption_key"
 CONF_DSMR_ID = "dsmr_id"
 CONF_GAS_MBUS_ID = "gas_mbus_id"
 CONF_WATER_MBUS_ID = "water_mbus_id"
+CONF_THERMAL_MBUS_ID = "thermal_mbus_id"
 CONF_MAX_TELEGRAM_LENGTH = "max_telegram_length"
 CONF_REQUEST_INTERVAL = "request_interval"
 CONF_REQUEST_PIN = "request_pin"
@@ -55,6 +56,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_CRC_CHECK, default=True): cv.boolean,
             cv.Optional(CONF_GAS_MBUS_ID, default=1): cv.int_,
             cv.Optional(CONF_WATER_MBUS_ID, default=2): cv.int_,
+            cv.Optional(CONF_THERMAL_MBUS_ID, default=3): cv.int_,
             cv.Optional(CONF_MAX_TELEGRAM_LENGTH, default=1500): cv.int_,
             cv.Optional(CONF_REQUEST_PIN): pins.gpio_output_pin_schema,
             cv.Optional(
@@ -85,9 +87,10 @@ async def to_code(config):
 
     cg.add_build_flag("-DDSMR_GAS_MBUS_ID=" + str(config[CONF_GAS_MBUS_ID]))
     cg.add_build_flag("-DDSMR_WATER_MBUS_ID=" + str(config[CONF_WATER_MBUS_ID]))
+    cg.add_build_flag("-DDSMR_THERMAL_MBUS_ID=" + str(config[CONF_THERMAL_MBUS_ID))
 
     # DSMR Parser
-    cg.add_library("glmnet/Dsmr", "0.8")
+    cg.add_library("glmnet/Dsmr", "0.9")
 
     # Crypto
     cg.add_library("rweather/Crypto", "0.4.0")
diff --git a/esphome/components/dsmr/sensor.py b/esphome/components/dsmr/sensor.py
index f2398d1908..8f376dcf3b 100644
--- a/esphome/components/dsmr/sensor.py
+++ b/esphome/components/dsmr/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_AMPERE,
     UNIT_CUBIC_METER,
+    UNIT_GIGAJOULE,
     UNIT_KILOWATT,
     UNIT_KILOWATT_HOURS,
     UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
@@ -237,6 +238,12 @@ CONFIG_SCHEMA = cv.Schema(
             device_class=DEVICE_CLASS_GAS,
             state_class=STATE_CLASS_TOTAL_INCREASING,
         ),
+        cv.Optional("thermal_delivered"): sensor.sensor_schema(
+            unit_of_measurement=UNIT_GIGAJOULE,
+            accuracy_decimals=3,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+        ),
         cv.Optional("water_delivered"): sensor.sensor_schema(
             unit_of_measurement=UNIT_CUBIC_METER,
             accuracy_decimals=3,
diff --git a/esphome/const.py b/esphome/const.py
index 40b7a1c419..5669a02dbf 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1035,6 +1035,7 @@ UNIT_DEGREE_PER_SECOND = "°/s"
 UNIT_DEGREES = "°"
 UNIT_EMPTY = ""
 UNIT_G = "G"
+UNIT_GIGAJOULE = "GJ"
 UNIT_GRAMS_PER_CUBIC_METER = "g/m³"
 UNIT_HECTOPASCAL = "hPa"
 UNIT_HERTZ = "Hz"