From 44dcd038880caf88daf75f6a96e225d2b403136e Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmail.com>
Date: Sat, 31 Jan 2026 10:17:45 +0100
Subject: [PATCH] MQTT: fix namespace clash (revert #26999)

---
 templates/definition/vehicle/mg2mqtt.yaml   | 15 +++++++--------
 templates/definition/vehicle/teslamate.yaml | 13 ++++++-------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/templates/definition/vehicle/mg2mqtt.yaml b/templates/definition/vehicle/mg2mqtt.yaml
index 90373afbb..0acacc80d 100644
--- a/templates/definition/vehicle/mg2mqtt.yaml
+++ b/templates/definition/vehicle/mg2mqtt.yaml
@@ -8,7 +8,6 @@ requirements:
     en: Required MQTT broker configuration and a SAIC/MQTT Gateway (https://github.com/SAIC-iSmart-API/saic-python-mqtt-gateway or https://github.com/SAIC-iSmart-API/saic-java-client)
     de: Voraussetzung ist ein konfigurierter MQTT Broker und ein SAIC/MQTT Gateway (https://github.com/SAIC-iSmart-API/saic-python-mqtt-gateway oder https://github.com/SAIC-iSmart-API/saic-java-client)
 params:
-  - preset: mqtt
   - name: user
     required: true
   - name: vin
@@ -21,22 +20,22 @@ render: |
   {{- include "vehicle-common" . }}
   soc: # battery soc (%)
     source: mqtt
-    {{- include "mqtt" . | indent 2 }}
     topic: saic/{{ .user }}/vehicles/{{ .vin }}/drivetrain/soc
+    timeout: {{ .timeout }}
   status:
     source: combined
     plugged:
       source: mqtt
-      {{- include "mqtt" . | indent 4 }}
       topic: saic/{{ .user }}/vehicles/{{ .vin }}/drivetrain/chargerConnected
+      timeout: {{ .timeout }}
     charging:
       source: mqtt
-      {{- include "mqtt" . | indent 4 }}
       topic: saic/{{ .user }}/vehicles/{{ .vin }}/drivetrain/charging
+      timeout: {{ .timeout }}
   range:
     source: mqtt
-    {{- include "mqtt" . | indent 2 }}
     topic: saic/{{ .user }}/vehicles/{{ .vin }}/drivetrain/range
+    timeout: {{ .timeout }}
   climater:
     source: go
     script: |
@@ -46,12 +45,12 @@ render: |
         type: string
         config:
           source: mqtt
-          {{- include "mqtt" . | indent 8 }}
           topic: saic/{{ .user }}/vehicles/{{ .vin }}/climate/remoteClimateState
+          timeout: {{ .timeout }}
   odometer:
     source: mqtt
-    {{- include "mqtt" . | indent 2 }}
     topic: saic/{{ .user }}/vehicles/{{ .vin }}/drivetrain/mileage
+    timeout: {{ .timeout }}
   wakeup:
     source: go
     script: |
@@ -61,5 +60,5 @@ render: |
         type: string
         config:
           source: mqtt
-          {{- include "mqtt" . | indent 8 }}
           topic: saic/{{ .user }}/vehicles/{{ .vin }}/refresh/mode/set
+          timeout: {{ .timeout }}
diff --git a/templates/definition/vehicle/teslamate.yaml b/templates/definition/vehicle/teslamate.yaml
index c9d9f570b..93301b62f 100644
--- a/templates/definition/vehicle/teslamate.yaml
+++ b/templates/definition/vehicle/teslamate.yaml
@@ -8,7 +8,6 @@ requirements:
     en: Open source Tesla data logger [github.com/adriankumpf/teslamate](https://github.com/adriankumpf/teslamate). MQTT broker required.
     de: Open Source Tesla Datenlogger [github.com/adriankumpf/teslamate](https://github.com/adriankumpf/teslamate). Voraussetzung ist konfigurierter MQTT Broker.
 params:
-  - preset: mqtt
   - preset: vehicle-common
   - name: id
     description:
@@ -22,29 +21,29 @@ render: |
   {{- include "vehicle-common" . }}
   soc:
     source: mqtt
-    {{- include "mqtt" . | indent 2 }}
     topic: teslamate/cars/{{ .id }}/battery_level
+    timeout: {{ .timeout }}
   status:
     source: combined
     plugged:
       source: mqtt
-      {{- include "mqtt" . | indent 4 }}
       topic: teslamate/cars/{{ .id }}/plugged_in
+      timeout: {{ .timeout }}
     charging:
       source: mqtt
-      {{- include "mqtt" . | indent 4 }}
       topic: teslamate/cars/{{ .id }}/charger_actual_current
+      timeout: {{ .timeout }}
       jq: . > 0
   range:
     source: mqtt
-    {{- include "mqtt" . | indent 2 }}
     topic: teslamate/cars/{{ .id }}/rated_battery_range_km
+    timeout: {{ .timeout }}
   odometer:
     source: mqtt
-    {{- include "mqtt" . | indent 2 }}
     topic: teslamate/cars/{{ .id }}/odometer
+    timeout: {{ .timeout }}
   limitsoc:
     source: mqtt
-    {{- include "mqtt" . | indent 2 }}
     topic: teslamate/cars/{{ .id }}/charge_limit_soc
+    timeout: {{ .timeout }}
   features: ["coarsecurrent"]