From 1bc932e95ae24ecc723e5714d167e2c3d04bfb88 Mon Sep 17 00:00:00 2001
From: Bernd Weymann <bernd.weymann@gmail.com>
Date: Wed, 28 Aug 2024 20:12:07 +0200
Subject: [PATCH] [mercedesme] Fix trip channel type id (#17267)

* bugfix trip channel naming

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>
---
 .../OH-INF/thing/thing-combustion.xml         |  6 ++-
 .../resources/OH-INF/thing/thing-hybrid.xml   |  4 ++
 .../OH-INF/thing/trip-conv-group.xml          |  2 +-
 .../OH-INF/thing/trip-hybrid-group.xml        |  2 +-
 .../resources/OH-INF/update/instructions.xml  | 46 +++++++++++++++++++
 5 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/update/instructions.xml

diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-combustion.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-combustion.xml
index e05ce90a9b7..977dd7af642 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-combustion.xml
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-combustion.xml
@@ -20,12 +20,16 @@
 			<channel-group id="hvac" typeId="hvac-values"/>
 			<channel-group id="service" typeId="service-values"/>
 			<channel-group id="range" typeId="range-conv-values"/>
-			<channel-group id="trip" typeId="trip-values"/>
+			<channel-group id="trip" typeId="trip-conv-values"/>
 			<channel-group id="position" typeId="position-values"/>
 			<channel-group id="tires" typeId="tires-values"/>
 			<channel-group id="command" typeId="command-values"/>
 		</channel-groups>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<config-description-ref uri="thing-type:mercedesme:conv"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-hybrid.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-hybrid.xml
index 30abc16d1f9..e55fa8d1c07 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-hybrid.xml
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-hybrid.xml
@@ -27,6 +27,10 @@
 			<channel-group id="command" typeId="command-values"/>
 		</channel-groups>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<config-description-ref uri="thing-type:mercedesme:hybrid"/>
 	</thing-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-conv-group.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-conv-group.xml
index 3eab344bcfd..2de660073f2 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-conv-group.xml
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-conv-group.xml
@@ -13,7 +13,7 @@
 			<channel id="distance-reset" typeId="distance-reset"/>
 			<channel id="time-reset" typeId="driven-time-reset"/>
 			<channel id="avg-speed-reset" typeId="avg-speed-reset"/>
-			<channel id="cons-conv-reset" typeId="consumption-conv-resetchannel"/>
+			<channel id="cons-conv-reset" typeId="consumption-conv-reset"/>
 			<channel id="cons-conv-unit" typeId="consumption-conv-unit"/>
 		</channels>
 	</channel-group-type>
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-hybrid-group.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-hybrid-group.xml
index 78cd171e109..a7501cde2cb 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-hybrid-group.xml
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-hybrid-group.xml
@@ -15,7 +15,7 @@
 			<channel id="time-reset" typeId="driven-time-reset"/>
 			<channel id="avg-speed-reset" typeId="avg-speed-reset"/>
 			<channel id="cons-ev-reset" typeId="consumption-ev-reset"/>
-			<channel id="cons-conv-reset" typeId="consumption-conv-resetchannel"/>
+			<channel id="cons-conv-reset" typeId="consumption-conv-reset"/>
 			<channel id="cons-ev-unit" typeId="consumption-ev-unit"/>
 			<channel id="cons-conv-unit" typeId="consumption-conv-unit"/>
 		</channels>
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/update/instructions.xml
new file mode 100644
index 00000000000..744a25359b9
--- /dev/null
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/update/instructions.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">
+
+	<thing-type uid="mercedesme:hybrid">
+		<instruction-set targetVersion="1">
+			<update-channel id="cons-conv-reset" groupIds="trip">
+				<type>mercedesme:consumption-conv-reset</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+	<thing-type uid="mercedesme:combustion">
+		<instruction-set targetVersion="1">
+			<update-channel id="distance" groupIds="trip">
+				<type>mercedesme:distance</type>
+			</update-channel>
+			<update-channel id="time" groupIds="trip">
+				<type>mercedesme:driven-time</type>
+			</update-channel>
+			<update-channel id="avg-speed" groupIds="trip">
+				<type>mercedesme:avg-speed</type>
+			</update-channel>
+			<update-channel id="cons-conv" groupIds="trip">
+				<type>mercedesme:consumption-conv</type>
+			</update-channel>
+			<update-channel id="distance-reset" groupIds="trip">
+				<type>mercedesme:distance-reset</type>
+			</update-channel>
+			<update-channel id="time-reset" groupIds="trip">
+				<type>mercedesme:driven-time-reset</type>
+			</update-channel>
+			<update-channel id="avg-speed-reset" groupIds="trip">
+				<type>mercedesme:avg-speed-reset</type>
+			</update-channel>
+			<update-channel id="cons-conv-reset" groupIds="trip">
+				<type>mercedesme:consumption-conv-reset</type>
+			</update-channel>
+			<update-channel id="cons-conv-unit" groupIds="trip">
+				<type>mercedesme:consumption-conv-unit</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+</update:update-descriptions>