[onkyo] Add channels for media info (#11813)

* [onkyo] Add channels for media info

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>

diff --git a/bundles/org.openhab.binding.onkyo/README.md b/bundles/org.openhab.binding.onkyo/README.md
index 2417065446d2f2afc01c88f3f92919abf4b9ea1c..3fa7112f8352fa4ce475a7538989924b6fc6872f 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/README.md
+++ b/bundles/org.openhab.binding.onkyo/README.md
@@ -167,6 +167,10 @@ The Onkyo AVR supports the following channels (some channels are model specific)
 | netmenu#item7             | String    | The text of USB/Net Menu entry 7                                                                                |
 | netmenu#item8             | String    | The text of USB/Net Menu entry 8                                                                                |
 | netmenu#item9             | String    | The text of USB/Net Menu entry 9                                                                                |
+| information#audioIn       | String    | Details of the input audio format                                                                               |
+| information#audioOut      | String    | Details of the output audio format                                                                              |
+| information#videoIn       | String    | Details of the input video format                                                                               |
+| information#videoOut      | String    | Details of the output video format                                                                              |
 
 ## Rule Actions
 
@@ -255,6 +259,11 @@ String avrLrNet_Item6     "Item6 [%s]"     <text>   { channel="onkyo:onkyoAVR:av
 String avrLrNet_Item7     "Item7 [%s]"     <text>   { channel="onkyo:onkyoAVR:avr-livingroom:netmenu#item7" }
 String avrLrNet_Item8     "Item8 [%s]"     <text>   { channel="onkyo:onkyoAVR:avr-livingroom:netmenu#item8" }
 String avrLrNet_Item9     "Item9 [%s]"     <text>   { channel="onkyo:onkyoAVR:avr-livingroom:netmenu#item9" }
+
+String audioIn            "Audio In [%s]"   <settings>   ["Point"]   { channel="onkyo:onkyoAVR:avr-livingroom:information#audioIn" }
+String audioOut           "Audio Out [%s]"  <settings>   ["Point"]   { channel="onkyo:onkyoAVR:avr-livingroom:information#audioOut" }
+String videoIn            "Video In [%s]"   <settings>   ["Point"]   { channel="onkyo:onkyoAVR:avr-livingroom:information#videoIn" }
+String videoOut           "Video Out [%s]"  <settings>   ["Point"]   { channel="onkyo:onkyoAVR:avr-livingroom:information#videoOut" }
 ```
 
 ## Sitemap Configuration
@@ -301,6 +310,12 @@ sitemap demo label="Onkyo AVR"
         Text      item=avrLrNet_Item8
         Text      item=avrLrNet_Item9
     }
+    Frame label="Audio & Video Information" {
+        Text      item=audioIn
+        Text      item=audioOut
+        Text      item=videoIn
+        Text      item=videoOut
+    }
 }
 ```
 

diff --git a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoBindingConstants.java b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoBindingConstants.java
index 07b64c9391dba9d6717afaebc81a90b3cdb5421d..ff9c583ee33677f61d7b31ea90d8ad76bbbcb7f6 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoBindingConstants.java
+++ b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoBindingConstants.java
@@ -90,6 +90,11 @@ public class OnkyoBindingConstants {
     public static final String CHANNEL_NET_MENU8 = "netmenu#item8";
     public static final String CHANNEL_NET_MENU9 = "netmenu#item9";
 
+    public final static String CHANNEL_AUDIO_IN_INFO = "info#audioIn";
+    public final static String CHANNEL_AUDIO_OUT_INFO = "info#audioOut";
+    public final static String CHANNEL_VIDEO_IN_INFO = "info#videoIn";
+    public final static String CHANNEL_VIDEO_OUT_INFO = "info#videoOut";
+
     // Used for Discovery service
     public static final String MANUFACTURER = "ONKYO";
     public static final String UPNP_DEVICE_TYPE = "MediaRenderer";

diff --git a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoParserHelper.java b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoParserHelper.java
new file mode 100644 (file)
index 0000000..a194660
--- /dev/null
+++ b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoParserHelper.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2010-2021 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.onkyo.internal;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.library.types.StringType;
+
+/**
+ * Helper to parse messages.
+ *
+ * @author Marcel Verpaalen - Initial contribution
+ */
+@NonNullByDefault
+public final class OnkyoParserHelper {
+
+    /**
+     * Slices the string, removing empty values
+     *
+     * @param data comma separated string
+     * @param startIndex initial index of the range to be copied
+     * @param endIndex final index of the range to be copied (inclusive)
+     * @return formatted StringType
+     */
+    public static StringType infoBuilder(String data, int startIndex, int endIndex) {
+        String[] params = data.split(",");
+        int toIndex = endIndex < params.length ? endIndex + 1 : params.length;
+        if (params.length >= startIndex) {
+            return new StringType(Stream.of(Arrays.copyOfRange(params, startIndex, toIndex))
+                    .filter(p -> p.trim().length() > 0).map(p -> p.trim()).collect(Collectors.joining(", ", "", "")));
+        }
+        return StringType.EMPTY;
+    }
+}

diff --git a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/eiscp/EiscpCommand.java b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/eiscp/EiscpCommand.java
index 41b1a8ab9bf0b9f93ec5c5cdba1f48ed8eeccb14..fa1ae61cd96f7797bb1369950c3a68bb2310f551 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/eiscp/EiscpCommand.java
+++ b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/eiscp/EiscpCommand.java
@@ -40,6 +40,8 @@ public enum EiscpCommand {
 
     AUDIOINFO("IFA", ""),
     AUDIOINFO_QUERY("IFA", "QSTN"),
+    VIDEOINFO("IFV", ""),
+    VIDEOINFO_QUERY("IFV", "QSTN"),
 
     SOURCE_UP("SLI", "UP"),
     SOURCE_DOWN("SLI", "DOWN"),

diff --git a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java
index 67fd63b00b7212cdfb7d9c7eb886128d95123636..cbf31f9742065c122425be0b71df8fd977790c4b 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java
+++ b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java
@@ -30,6 +30,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.openhab.binding.onkyo.internal.OnkyoAlbumArt;
 import org.openhab.binding.onkyo.internal.OnkyoConnection;
 import org.openhab.binding.onkyo.internal.OnkyoEventListener;
+import org.openhab.binding.onkyo.internal.OnkyoParserHelper;
 import org.openhab.binding.onkyo.internal.OnkyoStateDescriptionProvider;
 import org.openhab.binding.onkyo.internal.ServiceType;
 import org.openhab.binding.onkyo.internal.automation.modules.OnkyoThingActions;
@@ -120,9 +121,7 @@ public class OnkyoHandler extends UpnpAudioSinkHandler implements OnkyoEventList
             connection.openConnection();
             if (connection.isConnected()) {
                 updateStatus(ThingStatus.ONLINE);
-
-                sendCommand(EiscpCommand.INFO_QUERY);
-                sendCommand(EiscpCommand.AUDIOINFO_QUERY);
+                checkStatus();
             }
         });
 
@@ -330,6 +329,22 @@ public class OnkyoHandler extends UpnpAudioSinkHandler implements OnkyoEventList
                     sendCommand(EiscpCommand.AUDIOINFO_QUERY);
                 }
                 break;
+
+            /*
+             * MEDIA INFO
+             */
+            case CHANNEL_AUDIO_IN_INFO:
+            case CHANNEL_AUDIO_OUT_INFO:
+                if (command.equals(RefreshType.REFRESH)) {
+                    sendCommand(EiscpCommand.AUDIOINFO_QUERY);
+                }
+                break;
+            case CHANNEL_VIDEO_IN_INFO:
+            case CHANNEL_VIDEO_OUT_INFO:
+                if (command.equals(RefreshType.REFRESH)) {
+                    sendCommand(EiscpCommand.VIDEOINFO_QUERY);
+                }
+                break;
             /*
              * MISC
              */
@@ -485,6 +500,12 @@ public class OnkyoHandler extends UpnpAudioSinkHandler implements OnkyoEventList
                 case AUDIOINFO:
                     updateState(CHANNEL_AUDIOINFO, convertDeviceValueToOpenHabState(data.getValue(), StringType.class));
                     logger.debug("audioinfo message: '{}'", data.getValue());
+                    updateState(CHANNEL_AUDIO_IN_INFO, OnkyoParserHelper.infoBuilder(data.getValue(), 0, 2));
+                    updateState(CHANNEL_AUDIO_OUT_INFO, OnkyoParserHelper.infoBuilder(data.getValue(), 3, 5));
+                    break;
+                case VIDEOINFO:
+                    updateState(CHANNEL_VIDEO_IN_INFO, OnkyoParserHelper.infoBuilder(data.getValue(), 0, 3));
+                    updateState(CHANNEL_VIDEO_OUT_INFO, OnkyoParserHelper.infoBuilder(data.getValue(), 4, 7));
                     break;
                 case INFO:
                     processInfo(data.getValue());
@@ -806,6 +827,7 @@ public class OnkyoHandler extends UpnpAudioSinkHandler implements OnkyoEventList
             sendCommand(EiscpCommand.LISTEN_MODE_QUERY);
             sendCommand(EiscpCommand.INFO_QUERY);
             sendCommand(EiscpCommand.AUDIOINFO_QUERY);
+            sendCommand(EiscpCommand.VIDEOINFO_QUERY);
 
             if (isChannelAvailable(CHANNEL_POWERZONE2)) {
                 sendCommand(EiscpCommand.ZONE2_POWER_QUERY);

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties
index 208a6f92669b985a5c22b210aa2b86d4a2f44302..654c7f27a2d655b5e88e17910429296a1636fdba 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties
@@ -94,6 +94,7 @@ thing-type.config.onkyo.config.volumeScale.option.0.5 = 0-50
 
 # channel group types
 
+channel-group-type.onkyo.information.label = Audio & Video Info
 channel-group-type.onkyo.netMenuControls.label = Net/USB Menu
 channel-group-type.onkyo.netMenuControls.channel.item0.label = Menu Item 0
 channel-group-type.onkyo.netMenuControls.channel.item0.description = Net/USB menu item at position 0
@@ -130,6 +131,10 @@ channel-type.onkyo.albumArtUrl.label = Album Art Url
 channel-type.onkyo.albumArtUrl.description = Url to the image of cover art of the current song
 channel-type.onkyo.artist.label = Artist
 channel-type.onkyo.artist.description = Artist name of the current song
+channel-type.onkyo.audioIn.label = Audio Input Info
+channel-type.onkyo.audioIn.description = Audio Input Stream Information
+channel-type.onkyo.audioOut.label = Audio Output Info
+channel-type.onkyo.audioOut.description = Audio Output Stream Information
 channel-type.onkyo.audioinfo.label = Audio Info
 channel-type.onkyo.audioinfo.description = Detailed audio info
 channel-type.onkyo.control.label = Control
@@ -226,5 +231,9 @@ channel-type.onkyo.power.label = Power
 channel-type.onkyo.power.description = Power on/off your device
 channel-type.onkyo.title.label = Title
 channel-type.onkyo.title.description = Title of the current song
+channel-type.onkyo.videoIn.label = Video Input Info
+channel-type.onkyo.videoIn.description = Video Input Stream Information
+channel-type.onkyo.videoOut.label = Video Output Info
+channel-type.onkyo.videoOut.description = Video Output Stream Information
 channel-type.onkyo.volume.label = Volume
 channel-type.onkyo.volume.description = Volume of your device

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channel-groups.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channel-groups.xml
index 1c0df2383e37c51af01b1405caeec0757550e031..919636d9e0a38c0bbd2cca9860ee26a5f5471532 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channel-groups.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channel-groups.xml
@@ -101,4 +101,14 @@
                </channels>
        </channel-group-type>
 
+       <channel-group-type id="information">
+               <label>Audio &amp; Video Info</label>
+               <channels>
+                       <channel id="audioIn" typeId="audioIn"/>
+                       <channel id="audioOut" typeId="audioOut"/>
+                       <channel id="videoIn" typeId="videoIn"/>
+                       <channel id="videoOut" typeId="videoOut"/>
+               </channels>
+       </channel-group-type>
+
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channels.xml
index 505cf467f25bfa2c31b05e61b5958c1b43cb13d8..5ba983b94a65f0349c4ab38adec8125ce83f5a27 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/channels.xml
@@ -188,5 +188,29 @@
                <description>Position of the currently selected menu item</description>
                <state readOnly="true" pattern="%s"></state>
        </channel-type>
+       <channel-type id="audioIn" advanced="true">
+               <item-type>String</item-type>
+               <label>Audio Input Info</label>
+               <description>Audio Input Stream Information</description>
+               <state readOnly="true" pattern="%s"></state>
+       </channel-type>
+       <channel-type id="audioOut" advanced="true">
+               <item-type>String</item-type>
+               <label>Audio Output Info</label>
+               <description>Audio Output Stream Information</description>
+               <state readOnly="true" pattern="%s"></state>
+       </channel-type>
+       <channel-type id="videoIn" advanced="true">
+               <item-type>String</item-type>
+               <label>Video Input Info</label>
+               <description>Video Input Stream Information</description>
+               <state readOnly="true" pattern="%s"></state>
+       </channel-type>
+       <channel-type id="videoOut" advanced="true">
+               <item-type>String</item-type>
+               <label>Video Output Info</label>
+               <description>Video Output Stream Information</description>
+               <state readOnly="true" pattern="%s"></state>
+       </channel-type>
 
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/ht-rc560.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/ht-rc560.xml
index 9d6b1cb46a6ddcb2863aceb0b74981816e8eb9f5..93ec792d0f37b3072d64621c64586908f2d2427e 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/ht-rc560.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/ht-rc560.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoAVR.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoAVR.xml
index 556de328f7c8e93cce326f5eb10cd559e8518b91..baa96d474c18710be5d49712f983911c25b77929 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoAVR.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoAVR.xml
@@ -15,6 +15,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoUnsupported.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoUnsupported.xml
index 5ef600e688a9666c11144bc8cb936c9148aa4266..bfe7f5c46647a1cb1ea3d483f323fd22eb6450da 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoUnsupported.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/onkyoUnsupported.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone1Controls" id="zone1"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr3007.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr3007.xml
index 75c6437d8433b71ef65476ad8460d34888568376..4234733fa693bf5d39ef6bcb54c5decc2f5644b9 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr3007.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr3007.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr414.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr414.xml
index 3e6913fb71bf41194833a1fd70d451f6889a6ea4..835d87d2c884320966d92b2d9af8c3691de5b14f 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr414.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr414.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr474.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr474.xml
index b6f1d1a6041ba871844391145c1a05610a8cca96..658e4a7a8d9075013023a3f51cece51f24b601ff 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr474.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr474.xml
@@ -12,6 +12,7 @@
                        <channel-group typeId="zone1Controls" id="zone1"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr509.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr509.xml
index 65aa6f66af8e01890268fd27f4214158f05d9ec1..4d75f7071230edcff2f40666aa630b9e97a61d5f 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr509.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr509.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr515.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr515.xml
index 088a172b8d2184e2d88d17c4e2ff4eb1d289cf80..daf5e84ea751d5c79f8cf34e03a44f9e13d2fe46 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr515.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr515.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr525.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr525.xml
index 45ff4bc2acfc1c512993257047325614662d655d..e7d32538336c819e991ee786f0dcf464135611c6 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr525.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr525.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr535.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr535.xml
index bd29ac88e5a3fd82189c689d8a1c6a0d42654748..a80e4512d479906ef374530b4e8e6116b53bba31 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr535.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr535.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr545.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr545.xml
index b50e0c88f09303299bc52bfd025a5911e55d35bd..451f602ce0391face6bbd8bc3916e3da3602bd58 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr545.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr545.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr555.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr555.xml
index 2865b309c1fa210002bd41257dc2de06ca6c189f..b707c0bdd19c45d5ee3add8a9deeadc26ea0a924 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr555.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr555.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575.xml
index 5ec7af800d5c6828c8efea6b73aa97609f49c7e4..7a8346b7529ff5c4f10266cfa42f621ddfad844d 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575e.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575e.xml
index bfe837cf80bd36cd3626cf4e630e71d58d415e7d..3ef5592d215c66390ae8313d4894b6a530c4dfdc 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575e.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr575e.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr616.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr616.xml
index fc808e1149eac55e017764a5dec682e669158a70..8562a7195d30004ca37d4444ff4d8a884c4261da 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr616.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr616.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr626.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr626.xml
index ef0a088397f652aab9777981666842f5c3bafbf0..d62b7e4b2085c6fb860ee7974cc587af6b39273e 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr626.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr626.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr636.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr636.xml
index 758ff2e58564fb5ddc9d5da8480f13895d80713a..7911a117aead7b89a986440abcd354ed7de422ef 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr636.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr636.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr646.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr646.xml
index 13018e87c744d988ba325bcb63cb8e540a9d8772..1758eb29c447a6f22cad26262a7f19a90497911b 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr646.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr646.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr656.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr656.xml
index b555ff761d0084afdd28568f76d02facdac7d819..47a2a55102a60a0d4f2b19b381e787ccf1f85454 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr656.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr656.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr676.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr676.xml
index 1732a70b24917d1d31992ed54a60e138c629e5b2..aa3951e65ae1874d9b3c02da1f7795bc26a7368f 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr676.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr676.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr686.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr686.xml
index 72b35531b1a2db8738d6c7bf977d452dd98faba9..70007ccbb417b8da4202f31d3b7d616d9bdc742b 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr686.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr686.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr708.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr708.xml
index 26de65a9d12ee7fd8d89a5d0415b5cf2b80915f5..7df817ba616b03eb707c64c1e92599e086d276ca 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr708.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr708.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr717.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr717.xml
index a78297a4d01f401fd874aadb1d084a899f23635e..6028891d30a26906b679505a96091d9a35afcc76 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr717.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr717.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr727.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr727.xml
index b3fe2ba56d7212765edda161fb17fa0254e3c911..3bffde647b9eb8ab8e011eaacfb48ee9ea8030a8 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr727.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr727.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr737.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr737.xml
index 3dfb36053227e5b1e393da73bc657e5430f3226b..f9cb98f3a6a639ffaf776ff52eeb871a15ff6f55 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr737.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr737.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr747.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr747.xml
index 375661dc866792034310b9d37538c529a7b3e4f9..8c444fb1ea8106742223097e55ed0f836521aedd 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr747.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr747.xml
@@ -13,6 +13,7 @@
                        <channel-group typeId="zone2Controls" id="zone2"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr809.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr809.xml
index f7ace621d525c0d38275343baef557041f6824ed..404b34ee3d3b3f28cb806c5dc38e7436e6fd7507 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr809.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr809.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr818.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr818.xml
index 0e23b22485e60dd40bc09dca739961dff535e364..d06f7ce90806cfe0ac454ef8b713aff4f6393c15 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr818.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr818.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr828.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr828.xml
index fc3317abc3b2247aa0d6dba0c2db4ee44f95eb76..823f38f87c56db94ab879627a0b1fdc775d1c6d2 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr828.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr828.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr838.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr838.xml
index b48fef1f68963640e4d3e7b9b838f0298207a600..6e62f0eb92f7ca1a3210270c317ee9bc783d61b8 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr838.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-nr838.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>

diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-rz900.xml b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-rz900.xml
index 182dec795033818b8911851804b086a2bd3e2c71..edab080da87b1cd478aef311660b6cc0f1792238 100644 (file)
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-rz900.xml
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/thing/tx-rz900.xml
@@ -14,6 +14,7 @@
                        <channel-group typeId="zone3Controls" id="zone3"/>
                        <channel-group typeId="playerControls" id="player"/>
                        <channel-group typeId="netMenuControls" id="netmenu"/>
+                       <channel-group typeId="information" id="info"/>
                </channel-groups>
 
                <config-description-ref uri="thing-type:onkyo:config"/>