From da06f63922b868722bc78d7c26ab37eed4b05dbc Mon Sep 17 00:00:00 2001
From: James Hewitt <james.hewitt@uk.ibm.com>
Date: Wed, 9 Jun 2021 11:08:47 +0100
Subject: [PATCH] [rfxcom] New sub types for undecoded messages

New subtypes have been added to the firmware, these are taken from the
RFXtrx SDK documentation.

Signed-off-by: James Hewitt <james.hewitt@uk.ibm.com>
---
 bundles/org.openhab.binding.rfxcom/README.md                | 5 ++++-
 .../rfxcom/internal/messages/RFXComUndecodedRFMessage.java  | 6 +++++-
 .../src/main/resources/OH-INF/thing/undecoded.xml           | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.binding.rfxcom/README.md b/bundles/org.openhab.binding.rfxcom/README.md
index dad5c651661b5..d354679622a57 100644
--- a/bundles/org.openhab.binding.rfxcom/README.md
+++ b/bundles/org.openhab.binding.rfxcom/README.md
@@ -1210,7 +1210,10 @@ Any messages that RFXCOM can receive but not decode.
         *   RTS - RTS
         *   SELECT\_PLUS - Select Plus
         *   HOME\_CONFORT - Home Confort
-
+        *   EDISIO - Edisio
+        *   HONEYWELL - Honeywell
+        *   FUNKBUS - Gira Funk-Bussystem
+        *   BYRONSX - Byron SX
 
 ### uv - RFXCOM UV/Temperature Sensor
 
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComUndecodedRFMessage.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComUndecodedRFMessage.java
index 9c3b577cdb816..456510707913e 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComUndecodedRFMessage.java
+++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComUndecodedRFMessage.java
@@ -59,6 +59,10 @@ public enum SubType implements ByteEnumWrapper {
         RTS(0x14),
         SELECT_PLUS(0x15),
         HOME_CONFORT(0x16),
+        EDISIO(0x17),
+        HONEYWELL(0x18),
+        FUNKBUS(0x19),
+        BYRONSX(0x1A),
 
         UNKNOWN(0xFF);
 
@@ -85,7 +89,7 @@ public static SubType fromByte(int input) {
     }
 
     public SubType subType;
-    public byte[] rawPayload = new byte[0];
+    public byte[] rawPayload;
 
     public RFXComUndecodedRFMessage() {
         super(UNDECODED_RF_MESSAGE);
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/undecoded.xml b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/undecoded.xml
index 4cf5b787d3ee3..7510fc274b0b9 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/undecoded.xml
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/undecoded.xml
@@ -52,6 +52,10 @@
 					<option value="RTS">RTS</option>
 					<option value="SELECT_PLUS">Select Plus</option>
 					<option value="HOME_CONFORT">Home Confort</option>
+					<option value="EDISIO">Edisio</option>
+					<option value="HONEYWELL">Honeywell</option>
+					<option value="FUNKBUS">Gira Funk-Bussystem</option>
+					<option value="BYRONSX">Byron SX</option>
 				</options>
 			</parameter>
 		</config-description>