[miio] add viomi vaccum v6 & v7 (openhab#8405)

* minor typo fixes Signed-off-by: Marcel Verpaalen <[email protected]>
andrewfg · Oct 8, 2020 · 9f9ad86 · 9f9ad86
1 parent 23b5450
commit 9f9ad86
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 12 deletions.
diff --git a/bundles/org.openhab.binding.miio/README.md b/bundles/org.openhab.binding.miio/README.md
@@ -195,9 +195,9 @@ or in case of unknown models include the model information e.g.:
 | Roborock Vacuum S6           | miio:vacuum      | [rockrobo.vacuum.s6](#rockrobo-vacuum-s6) | Yes       |            |
 | Roborock Vacuum S6           | miio:vacuum      | [roborock.vacuum.s6](#roborock-vacuum-s6) | Yes       |            |
 | Rockrobo Xiaowa Vacuum v2    | miio:unsupported | roborock.vacuum.e2     | No        |            |
-| Xiaomi Mijia vacuum V-RVCLM21B | miio:unsupported | viomi.vacuum.v6        | No        |            |
-| Xiaomi Mijia vacuum mop STYJ02YM | miio:unsupported | viomi.vacuum.v7        | No        |            |
-| Xiaomi Mijia vacuum mop STYJ02YM | miio:basic       | [viomi.vacuum.v8](#viomi-vacuum-v8) | Yes       |            |
+| Xiaomi Mijia vacuum V-RVCLM21B | miio:basic       | [viomi.vacuum.v6](#viomi-vacuum-v6) | Yes       |            |
+| Xiaomi Mijia vacuum mop STYJ02YM | miio:basic       | [viomi.vacuum.v7](#viomi-vacuum-v7) | Yes       |            |
+| Xiaomi Mijia vacuum mop STYJ02YM v2 | miio:basic       | [viomi.vacuum.v8](#viomi-vacuum-v8) | Yes       |            |
 | Vacuum 1C STYTJ01ZHM         | miio:basic       | [dreame.vacuum.mc1808](#dreame-vacuum-mc1808) | Yes       |            |
 | roborock.vacuum.c1           | miio:unsupported | roborock.vacuum.c1     | No        |            |
 | Rockrobo Xiaowa Sweeper v2   | miio:unsupported | roborock.sweeper.e2v2  | No        |            |
@@ -1303,15 +1303,55 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
 | current          | Number  | Current                             |
 | temperature      | Number  | Temperature                         |
 
-### Xiaomi Mijia vacuum mop STYJ02YM (<a name="viomi-vacuum-v8">viomi.vacuum.v8</a>) Channels
+### Xiaomi Mijia vacuum V-RVCLM21B (<a name="viomi-vacuum-v6">viomi.vacuum.v6</a>) Channels
 
 | Channel          | Type    | Description                         |
 |------------------|---------|-------------------------------------|
 | vacuumaction     | Number  | Vacuum Action                       |
 | state            | Number  | State                               |
 | mode             | Number  | Mode                                |
 | err_state        | Number  | Error                               |
-| battary_life     | Number  | Battery                             |
+| battery_life     | Number  | Battery                             |
+| box_type         | Number  | Box type                            |
+| mop_type         | Number  | mop_type                            |
+| s_time           | Number  | Clean time                          |
+| s_area           | Number  | Clean Area                          |
+| suction_grade    | Number  | suction_grade                       |
+| water_grade      | Number  | water_grade                         |
+| remember_map     | Number  | remember_map                        |
+| has_map          | Number  | has_map                             |
+| is_mop           | Number  | is_mop                              |
+| has_newmap       | Number  | has_newmap                          |
+
+### Xiaomi Mijia vacuum mop STYJ02YM (<a name="viomi-vacuum-v7">viomi.vacuum.v7</a>) Channels
+
+| Channel          | Type    | Description                         |
+|------------------|---------|-------------------------------------|
+| vacuumaction     | Number  | Vacuum Action                       |
+| state            | Number  | State                               |
+| mode             | Number  | Mode                                |
+| err_state        | Number  | Error                               |
+| battery_life     | Number  | Battery                             |
+| box_type         | Number  | Box type                            |
+| mop_type         | Number  | mop_type                            |
+| s_time           | Number  | Clean time                          |
+| s_area           | Number  | Clean Area                          |
+| suction_grade    | Number  | suction_grade                       |
+| water_grade      | Number  | water_grade                         |
+| remember_map     | Number  | remember_map                        |
+| has_map          | Number  | has_map                             |
+| is_mop           | Number  | is_mop                              |
+| has_newmap       | Number  | has_newmap                          |
+
+### Xiaomi Mijia vacuum mop STYJ02YM v2 (<a name="viomi-vacuum-v8">viomi.vacuum.v8</a>) Channels
+
+| Channel          | Type    | Description                         |
+|------------------|---------|-------------------------------------|
+| vacuumaction     | Number  | Vacuum Action                       |
+| state            | Number  | State                               |
+| mode             | Number  | Mode                                |
+| err_state        | Number  | Error                               |
+| battery_life     | Number  | Battery                             |
 | box_type         | Number  | Box type                            |
 | mop_type         | Number  | mop_type                            |
 | s_time           | Number  | Clean time                          |
@@ -1327,6 +1367,7 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
 
 | Channel          | Type    | Description                         |
 |------------------|---------|-------------------------------------|
+| vacuumaction     | String  | Vacuum Action                       |
 | BatteryLevel     | Number  | Battery-Battery Level               |
 | ChargingState    | Number  | Battery-Charging State              |
 | FirmwareRevision | String  | Device Information-Current Firmware Version |
@@ -3071,7 +3112,30 @@ Number current "Current" (G_powerstrip) {channel="miio:basic:powerstrip:current"
 Number temperature "Temperature" (G_powerstrip) {channel="miio:basic:powerstrip:temperature"}
 ```
 
-### Xiaomi Mijia vacuum mop STYJ02YM (viomi.vacuum.v8) item file lines
+### Xiaomi Mijia vacuum V-RVCLM21B (viomi.vacuum.v6) item file lines
+
+note: Autogenerated example. Replace the id (vacuum) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_vacuum "Xiaomi Mijia vacuum V-RVCLM21B" <status>
+Number vacuumaction "Vacuum Action" (G_vacuum) {channel="miio:basic:vacuum:vacuumaction"}
+Number state "State" (G_vacuum) {channel="miio:basic:vacuum:state"}
+Number mode "Mode" (G_vacuum) {channel="miio:basic:vacuum:mode"}
+Number err_state "Error" (G_vacuum) {channel="miio:basic:vacuum:err_state"}
+Number battery_life "Battery" (G_vacuum) {channel="miio:basic:vacuum:battery_life"}
+Number box_type "Box type" (G_vacuum) {channel="miio:basic:vacuum:box_type"}
+Number mop_type "mop_type" (G_vacuum) {channel="miio:basic:vacuum:mop_type"}
+Number s_time "Clean time" (G_vacuum) {channel="miio:basic:vacuum:s_time"}
+Number s_area "Clean Area" (G_vacuum) {channel="miio:basic:vacuum:s_area"}
+Number suction_grade "suction_grade" (G_vacuum) {channel="miio:basic:vacuum:suction_grade"}
+Number water_grade "water_grade" (G_vacuum) {channel="miio:basic:vacuum:water_grade"}
+Number remember_map "remember_map" (G_vacuum) {channel="miio:basic:vacuum:remember_map"}
+Number has_map "has_map" (G_vacuum) {channel="miio:basic:vacuum:has_map"}
+Number is_mop "is_mop" (G_vacuum) {channel="miio:basic:vacuum:is_mop"}
+Number has_newmap "has_newmap" (G_vacuum) {channel="miio:basic:vacuum:has_newmap"}
+```
+
+### Xiaomi Mijia vacuum mop STYJ02YM (viomi.vacuum.v7) item file lines
 
 note: Autogenerated example. Replace the id (vacuum) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
 
@@ -3081,7 +3145,30 @@ Number vacuumaction "Vacuum Action" (G_vacuum) {channel="miio:basic:vacuum:vacuu
 Number state "State" (G_vacuum) {channel="miio:basic:vacuum:state"}
 Number mode "Mode" (G_vacuum) {channel="miio:basic:vacuum:mode"}
 Number err_state "Error" (G_vacuum) {channel="miio:basic:vacuum:err_state"}
-Number battary_life "Battery" (G_vacuum) {channel="miio:basic:vacuum:battary_life"}
+Number battery_life "Battery" (G_vacuum) {channel="miio:basic:vacuum:battery_life"}
+Number box_type "Box type" (G_vacuum) {channel="miio:basic:vacuum:box_type"}
+Number mop_type "mop_type" (G_vacuum) {channel="miio:basic:vacuum:mop_type"}
+Number s_time "Clean time" (G_vacuum) {channel="miio:basic:vacuum:s_time"}
+Number s_area "Clean Area" (G_vacuum) {channel="miio:basic:vacuum:s_area"}
+Number suction_grade "suction_grade" (G_vacuum) {channel="miio:basic:vacuum:suction_grade"}
+Number water_grade "water_grade" (G_vacuum) {channel="miio:basic:vacuum:water_grade"}
+Number remember_map "remember_map" (G_vacuum) {channel="miio:basic:vacuum:remember_map"}
+Number has_map "has_map" (G_vacuum) {channel="miio:basic:vacuum:has_map"}
+Number is_mop "is_mop" (G_vacuum) {channel="miio:basic:vacuum:is_mop"}
+Number has_newmap "has_newmap" (G_vacuum) {channel="miio:basic:vacuum:has_newmap"}
+```
+
+### Xiaomi Mijia vacuum mop STYJ02YM v2 (viomi.vacuum.v8) item file lines
+
+note: Autogenerated example. Replace the id (vacuum) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_vacuum "Xiaomi Mijia vacuum mop STYJ02YM v2" <status>
+Number vacuumaction "Vacuum Action" (G_vacuum) {channel="miio:basic:vacuum:vacuumaction"}
+Number state "State" (G_vacuum) {channel="miio:basic:vacuum:state"}
+Number mode "Mode" (G_vacuum) {channel="miio:basic:vacuum:mode"}
+Number err_state "Error" (G_vacuum) {channel="miio:basic:vacuum:err_state"}
+Number battery_life "Battery" (G_vacuum) {channel="miio:basic:vacuum:battery_life"}
 Number box_type "Box type" (G_vacuum) {channel="miio:basic:vacuum:box_type"}
 Number mop_type "mop_type" (G_vacuum) {channel="miio:basic:vacuum:mop_type"}
 Number s_time "Clean time" (G_vacuum) {channel="miio:basic:vacuum:s_time"}
@@ -3100,6 +3187,7 @@ note: Autogenerated example. Replace the id (vacuum) in the channel with your ow
 
 ```java
 Group G_vacuum "Vacuum 1C STYTJ01ZHM" <status>
+String vacuumaction "Vacuum Action" (G_vacuum) {channel="miio:basic:vacuum:vacuumaction"}
 Number BatteryLevel "Battery-Battery Level" (G_vacuum) {channel="miio:basic:vacuum:BatteryLevel"}
 Number ChargingState "Battery-Charging State" (G_vacuum) {channel="miio:basic:vacuum:ChargingState"}
 String FirmwareRevision "Device Information-Current Firmware Version" (G_vacuum) {channel="miio:basic:vacuum:FirmwareRevision"}

diff --git a/...org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java b/...org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java
@@ -137,9 +137,9 @@ public enum MiIoDevices {
     VACUUMSS6("rockrobo.vacuum.s6", "Roborock Vacuum S6", THING_TYPE_VACUUM),
     VACUUMSS62("roborock.vacuum.s6", "Roborock Vacuum S6", THING_TYPE_VACUUM),
     VACUUME2("roborock.vacuum.e2", "Rockrobo Xiaowa Vacuum v2", THING_TYPE_UNSUPPORTED),
-    VACUUME_V6("viomi.vacuum.v6", "Xiaomi Mijia vacuum V-RVCLM21B", THING_TYPE_UNSUPPORTED),
-    VACUUME_V7("viomi.vacuum.v7", "Xiaomi Mijia vacuum mop STYJ02YM", THING_TYPE_UNSUPPORTED),
-    VACUUME_V8("viomi.vacuum.v8", "Xiaomi Mijia vacuum mop STYJ02YM", THING_TYPE_BASIC),
+    VACUUME_V6("viomi.vacuum.v6", "Xiaomi Mijia vacuum V-RVCLM21B", THING_TYPE_BASIC),
+    VACUUME_V7("viomi.vacuum.v7", "Xiaomi Mijia vacuum mop STYJ02YM", THING_TYPE_BASIC),
+    VACUUME_V8("viomi.vacuum.v8", "Xiaomi Mijia vacuum mop STYJ02YM v2", THING_TYPE_BASIC),
     VACUUM_MC1808("dreame.vacuum.mc1808", "Vacuum 1C STYTJ01ZHM", THING_TYPE_BASIC),
     ROBOROCK_VACUUM_C1("roborock.vacuum.c1", "roborock.vacuum.c1", THING_TYPE_UNSUPPORTED),
     SWEEPER2("roborock.sweeper.e2v2", "Rockrobo Xiaowa Sweeper v2", THING_TYPE_UNSUPPORTED),

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/commonChannels.xml b/bundles/org.openhab.binding.miio/src/main/resources/ESH-INF/thing/commonChannels.xml
@@ -464,7 +464,7 @@
 		<state>
 			<options>
 				<option value="0">Stop</option>
-				<option value="1">Start</option>
+				<option value="1">Vacuum</option>
 				<option value="2">Pause</option>
 			</options>
 		</state>

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v8.json b/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v8.json
@@ -1,6 +1,8 @@
 {
     "deviceMapping": {
         "id": [
+            "viomi.vacuum.v6",
+            "viomi.vacuum.v7",
             "viomi.vacuum.v8"
         ],
         "channels": [
@@ -57,7 +59,7 @@
             {
                 "property": "battery_life",
                 "friendlyName": "Battery",
-                "channel": "battary_life",
+                "channel": "battery_life",
                 "type": "Number",
                 "refresh": true,
                 "actions": [