diff --git a/bundles/org.openhab.binding.miio/README.md b/bundles/org.openhab.binding.miio/README.md index 12a7a4729..1a3a95208 100644 --- a/bundles/org.openhab.binding.miio/README.md +++ b/bundles/org.openhab.binding.miio/README.md @@ -811,7 +811,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| | power | Switch | Power | | -| airFreshMode | String | Mode | | +| airFreshMode | String | Mode | Value mapping `["auto"="Auto","sleep"="Sleep","favourite"="Favorite"]` | | airFreshPTCPower | Switch | PTC | | | airFreshPTCStatus | Switch | PTC Status | | | airFreshDisplay | Switch | Display | | @@ -831,11 +831,11 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| | power | Switch | Power | | -| airFreshMode | String | Mode | | +| airFreshMode | String | Mode | Value mapping `["auto"="Auto","sleep"="Sleep","favourite"="Favorite"]` | | airFreshPTCPower | Switch | PTC | | -| airFreshPtcLevel | String | PTC Level | | +| airFreshPtcLevel | String | PTC Level | Value mapping `["low"="Low","medium"="Medium","high"="High"]` | | airFreshPTCStatus | Switch | PTC Status | | -| airFreshDisplayDirection | String | Screen direction | | +| airFreshDisplayDirection | String | Screen direction | Value mapping `["forward"="Normal","left"="Left","right"="Right"]` | | airFreshDisplay | Switch | Display | | | airFreshChildLock | Switch | Child Lock | | | airFreshSound | Switch | Sound | | @@ -1427,14 +1427,16 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| | fault | Number | Curtain - Device Fault | Value mapping `["0"="No faults"]` | -| current-position | Number | Curtain - Current Position | | +| motor_control | Number | Curtain - Motor Control | Value mapping `["0"="Pause","1"="Open","2"="Close","3"="auto"]` | +| current-position | Number:Dimensionless | Curtain - Current Position | | | status | Number | Curtain - Status | Value mapping `["0"="Stopped","1"="Opening","2"="Closing"]` | -| target-position | Number | Curtain - Target Position | | +| target-position | Number:Dimensionless | Curtain - Target Position | | | manual-enabled | Number | curtain_cfg - Manual Enabled | Value mapping `["0"="Disable","1"="Enable"]` | -| polarity | Number | curtain_cfg - Polarity | Value mapping `["0"="Positive","1"="Reverse"]` | +| polarity | Number | Curtain_cfg - Polarity | Value mapping `["0"="Positive","1"="Reverse"]` | | pos-limit | Number | curtain_cfg - Position Limit | Value mapping `["0"="Unlimit","1"="Limit"]` | -| en-night-tip-light | Switch | Set Night Tip Light | Value mapping `["0"="Disable","1"="Enable"]` | -| run-time | Number | curtain_cfg - Run-time | | +| en_night_tip_light | Number | Curtain_cfg - En_night_tip_light | Value mapping `["0"="Disable","1"="Enable"]` | +| run-time | Number | Curtain_cfg - Run-time | | +| adjust_value | Number | Motor_controller - Adjust_value | | ### Mi Air Purifier virtual (lumi.gateway.mgl03) Channels @@ -1772,6 +1774,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Philips ZhiRui Downlight (philips.light.downlight) Channels @@ -1875,6 +1878,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Nordic 40W (philips.light.mceilm) Channels @@ -1890,6 +1894,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Nordic 28W (philips.light.mceils) Channels @@ -1905,6 +1910,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Philips Smart Lamp (philips.light.mono1) Channels @@ -1941,6 +1947,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Black 40W (philips.light.obceim) Channels @@ -1956,6 +1963,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Black 28W (philips.light.obceis) Channels @@ -1971,6 +1979,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Mijia Philips Study Desk Lamp (philips.light.rwread) Channels @@ -1996,6 +2005,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Starry 40W (philips.light.sceilm) Channels @@ -2011,6 +2021,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Starry 28W (philips.light.sceils) Channels @@ -2026,6 +2037,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Philips EyeCare Connected Desk Lamp gen2. (philips.light.sread1) Channels @@ -2077,6 +2089,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Gorgeous 40W (philips.light.xzceim) Channels @@ -2092,6 +2105,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Zhirui Ceiling Lamp Gorgeous 28W (philips.light.xzceis) Channels @@ -2107,6 +2121,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | autoCct | String | Auto CCT | | | dimmingPeriod | Number | Dimming Period | | | MibandStatus | String | Mi Band Status | | +| actions | String | Actions | Value mapping `["light-brightness-down"="Light Brightness Down","light-brightness-up"="Light Brightness Up","light-toggle"="Light Toggle"]` | ### Philips ZhiYi Ceiling lamp (philips.light.zyceiling) Channels @@ -2209,7 +2224,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| vacuumaction | Number | Vacuum Action | | +| vacuumaction | Number | Vacuum Action | Value mapping `["1"="Start","0"="Stop","2"="Pause"]` | | state | Number | State | | | mode | Number | Mode | | | err_state | Number | Error | | @@ -2229,7 +2244,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| vacuumaction | Number | Vacuum Action | | +| vacuumaction | Number | Vacuum Action | Value mapping `["1"="Start","0"="Stop","2"="Pause"]` | | state | Number | State | | | mode | Number | Mode | | | err_state | Number | Error | | @@ -2249,7 +2264,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| vacuumaction | Number | Vacuum Action | | +| vacuumaction | Number | Vacuum Action | Value mapping `["1"="Start","0"="Stop","2"="Pause"]` | | state | Number | State | | | mode | Number | Mode | | | err_state | Number | Error | | @@ -4976,7 +4991,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | speedLevel | Number | Speed Level | | | speed | Number | Speed | | | naturalLevel | Number | Natural Level | | -| move | String | Move Direction | | +| move | String | Move Direction | Value mapping `[""="None","left"="Left","right"="Right"]` | ### Smartmi Standing Fan 2S (zhimi.fan.za4) Channels @@ -4993,7 +5008,7 @@ Note, not all the values need to be in the json file, e.g. a subset of the param | speedLevel | Number | Speed Level | | | speed | Number | Speed | | | naturalLevel | Number | Natural Level | | -| move | String | Move Direction | | +| move | String | Move Direction | Value mapping `[""="None","left"="Left","right"="Right"]` | ### Smartmi Standing Fan 3 (zhimi.fan.za5) Channels @@ -6320,14 +6335,16 @@ note: Autogenerated example. Replace the id (curtain) in the channel with your o ``` Group G_curtain "Xiaomiyoupin Curtain Controller (Wi-Fi)" Number fault "Curtain - Device Fault" (G_curtain) {channel="miio:basic:curtain:fault"} -Number current_position "Curtain - Current Position" (G_curtain) {channel="miio:basic:curtain:current-position"} +Number motor_control "Curtain - Motor Control" (G_curtain) {channel="miio:basic:curtain:motor_control"} +Number:Dimensionless current_position "Curtain - Current Position" (G_curtain) {channel="miio:basic:curtain:current-position"} Number status "Curtain - Status" (G_curtain) {channel="miio:basic:curtain:status"} -Number target_position "Curtain - Target Position" (G_curtain) {channel="miio:basic:curtain:target-position"} +Number:Dimensionless target_position "Curtain - Target Position" (G_curtain) {channel="miio:basic:curtain:target-position"} Number manual_enabled "curtain_cfg - Manual Enabled" (G_curtain) {channel="miio:basic:curtain:manual-enabled"} -Number polarity "curtain_cfg - Polarity" (G_curtain) {channel="miio:basic:curtain:polarity"} +Number polarity "Curtain_cfg - Polarity" (G_curtain) {channel="miio:basic:curtain:polarity"} Number pos_limit "curtain_cfg - Position Limit" (G_curtain) {channel="miio:basic:curtain:pos-limit"} -Switch en_night_tip_light "Set Night Tip Light" (G_curtain) {channel="miio:basic:curtain:en-night-tip-light"} -Number run_time "curtain_cfg - Run-time" (G_curtain) {channel="miio:basic:curtain:run-time"} +Number en_night_tip_light "Curtain_cfg - En_night_tip_light" (G_curtain) {channel="miio:basic:curtain:en_night_tip_light"} +Number run_time "Curtain_cfg - Run-time" (G_curtain) {channel="miio:basic:curtain:run-time"} +Number adjust_value "Motor_controller - Adjust_value" (G_curtain) {channel="miio:basic:curtain:adjust_value"} ``` ### Mi Air Purifier virtual (lumi.gateway.mgl03) item file lines @@ -6737,6 +6754,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Philips ZhiRui Downlight (philips.light.downlight) item file lines @@ -6861,6 +6879,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Nordic 40W (philips.light.mceilm) item file lines @@ -6879,6 +6898,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Nordic 28W (philips.light.mceils) item file lines @@ -6897,6 +6917,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Philips Smart Lamp (philips.light.mono1) item file lines @@ -6942,6 +6963,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Black 40W (philips.light.obceim) item file lines @@ -6960,6 +6982,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Black 28W (philips.light.obceis) item file lines @@ -6978,6 +7001,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Mijia Philips Study Desk Lamp (philips.light.rwread) item file lines @@ -7009,6 +7033,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Starry 40W (philips.light.sceilm) item file lines @@ -7027,6 +7052,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Starry 28W (philips.light.sceils) item file lines @@ -7045,6 +7071,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Philips EyeCare Connected Desk Lamp gen2. (philips.light.sread1) item file lines @@ -7108,6 +7135,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Gorgeous 40W (philips.light.xzceim) item file lines @@ -7126,6 +7154,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Zhirui Ceiling Lamp Gorgeous 28W (philips.light.xzceis) item file lines @@ -7144,6 +7173,7 @@ String WallScene "Wall Scene" (G_light) {channel="miio:basic:light:WallScene"} String autoCct "Auto CCT" (G_light) {channel="miio:basic:light:autoCct"} Number dimmingPeriod "Dimming Period" (G_light) {channel="miio:basic:light:dimmingPeriod"} String MibandStatus "Mi Band Status" (G_light) {channel="miio:basic:light:MibandStatus"} +String actions "Actions" (G_light) {channel="miio:basic:light:actions"} ``` ### Philips ZhiYi Ceiling lamp (philips.light.zyceiling) item file lines diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java index 9391acd15..33dc57574 100644 --- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java +++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java @@ -48,6 +48,9 @@ public class MiIoBasicChannel { @SerializedName("channel") @Expose private @Nullable String channel; + @SerializedName("description") + @Expose + private @Nullable String description; @SerializedName("channelType") @Expose private @Nullable String channelType; @@ -142,6 +145,15 @@ public class MiIoBasicChannel { this.channel = channel; } + public String getDescription() { + final String description = this.description; + return description != null ? description : ""; + } + + public void setDescription(@Nullable String description) { + this.description = description; + } + public String getChannelType() { final @Nullable String ct = channelType; if (ct == null || ct.isEmpty()) { diff --git a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml index d6ff826d8..f0a6b8763 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml +++ b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml @@ -82,18 +82,6 @@ - - - Number:Temperature - - - - - Number:Time - - - - String @@ -107,716 +95,5 @@ Switch - - Switch - - - - Switch - - - - Switch - - - - String - - - - String - - - - - - - - - - Number - - - - Number - - - - Number - - - - Number - - - - Switch - - - - Number - - - - Number - - - - Number - - - - Number - - - - Number - - - - Number - - - - String - - - - Number - - - - Number - - - - Switch - - - - Switch - - - - Switch - - - - Color - - - - Color - - - - Number - - - - - - Number - - - - - Number:Temperature - - - - - Number - - - - - Number - - Particulate Matter 2.5 - - - - Number - - Carbon Dioxide - - - - Number - - Total Volatile Organic Compounds - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - - Number:Time - - - - - Number:Time - - - - - Number:Time - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - Number - - - - - Switch - - - - Number - - - - Switch - - - - Number - - - - - String - - - - - - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - - Switch - - - - - String - - - - - Switch - - - - - Switch - - - - - String - - - - - - - - - - - - String - - - - - - - - - - - Number - - - - - Switch - - - - Switch - - - - Switch - - - - String - - - - - - - - - - - Switch - - - - Switch - - - - - String - - - - - - - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - - String - - - - - - - - - - String - - - - - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - - Number - - - - Number - - - - Number - - - - String - - - - Switch - - - - Number - - - - - - - - - Number - - - - - - - - - - - Number - - - - - - - - - - Number - - - - - - - - - - Number - - - - - - - - - - Switch - - - - - - - - - - Number - - - - - - - - - - - String - - - - - - - - - - - - - - Number - - - - - - - - - - - - - - Number - - - - - - - - - - - - - - - - - - - - - Number - - - - - - - - - - - Number - - - - - - - - - - - Number - - - - - - - - - - - - Number - - - - - - - - - - - Number - - - - - - - - - - - - - - - - - Number - - - - - - - - - - String - - - - - - - - - - - Number:Temperature - - - - - - Number - - - - - - - - - - - - - - - - - - Number - - - - - - - - - - - - Number - - - - - - - - - - - Number - - - - - - - - - - - Number - - - - - - - - - - - - - - - - diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.b1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.b1.json index a91b75b79..9c0ed5462 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.b1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.b1.json @@ -20,8 +20,11 @@ "property": "pm25", "friendlyName": "PM2.5", "channel": "pm25", - "channelType": "pm25", "type": "Number", + "stateDescription": { + "pattern": "%.1f", + "readOnly": true + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -30,7 +33,7 @@ "property": "co2e", "friendlyName": "CO2e", "channel": "co2", - "channelType": "co2", + "description": "Carbon Dioxide", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -43,7 +46,7 @@ "property": "tvoc", "friendlyName": "tVOC", "channel": "tvoc", - "channelType": "tvoc", + "description": "Total Volatile Organic Compounds", "type": "Number", "refresh": true, "ChannelGroup": "Status", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.s1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.s1.json index 75202f8aa..95f00dbd8 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.s1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.s1.json @@ -20,8 +20,11 @@ "property": "pm25", "friendlyName": "PM2.5", "channel": "pm25", - "channelType": "pm25", "type": "Number", + "stateDescription": { + "pattern": "%.1f", + "readOnly": true + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -30,7 +33,7 @@ "property": "co2", "friendlyName": "CO2", "channel": "co2", - "channelType": "co2", + "description": "Carbon Dioxide", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -45,7 +48,7 @@ "property": "tvoc", "friendlyName": "tVOC", "channel": "tvoc", - "channelType": "tvoc", + "description": "Total Volatile Organic Compounds", "type": "Number", "refresh": true, "ChannelGroup": "Status", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.m1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.m1.json index 3e2d57876..8c5e79c70 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.m1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.m1.json @@ -10,7 +10,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -46,7 +45,6 @@ "property": "wifi_led", "friendlyName": "Indicator light", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "actions": [ diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v1.json index 4d110f8e0..854e43023 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v1.json @@ -8,7 +8,6 @@ "property": "on", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -26,7 +25,6 @@ "property": "usb_on", "friendlyName": "USB", "channel": "usb", - "channelType": "usb", "type": "Switch", "refresh": true, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v2.json b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v2.json index 243a5060b..f4197d977 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v2.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v2.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -26,7 +25,6 @@ "property": "usb_on", "friendlyName": "USB", "channel": "usb", - "channelType": "usb", "type": "Switch", "refresh": true, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3.json b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3.json index 467077756..28f0aaa2e 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3.json @@ -10,7 +10,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -29,7 +28,6 @@ "property": "usb_on", "friendlyName": "USB", "channel": "usb", - "channelType": "usb", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -62,7 +60,6 @@ "property": "wifi_led", "friendlyName": "Wifi LED", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/cuco.plug.cp1-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/cuco.plug.cp1-miot.json index 970e625a6..c74bc4d3b 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/cuco.plug.cp1-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/cuco.plug.cp1-miot.json @@ -12,7 +12,6 @@ "piid": 4, "friendlyName": "Device Information-CurrentFirmware Version", "channel": "FirmwareRevision", - "channelType": "miot_string", "type": "String", "refresh": true, "actions": [] @@ -23,7 +22,6 @@ "piid": 1, "friendlyName": "Device Information-Device Manufacturer", "channel": "Manufacturer", - "channelType": "miot_string", "type": "String", "refresh": true, "actions": [] @@ -34,7 +32,6 @@ "piid": 2, "friendlyName": "Device Information-Device Model", "channel": "Model", - "channelType": "miot_string", "type": "String", "refresh": true, "actions": [] @@ -45,7 +42,6 @@ "piid": 3, "friendlyName": "Device Information-Device Serial Number", "channel": "SerialNumber", - "channelType": "miot_string", "type": "String", "refresh": true, "actions": [] @@ -56,7 +52,6 @@ "piid": 1, "friendlyName": "Switch-Switch Status", "channel": "On", - "channelType": "miot_bool", "type": "Switch", "refresh": true, "actions": [ diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.a1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.a1.json index d0c1da445..35eb0c3ab 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.a1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.a1.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -26,8 +25,23 @@ "property": "mode", "friendlyName": "Mode", "channel": "airFreshMode", - "channelType": "airFreshMode", "type": "String", + "stateDescription": { + "options": [ + { + "value": "auto", + "label": "Auto" + }, + { + "value": "sleep", + "label": "Sleep" + }, + { + "value": "favourite", + "label": "Favorite" + } + ] + }, "refresh": true, "actions": [ { @@ -37,13 +51,13 @@ ], "tags": [ "Control" - ] + ], + "readmeComment": "Value mapping `[\"auto\"\u003d\"Auto\",\"sleep\"\u003d\"Sleep\",\"favourite\"\u003d\"Favorite\"]`" }, { "property": "ptc_on", "friendlyName": "PTC", "channel": "airFreshPTCPower", - "channelType": "airFreshPTCPower", "type": "Switch", "refresh": true, "actions": [ @@ -57,7 +71,6 @@ "property": "ptc_status", "friendlyName": "PTC Status", "channel": "airFreshPTCStatus", - "channelType": "airFreshPTCStatus", "type": "Switch", "refresh": true, "ChannelGroup": "Status", @@ -67,7 +80,6 @@ "property": "display", "friendlyName": "Display", "channel": "airFreshDisplay", - "channelType": "airFreshDisplay", "type": "Switch", "refresh": true, "actions": [ @@ -81,7 +93,6 @@ "property": "child_lock", "friendlyName": "Child Lock", "channel": "airFreshChildLock", - "channelType": "airFreshChildLock", "type": "Switch", "refresh": true, "actions": [ @@ -95,7 +106,6 @@ "property": "sound", "friendlyName": "Sound", "channel": "airFreshSound", - "channelType": "airFreshSound", "type": "Switch", "refresh": true, "actions": [ @@ -109,8 +119,10 @@ "property": "pm25", "friendlyName": "PM2.5", "channel": "airFreshPM25", - "channelType": "airFreshPM25", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -119,8 +131,10 @@ "property": "co2", "friendlyName": "CO2", "channel": "airFreshCO2", - "channelType": "airFreshCO2", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [], @@ -134,8 +148,10 @@ "property": "control_speed", "friendlyName": "Current Speed", "channel": "airFreshCurrentSpeed", - "channelType": "airFreshCurrentSpeed", "type": "Number", + "stateDescription": { + "pattern": "%.0f m³/h" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -144,8 +160,12 @@ "property": "favourite_speed", "friendlyName": "Favorite Speed", "channel": "airFreshFavoriteSpeed", - "channelType": "airFreshFavoriteSpeed", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 300, + "pattern": "%.0f" + }, "refresh": true, "actions": [ { @@ -158,8 +178,10 @@ "property": "temperature_outside", "friendlyName": "Temperature Outside", "channel": "airFreshTemperature", - "channelType": "airFreshTemperature", "type": "Number", + "stateDescription": { + "pattern": "%.0f°C" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -168,8 +190,10 @@ "property": "filter_rate", "friendlyName": "Filter Percents Remaining", "channel": "airFreshFilterPercents", - "channelType": "airFreshFilterPercents", "type": "Number", + "stateDescription": { + "pattern": "%.0f%%" + }, "refresh": true, "actions": [] }, @@ -177,8 +201,10 @@ "property": "filter_day", "friendlyName": "Filter Days Remaining", "channel": "airFreshFilterDays", - "channelType": "airFreshFilterDays", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -187,7 +213,6 @@ "property": "", "friendlyName": "Reset Filter", "channel": "airFreshResetFilterA1", - "channelType": "airFreshResetFilterA1", "type": "String", "refresh": false, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.t2017.json b/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.t2017.json index 8485af890..f1929aa42 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.t2017.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.t2017.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -26,8 +25,23 @@ "property": "mode", "friendlyName": "Mode", "channel": "airFreshMode", - "channelType": "airFreshMode", "type": "String", + "stateDescription": { + "options": [ + { + "value": "auto", + "label": "Auto" + }, + { + "value": "sleep", + "label": "Sleep" + }, + { + "value": "favourite", + "label": "Favorite" + } + ] + }, "refresh": true, "actions": [ { @@ -37,13 +51,13 @@ ], "tags": [ "Control" - ] + ], + "readmeComment": "Value mapping `[\"auto\"\u003d\"Auto\",\"sleep\"\u003d\"Sleep\",\"favourite\"\u003d\"Favorite\"]`" }, { "property": "ptc_on", "friendlyName": "PTC", "channel": "airFreshPTCPower", - "channelType": "airFreshPTCPower", "type": "Switch", "refresh": true, "actions": [ @@ -57,21 +71,36 @@ "property": "ptc_level", "friendlyName": "PTC Level", "channel": "airFreshPtcLevel", - "channelType": "airFreshPtcLevel", "type": "String", + "stateDescription": { + "options": [ + { + "value": "low", + "label": "Low" + }, + { + "value": "medium", + "label": "Medium" + }, + { + "value": "high", + "label": "High" + } + ] + }, "refresh": true, "actions": [ { "command": "set_ptc_level", "parameterType": "STRING" } - ] + ], + "readmeComment": "Value mapping `[\"low\"\u003d\"Low\",\"medium\"\u003d\"Medium\",\"high\"\u003d\"High\"]`" }, { "property": "ptc_status", "friendlyName": "PTC Status", "channel": "airFreshPTCStatus", - "channelType": "airFreshPTCStatus", "type": "Switch", "refresh": true, "ChannelGroup": "Status", @@ -81,21 +110,36 @@ "property": "screen_direction", "friendlyName": "Screen direction", "channel": "airFreshDisplayDirection", - "channelType": "airFreshDisplayDirection", "type": "String", + "stateDescription": { + "options": [ + { + "value": "forward", + "label": "Normal" + }, + { + "value": "left", + "label": "Left" + }, + { + "value": "right", + "label": "Right" + } + ] + }, "refresh": true, "actions": [ { "command": "set_screen_direction", "parameterType": "STRING" } - ] + ], + "readmeComment": "Value mapping `[\"forward\"\u003d\"Normal\",\"left\"\u003d\"Left\",\"right\"\u003d\"Right\"]`" }, { "property": "display", "friendlyName": "Display", "channel": "airFreshDisplay", - "channelType": "airFreshDisplay", "type": "Switch", "refresh": true, "actions": [ @@ -109,7 +153,6 @@ "property": "child_lock", "friendlyName": "Child Lock", "channel": "airFreshChildLock", - "channelType": "airFreshChildLock", "type": "Switch", "refresh": true, "actions": [ @@ -123,7 +166,6 @@ "property": "sound", "friendlyName": "Sound", "channel": "airFreshSound", - "channelType": "airFreshSound", "type": "Switch", "refresh": true, "actions": [ @@ -137,8 +179,10 @@ "property": "pm25", "friendlyName": "PM2.5", "channel": "airFreshPM25", - "channelType": "airFreshPM25", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -147,8 +191,10 @@ "property": "co2", "friendlyName": "CO2", "channel": "airFreshCO2", - "channelType": "airFreshCO2", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [], @@ -162,8 +208,10 @@ "property": "control_speed", "friendlyName": "Current Speed", "channel": "airFreshCurrentSpeed", - "channelType": "airFreshCurrentSpeed", "type": "Number", + "stateDescription": { + "pattern": "%.0f m³/h" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -172,8 +220,12 @@ "property": "favourite_speed", "friendlyName": "Favorite Speed", "channel": "airFreshFavoriteSpeed", - "channelType": "airFreshFavoriteSpeed", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 300, + "pattern": "%.0f" + }, "refresh": true, "actions": [ { @@ -186,8 +238,10 @@ "property": "temperature_outside", "friendlyName": "Temperature Outside", "channel": "airFreshTemperature", - "channelType": "airFreshTemperature", "type": "Number", + "stateDescription": { + "pattern": "%.0f°C" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -196,8 +250,10 @@ "property": "filter_intermediate", "friendlyName": "Filter Percents Remaining", "channel": "airFreshFilterPercents", - "channelType": "airFreshFilterPercents", "type": "Number", + "stateDescription": { + "pattern": "%.0f%%" + }, "refresh": true, "actions": [] }, @@ -205,8 +261,10 @@ "property": "filter_inter_day", "friendlyName": "Filter Days Remaining", "channel": "airFreshFilterDays", - "channelType": "airFreshFilterDays", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -215,8 +273,10 @@ "property": "filter_efficient", "friendlyName": "Filter Pro Percents Remaining", "channel": "airFreshFilterProPercents", - "channelType": "airFreshFilterProPercents", "type": "Number", + "stateDescription": { + "pattern": "%.0f%%" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -225,8 +285,10 @@ "property": "filter_effi_day", "friendlyName": "Filter Pro Days Remaining", "channel": "airFreshFilterProDays", - "channelType": "airFreshFilterProDays", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -235,7 +297,6 @@ "property": "", "friendlyName": "Reset Filter", "channel": "airFreshResetFilter", - "channelType": "airFreshResetFilter", "type": "String", "refresh": false, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.fan.p5.json b/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.fan.p5.json index f032281ea..743a6a08c 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.fan.p5.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.fan.p5.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -39,7 +38,6 @@ "property": "mode", "friendlyName": "Mode", "channel": "mode", - "channelType": "mode", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -57,8 +55,13 @@ "property": "roll_angle", "friendlyName": "Angle", "channel": "angle", - "channelType": "angle", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 360, + "step": 1, + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "actions", "actions": [ @@ -128,8 +131,10 @@ "property": "speed", "friendlyName": "Speed", "channel": "speed", - "channelType": "speed", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "actions", "actions": [ diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.curtain.hagl05-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.curtain.hagl05-miot.json index e1c562d57..ce6fda7cb 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.curtain.hagl05-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.curtain.hagl05-miot.json @@ -12,7 +12,6 @@ "piid": 1, "friendlyName": "Curtain - Device Fault", "channel": "fault", - "channelType": "LumiCurtainHagl05_fault", "type": "Number", "stateDescription": { "readOnly": true, @@ -27,14 +26,57 @@ "actions": [], "readmeComment": "Value mapping `[\"0\"\u003d\"No faults\"]`" }, + { + "property": "motor-control", + "siid": 2, + "piid": 2, + "friendlyName": "Curtain - Motor Control", + "channel": "motor_control", + "type": "Number", + "stateDescription": { + "options": [ + { + "value": "0", + "label": "Pause" + }, + { + "value": "1", + "label": "Open" + }, + { + "value": "2", + "label": "Close" + }, + { + "value": "3", + "label": "auto" + } + ] + }, + "refresh": false, + "actions": [ + { + "command": "set_properties", + "parameterType": "NUMBER" + } + ], + "readmeComment": "Value mapping `[\"0\"\u003d\"Pause\",\"1\"\u003d\"Open\",\"2\"\u003d\"Close\",\"3\"\u003d\"auto\"]`" + }, { "property": "current-position", "siid": 2, "piid": 3, "friendlyName": "Curtain - Current Position", "channel": "current-position", - "channelType": "miot_uint8", - "type": "Number", + "type": "Number:Dimensionless", + "unit": "percentage", + "stateDescription": { + "minimum": 0, + "maximum": 100, + "step": 1, + "pattern": "%.0f %unit%", + "readOnly": true + }, "refresh": true, "actions": [] }, @@ -44,7 +86,6 @@ "piid": 6, "friendlyName": "Curtain - Status", "channel": "status", - "channelType": "LumiCurtainHagl05_status", "type": "Number", "stateDescription": { "readOnly": true, @@ -77,8 +118,14 @@ "piid": 7, "friendlyName": "Curtain - Target Position", "channel": "target-position", - "channelType": "miot_uint8", - "type": "Number", + "type": "Number:Dimensionless", + "unit": "percentage", + "stateDescription": { + "minimum": 0, + "maximum": 100, + "step": 1, + "pattern": "%.0f %unit%" + }, "refresh": true, "actions": [ { @@ -93,7 +140,6 @@ "piid": 1, "friendlyName": "curtain_cfg - Manual Enabled", "channel": "manual-enabled", - "channelType": "LumiCurtainHagl05_manual-enabled", "type": "Number", "stateDescription": { "options": [ @@ -120,9 +166,8 @@ "property": "polarity", "siid": 4, "piid": 2, - "friendlyName": "curtain_cfg - Polarity", + "friendlyName": "Curtain_cfg - Polarity", "channel": "polarity", - "channelType": "LumiCurtainHagl05_polarity", "type": "Number", "stateDescription": { "options": [ @@ -151,7 +196,6 @@ "piid": 3, "friendlyName": "curtain_cfg - Position Limit", "channel": "pos-limit", - "channelType": "LumiCurtainHagl05_pos-limit", "type": "Number", "stateDescription": { "options": [ @@ -178,10 +222,9 @@ "property": "en-night-tip-light", "siid": 4, "piid": 4, - "friendlyName": "Set Night Tip Light", - "channel": "en-night-tip-light", - "channelType": "LumiCurtainHagl05_en-night-tip-light", - "type": "Switch", + "friendlyName": "Curtain_cfg - En_night_tip_light", + "channel": "en_night_tip_light", + "type": "Number", "stateDescription": { "options": [ { @@ -207,12 +250,39 @@ "property": "run-time", "siid": 4, "piid": 5, - "friendlyName": "curtain_cfg - Run-time", + "friendlyName": "Curtain_cfg - Run-time", "channel": "run-time", - "channelType": "miot_int32", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 255, + "step": 1, + "pattern": "%.0f", + "readOnly": true + }, "refresh": true, "actions": [] + }, + { + "property": "adjust-value", + "siid": 5, + "piid": 1, + "friendlyName": "Motor_controller - Adjust_value", + "channel": "adjust_value", + "type": "Number", + "stateDescription": { + "minimum": -100, + "maximum": 100, + "step": 1, + "pattern": "%.0f" + }, + "refresh": false, + "actions": [ + { + "command": "set_properties", + "parameterType": "NUMBER" + } + ] } ], "experimental": true diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bceiling1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bceiling1.json index 69b4aad99..8998b0e8e 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bceiling1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bceiling1.json @@ -13,7 +13,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -59,7 +58,6 @@ "property": "cct", "friendlyName": "Correlated Color Temperature", "channel": "cct", - "channelType": "cct", "type": "Dimmer", "refresh": true, "actions": [ @@ -73,7 +71,6 @@ "property": "snm", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "actions": [ @@ -87,7 +84,6 @@ "property": "dv", "friendlyName": "DV", "channel": "dv", - "channelType": "dv", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -149,7 +145,6 @@ "property": "", "friendlyName": "Delay Off", "channel": "delayoff", - "channelType": "delayoff", "type": "Switch", "refresh": false, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bulb.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bulb.json index 6285f8509..8cfdb1284 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bulb.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bulb.json @@ -13,7 +13,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -60,7 +59,6 @@ "property": "cct", "friendlyName": "Correlated Color Temperature", "channel": "cct", - "channelType": "cct", "type": "Dimmer", "refresh": true, "ChannelGroup": "actions", @@ -75,7 +73,6 @@ "property": "snm", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -90,7 +87,6 @@ "property": "dv", "friendlyName": "DV", "channel": "dv", - "channelType": "dv", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -118,7 +114,6 @@ "property": "", "friendlyName": "Delay Off", "channel": "delayoff", - "channelType": "delayoff", "type": "Switch", "refresh": false, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.candle.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.candle.json index 05e14e543..517502b15 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.candle.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.candle.json @@ -9,7 +9,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -56,7 +55,6 @@ "property": "cct", "friendlyName": "Correlated Color Temperature", "channel": "cct", - "channelType": "cct", "type": "Dimmer", "refresh": true, "ChannelGroup": "actions", @@ -71,7 +69,6 @@ "property": "snm", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -86,7 +83,6 @@ "property": "", "friendlyName": "Delay Off", "channel": "delayoff", - "channelType": "delayoff", "type": "Switch", "refresh": false, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.cbulb.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.cbulb.json index 99d6fde03..a7b8c4eaf 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.cbulb.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.cbulb.json @@ -10,7 +10,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -57,7 +56,6 @@ "property": "cct", "friendlyName": "Correlated Color Temperature", "channel": "cct", - "channelType": "cct", "type": "Dimmer", "refresh": true, "ChannelGroup": "actions", @@ -72,7 +70,6 @@ "property": "snm", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -129,7 +126,6 @@ "property": "", "friendlyName": "Delay Off", "channel": "delayoff", - "channelType": "delayoff", "type": "Switch", "refresh": false, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceil-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceil-miot.json index 5a45e63c8..2304d9a06 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceil-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceil-miot.json @@ -24,7 +24,6 @@ "piid": 1, "friendlyName": "Power", "channel": "on", - "channelType": "miot_bool", "type": "Switch", "refresh": true, "actions": [ @@ -44,7 +43,6 @@ "piid": 2, "friendlyName": "Mode", "channel": "mode", - "channelType": "miot_uint8", "type": "Number", "refresh": true, "actions": [ @@ -83,7 +81,6 @@ "piid": 4, "friendlyName": "Color Temperature", "channel": "cct", - "channelType": "miot_uint32", "type": "Number", "refresh": true, "actions": [ @@ -99,8 +96,13 @@ "piid": 1, "friendlyName": "Delayed Turn-off", "channel": "dv", - "channelType": "miot_uint16", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 21600, + "step": 1, + "pattern": "%.0f %unit%" + }, "refresh": true, "actions": [ { @@ -115,7 +117,6 @@ "piid": 2, "friendlyName": "Wall Scene Enable", "channel": "WallSceneEn", - "channelType": "miot_bool", "type": "Switch", "refresh": true, "actions": [ @@ -131,7 +132,6 @@ "piid": 3, "friendlyName": "Wall Scene", "channel": "WallScene", - "channelType": "miot_string", "type": "String", "refresh": true, "actions": [ @@ -147,7 +147,6 @@ "piid": 4, "friendlyName": "Auto CCT", "channel": "autoCct", - "channelType": "miot_string", "type": "String", "refresh": true, "actions": [ @@ -163,8 +162,13 @@ "piid": 6, "friendlyName": "Dimming Period", "channel": "dimmingPeriod", - "channelType": "miot_uint16", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 65535, + "step": 1, + "pattern": "%.0f" + }, "refresh": true, "actions": [ { @@ -179,10 +183,77 @@ "piid": 12, "friendlyName": "Mi Band Status", "channel": "MibandStatus", - "channelType": "miot_string", "type": "String", "refresh": true, "actions": [] + }, + { + "property": "", + "friendlyName": "Actions", + "channel": "actions", + "type": "String", + "stateDescription": { + "options": [ + { + "value": "light-brightness-down", + "label": "Light Brightness Down" + }, + { + "value": "light-brightness-up", + "label": "Light Brightness Up" + }, + { + "value": "light-toggle", + "label": "Light Toggle" + } + ] + }, + "refresh": false, + "actions": [ + { + "command": "action", + "parameterType": "EMPTY", + "siid": 2, + "aiid": 1, + "condition": { + "name": "matchValue", + "parameters": [ + { + "matchValue": "light-brightness-down" + } + ] + } + }, + { + "command": "action", + "parameterType": "EMPTY", + "siid": 2, + "aiid": 2, + "condition": { + "name": "matchValue", + "parameters": [ + { + "matchValue": "light-brightness-up" + } + ] + } + }, + { + "command": "action", + "parameterType": "EMPTY", + "siid": 2, + "aiid": 3, + "condition": { + "name": "matchValue", + "parameters": [ + { + "matchValue": "light-toggle" + } + ] + } + } + ], + "readmeComment": "Value mapping `[\"light-brightness-down\"\u003d\"Light Brightness Down\",\"light-brightness-up\"\u003d\"Light Brightness Up\",\"light-toggle\"\u003d\"Light Toggle\"]`" } ], "experimental": true diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceiling.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceiling.json index 17e1051c3..42a497271 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceiling.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceiling.json @@ -9,7 +9,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -56,7 +55,6 @@ "property": "cct", "friendlyName": "Correlated Color Temperature", "channel": "cct", - "channelType": "cct", "type": "Dimmer", "refresh": true, "ChannelGroup": "actions", @@ -71,7 +69,6 @@ "property": "snm", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.mono.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.mono.json index bebb00d60..ada9d8256 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.mono.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.mono.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -55,7 +54,6 @@ "property": "scene_num", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.moonlight.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.moonlight.json index bb705f6ac..2ec405f49 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.moonlight.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.moonlight.json @@ -8,7 +8,6 @@ "property": "pow", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -51,7 +50,6 @@ "property": "cct", "friendlyName": "Correlated Color Temperature", "channel": "cct", - "channelType": "cct", "type": "Dimmer", "refresh": true, "ChannelGroup": "actions", @@ -66,7 +64,6 @@ "property": "snm", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -81,7 +78,6 @@ "property": "dv", "friendlyName": "DV", "channel": "dv", - "channelType": "dv", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -95,7 +91,6 @@ "property": "", "friendlyName": "Go Night", "channel": "gonight", - "channelType": "gonight", "type": "Switch", "refresh": false, "ChannelGroup": "actions", @@ -110,7 +105,6 @@ "property": "", "friendlyName": "Delay Off", "channel": "delayoff", - "channelType": "delayoff", "type": "Switch", "refresh": false, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.rwread.json b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.rwread.json index b3f9279f2..5e74a4578 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.rwread.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.rwread.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -55,7 +54,6 @@ "property": "snm", "friendlyName": "Scene", "channel": "scene", - "channelType": "scene", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -83,7 +81,6 @@ "property": "dv", "friendlyName": "DV", "channel": "dv", - "channelType": "dv", "type": "Number", "refresh": true, "ChannelGroup": "actions", 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 7b4237ce9..42b02375d 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 @@ -9,7 +9,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -56,7 +55,6 @@ "property": "ambstatus", "friendlyName": "Ambient Power", "channel": "ambientPower", - "channelType": "ambientPower", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -71,7 +69,6 @@ "property": "ambvalue", "friendlyName": "Ambient Brightness", "channel": "ambientBrightness", - "channelType": "ambientBrightness", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -86,8 +83,11 @@ "property": "dvalue", "friendlyName": "Ambient Illumination", "channel": "illumination", - "channelType": "illumination", "type": "Number", + "stateDescription": { + "pattern": "%.1f", + "readOnly": true + }, "refresh": true, "actions": [] }, @@ -95,7 +95,6 @@ "property": "eyecare", "friendlyName": "Eyecare", "channel": "eyecare", - "channelType": "eyecare", "type": "Switch", "refresh": true, "ChannelGroup": "actions", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/qmi.powerstrip.v1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/qmi.powerstrip.v1.json index 369b220ea..d5d68e315 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/qmi.powerstrip.v1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/qmi.powerstrip.v1.json @@ -89,7 +89,6 @@ "property": "wifi_led", "friendlyName": "wifi LED", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "actions": [ diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/scishare.coffee.s1102.json b/bundles/org.openhab.binding.miio/src/main/resources/database/scishare.coffee.s1102.json index b49a64da8..ca1e246b9 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/scishare.coffee.s1102.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/scishare.coffee.s1102.json @@ -9,7 +9,6 @@ "property": "", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": false, "actions": [ diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v18-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v18-miot.json index 115f948a6..efc34cbc5 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v18-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v18-miot.json @@ -12,7 +12,6 @@ "channel": "vacuumaction", "type": "String", "stateDescription": { - "readOnly": true, "options": [ { "value": "start-sweep", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v8.json b/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v8.json index 6aa4387dd..1a7de8e57 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v8.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v8.json @@ -10,8 +10,23 @@ "property": "", "friendlyName": "Vacuum Action", "channel": "vacuumaction", - "channelType": "vacuumaction", "type": "Number", + "stateDescription": { + "options": [ + { + "value": "1", + "label": "Start" + }, + { + "value": "0", + "label": "Stop" + }, + { + "value": "2", + "label": "Pause" + } + ] + }, "refresh": false, "actions": [ { @@ -23,13 +38,13 @@ 0 ] } - ] + ], + "readmeComment": "Value mapping `[\"1\"\u003d\"Start\",\"0\"\u003d\"Stop\",\"2\"\u003d\"Pause\"]`" }, { "property": "run_state", "friendlyName": "State", "channel": "state", - "channelType": "state", "type": "Number", "refresh": true, "actions": [] @@ -38,7 +53,6 @@ "property": "mode", "friendlyName": "Mode", "channel": "mode", - "channelType": "mode", "type": "Number", "refresh": true, "actions": [ diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/xiaomi.aircondition.mc1-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/xiaomi.aircondition.mc1-miot.json index 144bcb234..96879ecec 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/xiaomi.aircondition.mc1-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/xiaomi.aircondition.mc1-miot.json @@ -94,7 +94,6 @@ "stateDescription": { "minimum": 16, "maximum": 31, - "step": 0.0, "pattern": "%.1f %unit%" }, "refresh": true, @@ -351,13 +350,12 @@ "piid": 3, "friendlyName": "Electricity - Count", "channel": "elec-count", - "channelType": "miot_uint16", "type": "Number", "stateDescription": { "minimum": 0, "maximum": 65535, "step": 1, - "pattern": "%.1f", + "pattern": "%.0f", "readOnly": true }, "refresh": true, diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.bhf1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.bhf1.json index badbcecd6..b14bbeca8 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.bhf1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.bhf1.json @@ -107,7 +107,6 @@ "property": "nl_br", "friendlyName": "Nightlight Brightness", "channel": "nightlightBrightness", - "channelType": "nightlightBrightness", "type": "Number", "refresh": true, "actions": [], diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling.json b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling.json index 8bb665c09..09851a3c2 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling.json @@ -230,7 +230,6 @@ "property": "", "friendlyName": "Set Scene", "channel": "customScene", - "channelType": "customScene", "type": "String", "refresh": false, "ChannelGroup": "actions", @@ -245,7 +244,6 @@ "property": "nl_br", "friendlyName": "Nightlight Brightness", "channel": "nightlightBrightness", - "channelType": "nightlightBrightness", "type": "Number", "refresh": true, "actions": [], diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling2.json b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling2.json index 66ebf9009..c6cc80f46 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling2.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling2.json @@ -204,7 +204,6 @@ "property": "", "friendlyName": "Set Scene", "channel": "customScene", - "channelType": "customScene", "type": "String", "refresh": false, "ChannelGroup": "actions", @@ -219,7 +218,6 @@ "property": "nl_br", "friendlyName": "Nightlight Brightness", "channel": "nightlightBrightness", - "channelType": "nightlightBrightness", "type": "Number", "refresh": true, "actions": [], diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling4.json b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling4.json index 5af25be99..064f54009 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling4.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling4.json @@ -229,7 +229,6 @@ "property": "bg_power", "friendlyName": "Ambient Power", "channel": "ambientPower", - "channelType": "ambientPower", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -244,7 +243,6 @@ "property": "bg_rgb", "friendlyName": "Ambient Color", "channel": "ambientColor", - "channelType": "ambientColor", "type": "Color", "refresh": true, "ChannelGroup": "actions", @@ -259,7 +257,6 @@ "property": "bg_ct", "friendlyName": "Ambient Color Temperature", "channel": "ambientColorTemperature", - "channelType": "ambientColorTemperature", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -279,7 +276,6 @@ "property": "", "friendlyName": "Set Scene", "channel": "customScene", - "channelType": "customScene", "type": "String", "refresh": false, "ChannelGroup": "actions", @@ -294,7 +290,6 @@ "property": "bg_lmode", "friendlyName": "Ambient Color Mode", "channel": "ambientColorMode", - "channelType": "ambientColorMode", "type": "Number", "refresh": true, "actions": [] @@ -303,7 +298,6 @@ "property": "nl_br", "friendlyName": "Nightlight Brightness", "channel": "nightlightBrightness", - "channelType": "nightlightBrightness", "type": "Number", "refresh": true, "actions": [], diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.light15.json b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.light15.json index 0390aab28..fac444533 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.light15.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.light15.json @@ -232,7 +232,6 @@ "property": "bg_bright", "friendlyName": "Ambient Brightness", "channel": "ambientBrightness", - "channelType": "ambientBrightness", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -247,7 +246,6 @@ "property": "bg_power", "friendlyName": "Ambient Power", "channel": "ambientPower", - "channelType": "ambientPower", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -262,7 +260,6 @@ "property": "bg_rgb", "friendlyName": "Ambient Color", "channel": "ambientColor", - "channelType": "ambientColor", "type": "Color", "refresh": true, "ChannelGroup": "actions", @@ -277,7 +274,6 @@ "property": "bg_ct", "friendlyName": "Ambient Color Temperature", "channel": "ambientColorTemperature", - "channelType": "ambientColorTemperature", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -297,7 +293,6 @@ "property": "bg_lmode", "friendlyName": "Ambient Color Mode", "channel": "ambientColorMode", - "channelType": "ambientColorMode", "type": "Number", "refresh": true, "actions": [] diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airmonitor.v1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airmonitor.v1.json index f2c2a7c92..6e2736d98 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airmonitor.v1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airmonitor.v1.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -26,7 +25,6 @@ "property": "aqi", "friendlyName": "Air Quality Index", "channel": "aqi", - "channelType": "aqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.m1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.m1.json index f2f73e769..e90c98a85 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.m1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.m1.json @@ -19,7 +19,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -37,7 +36,6 @@ "property": "mode", "friendlyName": "Mode", "channel": "mode", - "channelType": "mode", "type": "String", "stateDescription": { "options": [ @@ -102,7 +100,6 @@ "property": "aqi", "friendlyName": "Air Quality Index", "channel": "aqi", - "channelType": "aqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -115,7 +112,6 @@ "property": "average_aqi", "friendlyName": "Average Air Quality Index", "channel": "averageaqi", - "channelType": "averageaqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -128,7 +124,6 @@ "property": "led", "friendlyName": "LED Status", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -143,7 +138,6 @@ "property": "buzzer", "friendlyName": "Buzzer Status", "channel": "buzzer", - "channelType": "buzzer", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -158,7 +152,6 @@ "property": "f1_hour", "friendlyName": "Filter Max Life", "channel": "filtermaxlife", - "channelType": "filtermaxlife", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -168,9 +161,11 @@ "property": "f1_hour_used", "friendlyName": "Filter Hours used", "channel": "filterhours", - "channelType": "filterhours", "type": "Number:Time", "unit": "hours", + "stateDescription": { + "pattern": "%.0f %unit%" + }, "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", @@ -181,9 +176,11 @@ "property": "use_time", "friendlyName": "Run Time", "channel": "usedhours", - "channelType": "usedhours", "type": "Number:Time", "unit": "hours", + "stateDescription": { + "pattern": "%.0f %unit%" + }, "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", @@ -194,8 +191,10 @@ "property": "motor1_speed", "friendlyName": "Motor Speed", "channel": "motorspeed", - "channelType": "motorspeed", "type": "Number", + "stateDescription": { + "pattern": "%.0f rpm" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -315,9 +314,11 @@ "property": "purify_volume", "friendlyName": "Purified Volume", "channel": "purifyvolume", - "channelType": "purifyvolume", "type": "Number:Volume", "unit": "liter", + "stateDescription": { + "pattern": "%.0f m3" + }, "refresh": true, "ChannelGroup": "Status", "actions": [], diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v1.json index 47952528d..81b03943a 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v1.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -26,7 +25,6 @@ "property": "mode", "friendlyName": "Mode", "channel": "mode", - "channelType": "mode", "type": "String", "refresh": true, "ChannelGroup": "actions", @@ -59,7 +57,6 @@ "property": "aqi", "friendlyName": "Air Quality Index", "channel": "aqi", - "channelType": "aqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -91,7 +88,6 @@ "property": "led", "friendlyName": "LED Status", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -106,7 +102,6 @@ "property": "act_det", "friendlyName": "Air AutoDetect", "channel": "act_det", - "channelType": "act_det", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -116,7 +111,6 @@ "property": "buzzer", "friendlyName": "Buzzer Status", "channel": "buzzer", - "channelType": "buzzer", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -131,7 +125,6 @@ "property": "f1_hour", "friendlyName": "Filter Max Life", "channel": "filtermaxlife", - "channelType": "filtermaxlife", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -141,8 +134,10 @@ "property": "filter1_life", "friendlyName": "Filter Life", "channel": "filterlive", - "channelType": "filterlive", "type": "Number", + "stateDescription": { + "pattern": "%.0f%%" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v6.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v6.json index 92299edb6..7642d5b7b 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v6.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v6.json @@ -9,7 +9,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -27,7 +26,6 @@ "property": "mode", "friendlyName": "Mode", "channel": "mode", - "channelType": "mode", "type": "String", "refresh": true, "ChannelGroup": "actions", @@ -60,7 +58,6 @@ "property": "aqi", "friendlyName": "Air Quality Index", "channel": "aqi", - "channelType": "aqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -73,7 +70,6 @@ "property": "average_aqi", "friendlyName": "Average Air Quality Index", "channel": "averageaqi", - "channelType": "averageaqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -86,7 +82,6 @@ "property": "led", "friendlyName": "LED Status", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -120,7 +115,6 @@ "property": "f1_hour", "friendlyName": "Filter Max Life", "channel": "filtermaxlife", - "channelType": "filtermaxlife", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -130,9 +124,11 @@ "property": "f1_hour_used", "friendlyName": "Filter Hours used", "channel": "filterhours", - "channelType": "filterhours", "type": "Number:Time", "unit": "hours", + "stateDescription": { + "pattern": "%.0f %unit%" + }, "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", @@ -143,9 +139,11 @@ "property": "use_time", "friendlyName": "Run Time", "channel": "usedhours", - "channelType": "usedhours", "type": "Number:Time", "unit": "hours", + "stateDescription": { + "pattern": "%.0f %unit%" + }, "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", @@ -156,8 +154,10 @@ "property": "motor1_speed", "friendlyName": "Motor Speed", "channel": "motorspeed", - "channelType": "motorspeed", "type": "Number", + "stateDescription": { + "pattern": "%.0f rpm" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -175,8 +175,10 @@ "property": "favorite_level", "friendlyName": "Favorite Level", "channel": "favoritelevel", - "channelType": "favoritelevel", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [ @@ -210,8 +212,10 @@ "property": "purify_volume", "friendlyName": "Purivied Volume", "channel": "purifyvolume", - "channelType": "purifyvolume", "type": "Number", + "stateDescription": { + "pattern": "%.0f m3" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -220,7 +224,6 @@ "property": "child_lock", "friendlyName": "Child Lock", "channel": "childlock", - "channelType": "childlock", "type": "Switch", "refresh": true, "ChannelGroup": "Status", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v7.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v7.json index 68e75135c..42fb5c90c 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v7.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v7.json @@ -8,7 +8,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -26,7 +25,6 @@ "property": "mode", "friendlyName": "Mode", "channel": "mode", - "channelType": "mode", "type": "String", "refresh": true, "ChannelGroup": "actions", @@ -59,7 +57,6 @@ "property": "aqi", "friendlyName": "Air Quality Index", "channel": "aqi", - "channelType": "aqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -72,7 +69,6 @@ "property": "average_aqi", "friendlyName": "Average Air Quality Index", "channel": "averageaqi", - "channelType": "averageaqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -94,7 +90,6 @@ "property": "led", "friendlyName": "LED Status", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -123,7 +118,6 @@ "property": "f1_hour", "friendlyName": "Filter Max Life", "channel": "filtermaxlife", - "channelType": "filtermaxlife", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -133,9 +127,11 @@ "property": "f1_hour_used", "friendlyName": "Filter Hours used", "channel": "filterhours", - "channelType": "filterhours", "type": "Number:Time", "unit": "hours", + "stateDescription": { + "pattern": "%.0f %unit%" + }, "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", @@ -146,8 +142,10 @@ "property": "motor1_speed", "friendlyName": "Motor Speed", "channel": "motorspeed", - "channelType": "motorspeed", "type": "Number", + "stateDescription": { + "pattern": "%.0f rpm" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -174,8 +172,10 @@ "property": "favorite_level", "friendlyName": "Favorite Level", "channel": "favoritelevel", - "channelType": "favoritelevel", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "Status", "actions": [ @@ -209,7 +209,6 @@ "property": "child_lock", "friendlyName": "Child Lock", "channel": "childlock", - "channelType": "childlock", "type": "Switch", "refresh": true, "ChannelGroup": "Status", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.za4.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.za4.json index 90c95b044..9c7cf2289 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.za4.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.za4.json @@ -9,7 +9,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -27,7 +26,6 @@ "property": "angle_enable", "friendlyName": "Rotation", "channel": "angleEnable", - "channelType": "angleEnable", "type": "Switch", "refresh": true, "actions": [ @@ -41,9 +39,11 @@ "property": "use_time", "friendlyName": "Run Time", "channel": "usedhours", - "channelType": "usedhours", "type": "Number:Time", "unit": "hours", + "stateDescription": { + "pattern": "%.0f %unit%" + }, "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", @@ -54,8 +54,13 @@ "property": "angle", "friendlyName": "Angle", "channel": "angle", - "channelType": "angle", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 360, + "step": 1, + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "actions", "actions": [ @@ -69,8 +74,13 @@ "property": "poweroff_time", "friendlyName": "Timer", "channel": "poweroffTime", - "channelType": "poweroffTime", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 28800, + "step": 1, + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "actions", "actions": [ @@ -84,7 +94,6 @@ "property": "buzzer", "friendlyName": "Buzzer", "channel": "buzzer", - "channelType": "buzzer", "type": "Number", "refresh": true, "ChannelGroup": "actions", @@ -127,8 +136,13 @@ "property": "speed_level", "friendlyName": "Speed Level", "channel": "speedLevel", - "channelType": "speedLevel", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 99, + "step": 1, + "pattern": "%.0f%%" + }, "refresh": true, "ChannelGroup": "actions", "actions": [ @@ -142,8 +156,10 @@ "property": "speed", "friendlyName": "Speed", "channel": "speed", - "channelType": "speed", "type": "Number", + "stateDescription": { + "pattern": "%.0f" + }, "refresh": true, "ChannelGroup": "actions", "actions": [ @@ -157,8 +173,13 @@ "property": "natural_level", "friendlyName": "Natural Level", "channel": "naturalLevel", - "channelType": "naturalLevel", "type": "Number", + "stateDescription": { + "minimum": 0, + "maximum": 99, + "step": 1, + "pattern": "%.0f%%" + }, "refresh": true, "ChannelGroup": "actions", "actions": [ @@ -172,8 +193,23 @@ "property": "", "friendlyName": "Move Direction", "channel": "move", - "channelType": "move", "type": "String", + "stateDescription": { + "options": [ + { + "value": "", + "label": "None" + }, + { + "value": "left", + "label": "Left" + }, + { + "value": "right", + "label": "Right" + } + ] + }, "refresh": true, "ChannelGroup": "actions", "actions": [ @@ -181,7 +217,8 @@ "command": "set_move", "parameterType": "STRING" } - ] + ], + "readmeComment": "Value mapping `[\"\"\u003d\"None\",\"left\"\u003d\"Left\",\"right\"\u003d\"Right\"]`" } ] } diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.v1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.v1.json index a21ff474e..f64237fa0 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.v1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.v1.json @@ -9,7 +9,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -27,7 +26,6 @@ "property": "mode", "friendlyName": "Mode", "channel": "mode", - "channelType": "mode", "type": "String", "refresh": true, "ChannelGroup": "actions", @@ -60,7 +58,6 @@ "property": "limit_hum", "friendlyName": "Humidity Set", "channel": "setHumidity", - "channelType": "setHumidity", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -75,7 +72,6 @@ "property": "aqi", "friendlyName": "Air Quality Index", "channel": "aqi", - "channelType": "aqi", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -88,7 +84,6 @@ "property": "trans_level", "friendlyName": "Trans_level", "channel": "translevel", - "channelType": "translevel", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -112,7 +107,6 @@ "property": "buzzer", "friendlyName": "Buzzer Status", "channel": "buzzer", - "channelType": "buzzer", "type": "Switch", "refresh": true, "ChannelGroup": "actions", @@ -127,7 +121,6 @@ "property": "depth", "friendlyName": "Depth", "channel": "depth", - "channelType": "depth", "type": "Number", "refresh": true, "ChannelGroup": "Status", @@ -137,7 +130,6 @@ "property": "dry", "friendlyName": "Dry", "channel": "dry", - "channelType": "dry", "type": "Switch", "refresh": true, "ChannelGroup": "Status", @@ -152,9 +144,11 @@ "property": "use_time", "friendlyName": "Run Time", "channel": "usedhours", - "channelType": "usedhours", "type": "Number:Time", "unit": "hours", + "stateDescription": { + "pattern": "%.0f %unit%" + }, "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", @@ -165,8 +159,10 @@ "property": "speed", "friendlyName": "Motor Speed", "channel": "motorspeed", - "channelType": "motorspeed", "type": "Number", + "stateDescription": { + "pattern": "%.0f rpm" + }, "refresh": true, "ChannelGroup": "Status", "actions": [] @@ -195,7 +191,6 @@ "property": "child_lock", "friendlyName": "Child Lock", "channel": "childlock", - "channelType": "childlock", "type": "Switch", "refresh": true, "ChannelGroup": "Status", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zimi.powerstrip.v2.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zimi.powerstrip.v2.json index 411e57613..ca8547bf8 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zimi.powerstrip.v2.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zimi.powerstrip.v2.json @@ -9,7 +9,6 @@ "property": "power", "friendlyName": "Power", "channel": "power", - "channelType": "power", "type": "Switch", "refresh": true, "actions": [ @@ -27,8 +26,10 @@ "property": "power_consume_rate", "friendlyName": "Power Consumption", "channel": "powerUsage", - "channelType": "powerUsage", "type": "Number", + "stateDescription": { + "pattern": "%.0fW" + }, "refresh": true, "actions": [ { @@ -40,7 +41,6 @@ "property": "wifi_led", "friendlyName": "wifi LED", "channel": "led", - "channelType": "led", "type": "Switch", "refresh": true, "actions": [ @@ -67,8 +67,10 @@ "property": "current", "friendlyName": "Current", "channel": "current", - "channelType": "current", "type": "Number", + "stateDescription": { + "pattern": "%.2fA" + }, "refresh": true, "actions": [] },