From 0d12c01e160efe2e5a86ba2ad7f8b52140121308 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 27 Apr 2021 22:32:39 +0200 Subject: [PATCH] [miio] add support Mi Smart LED Bulb Essential (yeelink.light.color5) (#10531) Signed-off-by: Marcel Verpaalen --- bundles/org.openhab.binding.miio/README.md | 54 ++++++++++++++----- .../binding/miio/internal/MiIoDevices.java | 1 + .../database/dreame.vacuum.p2009-miot.json | 6 +-- .../database/yeelink.light.color1.json | 4 +- 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/bundles/org.openhab.binding.miio/README.md b/bundles/org.openhab.binding.miio/README.md index 371dc00fb876e..25d32a6b11912 100644 --- a/bundles/org.openhab.binding.miio/README.md +++ b/bundles/org.openhab.binding.miio/README.md @@ -404,6 +404,7 @@ Currently the miio binding supports more than 280 different models. | Yeelight LED Bulb (Color) | miio:basic | [yeelink.light.color2](#yeelink-light-color2) | Yes | | | Mi LED Smart Bulb (White and Color) | miio:basic | [yeelink.light.color3](#yeelink-light-color3) | Yes | | | Yeelight LED Bulb 1S（Color） | miio:basic | [yeelink.light.color4](#yeelink-light-color4) | Yes | | +| Mi Smart LED Bulb Essential (White and Color) | miio:basic | [yeelink.light.color5](#yeelink-light-color5) | Yes | | | Yeelight Smart LED Bulb 1SE (color) | miio:basic | [yeelink.light.colora](#yeelink-light-colora) | Yes | | | Yeelight LED Bulb (Tunable) | miio:basic | [yeelink.light.ct2](#yeelink-light-ct2) | Yes | | | Mi LED Desk Lamp | miio:basic | [yeelink.light.lamp1](#yeelink-light-lamp1) | Yes | | @@ -890,7 +891,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock"] | +| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock","findme"="Find me","testsound"="Test Sound"] | | status | Number | Robot Cleaner - Status | Value mapping ["1"="Sweeping","2"="Idle","3"="Paused","4"="Error","5"="Go Charging","6"="Charging","7"="Mopping"] | | fault | Number | Robot Cleaner - Device Fault | | | battery-level | Number:Dimensionless | Battery - Battery Level | | @@ -932,7 +933,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock"] | +| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock","findme"="Find me","testsound"="Test Sound"] | | status | Number | Robot Cleaner - Status | Value mapping ["1"="Sweeping","2"="Idle","3"="Paused","4"="Error","5"="Go Charging","6"="Charging","7"="Mopping"] | | fault | Number | Robot Cleaner - Device Fault | | | battery-level | Number:Dimensionless | Battery - Battery Level | | @@ -1058,7 +1059,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock"] | +| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock","findme"="Find me","testsound"="Test Sound"] | | status | Number | Robot Cleaner - Status | Value mapping ["1"="Sweeping","2"="Idle","3"="Paused","4"="Error","5"="Go Charging","6"="Charging","7"="Mopping"] | | fault | Number | Robot Cleaner - Device Fault | | | battery-level | Number:Dimensionless | Battery - Battery Level | | @@ -2829,7 +2830,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -2841,7 +2842,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -2853,7 +2854,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -3226,7 +3227,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -3238,7 +3239,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -3250,7 +3251,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -3262,7 +3263,19 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | +| rgbColor | Color | RGB Color | | +| name | String | Name | | + +### Mi Smart LED Bulb Essential (White and Color) (yeelink.light.color5) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| power | Switch | Power | | +| brightness | Dimmer | Brightness | | +| delayoff | Number:Time | Shutdown Timer | | +| colorTemperature | Number | Color Temperature | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -3274,7 +3287,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -3431,7 +3444,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -3443,7 +3456,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | brightness | Dimmer | Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | -| colorMode | Number | Color Mode | | +| colorMode | Number | Color Mode | Value mapping ["0"="Default","1"="CT mode","2"="RGB mode","3"="HSV mode","4"="Color Flow mode","5"="Night Light mode"] | | rgbColor | Color | RGB Color | | | name | String | Name | | @@ -8294,6 +8307,21 @@ Color rgbColor "RGB Color" (G_light) {channel="miio:basic:light:rgbColor"} String name "Name" (G_light) {channel="miio:basic:light:name"} ``` +### Mi Smart LED Bulb Essential (White and Color) (yeelink.light.color5) item file lines + +note: Autogenerated example. Replace the id (light) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered. + +``` +Group G_light "Mi Smart LED Bulb Essential (White and Color)" +Switch power "Power" (G_light) {channel="miio:basic:light:power"} +Dimmer brightness "Brightness" (G_light) {channel="miio:basic:light:brightness"} +Number:Time delayoff "Shutdown Timer" (G_light) {channel="miio:basic:light:delayoff"} +Number colorTemperature "Color Temperature" (G_light) {channel="miio:basic:light:colorTemperature"} +Number colorMode "Color Mode" (G_light) {channel="miio:basic:light:colorMode"} +Color rgbColor "RGB Color" (G_light) {channel="miio:basic:light:rgbColor"} +String name "Name" (G_light) {channel="miio:basic:light:name"} +``` + ### Yeelight Smart LED Bulb 1SE (color) (yeelink.light.colora) item file lines note: Autogenerated example. Replace the id (light) 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 bba32932b0d89..422e5c1001148 100644 --- 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 @@ -288,6 +288,7 @@ public enum MiIoDevices { YEELINK_LIGHT_COLOR2("yeelink.light.color2", "Yeelight LED Bulb (Color)", THING_TYPE_BASIC), YEELINK_LIGHT_COLOR3("yeelink.light.color3", "Mi LED Smart Bulb (White and Color)", THING_TYPE_BASIC), YEELINK_LIGHT_COLOR4("yeelink.light.color4", "Yeelight LED Bulb 1S（Color）", THING_TYPE_BASIC), + YEELINK_LIGHT_COLOR5("yeelink.light.color5", "Mi Smart LED Bulb Essential (White and Color)", THING_TYPE_BASIC), YEELINK_LIGHT_COLORA("yeelink.light.colora", "Yeelight Smart LED Bulb 1SE (color)", THING_TYPE_BASIC), YEELINK_LIGHT_CT2("yeelink.light.ct2", "Yeelight LED Bulb (Tunable)", THING_TYPE_BASIC), YEELINK_LIGHT_LAMP1("yeelink.light.lamp1", "Mi LED Desk Lamp", THING_TYPE_BASIC), diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/dreame.vacuum.p2009-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/dreame.vacuum.p2009-miot.json index 09d69f9e0e4a4..dc7509a73f3aa 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/dreame.vacuum.p2009-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/dreame.vacuum.p2009-miot.json @@ -88,7 +88,7 @@ "aiid": 1, "condition": { "name": "matchValue", - "parameters" : [ + "parameters": [ { "matchValue": "findme" } @@ -102,7 +102,7 @@ "aiid": 2, "condition": { "name": "matchValue", - "parameters" : [ + "parameters": [ { "matchValue": "testsound" } @@ -110,7 +110,7 @@ } } ], - "readmeComment": "Value mapping [\"sweep\"\u003d\"Sweep\",\"stopsweep\"\u003d\"Stop Sweep\",\"dock\"\u003d\"Goto Dock\"]" + "readmeComment": "Value mapping [\"sweep\"\u003d\"Sweep\",\"stopsweep\"\u003d\"Stop Sweep\",\"dock\"\u003d\"Goto Dock\",\"findme\"\u003d\"Find me\",\"testsound\"\u003d\"Test Sound\"]" }, { "property": "status", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.color1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.color1.json index 6e462ab7a7745..491173d5b820b 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.color1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.color1.json @@ -5,6 +5,7 @@ "yeelink.light.color2", "yeelink.light.color3", "yeelink.light.color4", + "yeelink.light.color5", "yeelink.light.strip1", "yeelink.light.strip2", "yeelink.light.bslamp1", @@ -164,7 +165,8 @@ "tags": [ "Control", "Light" - ] + ], + "readmeComment": "Value mapping [\"0\"\u003d\"Default\",\"1\"\u003d\"CT mode\",\"2\"\u003d\"RGB mode\",\"3\"\u003d\"HSV mode\",\"4\"\u003d\"Color Flow mode\",\"5\"\u003d\"Night Light mode\"]" }, { "property": "rgb",