From 7be56a0ce4c5f30ded033383e4e8323e637d64f1 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Sun, 7 Jun 2026 21:52:21 +0200
Subject: [PATCH] chore: route climaterdisabled through vehicle-features
 include (#30615)

---
 templates/definition/vehicle/iso15118.yaml   |  6 +-----
 templates/definition/vehicle/mazda2mqtt.yaml |  6 +-----
 templates/definition/vehicle/offline.yaml    | 12 +-----------
 templates/definition/vehicle/tesla.yaml      |  6 +-----
 templates/definition/vehicle/teslafi.yaml    |  6 +-----
 templates/definition/vehicle/teslamate.yaml  |  6 +-----
 templates/definition/vehicle/tessie.yaml     |  6 +-----
 util/templates/includes/vehicle-features.tpl |  5 ++++-
 8 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/templates/definition/vehicle/iso15118.yaml b/templates/definition/vehicle/iso15118.yaml
index eedc6d35f..d05c6ca87 100644
--- a/templates/definition/vehicle/iso15118.yaml
+++ b/templates/definition/vehicle/iso15118.yaml
@@ -22,11 +22,7 @@ params:
 render: |
   type: custom
   {{- include "vehicle-common" . }}
-  features:
-  - offline
-  {{- if eq .climaterdisabled "true" }}
-  - climaterdisabled
-  {{- end }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "offline")) .) }}
   soc:
     source: const
     value: 0
diff --git a/templates/definition/vehicle/mazda2mqtt.yaml b/templates/definition/vehicle/mazda2mqtt.yaml
index 9568f03ff..343a33c76 100644
--- a/templates/definition/vehicle/mazda2mqtt.yaml
+++ b/templates/definition/vehicle/mazda2mqtt.yaml
@@ -36,8 +36,4 @@ render: |
     source: mqtt
     topic: mazda2mqtt/{{ .vin }}/chargeInfo/drivingRangeKm
     timeout: {{ .timeout }}
-  features:
-  - streaming
-  {{- if eq .climaterdisabled "true" }}
-  - climaterdisabled
-  {{- end }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "streaming")) .) }}
diff --git a/templates/definition/vehicle/offline.yaml b/templates/definition/vehicle/offline.yaml
index 9be0ab781..d7d63056c 100644
--- a/templates/definition/vehicle/offline.yaml
+++ b/templates/definition/vehicle/offline.yaml
@@ -17,17 +17,7 @@ params:
 render: |
   type: custom
   {{- include "vehicle-common" . }}
-  features:
-  - offline
-  {{- if eq .coarsecurrent "true" }}
-  - coarsecurrent
-  {{- end }}
-  {{- if eq .welcomecharge "true" }}
-  - welcomecharge
-  {{- end }}
-  {{- if eq .climaterdisabled "true" }}
-  - climaterdisabled
-  {{- end }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "offline")) .) }}
   soc:
     source: const
     value: 0
diff --git a/templates/definition/vehicle/tesla.yaml b/templates/definition/vehicle/tesla.yaml
index ea80d88ea..1da3eae0a 100644
--- a/templates/definition/vehicle/tesla.yaml
+++ b/templates/definition/vehicle/tesla.yaml
@@ -91,9 +91,5 @@ render: |
   commandProxy: {{ .commandProxy }}
   proxyToken: {{ .proxyToken }}
   {{ include "vehicle-common" . }}
-  features:
-  - coarsecurrent
-  {{- if eq .climaterdisabled "true" }}
-  - climaterdisabled
-  {{- end }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "coarsecurrent")) .) }}
   cache: {{ .cache }}
diff --git a/templates/definition/vehicle/teslafi.yaml b/templates/definition/vehicle/teslafi.yaml
index 5a6f491f7..f4aaca91c 100644
--- a/templates/definition/vehicle/teslafi.yaml
+++ b/templates/definition/vehicle/teslafi.yaml
@@ -44,8 +44,4 @@ render: |
   limitsoc:
     {{- include "teslafi_source" . | indent 2 }}
     jq: .charge_limit_soc
-  features:
-  - coarsecurrent
-  {{- if eq .climaterdisabled "true" }}
-  - climaterdisabled
-  {{- end }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "coarsecurrent")) .) }}
diff --git a/templates/definition/vehicle/teslamate.yaml b/templates/definition/vehicle/teslamate.yaml
index d2f7c6089..8b58823cd 100644
--- a/templates/definition/vehicle/teslamate.yaml
+++ b/templates/definition/vehicle/teslamate.yaml
@@ -69,8 +69,4 @@ render: |
     source: mqtt
     topic: teslamate/cars/{{ .id }}/is_preconditioning
     timeout: {{ .timeout }}
-  features:
-  - coarsecurrent
-  {{- if eq .climaterdisabled "true" }}
-  - climaterdisabled
-  {{- end }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "coarsecurrent")) .) }}
diff --git a/templates/definition/vehicle/tessie.yaml b/templates/definition/vehicle/tessie.yaml
index 187eee6d1..547372244 100644
--- a/templates/definition/vehicle/tessie.yaml
+++ b/templates/definition/vehicle/tessie.yaml
@@ -116,8 +116,4 @@ render: |
     headers:
       Authorization: Bearer {{ .token }}
     method: POST
-  features:
-  - coarsecurrent
-  {{- if eq .climaterdisabled "true" }}
-  - climaterdisabled
-  {{- end }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "coarsecurrent")) .) }}
diff --git a/util/templates/includes/vehicle-features.tpl b/util/templates/includes/vehicle-features.tpl
index 17219e155..8a842572f 100644
--- a/util/templates/includes/vehicle-features.tpl
+++ b/util/templates/includes/vehicle-features.tpl
@@ -1,6 +1,9 @@
 {{ define "vehicle-features" }}
-{{- if or (eq .coarsecurrent "true") (eq .welcomecharge "true") (eq .streaming "true") (eq .climaterdisabled "true") }}
+{{- if or .basefeatures (eq .coarsecurrent "true") (eq .welcomecharge "true") (eq .streaming "true") (eq .climaterdisabled "true") }}
 features:
+{{- range .basefeatures }}
+- {{ . }}
+{{- end }}
 {{- if eq .coarsecurrent "true" }}
 - coarsecurrent
 {{- end }}