[avmfritz] Fix wrong system channel types (#15172)

Signed-off-by: Jan N. Klug <github@klug.nrw>

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 482bc3b6c59958da87e5796ac090c6045db980a7..5ee848408ab2921cd91c437b63fef4613a688be2 100644 (file)
--- 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 dc034a8601131bb066ec13c1c2e79d87c27b7e38..b0106ae8cb86c96013700143fb8ea897a2452697 100644 (file)
--- 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">