[miio] add support for huayi Fans, heater and lights (#9348)

* [miio] add support for huayi Fans, heater and lights
* [miio] incl right names

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 ec5785a83140d5d14920e656810c9acd7fe4db58..a56652660d6ef65c635eaec19f98d426e977f0a7 100644 (file)
--- a/bundles/org.openhab.binding.miio/README.md
+++ b/bundles/org.openhab.binding.miio/README.md
@@ -87,7 +87,7 @@ or in case of unknown models include the model information of a similar device t
 
 # Mi IO Devices
 
-Currently the miio binding supports more than 220 different models.
+Currently the miio binding supports more than 230 different models.
 
 | Device                       | ThingType        | Device Model           | Supported | Remark     |
 |------------------------------|------------------|------------------------|-----------|------------|
@@ -158,6 +158,8 @@ Currently the miio binding supports more than 220 different models.
 | Mi Air Purifier virtual      | miio:basic       | [lumi.gateway.mgl03](#lumi-gateway-mgl03) | Yes       | Used to control the gateway itself. Use the mihome binding to control devices connected to the Xiaomi gateway.<br />Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO ARIES For Bedroom     | miio:basic       | [huayi.light.ari013](#huayi-light-ari013) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO ARIES For Living Room | miio:basic       | [huayi.light.aries](#huayi-light-aries) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| HUIZUO Fan Light             | miio:basic       | [huayi.light.fanwy](#huayi-light-fanwy) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| HUIZUO Fan Light(2020)       | miio:basic       | [huayi.light.fanwy2](#huayi-light-fanwy2) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO PEGASUS For Living Room | miio:basic       | [huayi.light.peg091](#huayi-light-peg091) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO PEGASUS For Bedroom   | miio:basic       | [huayi.light.peg093](#huayi-light-peg093) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO PISCES For Bedroom    | miio:basic       | [huayi.light.pis123](#huayi-light-pis123) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
@@ -167,6 +169,12 @@ Currently the miio binding supports more than 220 different models.
 | HUIZUO VIRGO For Bedroom     | miio:basic       | [huayi.light.vir063](#huayi-light-vir063) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO VIRGO For Living Room | miio:basic       | [huayi.light.virgo](#huayi-light-virgo) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO Ceiling Light         | miio:basic       | [huayi.light.wy](#huayi-light-wy) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| HUIZUO LIANGCHEN(BLE Mesh)   | miio:basic       | [huayi.light.wy200](#huayi-light-wy200) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| HUIZUO SAG Downlight (BLE Mesh) | miio:basic       | [huayi.light.wy201](#huayi-light-wy201) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| HUIZUO Bulb (BLE Mesh)       | miio:basic       | [huayi.light.wy202](#huayi-light-wy202) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| HUIZUO YONG Downlight (BLE Mesh) | miio:basic       | [huayi.light.wy203](#huayi-light-wy203) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| huayi.light.wy204            | miio:basic       | [huayi.light.wy204](#huayi-light-wy204) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| HUIZUO Heating Lamp          | miio:basic       | [huayi.light.wyheat](#huayi-light-wyheat) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | HUIZUO ZIWEI Ceiling Lamp    | miio:basic       | [huayi.light.zw131](#huayi-light-zw131) | Yes       | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
 | Aqara Wall Switch(No Neutral, Single Rocker) | miio:unsupported | lumi.ctrl_neutral1.v1  | No        |            |
 | Aqara Wall Switch (No Neutral, Double Rocker) | miio:unsupported | lumi.ctrl_neutral2.v1  | No        |            |
@@ -1385,96 +1393,178 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO ARIES For Living Room (<a name="huayi-light-aries">huayi.light.aries</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
+### HUIZUO Fan Light (<a name="huayi-light-fanwy">huayi.light.fanwy</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+| on1              | Switch  | Fan - Power                         |            |
+| fan-level        | Number:Dimensionless | Fan - Fan Level                     |            |
+| motor-reverse    | Switch  | Fan - Motor Reverse                 |            |
+| mode             | Number  | Fan - Mode                          | Value mapping [1="Normal Wind",2="Natural Wind"] |
+
+### HUIZUO Fan Light(2020) (<a name="huayi-light-fanwy2">huayi.light.fanwy2</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+| on1              | Switch  | Fan - Power                         |            |
+| fan-level        | Number:Dimensionless | Fan - Fan Level                     |            |
+| mode             | Number  | Fan - Mode                          | Value mapping [0="Basic",1="Natural Wind"] |
+| time-off         | Number:Time | Presets - Time Off                  |            |
+| pre-colortemp    | Number:Temperature | Presets - Pre Colortemp             |            |
+| pre-brightness   | Number:Dimensionless | Presets - Pre Brightness            |            |
+| pre-speed        | Number:Dimensionless | Presets - Pre Speed                 |            |
+| reversal         | Number  | Presets - Reversal                  | Value mapping [0="Positive",1="Reverse"] |
+| pre-custom       | Number  | Presets - Pre Custom                | Value mapping [0="Switch Off",1="Open"] |
+| flabellum        | Switch  | Presets - Flabellum                 |            |
+
 ### HUIZUO PEGASUS For Living Room (<a name="huayi-light-peg091">huayi.light.peg091</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO PEGASUS For Bedroom (<a name="huayi-light-peg093">huayi.light.peg093</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO PISCES For Bedroom (<a name="huayi-light-pis123">huayi.light.pis123</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO PISCES For Living Room (<a name="huayi-light-pisces">huayi.light.pisces</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO TAURUS For Bedroom (<a name="huayi-light-tau023">huayi.light.tau023</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO TAURUS For Living Room (<a name="huayi-light-taurus">huayi.light.taurus</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO VIRGO For Bedroom (<a name="huayi-light-vir063">huayi.light.vir063</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO VIRGO For Living Room (<a name="huayi-light-virgo">huayi.light.virgo</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### HUIZUO Ceiling Light (<a name="huayi-light-wy">huayi.light.wy</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+
+### HUIZUO LIANGCHEN(BLE Mesh) (<a name="huayi-light-wy200">huayi.light.wy200</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+
+### HUIZUO SAG Downlight (BLE Mesh) (<a name="huayi-light-wy201">huayi.light.wy201</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+
+### HUIZUO Bulb (BLE Mesh) (<a name="huayi-light-wy202">huayi.light.wy202</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+
+### HUIZUO YONG Downlight (BLE Mesh) (<a name="huayi-light-wy203">huayi.light.wy203</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+
+### huayi.light.wy204 (<a name="huayi-light-wy204">huayi.light.wy204</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
+| color-temperature | Number:Temperature | Light - Color Temperature           |            |
+
+### HUIZUO Heating Lamp (<a name="huayi-light-wyheat">huayi.light.wyheat</a>) Channels
+
+| Channel          | Type    | Description                         | Comment    |
+|------------------|---------|-------------------------------------|------------|
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
+| on1              | Switch  | Heater - Power                      |            |
+| fault            | Number  | Heater - Device Fault               | Value mapping [0="No Faults"] |
+| heat-level       | Number  | Heater - Heat Level                 |            |
+| screenshow       | Switch  | Other - Screenshow                  |            |
 
 ### HUIZUO ZIWEI Ceiling Lamp (<a name="huayi-light-zw131">huayi.light.zw131</a>) Channels
 
 | Channel          | Type    | Description                         | Comment    |
 |------------------|---------|-------------------------------------|------------|
-| on               | Switch  | Light - Switch Status               |            |
-| brightness       | Number:Dimensionless | Light - Brightness                  |            |
+| on               | Switch  | Light - Power                       |            |
+| brightness       | Dimmer  | Light - Brightness                  |            |
 | color-temperature | Number:Temperature | Light - Color Temperature           |            |
 
 ### Xiaomiyoupin Curtain Controller (Wi-Fi) (<a name="lumi-curtain-hagl05">lumi.curtain.hagl05</a>) Channels
@@ -4542,8 +4632,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO ARIES For Bedroom" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4553,9 +4643,45 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO ARIES For Living Room" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+```
+
+### HUIZUO Fan Light (huayi.light.fanwy) 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.
+
+```java
+Group G_light "HUIZUO Fan Light" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+Switch on1 "Fan - Power" (G_light) {channel="miio:basic:light:on1"}
+Number:Dimensionless fan-level "Fan - Fan Level" (G_light) {channel="miio:basic:light:fan-level"}
+Switch motor-reverse "Fan - Motor Reverse" (G_light) {channel="miio:basic:light:motor-reverse"}
+Number mode "Fan - Mode" (G_light) {channel="miio:basic:light:mode"}
+```
+
+### HUIZUO Fan Light(2020) (huayi.light.fanwy2) 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.
+
+```java
+Group G_light "HUIZUO Fan Light(2020)" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+Switch on1 "Fan - Power" (G_light) {channel="miio:basic:light:on1"}
+Number:Dimensionless fan-level "Fan - Fan Level" (G_light) {channel="miio:basic:light:fan-level"}
+Number mode "Fan - Mode" (G_light) {channel="miio:basic:light:mode"}
+Number:Time time-off "Presets - Time Off" (G_light) {channel="miio:basic:light:time-off"}
+Number:Temperature pre-colortemp "Presets - Pre Colortemp" (G_light) {channel="miio:basic:light:pre-colortemp"}
+Number:Dimensionless pre-brightness "Presets - Pre Brightness" (G_light) {channel="miio:basic:light:pre-brightness"}
+Number:Dimensionless pre-speed "Presets - Pre Speed" (G_light) {channel="miio:basic:light:pre-speed"}
+Number reversal "Presets - Reversal" (G_light) {channel="miio:basic:light:reversal"}
+Number pre-custom "Presets - Pre Custom" (G_light) {channel="miio:basic:light:pre-custom"}
+Switch flabellum "Presets - Flabellum" (G_light) {channel="miio:basic:light:flabellum"}
 ```
 
 ### HUIZUO PEGASUS For Living Room (huayi.light.peg091) item file lines
@@ -4564,8 +4690,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO PEGASUS For Living Room" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4575,8 +4701,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO PEGASUS For Bedroom" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4586,8 +4712,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO PISCES For Bedroom" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4597,8 +4723,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO PISCES For Living Room" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4608,8 +4734,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO TAURUS For Bedroom" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4619,8 +4745,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO TAURUS For Living Room" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4630,8 +4756,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO VIRGO For Bedroom" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4641,8 +4767,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO VIRGO For Living Room" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 
@@ -4652,9 +4778,79 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO Ceiling Light" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+```
+
+### HUIZUO LIANGCHEN(BLE Mesh) (huayi.light.wy200) 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.
+
+```java
+Group G_light "HUIZUO LIANGCHEN(BLE Mesh)" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+```
+
+### HUIZUO SAG Downlight (BLE Mesh) (huayi.light.wy201) 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.
+
+```java
+Group G_light "HUIZUO SAG Downlight (BLE Mesh)" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+```
+
+### HUIZUO Bulb (BLE Mesh) (huayi.light.wy202) 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.
+
+```java
+Group G_light "HUIZUO Bulb (BLE Mesh)" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+```
+
+### HUIZUO YONG Downlight (BLE Mesh) (huayi.light.wy203) 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.
+
+```java
+Group G_light "HUIZUO YONG Downlight (BLE Mesh)" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+```
+
+### huayi.light.wy204 (huayi.light.wy204) 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.
+
+```java
+Group G_light "huayi.light.wy204" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+```
+
+### HUIZUO Heating Lamp (huayi.light.wyheat) 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.
+
+```java
+Group G_light "HUIZUO Heating Lamp" <status>
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
+Switch on1 "Heater - Power" (G_light) {channel="miio:basic:light:on1"}
+Number fault "Heater - Device Fault" (G_light) {channel="miio:basic:light:fault"}
+Number heat-level "Heater - Heat Level" (G_light) {channel="miio:basic:light:heat-level"}
+Switch screenshow "Other - Screenshow" (G_light) {channel="miio:basic:light:screenshow"}
 ```
 
 ### HUIZUO ZIWEI Ceiling Lamp (huayi.light.zw131) item file lines
@@ -4663,8 +4859,8 @@ note: Autogenerated example. Replace the id (light) in the channel with your own
 
 ```java
 Group G_light "HUIZUO ZIWEI Ceiling Lamp" <status>
-Switch on "Light - Switch Status" (G_light) {channel="miio:basic:light:on"}
-Number:Dimensionless brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch on "Light - Power" (G_light) {channel="miio:basic:light:on"}
+Dimmer brightness "Light - Brightness" (G_light) {channel="miio:basic:light:brightness"}
 Number:Temperature color-temperature "Light - Color Temperature" (G_light) {channel="miio:basic:light:color-temperature"}
 ```
 

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 d547cb8b6ef9af8920c19d8c10a32e2af32fb569..711736aab1c5b6d784e9bf79776bce19cf14e94d 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
@@ -91,6 +91,8 @@ public enum MiIoDevices {
     LUMI_GATEWAY_MGL03("lumi.gateway.mgl03", "Mi Air Purifier virtual", THING_TYPE_BASIC),
     HUAYI_LIGHT_ARI013("huayi.light.ari013", "HUIZUO ARIES For Bedroom", THING_TYPE_BASIC),
     HUAYI_LIGHT_ARIES("huayi.light.aries", "HUIZUO ARIES For Living Room", THING_TYPE_BASIC),
+    HUAYI_LIGHT_FANWY("huayi.light.fanwy", "HUIZUO Fan Light", THING_TYPE_BASIC),
+    HUAYI_LIGHT_FANWY2("huayi.light.fanwy2", "HUIZUO Fan Light(2020)", THING_TYPE_BASIC),
     HUAYI_LIGHT_PEG091("huayi.light.peg091", "HUIZUO PEGASUS For Living Room", THING_TYPE_BASIC),
     HUAYI_LIGHT_PEG093("huayi.light.peg093", "HUIZUO PEGASUS For Bedroom", THING_TYPE_BASIC),
     HUAYI_LIGHT_PIS123("huayi.light.pis123", "HUIZUO PISCES For Bedroom", THING_TYPE_BASIC),
@@ -100,6 +102,12 @@ public enum MiIoDevices {
     HUAYI_LIGHT_VIR063("huayi.light.vir063", "HUIZUO VIRGO For Bedroom", THING_TYPE_BASIC),
     HUAYI_LIGHT_VIRGO("huayi.light.virgo", "HUIZUO VIRGO For Living Room", THING_TYPE_BASIC),
     HUAYI_LIGHT_WY("huayi.light.wy", "HUIZUO Ceiling Light", THING_TYPE_BASIC),
+    HUAYI_LIGHT_WY200("huayi.light.wy200", "HUIZUO LIANGCHEN(BLE Mesh)", THING_TYPE_BASIC),
+    HUAYI_LIGHT_WY201("huayi.light.wy201", "HUIZUO SAG Downlight (BLE Mesh)", THING_TYPE_BASIC),
+    HUAYI_LIGHT_WY202("huayi.light.wy202", "HUIZUO Bulb (BLE Mesh)", THING_TYPE_BASIC),
+    HUAYI_LIGHT_WY203("huayi.light.wy203", "HUIZUO YONG Downlight (BLE Mesh)", THING_TYPE_BASIC),
+    HUAYI_LIGHT_WY204("huayi.light.wy204", "huayi.light.wy204", THING_TYPE_BASIC),
+    HUAYI_LIGHT_WYHEAT("huayi.light.wyheat", "HUIZUO Heating Lamp", THING_TYPE_BASIC),
     HUAYI_LIGHT_ZW131("huayi.light.zw131", "HUIZUO ZIWEI Ceiling Lamp", THING_TYPE_BASIC),
     LUMI_CTRL_NEUTRAL1_V1("lumi.ctrl_neutral1.v1", "Aqara Wall Switch(No Neutral, Single Rocker)",
             THING_TYPE_UNSUPPORTED),
@@ -192,9 +200,9 @@ public enum MiIoDevices {
     VIOMI_VACUUM_V8("viomi.vacuum.v8", "Mi Robot Vacuum-Mop P", THING_TYPE_BASIC),
     ROBOROCK_SWEEPER_E2V2("roborock.sweeper.e2v2", "Rockrobo Xiaowa Sweeper v2", THING_TYPE_UNSUPPORTED),
     ROBOROCK_SWEEPER_E2V3("roborock.sweeper.e2v3", "Rockrobo Xiaowa Sweeper v3", THING_TYPE_UNSUPPORTED),
-    SWITCH_XSWITCH01("090615.switch.xswitch01", "PTX OneKey Switch (WIFI)", THING_TYPE_BASIC),
-    SWITCH_XSWITCH02("090615.switch.xswitch02", "PTX Twokey switch(wifi)", THING_TYPE_BASIC),
-    SWITCH_XSWITCH03("090615.switch.xswitch03", "PTX ThreeKey Switch (WIFI)", THING_TYPE_BASIC),
+    S090615_SWITCH_XSWITCH01("090615.switch.xswitch01", "PTX OneKey Switch (WIFI)", THING_TYPE_BASIC),
+    S090615_SWITCH_XSWITCH02("090615.switch.xswitch02", "PTX Twokey switch(wifi)", THING_TYPE_BASIC),
+    S090615_SWITCH_XSWITCH03("090615.switch.xswitch03", "PTX ThreeKey Switch (WIFI)", THING_TYPE_BASIC),
     YUNMI_WATERPURIFIER_V1("yunmi.waterpurifier.v1", "Mi Water Purifier v1", THING_TYPE_BASIC),
     YUNMI_WATERPURIFIER_V2("yunmi.waterpurifier.v2", "Mi Water Purifier v2", THING_TYPE_BASIC),
     YUNMI_WATERPURIFIER_V3("yunmi.waterpurifier.v3", "Mi Water Purifier (Under sink) v3", THING_TYPE_BASIC),

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.fanwy-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.fanwy-miot.json
new file mode 100644 (file)
index 0000000..00108d4
--- /dev/null
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.fanwy-miot.json
@@ -0,0 +1,165 @@
+{
+       "deviceMapping": {
+               "id": [
+                       "huayi.light.fanwy"
+               ],
+               "propertyMethod": "get_properties",
+               "maxProperties": 1,
+               "channels": [
+                       {
+                               "property": "on",
+                               "siid": 2,
+                               "piid": 1,
+                               "friendlyName": "Light - Power",
+                               "channel": "on",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Switch"
+                               ]
+                       },
+                       {
+                               "property": "brightness",
+                               "siid": 2,
+                               "piid": 2,
+                               "friendlyName": "Light - Brightness",
+                               "channel": "brightness",
+                               "type": "Dimmer",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1,
+                                       "maximum": 100,
+                                       "step": 1,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Setpoint",
+                                       "Light"
+                               ]
+                       },
+                       {
+                               "property": "color-temperature",
+                               "siid": 2,
+                               "piid": 3,
+                               "friendlyName": "Light - Color Temperature",
+                               "channel": "color-temperature",
+                               "type": "Number:Temperature",
+                               "unit": "kelvin",
+                               "stateDescription": {
+                                       "minimum": 3000,
+                                       "maximum": 6400,
+                                       "step": 1,
+                                       "pattern": "%.1f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "STRING"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "on1",
+                               "siid": 3,
+                               "piid": 1,
+                               "friendlyName": "Fan - Power",
+                               "channel": "on1",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ],"category": "fan",
+                               "tags": [
+                                       "Switch"
+                               ]
+                       },
+                       {
+                               "property": "fan-level",
+                               "siid": 3,
+                               "piid": 2,
+                               "friendlyName": "Fan - Fan Level",
+                               "channel": "fan-level",
+                               "type": "Number:Dimensionless",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1.0,
+                                       "maximum": 100.0,
+                                       "step": 1.0,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "motor-reverse",
+                               "siid": 3,
+                               "piid": 3,
+                               "friendlyName": "Fan - Motor Reverse",
+                               "channel": "motor-reverse",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "mode",
+                               "siid": 3,
+                               "piid": 4,
+                               "friendlyName": "Fan - Mode",
+                               "channel": "mode",
+                               "type": "Number",
+                               "stateDescription": {
+                                       "options": [
+                                               {
+                                                       "value": "1",
+                                                       "label": "Normal Wind"
+                                               },
+                                               {
+                                                       "value": "2",
+                                                       "label": "Natural Wind"
+                                               }
+                                       ]
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ],
+                               
+                                       "category": "fan"
+                               ,"readmeComment": "Value mapping [1\u003d\"Normal Wind\",2\u003d\"Natural Wind\"]"
+                       }
+               ],
+               "experimental": true
+       }
+}

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.fanwy2-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.fanwy2-miot.json
new file mode 100644 (file)
index 0000000..7cdaa7a
--- /dev/null
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.fanwy2-miot.json
@@ -0,0 +1,307 @@
+{
+       "deviceMapping": {
+               "id": [
+                       "huayi.light.fanwy2"
+               ],
+               "propertyMethod": "get_properties",
+               "maxProperties": 1,
+               "channels": [
+                       {
+                               "property": "on",
+                               "siid": 2,
+                               "piid": 1,
+                               "friendlyName": "Light - Power",
+                               "channel": "on",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Switch"
+                               ]
+                       },
+                       {
+                               "property": "brightness",
+                               "siid": 2,
+                               "piid": 2,
+                               "friendlyName": "Light - Brightness",
+                               "channel": "brightness",
+                               "type": "Dimmer",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1,
+                                       "maximum": 100,
+                                       "step": 1,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Setpoint",
+                                       "Light"
+                               ]
+                       },
+                       {
+                               "property": "color-temperature",
+                               "siid": 2,
+                               "piid": 3,
+                               "friendlyName": "Light - Color Temperature",
+                               "channel": "color-temperature",
+                               "type": "Number:Temperature",
+                               "unit": "kelvin",
+                               "stateDescription": {
+                                       "minimum": 3000,
+                                       "maximum": 5700,
+                                       "step": 1,
+                                       "pattern": "%.1f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "STRING"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "on1",
+                               "siid": 3,
+                               "piid": 1,
+                               "friendlyName": "Fan - Power",
+                               "channel": "on1",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ],"category": "fan",
+                               "tags": [
+                                       "Switch"
+                               ]
+                       },
+                       {
+                               "property": "fan-level",
+                               "siid": 3,
+                               "piid": 2,
+                               "friendlyName": "Fan - Fan Level",
+                               "channel": "fan-level",
+                               "type": "Number:Dimensionless",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1.0,
+                                       "maximum": 100.0,
+                                       "step": 1.0,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "mode",
+                               "siid": 3,
+                               "piid": 3,
+                               "friendlyName": "Fan - Mode",
+                               "channel": "mode",
+                               "type": "Number",
+                               "stateDescription": {
+                                       "options": [
+                                               {
+                                                       "value": "0",
+                                                       "label": "Basic"
+                                               },
+                                               {
+                                                       "value": "1",
+                                                       "label": "Natural Wind"
+                                               }
+                                       ]
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ],
+                               "readmeComment": "Value mapping [0\u003d\"Basic\",1\u003d\"Natural Wind\"]"
+                       },
+                       {
+                               "property": "time-off",
+                               "siid": 4,
+                               "piid": 1,
+                               "friendlyName": "Presets - Time Off",
+                               "channel": "time-off",
+                               "type": "Number:Time",
+                               "unit": "minutes",
+                               "stateDescription": {
+                                       "minimum": 1,
+                                       "maximum": 1440,
+                                       "step": 1,
+                                       "pattern": "%.1f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "STRING"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "pre-colortemp",
+                               "siid": 4,
+                               "piid": 2,
+                               "friendlyName": "Presets - Pre Colortemp",
+                               "channel": "pre-colortemp",
+                               "type": "Number:Temperature",
+                               "unit": "kelvin",
+                               "stateDescription": {
+                                       "minimum": 3000,
+                                       "maximum": 5700,
+                                       "step": 1,
+                                       "pattern": "%.1f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "STRING"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "pre-brightness",
+                               "siid": 4,
+                               "piid": 3,
+                               "friendlyName": "Presets - Pre Brightness",
+                               "channel": "pre-brightness",
+                               "type": "Number:Dimensionless",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1.0,
+                                       "maximum": 100.0,
+                                       "step": 1.0,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "pre-speed",
+                               "siid": 4,
+                               "piid": 4,
+                               "friendlyName": "Presets - Pre Speed",
+                               "channel": "pre-speed",
+                               "type": "Number:Dimensionless",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1.0,
+                                       "maximum": 100.0,
+                                       "step": 1.0,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "reversal",
+                               "siid": 4,
+                               "piid": 5,
+                               "friendlyName": "Presets - Reversal",
+                               "channel": "reversal",
+                               "type": "Number",
+                               "stateDescription": {
+                                       "options": [
+                                               {
+                                                       "value": "0",
+                                                       "label": "Postitive"
+                                               },
+                                               {
+                                                       "value": "1",
+                                                       "label": "Reverse"
+                                               }
+                                       ]
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ],
+                               "readmeComment": "Value mapping [0\u003d\"Positive\",1\u003d\"Reverse\"]"
+                       },
+                       {
+                               "property": "pre-custom",
+                               "siid": 4,
+                               "piid": 7,
+                               "friendlyName": "Presets - Pre Custom",
+                               "channel": "pre-custom",
+                               "type": "Number",
+                               "stateDescription": {
+                                       "options": [
+                                               {
+                                                       "value": "0",
+                                                       "label": "Switch Off"
+                                               },
+                                               {
+                                                       "value": "1",
+                                                       "label": "Open"
+                                               }
+                                       ]
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "STRING"
+                                       }
+                               ],
+                               "readmeComment": "Value mapping [0\u003d\"Switch Off\",1\u003d\"Open\"]"
+                       },
+                       {
+                               "property": "flabellum",
+                               "siid": 4,
+                               "piid": 8,
+                               "friendlyName": "Presets - Flabellum",
+                               "channel": "flabellum",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ]
+                       }
+               ],
+               "experimental": true
+       }
+}

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.pis123-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.pis123-miot.json
index b06cc5f3e90390accfef9794ba50c73ff65bb7ce..520056dda094256e82116b1f25acc853675b7c68 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.pis123-miot.json
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.pis123-miot.json
@@ -21,7 +21,7 @@
                                "property": "on",
                                "siid": 2,
                                "piid": 1,
-                               "friendlyName": "Light - Switch Status",
+                               "friendlyName": "Light - Power",
                                "channel": "on",
                                "type": "Switch",
                                "refresh": true,
@@ -42,7 +42,7 @@
                                "piid": 2,
                                "friendlyName": "Light - Brightness",
                                "channel": "brightness",
-                               "type": "Number:Dimensionless",
+                               "type": "Dimmer",
                                "unit": "percentage",
                                "stateDescription": {
                                        "minimum": 1,
@@ -57,7 +57,7 @@
                                                "parameterType": "NUMBER"
                                        }
                                ],
-                               "category": "dimmablelight",
+                               "category": "light",
                                "tags": [
                                        "Setpoint",
                                        "Light"

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.wy200-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.wy200-miot.json
new file mode 100644 (file)
index 0000000..65a1148
--- /dev/null
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.wy200-miot.json
@@ -0,0 +1,89 @@
+{
+       "deviceMapping": {
+               "id": [
+                       "huayi.light.wy200",
+                       "huayi.light.wy201",
+                       "huayi.light.wy202",
+                       "huayi.light.wy203",
+                       "huayi.light.wy204"
+               ],
+               "propertyMethod": "get_properties",
+               "maxProperties": 1,
+               "channels": [
+                       {
+                               "property": "on",
+                               "siid": 2,
+                               "piid": 1,
+                               "friendlyName": "Light - Power",
+                               "channel": "on",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Switch"
+                               ]
+                       },
+                       {
+                               "property": "brightness",
+                               "siid": 2,
+                               "piid": 2,
+                               "friendlyName": "Light - Brightness",
+                               "channel": "brightness",
+                               "type": "Dimmer",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1,
+                                       "maximum": 100,
+                                       "step": 1,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Setpoint",
+                                       "Light"
+                               ]
+                       },
+                       {
+                               "property": "color-temperature",
+                               "siid": 2,
+                               "piid": 3,
+                               "friendlyName": "Light - Color Temperature",
+                               "channel": "color-temperature",
+                               "type": "Number:Temperature",
+                               "unit": "kelvin",
+                               "stateDescription": {
+                                       "minimum": 3000,
+                                       "maximum": 6400,
+                                       "step": 1,
+                                       "pattern": "%.1f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "STRING"
+                                       }
+                               ],
+                               "category": "rgb",
+                               "tags": [
+                                       "Setpoint",
+                                       "ColorTemperature"
+                               ]
+                       }
+               ],
+               "experimental": true
+       }
+}

diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.wyheat-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.wyheat-miot.json
new file mode 100644 (file)
index 0000000..91a65a6
--- /dev/null
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/huayi.light.wyheat-miot.json
@@ -0,0 +1,160 @@
+{
+       "deviceMapping": {
+               "id": [
+                       "huayi.light.wyheat"
+               ],
+               "propertyMethod": "get_properties",
+               "maxProperties": 1,
+               "channels": [
+                       {
+                               "property": "on",
+                               "siid": 2,
+                               "piid": 1,
+                               "friendlyName": "Light - Power",
+                               "channel": "on",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Switch"
+                               ]
+                       },
+                       {
+                               "property": "brightness",
+                               "siid": 2,
+                               "piid": 2,
+                               "friendlyName": "Light - Brightness",
+                               "channel": "brightness",
+                               "type": "Dimmer",
+                               "unit": "percentage",
+                               "stateDescription": {
+                                       "minimum": 1,
+                                       "maximum": 100,
+                                       "step": 1,
+                                       "pattern": "%.0f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ],
+                               "category": "light",
+                               "tags": [
+                                       "Setpoint",
+                                       "Light"
+                               ]
+                       },
+                       {
+                               "property": "color-temperature",
+                               "siid": 2,
+                               "piid": 3,
+                               "friendlyName": "Light - Color Temperature",
+                               "channel": "color-temperature",
+                               "type": "Number:Temperature",
+                               "unit": "kelvin",
+                               "stateDescription": {
+                                       "minimum": 3000,
+                                       "maximum": 6400,
+                                       "step": 1,
+                                       "pattern": "%.1f %unit%"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "STRING"
+                                       }
+                               ],
+                               "category": "rgb",
+                               "tags": [
+                                       "Setpoint",
+                                       "ColorTemperature"
+                               ]
+                       },
+                       {
+                               "property": "on1",
+                               "siid": 3,
+                               "piid": 1,
+                               "friendlyName": "Heater - Power",
+                               "channel": "on1",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ],
+                               "category": "switch",
+                               "tags": [
+                                       "Switch"
+                               ]
+                       },
+                       {
+                               "property": "fault",
+                               "siid": 3,
+                               "piid": 2,
+                               "friendlyName": "Heater - Device Fault",
+                               "channel": "fault",
+                               "type": "Number",
+                               "stateDescription": {
+                                       "readOnly": true,
+                                       "options": [
+                                               {
+                                                       "value": "0",
+                                                       "label": "No Faults"
+                                               }
+                                       ]
+                               },
+                               "refresh": true,
+                               "actions": [],
+                               "readmeComment": "Value mapping [0\u003d\"No Faults\"]"
+                       },
+                       {
+                               "property": "heat-level",
+                               "siid": 3,
+                               "piid": 3,
+                               "friendlyName": "Heater - Heat Level",
+                               "channel": "heat-level",
+                               "type": "Number",
+                               "stateDescription": {
+                                       "minimum": 1,
+                                       "maximum": 3,
+                                       "step": 1,
+                                       "pattern": "%.0f"
+                               },
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "NUMBER"
+                                       }
+                               ]
+                       },
+                       {
+                               "property": "screenshow",
+                               "siid": 4,
+                               "piid": 1,
+                               "friendlyName": "Other - Screenshow",
+                               "channel": "screenshow",
+                               "type": "Switch",
+                               "refresh": true,
+                               "actions": [
+                                       {
+                                               "command": "set_properties",
+                                               "parameterType": "ONOFFBOOL"
+                                       }
+                               ]
+                       }
+               ],
+               "experimental": true
+       }
+}