From 84b096d2eb067252b2ca72dc1e95a80d10e7a38f Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Tue, 21 Jan 2025 15:50:59 +0100
Subject: [PATCH] Vaillant: fix zone selection (#18326)

---
 charger/vaillant.go                        |  6 +++---
 templates/definition/charger/vaillant.yaml | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charger/vaillant.go b/charger/vaillant.go
index 0f7c34d81..c395fd269 100644
--- a/charger/vaillant.go
+++ b/charger/vaillant.go
@@ -94,7 +94,7 @@ func NewVaillantFromConfig(ctx context.Context, other map[string]interface{}) (a
 	}
 
 	systemId := homes[0].SystemID
-	heating := cc.HeatingZone > 0 && cc.HeatingSetpoint > 0
+	heating := cc.HeatingSetpoint > 0
 
 	set := func(mode int64) error {
 		switch mode {
@@ -105,9 +105,9 @@ func NewVaillantFromConfig(ctx context.Context, other map[string]interface{}) (a
 			return conn.StopHotWaterBoost(systemId, sensonet.HOTWATERINDEX_DEFAULT)
 		case Boost:
 			if heating {
-				return conn.StartZoneQuickVeto(systemId, cc.HeatingZone, cc.HeatingSetpoint, sensonet.ZONEVETODURATION_DEFAULT)
+				return conn.StartZoneQuickVeto(systemId, cc.HeatingZone, cc.HeatingSetpoint, 4) // hours
 			}
-			return conn.StartHotWaterBoost(systemId, sensonet.HOTWATERINDEX_DEFAULT)
+			return conn.StartHotWaterBoost(systemId, sensonet.HOTWATERINDEX_DEFAULT) // zone 255
 		default:
 			return api.ErrNotAvailable
 		}
diff --git a/templates/definition/charger/vaillant.yaml b/templates/definition/charger/vaillant.yaml
index 2ca437f56..56469ee4d 100644
--- a/templates/definition/charger/vaillant.yaml
+++ b/templates/definition/charger/vaillant.yaml
@@ -7,21 +7,21 @@ group: heating
 requirements:
   # evcc: ["sponsorship"]
   description:
-    de: Die Boost Funktion erwärmt Warmwasser und optional eine Boostzone. Die Boostzone wird durch die ID identifiziert. Die Boost Temperatur wird in Grad Celsius angegeben.
-    en: The boost function heats hot water and optionally a boost zone. The boost zone is identified by the ID. The boost temperature is specified in degrees Celsius.
+    de: Die Boost Funktion erwärmt Warmwasser oder eine Boostzone. Die Boostzone wird durch die ID identifiziert. Die Boost Temperatur wird in Grad Celsius angegeben. Ist eine Boost Temperatur angegeben, wird die Boostzone aktiviert, anderenfalls Warmwasser.
+    en: The boost function heats hot water or a boost zone. The boost zone is identified by the ID. The boost temperature is specified in degrees Celsius. If boost temperature is specified, the boost zone is activated, otherwise hot water.
 params:
   - name: user
   - name: password
   - name: zone
     type: int
     help:
-      de: Id der Boostzone (zusätzlich zu Warmwasser)
-      en: Boost zone id (in addition to hot water)
+      de: Id der Boostzone
+      en: Boost zone id
   - name: setpoint
     type: float
     help:
-      de: Boost Temperatur (zusätzlich zu Warmwasser)
-      en: Boost temperature setpoint (in addition to hot water)
+      de: Boost Temperatur
+      en: Boost temperature setpoint
   - name: phases
     type: int
     advanced: true