diff --git a/bundles/org.openhab.binding.miio/README.base.md b/bundles/org.openhab.binding.miio/README.base.md
index 7f2fb4192a1..5dbd50e19b7 100644
--- a/bundles/org.openhab.binding.miio/README.base.md
+++ b/bundles/org.openhab.binding.miio/README.base.md
@@ -74,13 +74,13 @@ However, for devices that are unsupported, you may override the value and try to
### Example Thing file
-`Thing miio:basic:light "My Light" [ host="192.168.x.x", token="put here your token", deviceId="0326xxxx" ]`
+`Thing miio:basic:light "My Light" [ host="192.168.x.x", token="put here your token", deviceId="0326xxxx", model="philips.light.bulb" ]`
-or in case of unknown models include the model information e.g.:
+or in case of unknown models include the model information of a similar device that is supported:
-`Thing miio:vacuum:s50 "vacuum" @ "livingroom" [ host="192.168.15.20", token="xxxxxxx", deviceId=“0470DDAA”, model="roborock.vacuum.s5" ]`
+`Thing miio:vacuum:s50 "vacuum" @ "livingroom" [ host="192.168.15.20", token="xxxxxxx", deviceId=“0470DDAA”, model="roborock.vacuum.s4" ]`
-## Mi IO Devices
+# Mi IO Devices
!!!devices
@@ -93,6 +93,7 @@ The binding allows to try/test if your new device is working with database files
There are 2 ways to get unsupported devices working, by overriding the model with the model of a supported item or by test all known properties to see which are supported by your device.
## Substitute model for unsupported devices
+
Replace the model with the model which is already supported.
For this, first remove your unsupported thing. Manually add a miio:basic thing.
Besides the regular configuration (like ip address, token) the modelId needs to be provided.
@@ -100,6 +101,7 @@ Normally the modelId is populated with the model of your device, however in this
Look at the openHAB forum, or the openHAB GitHub repository for the modelId of similar devices.
## Supported property test
+
The unsupported device has a test channel with switch. When switching on, all known properties are tested, this may take few minutes.
A test report will be shown in the log and is saved in the userdata/miio folder.
If supported properties are found, an experimental database file is saved to the conf/misc/miio folder (see below chapter).
@@ -115,6 +117,49 @@ The conf/misc/miio (e.g. in Linux `/opt/openhab2/conf/misc/miio/`) is scanned fo
Note that local database files take preference over build-in ones, hence if a json file is local and in the database the local file will be used.
For format, please check the current database files in openHAB GitHub.
+# FAQ.. what to do in case of problems
+
+If your device is not getting online:
+
+_Are you using text config?_
+Make sure you define all the fields as per above example.
+Or, better, try to get it going first without text config.
+
+_The token is wrong_
+The most common cause of non responding devices is a wrong token.
+When you reset, or change wifi or update firmware, and possibly other cases as well, the token may change. You'll need to get a refreshed token.
+
+_My token is coming from the cloud... how can it be wrong?_
+Is not very likely but still can happen._
+This can happen e.g. if your device is defined on multiple country servers.
+The binding may pull the token from the wrong country server.
+First try to get the token from all country servers by leave the county setting empty.
+If that does not solve it, you define only the country that the device is on in the binding config page (where the cloud userid/pwd is entered) this should pull the right token.
+
+_You have the same device added multiple times._
+The communication each time send a sequential number.
+If the device is twice defined, the numbers received by the device are no longer sequential and it will stop responding for some time.
+
+_The connection is not too good, so you have timeouts etc._
+Position your device closer to wifi / check in the mihome app if the wifi strength is good enough.
+Alternatively as described above, double check for multiple connections for single device.
+
+_Your device is on a different subnet?_
+This is in most cases not working.
+Firmware of the device don't accept commands coming from other subnets.
+
+_Cloud connectivity is not working_
+The most common problem is a wrong userId/password. Try to fix your userId/password.
+If it still fails, you're bit out of luck. You may try to restart OpenHAB (not just the binding) to clean the cookies.
+As the cloud logon process is still little understood, your only luck might be to enable trace logging and see if you can translate the Chinese error code that it returns.
+
+_My Roborock vacuum is not found or not reacting_
+Did you link the vacuum with the Roborock app?
+This won't work, the Roborock app is using a different communication method.
+Reset your vacuum and connect it to the Xiaomi MiHome app.
+This will change the communication method and the Mi IO binding can communicate with the vacuum.
+
+
# Channels
Depending on the device, different channels are available.
@@ -199,10 +244,10 @@ Additionally depending on the capabilities of your robot vacuum other channels m
!!!itemFileExamples
-###(Country Servers)
+### Country Servers
Known country Servers: cn, de, i2, ru, sg, us
-Mapping of countries in mihome app to server
+Mapping of countries in mihome app to server:
| Country | Country Code | Server |
|--------------------------|--------------|--------|
diff --git a/bundles/org.openhab.binding.miio/README.md b/bundles/org.openhab.binding.miio/README.md
index 39ea5cffa95..da9516dabff 100644
--- a/bundles/org.openhab.binding.miio/README.md
+++ b/bundles/org.openhab.binding.miio/README.md
@@ -74,13 +74,13 @@ However, for devices that are unsupported, you may override the value and try to
### Example Thing file
-`Thing miio:basic:light "My Light" [ host="192.168.x.x", token="put here your token", deviceId="0326xxxx" ]`
+`Thing miio:basic:light "My Light" [ host="192.168.x.x", token="put here your token", deviceId="0326xxxx", model="philips.light.bulb" ]`
-or in case of unknown models include the model information e.g.:
+or in case of unknown models include the model information of a similar device that is supported:
-`Thing miio:vacuum:s50 "vacuum" @ "livingroom" [ host="192.168.15.20", token="xxxxxxx", deviceId=“0470DDAA”, model="roborock.vacuum.s5" ]`
+`Thing miio:vacuum:s50 "vacuum" @ "livingroom" [ host="192.168.15.20", token="xxxxxxx", deviceId=“0470DDAA”, model="roborock.vacuum.s4" ]`
-## Mi IO Devices
+# Mi IO Devices
| Device | ThingType | Device Model | Supported | Remark |
|------------------------------|------------------|------------------------|-----------|------------|
@@ -148,7 +148,11 @@ or in case of unknown models include the model information e.g.:
| Mi Humdifier | miio:basic | [zhimi.humidifier.v1](#zhimi-humidifier-v1) | Yes | |
| Light Control (Wall Switch) | miio:unsupported | lumi.ctrl_neutral1.v1 | No | |
| Light Control (Wall Switch) | miio:unsupported | lumi.ctrl_neutral2.v1 | No | |
+| Mr Bond M1 Pro Smart Clothes Dryer | miio:basic | [mrbond.airer.m1pro](#mrbond-airer-m1pro) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| Mr Bond M1 Smart Clothes Dryer | miio:basic | [mrbond.airer.m1s](#mrbond-airer-m1s) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
+| Mr Bond M1 Super Smart Clothes Dryer | miio:basic | [mrbond.airer.m1super](#mrbond-airer-m1super) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
| Xiaomi Philips Eyecare Smart Lamp 2 | miio:basic | [philips.light.sread1](#philips-light-sread1) | Yes | |
+| Xiaomi Philips Eyecare Smart Lamp 2 | miio:basic | [philips.light.sread2](#philips-light-sread2) | Yes | |
| Xiaomi Philips LED Ceiling Lamp | miio:basic | [philips.light.ceiling](#philips-light-ceiling) | Yes | |
| Xiaomi Philips LED Ceiling Lamp | miio:basic | [philips.light.zyceiling](#philips-light-zyceiling) | Yes | |
| Xiaomi Philips Bulb | miio:basic | [philips.light.bulb](#philips-light-bulb) | Yes | |
@@ -158,13 +162,10 @@ or in case of unknown models include the model information e.g.:
| Xiaomi Philips ZhiRui bedside lamp | miio:basic | [philips.light.moonlight](#philips-light-moonlight) | Yes | |
| Philips Ceiling Light | miio:basic | [philips.light.bceiling1](#philips-light-bceiling1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
| Philips Ceiling Light | miio:basic | [philips.light.bceiling2](#philips-light-bceiling2) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
-<<<<<<< miio-backport
-=======
| Philips Light | miio:basic | [philips.light.cbulb](#philips-light-cbulb) | Yes | |
| Philips Light | miio:basic | [philips.light.cbulbs](#philips-light-cbulbs) | Yes | |
| Philips Light | miio:basic | [philips.light.dcolor](#philips-light-dcolor) | Yes | |
| Philips Light | miio:basic | [philips.light.rwread](#philips-light-rwread) | Yes | |
->>>>>>> ed6d68f [miio] add new country server and improve readme (#8816)
| Philips Light | miio:basic | [philips.light.lnblight1](#philips-light-lnblight1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
| Philips Light | miio:basic | [philips.light.lnblight2](#philips-light-lnblight2) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
| Philips Light | miio:basic | [philips.light.lnlrlight](#philips-light-lnlrlight) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
@@ -193,6 +194,8 @@ or in case of unknown models include the model information e.g.:
| Mi Power-plug v3 | miio:basic | [chuangmi.plug.v3](#chuangmi-plug-v3) | Yes | |
| Mi Power-plug | miio:basic | [chuangmi.plug.m3](#chuangmi-plug-m3) | Yes | |
| Mi Smart Plug | miio:basic | [chuangmi.plug.hmi205](#chuangmi-plug-hmi205) | Yes | |
+| Mi Smart Plug | miio:basic | [chuangmi.plug.hmi206](#chuangmi-plug-hmi206) | Yes | |
+| Mi Smart Plug | miio:basic | [chuangmi.plug.hmi208](#chuangmi-plug-hmi208) | Yes | |
| Qing Mi Smart Power Strip v1 | miio:basic | [qmi.powerstrip.v1](#qmi-powerstrip-v1) | Yes | |
| Mi Power-strip v2 | miio:basic | [zimi.powerstrip.v2](#zimi-powerstrip-v2) | Yes | |
| Mi Toothbrush | miio:unsupported | soocare.toothbrush.x3 | No | |
@@ -312,6 +315,7 @@ or in case of unknown models include the model information e.g.:
| Yeelight yilai ceiling | miio:basic | [yilai.light.ceiling1](#yilai-light-ceiling1) | Yes | |
| Yeelight yilai ceiling | miio:basic | [yilai.light.ceiling2](#yilai-light-ceiling2) | Yes | |
| Yeelight yilai ceiling | miio:basic | [yilai.light.ceiling3](#yilai-light-ceiling3) | Yes | |
+| Zhimi Heater | miio:basic | [zhimi.heater.za1](#zhimi-heater-za1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
# Advanced: Unsupported devices
@@ -323,6 +327,7 @@ The binding allows to try/test if your new device is working with database files
There are 2 ways to get unsupported devices working, by overriding the model with the model of a supported item or by test all known properties to see which are supported by your device.
## Substitute model for unsupported devices
+
Replace the model with the model which is already supported.
For this, first remove your unsupported thing. Manually add a miio:basic thing.
Besides the regular configuration (like ip address, token) the modelId needs to be provided.
@@ -330,6 +335,7 @@ Normally the modelId is populated with the model of your device, however in this
Look at the openHAB forum, or the openHAB GitHub repository for the modelId of similar devices.
## Supported property test
+
The unsupported device has a test channel with switch. When switching on, all known properties are tested, this may take few minutes.
A test report will be shown in the log and is saved in the userdata/miio folder.
If supported properties are found, an experimental database file is saved to the conf/misc/miio folder (see below chapter).
@@ -337,7 +343,7 @@ The thing will go offline and will come back online as basic device, supporting
The database file may need to be modified to display the right channel names.
After validation, please share the logfile and json files on the openHAB forum or the openHAB GitHub to build future support for this model.
-# Advanced: adding local database files to support new devices
+## Advanced: adding local database files to support new devices
Things using the basic handler (miio:basic things) are driven by json 'database' files.
This instructs the binding which channels to create, which properties and actions are associated with the channels etc.
@@ -345,7 +351,50 @@ The conf/misc/miio (e.g. in Linux `/opt/openhab2/conf/misc/miio/`) is scanned fo
Note that local database files take preference over build-in ones, hence if a json file is local and in the database the local file will be used.
For format, please check the current database files in openHAB GitHub.
-## Channels
+# FAQ.. what to do in case of problems
+
+If your device is not getting online:
+
+_Are you using text config?_
+Make sure you define all the fields as per above example.
+Or, better, try to get it going first without text config.
+
+_The token is wrong_
+The most common cause of non responding devices is a wrong token.
+When you reset, or change wifi or update firmware, and possibly other cases as well, the token may change. You'll need to get a refreshed token.
+
+_My token is coming from the cloud... how can it be wrong?_
+Is not very likely but still can happen._
+This can happen e.g. if your device is defined on multiple country servers.
+The binding may pull the token from the wrong country server.
+First try to get the token from all country servers by leave the county setting empty.
+If that does not solve it, you define only the country that the device is on in the binding config page (where the cloud userid/pwd is entered) this should pull the right token.
+
+_You have the same device added multiple times._
+The communication each time send a sequential number.
+If the device is twice defined, the numbers received by the device are no longer sequential and it will stop responding for some time.
+
+_The connection is not too good, so you have timeouts etc._
+Position your device closer to wifi / check in the mihome app if the wifi strength is good enough.
+Alternatively as described above, double check for multiple connections for single device.
+
+_Your device is on a different subnet?_
+This is in most cases not working.
+Firmware of the device don't accept commands coming from other subnets.
+
+_Cloud connectivity is not working_
+The most common problem is a wrong userId/password. Try to fix your userId/password.
+If it still fails, you're bit out of luck. You may try to restart OpenHAB (not just the binding) to clean the cookies.
+As the cloud logon process is still little understood, your only luck might be to enable trace logging and see if you can translate the Chinese error code that it returns.
+
+_My Roborock vacuum is not found or not reacting_
+Did you link the vacuum with the Roborock app?
+This won't work, the Roborock app is using a different communication method.
+Reset your vacuum and connect it to the Xiaomi MiHome app.
+This will change the communication method and the Mi IO binding can communicate with the vacuum.
+
+
+# Channels
Depending on the device, different channels are available.
@@ -1207,6 +1256,42 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
| temperature | Number | Temperature | |
| childlock | Switch | Child Lock | |
+### Mr Bond M1 Pro Smart Clothes Dryer (mrbond.airer.m1pro) Channels
+
+| Channel | Type | Description | Comment |
+|------------------|---------|-------------------------------------|------------|
+| dry | Switch | Dry | |
+| led | Switch | LED Status | |
+| motor | Number | Motor | |
+| drytime | Number | Dry Time | |
+| airer_location | Number | Airer Location | |
+| disinfect | Switch | disinfect | |
+| distime | Number | Disinfect Time | |
+
+### Mr Bond M1 Smart Clothes Dryer (mrbond.airer.m1s) Channels
+
+| Channel | Type | Description | Comment |
+|------------------|---------|-------------------------------------|------------|
+| dry | Switch | Dry | |
+| led | Switch | LED Status | |
+| motor | Number | Motor | |
+| drytime | Number | Dry Time | |
+| airer_location | Number | Airer Location | |
+| disinfect | Switch | disinfect | |
+| distime | Number | Disinfect Time | |
+
+### Mr Bond M1 Super Smart Clothes Dryer (mrbond.airer.m1super) Channels
+
+| Channel | Type | Description | Comment |
+|------------------|---------|-------------------------------------|------------|
+| dry | Switch | Dry | |
+| led | Switch | LED Status | |
+| motor | Number | Motor | |
+| drytime | Number | Dry Time | |
+| airer_location | Number | Airer Location | |
+| disinfect | Switch | disinfect | |
+| distime | Number | Disinfect Time | |
+
### Xiaomi Philips Eyecare Smart Lamp 2 (philips.light.sread1) Channels
| Channel | Type | Description | Comment |
@@ -1217,6 +1302,19 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
| ambientBrightness | Number | Ambient Brightness | |
| illumination | Number | Ambient Illumination | |
| eyecare | Switch | Eyecare | |
+| bl | Switch | Night Light | |
+
+### Xiaomi Philips Eyecare Smart Lamp 2 (philips.light.sread2) Channels
+
+| Channel | Type | Description | Comment |
+|------------------|---------|-------------------------------------|------------|
+| power | Switch | Power | |
+| brightness | Dimmer | Brightness | |
+| ambientPower | Switch | Ambient Power | |
+| ambientBrightness | Number | Ambient Brightness | |
+| illumination | Number | Ambient Illumination | |
+| eyecare | Switch | Eyecare | |
+| bl | Switch | Night Light | |
### Xiaomi Philips LED Ceiling Lamp (philips.light.ceiling) Channels
@@ -1332,8 +1430,6 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
| delayoff | Switch | Delay Off | |
| mb | Switch | MiBand | |
-<<<<<<< miio-backport
-=======
### Philips Light (philips.light.cbulb) Channels
| Channel | Type | Description | Comment |
@@ -1383,7 +1479,6 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
| flm | Number | Follow Me | |
| dv | Number | DV | |
->>>>>>> ed6d68f [miio] add new country server and improve readme (#8816)
### Philips Light (philips.light.lnblight1) Channels
| Channel | Type | Description | Comment |
@@ -1746,6 +1841,24 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
| temperature | Number | Temperature | |
| led | Switch | Indicator light | |
+### Mi Smart Plug (chuangmi.plug.hmi206) Channels
+
+| Channel | Type | Description | Comment |
+|------------------|---------|-------------------------------------|------------|
+| power | Switch | Power | If this channel does not respond to on/off replace the model with chuangmi.plug.v3old in the config or upgrade firmware |
+| usb | Switch | USB | |
+| temperature | Number | Temperature | |
+| led | Switch | Wifi LED | |
+
+### Mi Smart Plug (chuangmi.plug.hmi208) Channels
+
+| Channel | Type | Description | Comment |
+|------------------|---------|-------------------------------------|------------|
+| power | Switch | Power | If this channel does not respond to on/off replace the model with chuangmi.plug.v3old in the config or upgrade firmware |
+| usb | Switch | USB | |
+| temperature | Number | Temperature | |
+| led | Switch | Wifi LED | |
+
### Qing Mi Smart Power Strip v1 (qmi.powerstrip.v1) Channels
| Channel | Type | Description | Comment |
@@ -2995,6 +3108,20 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
| customScene | String | Set Scene | |
| nightlightBrightness | Number | Nightlight Brightness | |
+### Zhimi Heater (zhimi.heater.za1) Channels
+
+| Channel | Type | Description | Comment |
+|------------------|---------|-------------------------------------|------------|
+| power | Switch | Power | |
+| target_temperature | Number | Target Temperature | |
+| brightness | Number | Brightness | |
+| buzzer | Switch | Buzzer Status | |
+| relative_humidity | Number | Relative Humidity | |
+| childlock | Switch | Child Lock | |
+| HWSwitch | Switch | HW Switch | |
+| temperature | Number | Temperature | |
+| usedhours | Number | Run Time | |
+
@@ -4029,6 +4156,51 @@ Number temperature "Temperature" (G_humidifier) {channel="miio:basic:humidifier:
Switch childlock "Child Lock" (G_humidifier) {channel="miio:basic:humidifier:childlock"}
```
+### Mr Bond M1 Pro Smart Clothes Dryer (mrbond.airer.m1pro) item file lines
+
+note: Autogenerated example. Replace the id (airer) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_airer "Mr Bond M1 Pro Smart Clothes Dryer"
+Switch dry "Dry" (G_airer) {channel="miio:basic:airer:dry"}
+Switch led "LED Status" (G_airer) {channel="miio:basic:airer:led"}
+Number motor "Motor" (G_airer) {channel="miio:basic:airer:motor"}
+Number drytime "Dry Time" (G_airer) {channel="miio:basic:airer:drytime"}
+Number airer_location "Airer Location" (G_airer) {channel="miio:basic:airer:airer_location"}
+Switch disinfect "disinfect" (G_airer) {channel="miio:basic:airer:disinfect"}
+Number distime "Disinfect Time" (G_airer) {channel="miio:basic:airer:distime"}
+```
+
+### Mr Bond M1 Smart Clothes Dryer (mrbond.airer.m1s) item file lines
+
+note: Autogenerated example. Replace the id (airer) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_airer "Mr Bond M1 Smart Clothes Dryer"
+Switch dry "Dry" (G_airer) {channel="miio:basic:airer:dry"}
+Switch led "LED Status" (G_airer) {channel="miio:basic:airer:led"}
+Number motor "Motor" (G_airer) {channel="miio:basic:airer:motor"}
+Number drytime "Dry Time" (G_airer) {channel="miio:basic:airer:drytime"}
+Number airer_location "Airer Location" (G_airer) {channel="miio:basic:airer:airer_location"}
+Switch disinfect "disinfect" (G_airer) {channel="miio:basic:airer:disinfect"}
+Number distime "Disinfect Time" (G_airer) {channel="miio:basic:airer:distime"}
+```
+
+### Mr Bond M1 Super Smart Clothes Dryer (mrbond.airer.m1super) item file lines
+
+note: Autogenerated example. Replace the id (airer) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_airer "Mr Bond M1 Super Smart Clothes Dryer"
+Switch dry "Dry" (G_airer) {channel="miio:basic:airer:dry"}
+Switch led "LED Status" (G_airer) {channel="miio:basic:airer:led"}
+Number motor "Motor" (G_airer) {channel="miio:basic:airer:motor"}
+Number drytime "Dry Time" (G_airer) {channel="miio:basic:airer:drytime"}
+Number airer_location "Airer Location" (G_airer) {channel="miio:basic:airer:airer_location"}
+Switch disinfect "disinfect" (G_airer) {channel="miio:basic:airer:disinfect"}
+Number distime "Disinfect Time" (G_airer) {channel="miio:basic:airer:distime"}
+```
+
### Xiaomi Philips Eyecare Smart Lamp 2 (philips.light.sread1) 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.
@@ -4041,6 +4213,22 @@ Switch ambientPower "Ambient Power" (G_light) {channel="miio:basic:light:ambient
Number ambientBrightness "Ambient Brightness" (G_light) {channel="miio:basic:light:ambientBrightness"}
Number illumination "Ambient Illumination" (G_light) {channel="miio:basic:light:illumination"}
Switch eyecare "Eyecare" (G_light) {channel="miio:basic:light:eyecare"}
+Switch bl "Night Light" (G_light) {channel="miio:basic:light:bl"}
+```
+
+### Xiaomi Philips Eyecare Smart Lamp 2 (philips.light.sread2) 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 "Xiaomi Philips Eyecare Smart Lamp 2"
+Switch power "Power" (G_light) {channel="miio:basic:light:power"}
+Dimmer brightness "Brightness" (G_light) {channel="miio:basic:light:brightness"}
+Switch ambientPower "Ambient Power" (G_light) {channel="miio:basic:light:ambientPower"}
+Number ambientBrightness "Ambient Brightness" (G_light) {channel="miio:basic:light:ambientBrightness"}
+Number illumination "Ambient Illumination" (G_light) {channel="miio:basic:light:illumination"}
+Switch eyecare "Eyecare" (G_light) {channel="miio:basic:light:eyecare"}
+Switch bl "Night Light" (G_light) {channel="miio:basic:light:bl"}
```
### Xiaomi Philips LED Ceiling Lamp (philips.light.ceiling) item file lines
@@ -4184,8 +4372,6 @@ Switch delayoff "Delay Off" (G_light) {channel="miio:basic:light:delayoff"}
Switch mb "MiBand" (G_light) {channel="miio:basic:light:mb"}
```
-<<<<<<< miio-backport
-=======
### Philips Light (philips.light.cbulb) 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.
@@ -4247,7 +4433,6 @@ Number flm "Follow Me" (G_light) {channel="miio:basic:light:flm"}
Number dv "DV" (G_light) {channel="miio:basic:light:dv"}
```
->>>>>>> ed6d68f [miio] add new country server and improve readme (#8816)
### Philips Light (philips.light.lnblight1) 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.
@@ -4694,6 +4879,30 @@ Number temperature "Temperature" (G_plug) {channel="miio:basic:plug:temperature"
Switch led "Indicator light" (G_plug) {channel="miio:basic:plug:led"}
```
+### Mi Smart Plug (chuangmi.plug.hmi206) item file lines
+
+note: Autogenerated example. Replace the id (plug) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_plug "Mi Smart Plug"
+Switch power "Power" (G_plug) {channel="miio:basic:plug:power"}
+Switch usb "USB" (G_plug) {channel="miio:basic:plug:usb"}
+Number temperature "Temperature" (G_plug) {channel="miio:basic:plug:temperature"}
+Switch led "Wifi LED" (G_plug) {channel="miio:basic:plug:led"}
+```
+
+### Mi Smart Plug (chuangmi.plug.hmi208) item file lines
+
+note: Autogenerated example. Replace the id (plug) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_plug "Mi Smart Plug"
+Switch power "Power" (G_plug) {channel="miio:basic:plug:power"}
+Switch usb "USB" (G_plug) {channel="miio:basic:plug:usb"}
+Number temperature "Temperature" (G_plug) {channel="miio:basic:plug:temperature"}
+Switch led "Wifi LED" (G_plug) {channel="miio:basic:plug:led"}
+```
+
### Qing Mi Smart Power Strip v1 (qmi.powerstrip.v1) item file lines
note: Autogenerated example. Replace the id (powerstrip) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
@@ -6198,12 +6407,29 @@ String customScene "Set Scene" (G_light) {channel="miio:basic:light:customScene"
Number nightlightBrightness "Nightlight Brightness" (G_light) {channel="miio:basic:light:nightlightBrightness"}
```
+### Zhimi Heater (zhimi.heater.za1) item file lines
+
+note: Autogenerated example. Replace the id (heater) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
+
+```java
+Group G_heater "Zhimi Heater"
+Switch power "Power" (G_heater) {channel="miio:basic:heater:power"}
+Number target_temperature "Target Temperature" (G_heater) {channel="miio:basic:heater:target_temperature"}
+Number brightness "Brightness" (G_heater) {channel="miio:basic:heater:brightness"}
+Switch buzzer "Buzzer Status" (G_heater) {channel="miio:basic:heater:buzzer"}
+Number relative_humidity "Relative Humidity" (G_heater) {channel="miio:basic:heater:relative_humidity"}
+Switch childlock "Child Lock" (G_heater) {channel="miio:basic:heater:childlock"}
+Switch HWSwitch "HW Switch" (G_heater) {channel="miio:basic:heater:HWSwitch"}
+Number temperature "Temperature" (G_heater) {channel="miio:basic:heater:temperature"}
+Number usedhours "Run Time" (G_heater) {channel="miio:basic:heater:usedhours"}
+```
-###(Country Servers)
+
+### Country Servers
Known country Servers: cn, de, i2, ru, sg, us
-Mapping of countries in mihome app to server
+Mapping of countries in mihome app to server:
| Country | Country Code | Server |
|--------------------------|--------------|--------|
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 657ac43016e..615cd069965 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
@@ -102,6 +102,10 @@ public enum MiIoDevices {
PHILIPS_MOON("philips.light.moonlight", "Xiaomi Philips ZhiRui bedside lamp", THING_TYPE_BASIC),
PHILIPS_LIGHT_BCEILING1("philips.light.bceiling1", "Philips Ceiling Light", THING_TYPE_BASIC),
PHILIPS_LIGHT_BCEILING2("philips.light.bceiling2", "Philips Ceiling Light", THING_TYPE_BASIC),
+ PHILIPS_LIGHT_CBULB("philips.light.cbulb", "Philips Light", THING_TYPE_BASIC),
+ PHILIPS_LIGHT_CBULBS("philips.light.cbulbs", "Philips Light", THING_TYPE_BASIC),
+ PHILIPS_LIGHT_DCOLOR("philips.light.dcolor", "Philips Light", THING_TYPE_BASIC),
+ PHILIPS_LIGHT_RWREAD("philips.light.rwread", "Philips Light", THING_TYPE_BASIC),
PHILIPS_LIGHT_LNBLIGHT1("philips.light.lnblight1", "Philips Light", THING_TYPE_BASIC),
PHILIPS_LIGHT_LNBLIGHT2("philips.light.lnblight2", "Philips Light", THING_TYPE_BASIC),
PHILIPS_LIGHT_LNLRLIGHT("philips.light.lnlrlight", "Philips Light", THING_TYPE_BASIC),
@@ -131,6 +135,8 @@ public enum MiIoDevices {
POWERPLUG3("chuangmi.plug.v3", "Mi Power-plug v3", THING_TYPE_BASIC),
POWERPLUGM3("chuangmi.plug.m3", "Mi Power-plug", THING_TYPE_BASIC),
POWERPLUG_HMI205("chuangmi.plug.hmi205", "Mi Smart Plug", THING_TYPE_BASIC),
+ CHUANGMI_PLUG_HMI206("chuangmi.plug.hmi206", "Mi Smart Plug", THING_TYPE_BASIC),
+ CHUANGMI_PLUG_HMI208("chuangmi.plug.hmi208", "Mi Smart Plug", THING_TYPE_BASIC),
POWERSTRIP("qmi.powerstrip.v1", "Qing Mi Smart Power Strip v1", THING_TYPE_BASIC),
POWERSTRIP2("zimi.powerstrip.v2", "Mi Power-strip v2", THING_TYPE_BASIC),
TOOTHBRUSH("soocare.toothbrush.x3", "Mi Toothbrush", THING_TYPE_UNSUPPORTED),
@@ -250,6 +256,7 @@ public enum MiIoDevices {
YL_CEILING1("yilai.light.ceiling1", "Yeelight yilai ceiling", THING_TYPE_BASIC),
YL_CEILING2("yilai.light.ceiling2", "Yeelight yilai ceiling", THING_TYPE_BASIC),
YL_CEILING3("yilai.light.ceiling3", "Yeelight yilai ceiling", THING_TYPE_BASIC),
+ ZHIMI_HEATER_ZA1("zhimi.heater.za1", "Zhimi Heater", THING_TYPE_BASIC),
UNKNOWN("unknown", "Unknown Mi IO Device", THING_TYPE_UNSUPPORTED);
public static MiIoDevices getType(String modelString) {
diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3fw.json b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3fw.json
index a1c907ed485..c3e5f630846 100644
--- a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3fw.json
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3fw.json
@@ -2,7 +2,9 @@
"deviceMapping": {
"id": [
"chuangmi.plug.v3",
- "chuangmi.plug.v3fw"
+ "chuangmi.plug.v3fw",
+ "chuangmi.plug.hmi206",
+ "chuangmi.plug.hmi208"
],
"channels": [
{
diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/mrbond.airer.m1pro.json b/bundles/org.openhab.binding.miio/src/main/resources/database/mrbond.airer.m1pro.json
new file mode 100644
index 00000000000..746b3296b8c
--- /dev/null
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/mrbond.airer.m1pro.json
@@ -0,0 +1,107 @@
+{
+ "deviceMapping": {
+ "id": [
+ "mrbond.airer.m1s",
+ "mrbond.airer.m1pro",
+ "mrbond.airer.m1super"
+ ],
+ "propertyMethod": "get_prop",
+ "maxProperties": 2,
+ "channels": [
+ {
+ "property": "dry",
+ "friendlyName": "Dry",
+ "channel": "dry",
+ "type": "Switch",
+ "refresh": true,
+ "ChannelGroup": "Status",
+ "actions": [
+ {
+ "command": "set_dry",
+ "parameterType": "NUMBER"
+ }
+ ]
+ },
+ {
+ "property": "led",
+ "friendlyName": "LED Status",
+ "channel": "led",
+ "type": "Switch",
+ "refresh": true,
+ "ChannelGroup": "actions",
+ "actions": [
+ {
+ "command": "set_lamp",
+ "parameterType": "NUMBER"
+ }
+ ]
+ },
+ {
+ "property": "motor",
+ "friendlyName": "Motor",
+ "channel": "motor",
+ "type": "Number",
+ "refresh": true,
+ "actions": [
+ {
+ "command": "set_motor",
+ "parameterType": "NUMBER"
+ }
+ ]
+ },
+ {
+ "property": "drytime",
+ "friendlyName": "Dry Time",
+ "channel": "drytime",
+ "type": "Number",
+ "refresh": true,
+ "actions": [
+ {
+ "command": "set_drytime",
+ "parameterType": "NUMBER"
+ }
+ ]
+ },
+ {
+ "property": "airer_location",
+ "friendlyName": "Airer Location",
+ "channel": "airer_location",
+ "type": "Number",
+ "refresh": true,
+ "actions": [
+ {
+ "command": "set_airer_location",
+ "parameterType": "NUMBER"
+ }
+ ]
+ },
+ {
+ "property": "disinfect",
+ "friendlyName": "disinfect",
+ "channel": "disinfect",
+ "type": "Switch",
+ "refresh": true,
+ "actions": [
+ {
+ "command": "set_disinfect",
+ "parameterType": "NUMBER"
+ }
+ ]
+ },
+ {
+ "property": "distime",
+ "friendlyName": "Disinfect Time",
+ "channel": "distime",
+ "type": "Number",
+ "refresh": true,
+ "actions": [
+ {
+ "command": "set_distime",
+ "parameterType": "NUMBER"
+ }
+ ]
+ }
+ ],
+ "experimental": true
+ }
+}
diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.sread1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.sread1.json
index 7c328a440b7..9c993f09da2 100644
--- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.sread1.json
+++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.sread1.json
@@ -1,7 +1,8 @@
{
"deviceMapping": {
"id": [
- "philips.light.sread1"
+ "philips.light.sread1",
+ "philips.light.sread2"
],
"channels": [
{
@@ -98,6 +99,19 @@
"parameterType": "ONOFF"
}
]
+ },
+ {
+ "property": "bl",
+ "friendlyName": "Night Light",
+ "channel": "bl",
+ "type": "Switch",
+ "refresh": true,
+ "actions": [
+ {
+ "command": "enable_bl",
+ "parameterType": "NUMBER"
+ }
+ ]
}
]
}