[rotel] Support of MKII models (#12522)

There is no difference between original and MKII models regarding
available inputs and way to control the device.

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

diff --git a/bundles/org.openhab.binding.rotel/README.md b/bundles/org.openhab.binding.rotel/README.md
index 2a48a6ec1fc7d34d12b98c95fabfca2ea22e4529..ed5fdf9d0d752ce4e5f289b764eb1b6159376867 100644 (file)
--- a/bundles/org.openhab.binding.rotel/README.md
+++ b/bundles/org.openhab.binding.rotel/README.md
@@ -28,52 +28,52 @@ The binding has been tested with a RSP-1066 and a RSP-1570.
 
 This binding supports the following thing types:
 
-| Thing Type | Description                                                   |
-|------------|---------------------------------------------------------------|
-| a11        | Connection to the Rotel A11 integrated amplifier              |
-| a12        | Connection to the Rotel A12 integrated amplifier              |
-| a14        | Connection to the Rotel A14 integrated amplifier              |
-| cd11       | Connection to the Rotel CD11 CD player                        |
-| cd14       | Connection to the Rotel CD14 CD player                        |
-| p5         | Connection to the Rotel Michi P5 stereo preamplifier          |
-| ra11       | Connection to the Rotel RA-11 integrated amplifier            |
-| ra12       | Connection to the Rotel RA-12 integrated amplifier            |
-| ra1570     | Connection to the Rotel RA-1570 integrated amplifier          |
-| ra1572     | Connection to the Rotel RA-1572 integrated amplifier          |
-| ra1592     | Connection to the Rotel RA-1592 integrated amplifier          |
-| rap1580    | Connection to the Rotel RAP-1580 surround amplified processor |
-| rc1570     | Connection to the Rotel RC-1570 stereo preamplifier           |
-| rc1572     | Connection to the Rotel RC-1572 stereo preamplifier           |
-| rc1590     | Connection to the Rotel RC-1590 stereo preamplifier           |
-| rcd1570    | Connection to the Rotel RCD-1570 CD player                    |
-| rcd1572    | Connection to the Rotel RCD-1572 CD player                    |
-| rcx1500    | Connection to the Rotel RCX-1500 stereo receiver              |
-| rdd1580    | Connection to the Rotel RDD-1580 stereo DAC                   |
-| rdg1520    | Connection to the Rotel RDG-1520 tuner                        |
-| rsp1066    | Connection to the Rotel RSP-1066 surround processor           |
-| rsp1068    | Connection to the Rotel RSP-1068 surround processor           |
-| rsp1069    | Connection to the Rotel RSP-1069 surround processor           |
-| rsp1098    | Connection to the Rotel RSP-1098 surround processor           |
-| rsp1570    | Connection to the Rotel RSP-1570 surround processor           |
-| rsp1572    | Connection to the Rotel RSP-1572 surround processor           |
-| rsp1576    | Connection to the Rotel RSP-1576 surround processor           |
-| rsp1582    | Connection to the Rotel RSP-1582 surround processor           |
-| rsx1055    | Connection to the Rotel RSX-1055 surround receiver            |
-| rsx1056    | Connection to the Rotel RSX-1056 surround receiver            |
-| rsx1057    | Connection to the Rotel RSX-1057 surround receiver            |
-| rsx1058    | Connection to the Rotel RSX-1058 surround receiver            |
-| rsx1065    | Connection to the Rotel RSX-1065 surround receiver            |
-| rsx1067    | Connection to the Rotel RSX-1067 surround receiver            |
-| rsx1550    | Connection to the Rotel RSX-1550 surround receiver            |
-| rsx1560    | Connection to the Rotel RSX-1560 surround receiver            |
-| rsx1562    | Connection to the Rotel RSX-1562 surround receiver            |
-| rt09       | Connection to the Rotel RT-09 tuner                           |
-| rt11       | Connection to the Rotel RT-11 tuner                           |
-| rt1570     | Connection to the Rotel RT-1570 tuner                         |
-| t11        | Connection to the Rotel T11 tuner                             |
-| t14        | Connection to the Rotel T14 tuner                             |
-| x3         | Connection to the Rotel Michi X3 integrated amplifier         |
-| x5         | Connection to the Rotel Michi X5 integrated amplifier         |
+| Thing Type | Description                                                                   |
+|------------|-------------------------------------------------------------------------------|
+| a11        | Connection to the Rotel A11 integrated amplifier                              |
+| a12        | Connection to the Rotel A12 or A12MKII integrated amplifier                   |
+| a14        | Connection to the Rotel A14 or A14MKII integrated amplifier                   |
+| cd11       | Connection to the Rotel CD11 CD player                                        |
+| cd14       | Connection to the Rotel CD14 or CD14MKII CD player                            |
+| p5         | Connection to the Rotel Michi P5 stereo preamplifier                          |
+| ra11       | Connection to the Rotel RA-11 integrated amplifier                            |
+| ra12       | Connection to the Rotel RA-12 integrated amplifier                            |
+| ra1570     | Connection to the Rotel RA-1570 integrated amplifier                          |
+| ra1572     | Connection to the Rotel RA-1572 or RA-1572MKII integrated amplifier           |
+| ra1592     | Connection to the Rotel RA-1592 or RA-1592MKII integrated amplifier           |
+| rap1580    | Connection to the Rotel RAP-1580 or RAP-1580MKII surround amplified processor |
+| rc1570     | Connection to the Rotel RC-1570 stereo preamplifier                           |
+| rc1572     | Connection to the Rotel RC-1572 or RC-1572MKII stereo preamplifier            |
+| rc1590     | Connection to the Rotel RC-1590 or RC-1590MKII stereo preamplifier            |
+| rcd1570    | Connection to the Rotel RCD-1570 CD player                                    |
+| rcd1572    | Connection to the Rotel RCD-1572 or RCD-1572MKII CD player                    |
+| rcx1500    | Connection to the Rotel RCX-1500 stereo receiver                              |
+| rdd1580    | Connection to the Rotel RDD-1580 stereo DAC                                   |
+| rdg1520    | Connection to the Rotel RDG-1520 tuner                                        |
+| rsp1066    | Connection to the Rotel RSP-1066 surround processor                           |
+| rsp1068    | Connection to the Rotel RSP-1068 surround processor                           |
+| rsp1069    | Connection to the Rotel RSP-1069 surround processor                           |
+| rsp1098    | Connection to the Rotel RSP-1098 surround processor                           |
+| rsp1570    | Connection to the Rotel RSP-1570 surround processor                           |
+| rsp1572    | Connection to the Rotel RSP-1572 surround processor                           |
+| rsp1576    | Connection to the Rotel RSP-1576 or RSP-1576MKII surround processor           |
+| rsp1582    | Connection to the Rotel RSP-1582 surround processor                           |
+| rsx1055    | Connection to the Rotel RSX-1055 surround receiver                            |
+| rsx1056    | Connection to the Rotel RSX-1056 surround receiver                            |
+| rsx1057    | Connection to the Rotel RSX-1057 surround receiver                            |
+| rsx1058    | Connection to the Rotel RSX-1058 surround receiver                            |
+| rsx1065    | Connection to the Rotel RSX-1065 surround receiver                            |
+| rsx1067    | Connection to the Rotel RSX-1067 surround receiver                            |
+| rsx1550    | Connection to the Rotel RSX-1550 surround receiver                            |
+| rsx1560    | Connection to the Rotel RSX-1560 surround receiver                            |
+| rsx1562    | Connection to the Rotel RSX-1562 surround receiver                            |
+| rt09       | Connection to the Rotel RT-09 tuner                                           |
+| rt11       | Connection to the Rotel RT-11 tuner                                           |
+| rt1570     | Connection to the Rotel RT-1570 tuner                                         |
+| t11        | Connection to the Rotel T11 tuner                                             |
+| t14        | Connection to the Rotel T14 tuner                                             |
+| x3         | Connection to the Rotel Michi X3 integrated amplifier                         |
+| x5         | Connection to the Rotel Michi X5 integrated amplifier                         |
 
 ## Discovery
 

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties
index 2af3cf7a4eb9fd06d6de2541d13c010a5e0c8d20..8378a5c352b75228578674b93554969f8ab28f55 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties
@@ -8,13 +8,13 @@ binding.rotel.description = The Rotel binding controls a Rotel audio device like
 thing-type.rotel.a11.label = A11 Integrated Amplifier
 thing-type.rotel.a11.description = Connection to the Rotel A11 integrated amplifier
 thing-type.rotel.a12.label = A12 Integrated Amplifier
-thing-type.rotel.a12.description = Connection to the Rotel A12 integrated amplifier
+thing-type.rotel.a12.description = Connection to the Rotel A12 or A12MKII integrated amplifier
 thing-type.rotel.a14.label = A14 Integrated Amplifier
-thing-type.rotel.a14.description = Connection to the Rotel A14 integrated amplifier
+thing-type.rotel.a14.description = Connection to the Rotel A14 or A14MKII integrated amplifier
 thing-type.rotel.cd11.label = CD11 CD Player
 thing-type.rotel.cd11.description = Connection to the Rotel CD11 CD player
 thing-type.rotel.cd14.label = CD14 CD Player
-thing-type.rotel.cd14.description = Connection to the Rotel CD14 CD player
+thing-type.rotel.cd14.description = Connection to the Rotel CD14 or CD14MKII CD player
 thing-type.rotel.p5.label = P5 Stereo Preamplifier
 thing-type.rotel.p5.description = Connection to the Rotel Michi P5 stereo preamplifier
 thing-type.rotel.ra11.label = RA-11 Integrated Amplifier
@@ -24,21 +24,21 @@ thing-type.rotel.ra12.description = Connection to the Rotel RA-12 integrated amp
 thing-type.rotel.ra1570.label = RA-1570 Integrated Amplifier
 thing-type.rotel.ra1570.description = Connection to the Rotel RA-1570 integrated amplifier
 thing-type.rotel.ra1572.label = RA-1572 Integrated Amplifier
-thing-type.rotel.ra1572.description = Connection to the Rotel RA-1572 integrated amplifier
+thing-type.rotel.ra1572.description = Connection to the Rotel RA-1572 or RA-1572MKII integrated amplifier
 thing-type.rotel.ra1592.label = RA-1592 Integrated Amplifier
-thing-type.rotel.ra1592.description = Connection to the Rotel RA-1592 integrated amplifier
+thing-type.rotel.ra1592.description = Connection to the Rotel RA-1592 or RA-1592MKII integrated amplifier
 thing-type.rotel.rap1580.label = RAP-1580 Surround Amplified Processor
-thing-type.rotel.rap1580.description = Connection to the Rotel RAP-1580 surround amplified processor
+thing-type.rotel.rap1580.description = Connection to the Rotel RAP-1580 or RAP-1580MKII surround amplified processor
 thing-type.rotel.rc1570.label = RC-1570 Stereo Preamplifier
 thing-type.rotel.rc1570.description = Connection to the Rotel RC-1570 stereo preamplifier
 thing-type.rotel.rc1572.label = RC-1572 Stereo Preamplifier
-thing-type.rotel.rc1572.description = Connection to the Rotel RC-1572 stereo preamplifier
+thing-type.rotel.rc1572.description = Connection to the Rotel RC-1572 or RC-1572MKII stereo preamplifier
 thing-type.rotel.rc1590.label = RC-1590 Stereo Preamplifier
-thing-type.rotel.rc1590.description = Connection to the Rotel RC-1590 stereo preamplifier
+thing-type.rotel.rc1590.description = Connection to the Rotel RC-1590 or RC-1590MKII stereo preamplifier
 thing-type.rotel.rcd1570.label = RCD-1570 CD Player
 thing-type.rotel.rcd1570.description = Connection to the Rotel RCD-1570 CD player
 thing-type.rotel.rcd1572.label = RCD-1572 CD Player
-thing-type.rotel.rcd1572.description = Connection to the Rotel RCD-1572 CD player
+thing-type.rotel.rcd1572.description = Connection to the Rotel RCD-1572 or RCD-1572MKII CD player
 thing-type.rotel.rcx1500.label = RCX-1500 Stereo Receiver
 thing-type.rotel.rcx1500.description = Connection to the Rotel RCX-1500 stereo receiver
 thing-type.rotel.rdd1580.label = RDD-1580 Stereo DAC
@@ -58,7 +58,7 @@ thing-type.rotel.rsp1570.description = Connection to the Rotel RSP-1570 surround
 thing-type.rotel.rsp1572.label = RSP-1572 Surround Processor
 thing-type.rotel.rsp1572.description = Connection to the Rotel RSP-1572 surround processor
 thing-type.rotel.rsp1576.label = RSP-1576 Surround Processor
-thing-type.rotel.rsp1576.description = Connection to the Rotel RSP-1576 surround processor
+thing-type.rotel.rsp1576.description = Connection to the Rotel RSP-1576 or RSP-1576MKII surround processor
 thing-type.rotel.rsp1582.label = RSP-1582 Surround Processor
 thing-type.rotel.rsp1582.description = Connection to the Rotel RSP-1582 surround processor
 thing-type.rotel.rsx1055.label = RSX-1055 Surround Receiver

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a12.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a12.xml
index ba667de6411f1d381e3fe8c95bd7c43c57dbe6f6..441fcc8b6b024d22cc468b5167d5ffa712af3af0 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a12.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a12.xml
@@ -7,7 +7,7 @@
        <!-- Rotel A12 Connection Thing Type -->
        <thing-type id="a12">
                <label>A12 Integrated Amplifier</label>
-               <description>Connection to the Rotel A12 integrated amplifier</description>
+               <description>Connection to the Rotel A12 or A12MKII integrated amplifier</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a14.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a14.xml
index 23a41ad3924f35b25e24ae3885b09f37cd04df02..0260bcd6a02e1dcb7da67dc8d9e214f331f8b6c0 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a14.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/a14.xml
@@ -7,7 +7,7 @@
        <!-- Rotel A14 Connection Thing Type -->
        <thing-type id="a14">
                <label>A14 Integrated Amplifier</label>
-               <description>Connection to the Rotel A14 integrated amplifier</description>
+               <description>Connection to the Rotel A14 or A14MKII integrated amplifier</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/cd14.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/cd14.xml
index fccc0d71f5651bbeaa10f52840644a8241ab3651..4d0a2b907932928ecb9d48fcfa9e5e7179f33f2d 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/cd14.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/cd14.xml
@@ -7,7 +7,7 @@
        <!-- Rotel CD14 Connection Thing Type -->
        <thing-type id="cd14">
                <label>CD14 CD Player</label>
-               <description>Connection to the Rotel CD14 CD player</description>
+               <description>Connection to the Rotel CD14 or CD14MKII CD player</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1572.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1572.xml
index 8bfbf0730843b411805fb3e28fc967f64565394a..cc84c5b1187515785b20a0e5d2e74fc991eb55a3 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1572.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1572.xml
@@ -7,7 +7,7 @@
        <!-- Rotel RA-1572 Connection Thing Type -->
        <thing-type id="ra1572">
                <label>RA-1572 Integrated Amplifier</label>
-               <description>Connection to the Rotel RA-1572 integrated amplifier</description>
+               <description>Connection to the Rotel RA-1572 or RA-1572MKII integrated amplifier</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1592.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1592.xml
index bb431ee2af76e0191b1435beeb3b3f786ea218d8..ce0f67139a1548cc693eb1817fcebec731c4c476 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1592.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/ra1592.xml
@@ -7,7 +7,7 @@
        <!-- Rotel RA-1592 Connection Thing Type -->
        <thing-type id="ra1592">
                <label>RA-1592 Integrated Amplifier</label>
-               <description>Connection to the Rotel RA-1592 integrated amplifier</description>
+               <description>Connection to the Rotel RA-1592 or RA-1592MKII integrated amplifier</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rap1580.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rap1580.xml
index c6d942947ba1535abda00b2a86029a8f3fe7119b..bbcb59c3eceab2bd08622db2e2678757eb52f5c4 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rap1580.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rap1580.xml
@@ -7,7 +7,7 @@
        <!-- Rotel RAP-1580 Connection Thing Type -->
        <thing-type id="rap1580">
                <label>RAP-1580 Surround Amplified Processor</label>
-               <description>Connection to the Rotel RAP-1580 surround amplified processor</description>
+               <description>Connection to the Rotel RAP-1580 or RAP-1580MKII surround amplified processor</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1572.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1572.xml
index 09e66055a040d9f49081d4cbb60921f9d3609c03..466f3e4cf7effbcb22f7be07d41b6bd5620d0474 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1572.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1572.xml
@@ -7,7 +7,7 @@
        <!-- Rotel RC-1572 Connection Thing Type -->
        <thing-type id="rc1572">
                <label>RC-1572 Stereo Preamplifier</label>
-               <description>Connection to the Rotel RC-1572 stereo preamplifier</description>
+               <description>Connection to the Rotel RC-1572 or RC-1572MKII stereo preamplifier</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1590.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1590.xml
index 75c24867f26bab4e99308879367d9205d3e46dc2..b14453c2ca8c7c287ccd40d406c8967834bec15e 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1590.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rc1590.xml
@@ -7,7 +7,7 @@
        <!-- Rotel RC-1590 Connection Thing Type -->
        <thing-type id="rc1590">
                <label>RC-1590 Stereo Preamplifier</label>
-               <description>Connection to the Rotel RC-1590 stereo preamplifier</description>
+               <description>Connection to the Rotel RC-1590 or RC-1590MKII stereo preamplifier</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rcd1572.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rcd1572.xml
index 365700812ed5535bd1a5820031a4957d17edbb53..34932be3e25aafdd1054214519438c15826b0aaa 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rcd1572.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rcd1572.xml
@@ -7,7 +7,7 @@
        <!-- Rotel RCD-1572 Connection Thing Type -->
        <thing-type id="rcd1572">
                <label>RCD-1572 CD Player</label>
-               <description>Connection to the Rotel RCD-1572 CD player</description>
+               <description>Connection to the Rotel RCD-1572 or RCD-1572MKII CD player</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rsp1576.xml b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rsp1576.xml
index 30db04ead9036399cbe7441eead920ddcd28a0e6..fcee522fd6e58f66349b6952930f281f181902c7 100644 (file)
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rsp1576.xml
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/thing/rsp1576.xml
@@ -7,7 +7,7 @@
        <!-- Rotel RSP-1576 Connection Thing Type -->
        <thing-type id="rsp1576">
                <label>RSP-1576 Surround Processor</label>
-               <description>Connection to the Rotel RSP-1576 surround processor</description>
+               <description>Connection to the Rotel RSP-1576 or RSP-1576MKII surround processor</description>
 
                <channels>
                        <channel id="power" typeId="system.power"/>