From ae1a7475a731fb3ee7e5981fe45939331c655292 Mon Sep 17 00:00:00 2001
From: J-N-K <github@klug.nrw>
Date: Mon, 3 Jul 2023 22:48:03 +0200
Subject: [PATCH] [avmfritz] Fix wrong system channel types (#15172)

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .../resources/OH-INF/thing/thing-types.xml    |  8 ++--
 .../resources/OH-INF/update/instructions.xml  | 44 +++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
index 482bc3b6c5..5ee848408a 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
@@ -241,7 +241,7 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="energy" typeId="system.electrical-energy">
+			<channel id="energy" typeId="system.electric-energy">
 				<label>Energy Consumption</label>
 				<description>Accumulated energy consumption.</description>
 			</channel>
@@ -275,7 +275,7 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="energy" typeId="system.electrical-energy">
+			<channel id="energy" typeId="system.electric-energy">
 				<label>Energy Consumption</label>
 				<description>Accumulated energy consumption.</description>
 			</channel>
@@ -309,7 +309,7 @@
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
-			<channel id="energy" typeId="system.electrical-energy">
+			<channel id="energy" typeId="system.electric-energy">
 				<label>Energy Consumption</label>
 				<description>Accumulated energy consumption.</description>
 			</channel>
@@ -515,7 +515,7 @@
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
-			<channel id="energy" typeId="system.electrical-energy">
+			<channel id="energy" typeId="system.electric-energy">
 				<label>Energy Consumption</label>
 				<description>Accumulated energy consumption.</description>
 			</channel>
diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/update/instructions.xml
index dc034a8601..b0106ae8cb 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/update/instructions.xml
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/update/instructions.xml
@@ -15,6 +15,17 @@
 				<type>system:electrical-voltage</type>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="2">
+			<update-channel id="energy">
+				<type>system:electric-energy</type>
+			</update-channel>
+			<update-channel id="power">
+				<type>system:electric-power</type>
+			</update-channel>
+			<update-channel id="voltage">
+				<type>system:electric-voltage</type>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 
 	<thing-type uid="avmfritz:FRITZ_DECT_210">
@@ -29,6 +40,17 @@
 				<type>system:electrical-voltage</type>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="2">
+			<update-channel id="energy">
+				<type>system:electric-energy</type>
+			</update-channel>
+			<update-channel id="power">
+				<type>system:electric-power</type>
+			</update-channel>
+			<update-channel id="voltage">
+				<type>system:electric-voltage</type>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 
 	<thing-type uid="avmfritz:FRITZ_DECT_200">
@@ -43,6 +65,17 @@
 				<type>system:electrical-voltage</type>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="2">
+			<update-channel id="energy">
+				<type>system:electric-energy</type>
+			</update-channel>
+			<update-channel id="power">
+				<type>system:electric-power</type>
+			</update-channel>
+			<update-channel id="voltage">
+				<type>system:electric-voltage</type>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 
 	<thing-type uid="avmfritz:FRITZ_Powerline_546E">
@@ -57,6 +90,17 @@
 				<type>system:electrical-voltage</type>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="2">
+			<update-channel id="energy">
+				<type>system:electric-energy</type>
+			</update-channel>
+			<update-channel id="power">
+				<type>system:electric-power</type>
+			</update-channel>
+			<update-channel id="voltage">
+				<type>system:electric-voltage</type>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 
 	<thing-type uid="avmfritz:Comet_DECT">
-- 
2.47.3