From 71011b2431c1df5b75e7181302be9c27a610312d Mon Sep 17 00:00:00 2001
From: Martin van Wingerden <martin@martinvw.nl>
Date: Thu, 13 Jan 2022 14:12:19 +0100
Subject: [PATCH] [rfxcom] Updates / small fixes (#12037)

* [rfxcom] Updates / small fixes

Added support for:
 - CHIME - Alfawise, dBell
 - HUMIDITY - HUM3 - Inovalley S80 plant humidity sensor
 - LIGHTING1 - Oase Inscenio FM Master

Fixes #10251

Signed-off-by: Martin van Wingerden <martin@martinvw.nl>
---
 bundles/org.openhab.binding.rfxcom/README.md  | 37 ++++++++++---------
 .../internal/messages/RFXComChimeMessage.java |  5 ++-
 .../messages/RFXComLighting1Message.java      |  3 +-
 .../resources/OH-INF/i18n/rfxcom.properties   |  3 ++
 .../main/resources/OH-INF/thing/channels.xml  |  2 +-
 .../src/main/resources/OH-INF/thing/chime.xml |  3 +-
 .../main/resources/OH-INF/thing/humidity.xml  |  1 +
 .../main/resources/OH-INF/thing/lighting1.xml |  1 +
 8 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/bundles/org.openhab.binding.rfxcom/README.md b/bundles/org.openhab.binding.rfxcom/README.md
index 2931b23fb..a931a3781 100644
--- a/bundles/org.openhab.binding.rfxcom/README.md
+++ b/bundles/org.openhab.binding.rfxcom/README.md
@@ -324,11 +324,12 @@ A Chime device
 *   subType - Sub Type
     *   Specifies device sub type.
 
-        *   BYRONSX - Byron SX
-        *   BYRONMP001 - Byron MP001
-        *   SELECTPLUS - SelectPlus
-        *   SELECTPLUS3 - SelectPlus3
-        *   ENVIVO - Envivo
+        * BYRONSX - Byron SX
+        * BYRONMP001 - Byron MP001
+        * SELECTPLUS - SelectPlus
+        * SELECTPLUS3 - SelectPlus3
+        * ENVIVO - Envivo
+        * ALFAWISE_DBELL - Alfawise, dBell
 
 
 ### current - RFXCOM Current Sensor
@@ -609,6 +610,7 @@ A Humidity device
 
         *   HUM1 - LaCrosse TX3
         *   HUM2 - LaCrosse WS2300
+        *   HUM3 - Inovalley S80 plant humidity sensor
 
 
 ### lighting1 - RFXCOM Lighting1 Actuator
@@ -642,18 +644,19 @@ A Lighting1 device
 *   subType - Sub Type
     *   Specifies device sub type.
 
-        *   X10 - X10 lighting
-        *   ARC - ARC
-        *   AB400D - ELRO AB400D (Flamingo)
-        *   WAVEMAN - Waveman
-        *   EMW200 - Chacon EMW200
-        *   IMPULS - IMPULS
-        *   RISINGSUN - RisingSun
-        *   PHILIPS - Philips SBC
-        *   ENERGENIE - Energenie ENER010
-        *   ENERGENIE\_5 - Energenie 5-gang
-        *   COCO - COCO GDR2-2000R
-        *   HQ\_COCO20 - HQ COCO-20
+        * X10 - X10 lighting
+        * ARC - ARC
+        * AB400D - ELRO AB400D (Flamingo)
+        * WAVEMAN - Waveman
+        * EMW200 - Chacon EMW200
+        * IMPULS - IMPULS
+        * RISINGSUN - RisingSun
+        * PHILIPS - Philips SBC
+        * ENERGENIE - Energenie ENER010
+        * ENERGENIE\_5 - Energenie 5-gang
+        * COCO - COCO GDR2-2000R
+        * HQ\_COCO20 - HQ COCO-20
+        * OASE_INSCENIO_FM_N - Oase Inscenio FM Master
 
 
 ### lighting2 - RFXCOM Lighting2 Actuator
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComChimeMessage.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComChimeMessage.java
index 4f16ac033..e4c2f04da 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComChimeMessage.java
+++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComChimeMessage.java
@@ -37,7 +37,8 @@ public class RFXComChimeMessage extends RFXComDeviceMessageImpl<RFXComChimeMessa
         BYRONMP001(1),
         SELECTPLUS(2),
         SELECTPLUS3(3),
-        ENVIVO(4);
+        ENVIVO(4),
+        ALFAWISE_DBELL(5);
 
         private final int subType;
 
@@ -91,6 +92,7 @@ public class RFXComChimeMessage extends RFXComDeviceMessageImpl<RFXComChimeMessa
             case SELECTPLUS:
             case SELECTPLUS3:
             case ENVIVO:
+            case ALFAWISE_DBELL:
                 sensorId = (data[4] & 0xFF) << 16 | (data[5] & 0xFF) << 8 | (data[6] & 0xFF);
                 chimeSound = 1;
                 break;
@@ -118,6 +120,7 @@ public class RFXComChimeMessage extends RFXComDeviceMessageImpl<RFXComChimeMessa
             case SELECTPLUS:
             case SELECTPLUS3:
             case ENVIVO:
+            case ALFAWISE_DBELL:
                 data[4] = (byte) ((sensorId & 0xFF0000) >> 16);
                 data[5] = (byte) ((sensorId & 0x00FF00) >> 8);
                 data[6] = (byte) ((sensorId & 0x0000FF));
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting1Message.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting1Message.java
index 27b6b0d54..b839ab8d6 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting1Message.java
+++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting1Message.java
@@ -49,7 +49,8 @@ public class RFXComLighting1Message extends RFXComDeviceMessageImpl<RFXComLighti
         ENERGENIE(8),
         ENERGENIE_5(9),
         COCO(10),
-        HQ_COCO20(11);
+        HQ_COCO20(11),
+        OASE_INSCENIO_FM_N(12);
 
         private final int subType;
 
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
index 6afa47eb0..90f7bf962 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
@@ -119,6 +119,7 @@ thing-type.config.rfxcom.chime.subType.option.BYRONMP001 = Byron MP001
 thing-type.config.rfxcom.chime.subType.option.SELECTPLUS = SelectPlus
 thing-type.config.rfxcom.chime.subType.option.SELECTPLUS3 = SelectPlus3
 thing-type.config.rfxcom.chime.subType.option.ENVIVO = Envivo
+thing-type.config.rfxcom.chime.subType.option.ALFAWISE_DBELL = Alfawise, dBell
 thing-type.config.rfxcom.current.deviceId.description = Sensor Id. Example 5693
 thing-type.config.rfxcom.current.subType.option.ELEC1 = CM113
 thing-type.config.rfxcom.currentenergy.deviceId.description = Sensor Id. Example 47104
@@ -162,6 +163,7 @@ thing-type.config.rfxcom.homeconfort.deviceId.description = Device Id. Unit ID +
 thing-type.config.rfxcom.humidity.deviceId.description = Sensor Id. Example 5693
 thing-type.config.rfxcom.humidity.subType.option.HUM1 = LaCrosse TX3
 thing-type.config.rfxcom.humidity.subType.option.HUM2 = LaCrosse WS2300
+thing-type.config.rfxcom.humidity.subType.option.HUM3 = Inovalley S80 plant humidity sensor
 thing-type.config.rfxcom.lighting1.deviceId.description = Device Id. House code + unit code, separated by dot. Example A.1
 thing-type.config.rfxcom.lighting1.subType.option.X10 = X10 lighting
 thing-type.config.rfxcom.lighting1.subType.option.ARC = ARC
@@ -175,6 +177,7 @@ thing-type.config.rfxcom.lighting1.subType.option.ENERGENIE = Energenie ENER010
 thing-type.config.rfxcom.lighting1.subType.option.ENERGENIE_5 = Energenie 5-gang
 thing-type.config.rfxcom.lighting1.subType.option.COCO = COCO GDR2-2000R
 thing-type.config.rfxcom.lighting1.subType.option.HQ_COCO20 = HQ COCO-20
+thing-type.config.rfxcom.lighting1.subType.option.OASE_INSCENIO_FM_N = Oase Inscenio FM Master
 thing-type.config.rfxcom.lighting2.deviceId.description = Remote/switch/unit Id + unit code, separated by dot. Example 8773718.10
 thing-type.config.rfxcom.lighting2.subType.option.AC = AC
 thing-type.config.rfxcom.lighting2.subType.option.HOME_EASY_EU = HomeEasy EU
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/channels.xml
index e7eb71502..b656fd395 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/channels.xml
@@ -173,7 +173,7 @@
 		<item-type>Number</item-type>
 		<label>Total Usage</label>
 		<description>Used energy in Watt hours</description>
-		<state pattern="%d Wh" readOnly="true"></state>
+		<state pattern="%.2f Wh" readOnly="true"></state>
 	</channel-type>
 
 	<channel-type id="instantamp" advanced="true">
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/chime.xml b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/chime.xml
index c3df94df5..e54f8e084 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/chime.xml
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/chime.xml
@@ -29,11 +29,12 @@
 				<label>@text/config.subType.label</label>
 				<description>@text/config.subType.description</description>
 				<options>
+					<option value="ALFAWISE_DBELL">Alfawise, dBell</option>
 					<option value="BYRONSX">Byron SX</option>
 					<option value="BYRONMP001">Byron MP001</option>
+					<option value="ENVIVO">Envivo</option>
 					<option value="SELECTPLUS">SelectPlus</option>
 					<option value="SELECTPLUS3">SelectPlus3</option>
-					<option value="ENVIVO">Envivo</option>
 				</options>
 			</parameter>
 		</config-description>
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/humidity.xml b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/humidity.xml
index 6ac206868..a5783e30a 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/humidity.xml
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/humidity.xml
@@ -34,6 +34,7 @@
 				<options>
 					<option value="HUM1">LaCrosse TX3</option>
 					<option value="HUM2">LaCrosse WS2300</option>
+					<option value="HUM3">Inovalley S80 plant humidity sensor</option>
 				</options>
 			</parameter>
 		</config-description>
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/lighting1.xml b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/lighting1.xml
index 539e22030..f8f556b90 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/lighting1.xml
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/lighting1.xml
@@ -44,6 +44,7 @@
 					<option value="ENERGENIE_5">Energenie 5-gang</option>
 					<option value="COCO">COCO GDR2-2000R</option>
 					<option value="HQ_COCO20">HQ COCO-20</option>
+					<option value="OASE_INSCENIO_FM_N">Oase Inscenio FM Master</option>
 				</options>
 			</parameter>
 		</config-description>