[freeboxos] Fix systeminfo group for active-player thing type (#17097)

* [freeboxos] Fix systeminfo group for active-player thing type

And remove this group from player thing type.

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties
index 0c2cab27160423ba0878ef79752d05f659d5377e..e6c76e61881c7f8ec9825a356a9dc6f83ffa1097 100644 (file)
--- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties
+++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties
@@ -189,6 +189,8 @@ channel-group-type.freeboxos.outgoing.channel.timestamp.label = Outgoing Call Ti
 channel-group-type.freeboxos.player-actions.label = Player Actions
 channel-group-type.freeboxos.player-status.label = Player Status
 channel-group-type.freeboxos.player-sysinfo.label = System Informations
+channel-group-type.freeboxos.player-sysinfo.channel.box-event.label = Player Event
+channel-group-type.freeboxos.player-sysinfo.channel.box-event.description = Triggers when an event related to the Freebox player has been detected
 channel-group-type.freeboxos.repeater-misc.label = Repeater Settings
 channel-group-type.freeboxos.repeater-misc.channel.box-event.label = Repeater Event
 channel-group-type.freeboxos.sensors.label = System Sensors

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-channel-groups.xml b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-channel-groups.xml
index 9a4f7e2d975e61d844ce65472ce377191bacceed..db75018e07452aa465636de800d6df48ea2cb7c1 100644 (file)
--- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-channel-groups.xml
+++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-channel-groups.xml
@@ -23,7 +23,10 @@
                <label>System Informations</label>
                <channels>
                        <channel id="uptime" typeId="uptime"/>
-                       <channel id="box-event" typeId="box-event"/>
+                       <channel id="box-event" typeId="box-event">
+                               <label>Player Event</label>
+                               <description>Triggers when an event related to the Freebox player has been detected</description>
+                       </channel>
                </channels>
        </channel-group-type>
 

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-thing-type.xml b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-thing-type.xml
index e6c94f1194ab3ee079a1f77754875db26ad7a402..787c687c9a1848a9a8e9282334a1aea66c82021a 100644 (file)
--- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-thing-type.xml
+++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-thing-type.xml
@@ -14,10 +14,13 @@
 
                <channel-groups>
                        <channel-group typeId="player-actions" id="player-actions"/>
-                       <channel-group typeId="sysinfo" id="sysinfo"/>
                        <channel-group typeId="connectivity" id="connectivity"/>
                </channel-groups>
 
+               <properties>
+                       <property name="thingTypeVersion">1</property>
+               </properties>
+
                <representation-property>macAddress</representation-property>
 
                <config-description-ref uri="thing-type:freeboxos:player"/>
@@ -34,10 +37,14 @@
                <channel-groups>
                        <channel-group typeId="player-actions" id="player-actions"/>
                        <channel-group typeId="player-status" id="player-status"/>
-                       <channel-group typeId="sysinfo" id="sysinfo"/>
+                       <channel-group typeId="player-sysinfo" id="sysinfo"/>
                        <channel-group typeId="connectivity" id="connectivity"/>
                </channel-groups>
 
+               <properties>
+                       <property name="thingTypeVersion">1</property>
+               </properties>
+
                <representation-property>macAddress</representation-property>
 
                <config-description-ref uri="thing-type:freeboxos:player"/>

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/update/instructions.xml
new file mode 100644 (file)
index 0000000..770fa5f
--- /dev/null
+++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/update/instructions.xml
@@ -0,0 +1,29 @@
+<?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="freeboxos:player">
+
+               <instruction-set targetVersion="1">
+                       <remove-channel id="uptime" groupIds="sysinfo"/>
+                       <remove-channel id="ip-address" groupIds="sysinfo"/>
+                       <remove-channel id="box-event" groupIds="sysinfo"/>
+               </instruction-set>
+
+       </thing-type>
+
+       <thing-type uid="freeboxos:active-player">
+
+               <instruction-set targetVersion="1">
+                       <remove-channel id="ip-address" groupIds="sysinfo"/>
+                       <update-channel id="box-event" groupIds="sysinfo">
+                               <type>freeboxos:box-event</type>
+                               <label>Player Event</label>
+                               <description>Triggers when an event related to the Freebox player has been detected</description>
+                       </update-channel>
+               </instruction-set>
+
+       </thing-type>
+
+</update:update-descriptions>