From 57d74ee43f9e6e02bf556de206aa10c975f3ee25 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Thu, 23 Jan 2025 08:25:53 +0100
Subject: [PATCH] Vaillant: add heating zone temperature (#18357)

---
 charger/vaillant.go | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/charger/vaillant.go b/charger/vaillant.go
index c395fd269..f3b7d027c 100644
--- a/charger/vaillant.go
+++ b/charger/vaillant.go
@@ -135,8 +135,24 @@ func NewVaillantFromConfig(ctx context.Context, other map[string]interface{}) (a
 		}, cc.Cache)
 	}
 
+	heatingTemp := func(zz []sensonet.StateZone) float64 {
+		z, _ := lo.Find(zz, func(z sensonet.StateZone) bool {
+			return z.Index == cc.HeatingZone
+		})
+		return z.CurrentRoomTemperature
+	}
+
+	var heatingTempSensor bool
+	if heating {
+		system, err := conn.GetSystem(systemId)
+		if err != nil {
+			return nil, err
+		}
+		heatingTempSensor = heatingTemp(system.State.Zones) > 0
+	}
+
 	var temp func() (float64, error)
-	if !heating {
+	if !heating || heatingTempSensor {
 		temp = provider.Cached(func() (float64, error) {
 			system, err := conn.GetSystem(systemId)
 			if err != nil {
@@ -144,6 +160,11 @@ func NewVaillantFromConfig(ctx context.Context, other map[string]interface{}) (a
 			}
 
 			switch {
+			case heatingTempSensor:
+				if res := heatingTemp(system.State.Zones); res > 0 {
+					return res, nil
+				}
+				return 0, api.ErrNotAvailable
 			case len(system.State.Dhw) > 0:
 				return system.State.Dhw[0].CurrentDhwTemperature, nil
 			case len(system.State.DomesticHotWater) > 0: