From 65ea4d9004c9042c8b7b60f5cf86f9bb99b55575 Mon Sep 17 00:00:00 2001
From: Bernd Weymann <bernd.weymann@gmail.com>
Date: Fri, 16 Aug 2024 00:20:03 +0200
Subject: [PATCH 1/5] bugfix trip channel naming

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>
---
 .../src/main/resources/OH-INF/thing/trip-conv-group.xml         | 2 +-
 .../src/main/resources/OH-INF/thing/trip-hybrid-group.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 3eab344bcfd3f..2de660073f29b 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 78cd171e1097b..a7501cde2cbeb 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>

From e97db1b5492008bb85912ea69c5ebf8b5bb84c9b Mon Sep 17 00:00:00 2001
From: Bernd Weymann <bernd.weymann@gmail.com>
Date: Mon, 26 Aug 2024 16:05:57 +0200
Subject: [PATCH 2/5] update instructions

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>
---
 .../resources/OH-INF/thing/thing-combustion.xml  |  6 +++++-
 .../main/resources/OH-INF/thing/thing-hybrid.xml |  4 ++++
 .../src/main/resources/update/instructions.xml   | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.openhab.binding.mercedesme/src/main/resources/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 e05ce90a9b748..977dd7af64264 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 30abc16d1f9f8..e55fa8d1c07de 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/update/instructions.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
new file mode 100644
index 0000000000000..35c23b2c3d0b8
--- /dev/null
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
@@ -0,0 +1,16 @@
+<?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">
+			<add-channel id="cons-conv-reset" groupIds="trip-hybrid-values">
+				<type>
+					mercedesme:consumption-conv-reset
+				</typeId>
+			</add-channel>
+		</instruction-set>
+	</thing-type>
+
+</update:update-descriptions>

From 6799c308e888c4b488bd48a3dda66e9735fca850 Mon Sep 17 00:00:00 2001
From: Bernd Weymann <bernd.weymann@gmail.com>
Date: Mon, 26 Aug 2024 19:08:29 +0200
Subject: [PATCH 3/5] update instructions combustion

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>
---
 .../main/resources/update/instructions.xml    | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
index 35c23b2c3d0b8..3a096ee4a0253 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
@@ -5,10 +5,40 @@
 
 	<thing-type uid="mercedesme:hybrid">
 		<instruction-set targetVersion="1">
-			<add-channel id="cons-conv-reset" groupIds="trip-hybrid-values">
-				<type>
-					mercedesme:consumption-conv-reset
-				</typeId>
+			<add-channel id="cons-conv-reset" groupIds="trip">
+				<type>mercedesme:consumption-conv-reset</type>
+			</add-channel>
+		</instruction-set>
+	</thing-type>
+
+	<thing-type uid="mercedesme:combustion">
+		<instruction-set targetVersion="1">
+			<add-channel id="distance" groupIds="trip">
+				<type>mercedesme:distance</type>
+			</add-channel>
+			<add-channel id="time" groupIds="trip">
+				<type>mercedesme:driven-time</type>
+			</add-channel>
+			<add-channel id="avg-speed" groupIds="trip">
+				<type>mercedesme:avg-speed</type>
+			</add-channel>
+			<add-channel id="cons-conv" groupIds="trip">
+				<type>mercedesme:consumption-conv</type>
+			</add-channel>
+			<add-channel id="distance-reset" groupIds="trip">
+				<type>mercedesme:distance-reset</type>
+			</add-channel>
+			<add-channel id="time-reset" groupIds="trip">
+				<type>mercedesme:driven-time-reset</type>
+			</add-channel>
+			<add-channel id="avg-speed-reset" groupIds="trip">
+				<type>mercedesme:avg-speed-reset</type>
+			</add-channel>
+			<add-channel id="cons-conv-reset" groupIds="trip">
+				<type>mercedesme:consumption-conv-reset</type>
+			</add-channel>
+			<add-channel id="cons-conv-unit" groupIds="trip">
+				<type>mercedesme:consumption-conv-unit</type>
 			</add-channel>
 		</instruction-set>
 	</thing-type>

From 6b2362d462c17d04b9036045d298bb9369b1e718 Mon Sep 17 00:00:00 2001
From: Bernd Weymann <bernd.weymann@gmail.com>
Date: Tue, 27 Aug 2024 00:42:59 +0200
Subject: [PATCH 4/5] update-channel

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>
---
 .../main/resources/update/instructions.xml    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
index 3a096ee4a0253..744a25359b913 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
@@ -5,41 +5,41 @@
 
 	<thing-type uid="mercedesme:hybrid">
 		<instruction-set targetVersion="1">
-			<add-channel id="cons-conv-reset" groupIds="trip">
+			<update-channel id="cons-conv-reset" groupIds="trip">
 				<type>mercedesme:consumption-conv-reset</type>
-			</add-channel>
+			</update-channel>
 		</instruction-set>
 	</thing-type>
 
 	<thing-type uid="mercedesme:combustion">
 		<instruction-set targetVersion="1">
-			<add-channel id="distance" groupIds="trip">
+			<update-channel id="distance" groupIds="trip">
 				<type>mercedesme:distance</type>
-			</add-channel>
-			<add-channel id="time" groupIds="trip">
+			</update-channel>
+			<update-channel id="time" groupIds="trip">
 				<type>mercedesme:driven-time</type>
-			</add-channel>
-			<add-channel id="avg-speed" groupIds="trip">
+			</update-channel>
+			<update-channel id="avg-speed" groupIds="trip">
 				<type>mercedesme:avg-speed</type>
-			</add-channel>
-			<add-channel id="cons-conv" groupIds="trip">
+			</update-channel>
+			<update-channel id="cons-conv" groupIds="trip">
 				<type>mercedesme:consumption-conv</type>
-			</add-channel>
-			<add-channel id="distance-reset" groupIds="trip">
+			</update-channel>
+			<update-channel id="distance-reset" groupIds="trip">
 				<type>mercedesme:distance-reset</type>
-			</add-channel>
-			<add-channel id="time-reset" groupIds="trip">
+			</update-channel>
+			<update-channel id="time-reset" groupIds="trip">
 				<type>mercedesme:driven-time-reset</type>
-			</add-channel>
-			<add-channel id="avg-speed-reset" groupIds="trip">
+			</update-channel>
+			<update-channel id="avg-speed-reset" groupIds="trip">
 				<type>mercedesme:avg-speed-reset</type>
-			</add-channel>
-			<add-channel id="cons-conv-reset" groupIds="trip">
+			</update-channel>
+			<update-channel id="cons-conv-reset" groupIds="trip">
 				<type>mercedesme:consumption-conv-reset</type>
-			</add-channel>
-			<add-channel id="cons-conv-unit" groupIds="trip">
+			</update-channel>
+			<update-channel id="cons-conv-unit" groupIds="trip">
 				<type>mercedesme:consumption-conv-unit</type>
-			</add-channel>
+			</update-channel>
 		</instruction-set>
 	</thing-type>
 

From aaeb8d3f2299e1cff960e0b775c81a7e60a53209 Mon Sep 17 00:00:00 2001
From: Bernd Weymann <bernd.weymann@gmail.com>
Date: Wed, 28 Aug 2024 19:22:29 +0200
Subject: [PATCH 5/5] update folder correction

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>
---
 .../src/main/resources/{ => OH-INF}/update/instructions.xml       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename bundles/org.openhab.binding.mercedesme/src/main/resources/{ => OH-INF}/update/instructions.xml (100%)

diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/update/instructions.xml
similarity index 100%
rename from bundles/org.openhab.binding.mercedesme/src/main/resources/update/instructions.xml
rename to bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/update/instructions.xml