[rotel] Add support for RC-1590 with firmware >= 1.40 (openhab#7946)

Signed-off-by: Laurent Garnier <[email protected]>
andrewfg · Aug 31, 2020 · 580d9d0 · 580d9d0
1 parent 109778c
commit 580d9d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/bundles/org.openhab.binding.rotel/README.md b/bundles/org.openhab.binding.rotel/README.md
@@ -107,12 +107,13 @@ The thing requires the following configuration parameters:
 All things have the following parameters: serialPort, host and port.
 Some have additional parameters listed in the next table:
 
-| Thing Type | Parameters available in addition to serialPort, host and port |
-|------------|---------------------------------------------------------------|
-| ra1572     | protocol (ASCII_V2 by default)                                |
-| ra1592     | protocol (ASCII_V2 by default)                                |
-| rc1572     | protocol (ASCII_V2 by default)                                |
-| rcd1572    | protocol (ASCII_V2 by default)                                |
+| Thing Type | Parameters available in addition to serialPort, host and port   |
+|------------|-----------------------------------------------------------------|
+| ra1572     | protocol (ASCII_V2 by default); as of firmware V2.65, select V2 |
+| ra1592     | protocol (ASCII_V2 by default); as of firmware V1.53, select V2 |
+| rc1572     | protocol (ASCII_V2 by default); as of firmware V2.65, select V2 |
+| rc1590     | protocol (ASCII_V2 by default); as of firmware V1.40, select V2 |
+| rcd1572    | protocol (ASCII_V2 by default); as of firmware V2.33, select V2 |
 | rsp1066    | inputLabelVideo1, inputLabelVideo2, inputLabelVideo3, inputLabelVideo4, inputLabelVideo5 |
 | rsp1068    | inputLabelCd, inputLabelTuner, inputLabelTape, inputLabelVideo1, inputLabelVideo2, inputLabelVideo3, inputLabelVideo4, inputLabelVideo5 |
 | rsp1069    | inputLabelCd, inputLabelTuner, inputLabelTape, inputLabelVideo1, inputLabelVideo2, inputLabelVideo3, inputLabelVideo4, inputLabelVideo5 |

diff --git a/...rg.openhab.binding.rotel/src/main/java/org/openhab/binding/rotel/internal/RotelModel.java b/...rg.openhab.binding.rotel/src/main/java/org/openhab/binding/rotel/internal/RotelModel.java
@@ -76,7 +76,7 @@ public enum RotelModel {
             RotelConnector.NO_SPECIAL_CHARACTERS),
     RC1570("RC-1570", 115200, 7, 96, true, 10, true, -1, true, false, 6, 0, RotelConnector.SPECIAL_CHARACTERS),
     RC1572("RC-1572", 115200, 8, 96, true, 10, false, -1, true, true, 6, 0, RotelConnector.SPECIAL_CHARACTERS),
-    RC1590("RC-1590", 115200, 9, 96, true, 10, false, -1, true, false, 6, 0, RotelConnector.SPECIAL_CHARACTERS),
+    RC1590("RC-1590", 115200, 9, 96, true, 10, false, -1, true, true, 6, 0, RotelConnector.SPECIAL_CHARACTERS),
     RCD1570("RCD-1570", 115200, 0, null, false, null, true, -1, false, true, 6, 0, RotelConnector.SPECIAL_CHARACTERS),
     RCD1572("RCD-1572", 57600, 0, null, false, null, true, -1, false, true, 6, 0,
             RotelConnector.SPECIAL_CHARACTERS_RCD1572),

diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/ESH-INF/thing/rc1590.xml b/bundles/org.openhab.binding.rotel/src/main/resources/ESH-INF/thing/rc1590.xml
@@ -20,11 +20,7 @@
 			<channel id="brightness" typeId="brightness"/>
 		</channels>
 
-		<properties>
-			<property name="protocol">ASCII_V1</property>
-		</properties>
-
-		<config-description-ref uri="thing-type:rotel:serialandip"/>
+		<config-description-ref uri="thing-type:rotel:serialandipandprotocol"/>
 	</thing-type>
 
 </thing:thing-descriptions>