[miio] add support for Mi Smart Humidifer S (deerma.humidifier.jsqs) (#11687)

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

diff --git a/bundles/org.openhab.binding.miio/README.md b/bundles/org.openhab.binding.miio/README.md
index 59695ffb2719653b8d743cc0dee099a88c33beb8..21d711a5d37296ca3bf277698c44dfb73c86ddc1 100644 (file)
--- a/bundles/org.openhab.binding.miio/README.md
+++ b/bundles/org.openhab.binding.miio/README.md
@@ -206,6 +206,7 @@ Currently the miio binding supports more than 300 different models.
 | Mi Smart Antibacterial Humidifier | miio:basic       | [deerma.humidifier.jsq](#deerma-humidifier-jsq) | Yes       |            |
 | Mi S Smart Humidifer         | miio:basic       | [deerma.humidifier.jsq1](#deerma-humidifier-jsq1) | Yes       |            |
 | Mi Smart Antibacterial Humidifier | miio:basic       | [deerma.humidifier.jsq5](#deerma-humidifier-jsq5) | Yes       |            |
+| Mi Smart Humidifer S         | miio:basic       | [deerma.humidifier.jsqs](#deerma-humidifier-jsqs) | Yes       |            |
 | Mi Smart Humidifier          | miio:basic       | [deerma.humidifier.mjjsq](#deerma-humidifier-mjjsq) | Yes       |            |
 | Mi Fresh Air Ventilator A1-150 | miio:basic       | [dmaker.airfresh.a1](#dmaker-airfresh-a1) | Yes       |            |
 | Mi Fresh Air Ventilator      | miio:basic       | [dmaker.airfresh.t2017](#dmaker-airfresh-t2017) | Yes       |            |
@@ -812,6 +813,21 @@ Note, not all the values need to be in the json file, e.g. a subset of the param
 | water_shortage_fault | Switch               | Custom - Water Shortage Fault            |            |
 | the_tank_filed       | Switch               | Custom - The Tank Filed                  |            |
 
+### Mi Smart Humidifer S (<a name="deerma-humidifier-jsqs">deerma.humidifier.jsqs</a>) Channels
+
+| Channel              | Type                 | Description                              | Comment    |
+|----------------------|----------------------|------------------------------------------|------------|
+| on                   | Switch               | Humidifier - Switch Status               |            |
+| fault                | Number               | Humidifier - Device Fault                | Value mapping `["0"="No Faults","1"="Insufficient Water","2"="Water Separation"]` |
+| fan_level            | Number               | Humidifier - Fan Level                   | Value mapping `["1"="Level1","2"="Level2","3"="Level3","4"="Humidity"]` |
+| target_humidity      | Number:Dimensionless | Humidifier - Target Humidity             |            |
+| relative_humidity    | Number:Dimensionless | Environment - Relative Humidity          |            |
+| temperature          | Number:Temperature   | Environment - Temperature                |            |
+| alarm                | Switch               | Alarm - Alarm                            |            |
+| on1                  | Switch               | Indicator Light - Switch Status          |            |
+| water_shortage_fault | Switch               | Custom - Water Shortage Fault            |            |
+| the_tank_filed       | Switch               | Custom - The Tank Filed                  |            |
+
 ### Mi Smart Humidifier (<a name="deerma-humidifier-mjjsq">deerma.humidifier.mjjsq</a>) Channels
 
 | Channel              | Type                 | Description                              | Comment    |
@@ -5644,6 +5660,24 @@ Switch water_shortage_fault "Custom - Water Shortage Fault" (G_humidifier) {chan
 Switch the_tank_filed "Custom - The Tank Filed" (G_humidifier) {channel="miio:basic:humidifier:the_tank_filed"}
 ```
 
+### Mi Smart Humidifer S (deerma.humidifier.jsqs) item file lines
+
+note: Autogenerated example. Replace the id (humidifier) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```
+Group G_humidifier "Mi Smart Humidifer S" <status>
+Switch on "Humidifier - Switch Status" (G_humidifier) {channel="miio:basic:humidifier:on"}
+Number fault "Humidifier - Device Fault" (G_humidifier) {channel="miio:basic:humidifier:fault"}
+Number fan_level "Humidifier - Fan Level" (G_humidifier) {channel="miio:basic:humidifier:fan_level"}
+Number:Dimensionless target_humidity "Humidifier - Target Humidity" (G_humidifier) {channel="miio:basic:humidifier:target_humidity"}
+Number:Dimensionless relative_humidity "Environment - Relative Humidity" (G_humidifier) {channel="miio:basic:humidifier:relative_humidity"}
+Number:Temperature temperature "Environment - Temperature" (G_humidifier) {channel="miio:basic:humidifier:temperature"}
+Switch alarm "Alarm - Alarm" (G_humidifier) {channel="miio:basic:humidifier:alarm"}
+Switch on1 "Indicator Light - Switch Status" (G_humidifier) {channel="miio:basic:humidifier:on1"}
+Switch water_shortage_fault "Custom - Water Shortage Fault" (G_humidifier) {channel="miio:basic:humidifier:water_shortage_fault"}
+Switch the_tank_filed "Custom - The Tank Filed" (G_humidifier) {channel="miio:basic:humidifier:the_tank_filed"}
+```
+
 ### Mi Smart Humidifier (deerma.humidifier.mjjsq) item file lines
 
 note: Autogenerated example. Replace the id (humidifier) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java
index 931eb258fdeb3274f85052bbb7419a9e342e8d77..5f925592cbb7a965d2eb4a3f3006fbcc223b4875 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java
@@ -52,6 +52,7 @@ public enum MiIoDevices {
     DEERMA_HUMIDIFIER_JSQ("deerma.humidifier.jsq", "Mi Smart Antibacterial Humidifier", THING_TYPE_BASIC),
     DEERMA_HUMIDIFIER_JSQ1("deerma.humidifier.jsq1", "Mi S Smart Humidifer ", THING_TYPE_BASIC),
     DEERMA_HUMIDIFIER_JSQ5("deerma.humidifier.jsq5", "Mi Smart Antibacterial Humidifier", THING_TYPE_BASIC),
+    DEERMA_HUMIDIFIER_JSQS("deerma.humidifier.jsqs", "Mi Smart Humidifer S", THING_TYPE_BASIC),
     DEERMA_HUMIDIFIER_MJJSQ("deerma.humidifier.mjjsq", "Mi Smart Humidifier", THING_TYPE_BASIC),
     DMAKER_AIRFRESH_A1("dmaker.airfresh.a1", "Mi Fresh Air Ventilator A1-150", THING_TYPE_BASIC),
     DMAKER_AIRFRESH_T2017("dmaker.airfresh.t2017", "Mi Fresh Air Ventilator", THING_TYPE_BASIC),

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/deerma.humidifier.jsq5.json b/bundles/org.openhab.binding.miio/src/main/resources/database/deerma.humidifier.jsq5.json
index 9a8cfbc9a93f0070c9f367bbfc11b769b803b5fa..0bb5fa2f1c17b060ed33a3539e88c716dff917ad 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/resources/database/deerma.humidifier.jsq5.json
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/deerma.humidifier.jsq5.json
@@ -1,7 +1,8 @@
 {
        "deviceMapping": {
                "id": [
-                       "deerma.humidifier.jsq5"
+                       "deerma.humidifier.jsq5",
+                       "deerma.humidifier.jsqs"
                ],
                "propertyMethod": "get_properties",
                "maxProperties": 1,