diff --git a/bundles/org.openhab.binding.miio/README.md b/bundles/org.openhab.binding.miio/README.md index 000fd4b321210..f8659b300331f 100644 --- a/bundles/org.openhab.binding.miio/README.md +++ b/bundles/org.openhab.binding.miio/README.md @@ -1386,8 +1386,8 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena | brush-left-time | Number | Brush Cleaner - Brush Left Time | | | brush-life-level1 | Number | Brush Cleaner - Brush Life Level | | | brush-left-time1 | Number | Brush Cleaner - Brush Left Time | | -| clean-area | Number | Clean Record - Clean Area | | -| clean-time | Number | Clean Record - Clean Time | | +| clean-area | Number:Area | Clean Record - Clean Area | | +| clean-time | Number:Time | Clean Record - Clean Time | | | total-clean-area | Number | Clean Record - Total Clean Area | | | total-clean-time | Number | Clean Record - Total Clean Time | | | total-clean-count | Number | Clean Record - Total Clean Count | | @@ -4446,8 +4446,8 @@ Number brush-life-level "Brush Cleaner - Brush Life Level" (G_vacuum) {channel=" Number brush-left-time "Brush Cleaner - Brush Left Time" (G_vacuum) {channel="miio:basic:vacuum:brush-left-time"} Number brush-life-level1 "Brush Cleaner - Brush Life Level" (G_vacuum) {channel="miio:basic:vacuum:brush-life-level1"} Number brush-left-time1 "Brush Cleaner - Brush Left Time" (G_vacuum) {channel="miio:basic:vacuum:brush-left-time1"} -Number clean-area "Clean Record - Clean Area" (G_vacuum) {channel="miio:basic:vacuum:clean-area"} -Number clean-time "Clean Record - Clean Time" (G_vacuum) {channel="miio:basic:vacuum:clean-time"} +Number:Area clean-area "Clean Record - Clean Area" (G_vacuum) {channel="miio:basic:vacuum:clean-area"} +Number:Time clean-time "Clean Record - Clean Time" (G_vacuum) {channel="miio:basic:vacuum:clean-time"} Number total-clean-area "Clean Record - Total Clean Area" (G_vacuum) {channel="miio:basic:vacuum:total-clean-area"} Number total-clean-time "Clean Record - Total Clean Time" (G_vacuum) {channel="miio:basic:vacuum:total-clean-time"} Number total-clean-count "Clean Record - Total Clean Count" (G_vacuum) {channel="miio:basic:vacuum:total-clean-count"} 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 5987912a32dae..eb952bae7846b 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 @@ -61,11 +61,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] } ] } 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 cd2a1c75260ba..b15387c694793 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 @@ -61,11 +61,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] } ] } 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 493f3b6f1a400..f4133b9cf46a0 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 @@ -26,11 +26,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "wifi_led", 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 617f330c63071..65fce4d98781e 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 @@ -38,11 +38,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] } ] } 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 00f34c76a95e4..cc91a8132a8f7 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 @@ -38,11 +38,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "wifi_led", 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 3db10fc8ca0fe..055e860ad30f4 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 @@ -43,11 +43,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "wifi_led", 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 497618906e690..4aa2016f17cde 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 @@ -14,14 +14,17 @@ "channel": "fault", "channelType": "LumiCurtainHagl05_fault", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "0", + "label": "No faults" + } + ] + }, "refresh": true, "actions": [], - "value-list": [ - { - "value": 0, - "description": "No faults" - } - ], "readmeComment": "Value mapping [0\u003d\"No faults\"]" }, { @@ -43,22 +46,25 @@ "channel": "status", "channelType": "LumiCurtainHagl05_status", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "0", + "label": "Stopped" + }, + { + "value": "1", + "label": "Opening" + }, + { + "value": "2", + "label": "Closing" + } + ] + }, "refresh": true, "actions": [], - "value-list": [ - { - "value": 0, - "description": "Stopped" - }, - { - "value": 1, - "description": "Opening" - }, - { - "value": 2, - "description": "Closing" - } - ], "readmeComment": "Value mapping [0\u003d\"Stopped\",1\u003d\"Opening\",2\u003d\"Closing\"]" }, { @@ -85,6 +91,18 @@ "channel": "manual-enabled", "channelType": "LumiCurtainHagl05_manual-enabled", "type": "Number", + "stateDescription": { + "options": [ + { + "value": "0", + "label": "Disable" + }, + { + "value": "1", + "label": "Enable" + } + ] + }, "refresh": true, "actions": [ { @@ -92,16 +110,6 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 0, - "description": "Disable" - }, - { - "value": 1, - "description": "Enable" - } - ], "readmeComment": "Value mapping [0\u003d\"Disable\",1\u003d\"Enable\"]" }, { @@ -112,6 +120,18 @@ "channel": "polarity", "channelType": "LumiCurtainHagl05_polarity", "type": "Number", + "stateDescription": { + "options": [ + { + "value": "0", + "label": "Positive" + }, + { + "value": "1", + "label": "Reverse" + } + ] + }, "refresh": true, "actions": [ { @@ -119,16 +139,6 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 0, - "description": "Positive" - }, - { - "value": 1, - "description": "Reverse" - } - ], "readmeComment": "Value mapping [0\u003d\"Positive\",1\u003d\"Reverse\"]" }, { @@ -139,6 +149,18 @@ "channel": "pos-limit", "channelType": "LumiCurtainHagl05_pos-limit", "type": "Number", + "stateDescription": { + "options": [ + { + "value": "0", + "label": "Unlimit" + }, + { + "value": "1", + "label": "Limit" + } + ] + }, "refresh": true, "actions": [ { @@ -146,16 +168,6 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 0, - "description": "Unlimit" - }, - { - "value": 1, - "description": "Limit" - } - ], "readmeComment": "Value mapping [0\u003d\"Unlimit\",1\u003d\"Limit\"]" }, { @@ -166,6 +178,18 @@ "channel": "en-night-tip-light", "channelType": "LumiCurtainHagl05_en-night-tip-light", "type": "Switch", + "stateDescription": { + "options": [ + { + "value": "0", + "label": "Disable" + }, + { + "value": "1", + "label": "Enable" + } + ] + }, "refresh": true, "actions": [ { @@ -173,16 +197,6 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 0, - "description": "Disable" - }, - { - "value": 1, - "description": "Enable" - } - ], "readmeComment": "Value mapping [0\u003d\"Disable\",1\u003d\"Enable\"]" }, { diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.gateway.json b/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.gateway.json index 4e1768cc0c6f2..8f5b17bacfa5c 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.gateway.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/lumi.gateway.json @@ -13,7 +13,6 @@ "property": "", "friendlyName": "Enable Telnet", "channel": "telnetEnable", - "readmeComment": "Access the device with telnet to further unlock developer mode. See forum", "type": "Switch", "refresh": false, "actions": [ @@ -21,7 +20,8 @@ "command": "enable_telnet_service", "parameterType": "EMPTY" } - ] + ], + "readmeComment": "Access the device with telnet to further unlock developer mode. See forum" }, { "property": "doorbell_volume", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/mijia.vacuum.v2-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/mijia.vacuum.v2-miot.json index 5613a2508e1ed..cbf4beec33140 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/mijia.vacuum.v2-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/mijia.vacuum.v2-miot.json @@ -71,6 +71,9 @@ } } ], + "tags": [ + "Control" + ], "readmeComment": "This channel accepts `start`, `stop`, `findme` and `dock`." }, { @@ -81,33 +84,39 @@ "channel": "status", "channelType": "MijiaVacuumV2_status", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "1", + "label": "Idle" + }, + { + "value": "2", + "label": "Sweeping" + }, + { + "value": "3", + "label": "Paused" + }, + { + "value": "4", + "label": "Error" + }, + { + "value": "5", + "label": "Charging" + }, + { + "value": "6", + "label": "Go Charging" + } + ] + }, "refresh": true, "actions": [], - "value-list": [ - { - "value": 1, - "description": "Idle" - }, - { - "value": 2, - "description": "Sweeping" - }, - { - "value": 3, - "description": "Paused" - }, - { - "value": 4, - "description": "Error" - }, - { - "value": 5, - "description": "Charging" - }, - { - "value": 6, - "description": "Go Charging" - } + "tags": [ + "Status" ], "readmeComment": "Value mapping [1\u003d\"Idle\",2\u003d\"Sweeping\",3\u003d\"Paused\",4\u003d\"Error\",5\u003d\"Charging\",6\u003d\"Go Charging\"]" }, @@ -119,61 +128,67 @@ "channel": "fault", "channelType": "MijiaVacuumV2_fault", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "0", + "label": "No Faults" + }, + { + "value": "1", + "label": "Left-wheel-error" + }, + { + "value": "2", + "label": "Right-wheel-error" + }, + { + "value": "3", + "label": "Cliff-error" + }, + { + "value": "4", + "label": "Low-battery-error" + }, + { + "value": "5", + "label": "Bump-error" + }, + { + "value": "6", + "label": "Main-brush-error" + }, + { + "value": "7", + "label": "Side-brush-error" + }, + { + "value": "8", + "label": "Fan-motor-error" + }, + { + "value": "9", + "label": "Dustbin-error" + }, + { + "value": "10", + "label": "Charging-error" + }, + { + "value": "11", + "label": "No-wate-error" + }, + { + "value": "12", + "label": "Pick-up-error" + } + ] + }, "refresh": true, "actions": [], - "value-list": [ - { - "value": 0, - "description": "No Faults" - }, - { - "value": 1, - "description": "Left-wheel-error" - }, - { - "value": 2, - "description": "Right-wheel-error" - }, - { - "value": 3, - "description": "Cliff-error" - }, - { - "value": 4, - "description": "Low-battery-error" - }, - { - "value": 5, - "description": "Bump-error" - }, - { - "value": 6, - "description": "Main-brush-error" - }, - { - "value": 7, - "description": "Side-brush-error" - }, - { - "value": 8, - "description": "Fan-motor-error" - }, - { - "value": 9, - "description": "Dustbin-error" - }, - { - "value": 10, - "description": "Charging-error" - }, - { - "value": 11, - "description": "No-wate-error" - }, - { - "value": 12, - "description": "Pick-up-error" - } + "tags": [ + "Status" ], "readmeComment": "Value mapping [0\u003d\"No Faults\",1\u003d\"Left-wheel-error\",2\u003d\"Right-whelel-error\",3\u003d\"Cliff-error\",4\u003d\"Low-battery-error\",5\u003d\"Bump-error\",6\u003d\"Main-brush-error\",7\u003d\"Side-brush-error\",8\u003d\"Fan-motor-error\",9\u003d\"Dustbin-error\",10\u003d\"Charging-error\",11\u003d\"No-wate-error\",12\u003d\"Pick-up-error\"]" }, @@ -185,6 +200,22 @@ "channel": "mode", "channelType": "MijiaVacuumV2_mode", "type": "Number", + "stateDescription": { + "options": [ + { + "value": "1", + "label": "Auto-clean" + }, + { + "value": "2", + "label": "Spot-clean" + }, + { + "value": "3", + "label": "Wallflow-clean" + } + ] + }, "refresh": true, "actions": [ { @@ -192,19 +223,8 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 1, - "description": "Auto-clean" - }, - { - "value": 2, - "description": "Spot-clean" - }, - { - "value": 3, - "description": "Wallflow-clean" - } + "tags": [ + "Control" ], "readmeComment": "Value mapping [1\u003d\"Auto-clean\",2\u003d\"Spot-clean\",3\u003d\"Wallflow-clean\"]" }, @@ -216,6 +236,23 @@ "channel": "target-water-level", "channelType": "MijiaVacuumV2_target-water-level", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "1", + "label": "Level1" + }, + { + "value": "2", + "label": "Level2" + }, + { + "value": "3", + "label": "Level3" + } + ] + }, "refresh": true, "actions": [ { @@ -223,19 +260,8 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 1, - "description": "Level1" - }, - { - "value": 2, - "description": "Level2" - }, - { - "value": 3, - "description": "Level3" - } + "tags": [ + "Setpoint" ], "readmeComment": "Value mapping [1\u003d\"Level1\",2\u003d\"Level2\",3\u003d\"Level3\"]" }, @@ -247,6 +273,26 @@ "channel": "fan-level", "channelType": "MijiaVacuumV2_fan-level", "type": "Number", + "stateDescription": { + "options": [ + { + "value": "0", + "label": "Silence" + }, + { + "value": "1", + "label": "Stanrd" + }, + { + "value": "2", + "label": "Middle" + }, + { + "value": "3", + "label": "Enchance" + } + ] + }, "refresh": true, "actions": [ { @@ -254,23 +300,8 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 0, - "description": "Silence" - }, - { - "value": 1, - "description": "Stanrd" - }, - { - "value": 2, - "description": "Middle" - }, - { - "value": 3, - "description": "Enchance" - } + "tags": [ + "Setpoint" ], "readmeComment": "Value mapping [0\u003d\"Silence\",1\u003d\"Stanrd\",2\u003d\"Middle\",3\u003d\"Enchance\"]" }, @@ -293,21 +324,27 @@ "channel": "charging-state", "channelType": "MijiaVacuumV2_charging-state", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "0", + "label": "Not-charging" + }, + { + "value": "1", + "label": "Charging" + }, + { + "value": "2", + "label": "Charging-competely" + } + ] + }, "refresh": true, "actions": [], - "value-list": [ - { - "value": 0, - "description": "Not-charging" - }, - { - "value": 1, - "description": "Charging" - }, - { - "value": 2, - "description": "Charging-competely" - } + "tags": [ + "Status" ], "readmeComment": "Value mapping [0\u003d\"Not-charging\",1\u003d\"Charging\",2\u003d\"Charging-competely\"]" }, @@ -325,6 +362,9 @@ "command": "set_properties", "parameterType": "ONOFFBOOL" } + ], + "tags": [ + "Alarm" ] }, { @@ -341,6 +381,9 @@ "command": "set_properties", "parameterType": "NUMBER" } + ], + "tags": [ + "Setpoint" ] }, { @@ -352,7 +395,10 @@ "channelType": "miot_uint8", "type": "Number", "refresh": true, - "actions": [] + "actions": [], + "tags": [ + "Status" + ] }, { "property": "filter-left-time", @@ -363,7 +409,10 @@ "channelType": "miot_uint16", "type": "Number", "refresh": true, - "actions": [] + "actions": [], + "tags": [ + "Status" + ] }, { "property": "brush-life-level", @@ -374,7 +423,10 @@ "channelType": "miot_uint8", "type": "Number", "refresh": true, - "actions": [] + "actions": [], + "tags": [ + "Status" + ] }, { "property": "brush-left-time", @@ -385,7 +437,10 @@ "channelType": "miot_uint16", "type": "Number", "refresh": true, - "actions": [] + "actions": [], + "tags": [ + "Status" + ] }, { "property": "brush-life-level1", @@ -396,7 +451,10 @@ "channelType": "miot_uint8", "type": "Number", "refresh": true, - "actions": [] + "actions": [], + "tags": [ + "Status" + ] }, { "property": "brush-left-time1", @@ -407,7 +465,10 @@ "channelType": "miot_uint16", "type": "Number", "refresh": true, - "actions": [] + "actions": [], + "tags": [ + "Status" + ] }, { "property": "clean-area", @@ -416,9 +477,12 @@ "friendlyName": "Clean Record - Clean Area", "channel": "clean-area", "channelType": "miot_uint16", - "type": "Number", + "type": "Number:Area", "refresh": true, - "actions": [] + "actions": [], + "tags": [ + "Measurement" + ] }, { "property": "clean-time", @@ -427,7 +491,8 @@ "friendlyName": "Clean Record - Clean Time", "channel": "clean-time", "channelType": "miot_uint16", - "type": "Number", + "type": "Number:Time", + "unit": "hours", "refresh": true, "actions": [] }, @@ -472,6 +537,46 @@ "channel": "language", "channelType": "MijiaVacuumV2_language", "type": "Number", + "stateDescription": { + "options": [ + { + "value": "0", + "label": "English" + }, + { + "value": "1", + "label": "简体中文" + }, + { + "value": "2", + "label": "Español" + }, + { + "value": "3", + "label": "Русский" + }, + { + "value": "4", + "label": "Italiano" + }, + { + "value": "5", + "label": "Français" + }, + { + "value": "6", + "label": "Deutsch" + }, + { + "value": "7", + "label": "한국어" + }, + { + "value": "8", + "label": "Polski" + } + ] + }, "refresh": true, "actions": [ { @@ -479,44 +584,6 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 0, - "description": "English" - }, - { - "value": 1, - "description": "简体中文" - }, - { - "value": 2, - "description": "Español" - }, - { - "value": 3, - "description": "Русский" - }, - { - "value": 4, - "description": "Italiano" - }, - { - "value": 5, - "description": "Français" - }, - { - "value": 6, - "description": "Deutsch" - }, - { - "value": 7, - "description": "한국어" - }, - { - "value": 8, - "description": "Polski" - } - ], "readmeComment": "Value mapping [0\u003d\"English\",1\u003d\"简体中文\",2\u003d\"Español\",3\u003d\"Русский\",4\u003d\"Italiano\",5\u003d\"Français\",6\u003d\"Deutsch\",7\u003d\"한국어\",8\u003d\"Polski\"]" }, { @@ -543,18 +610,21 @@ "channel": "mop-status", "channelType": "MijiaVacuumV2_mop-status", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "0", + "label": "Mop Uninstall" + }, + { + "value": "1", + "label": "Mop Install" + } + ] + }, "refresh": true, "actions": [], - "value-list": [ - { - "value": 0, - "description": "Mop Uninstall" - }, - { - "value": 1, - "description": "Mop Install" - } - ], "readmeComment": "Value mapping [0\u003d\"MopUninstall\",1\u003d\"MopInstall\"]" } ], 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 10e6b704b8bcc..b49a64da81afa 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 @@ -24,8 +24,8 @@ "friendlyName": "status", "channel": "Status", "type": "String", - "customRefreshCommand": true, "refresh": true, + "customRefreshCommand": "true", "ChannelGroup": "actions", "actions": [] }, @@ -86,7 +86,7 @@ "readmeComment": "Value is the amount of water (ml) to heat. 2nd parameter in the json db is the water temperature" } ], - "experimental": true, - "readmeComment": "This device does not allow for regular querying for the status. Hence the status is not updated for the action channels." + "readmeComment": "This device does not allow for regular querying for the status. Hence the status is not updated for the action channels.", + "experimental": true } } 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 71b0e0bc66747..6013504d1a7d7 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 @@ -175,4 +175,4 @@ } ] } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/xjx.toilet.json b/bundles/org.openhab.binding.miio/src/main/resources/database/xjx.toilet.json index 206785a9c7e36..23b67cd1240d5 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/xjx.toilet.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/xjx.toilet.json @@ -12,12 +12,18 @@ "friendlyName": "Seat Temperature", "channel": "seat_temp", "type": "Number", + "unit": "CELCIUS", "refresh": true, "actions": [ { "command": "set_seat_temp", "parameterType": "NUMBER" } + ], + "category": "temperature", + "tags": [ + "Setpoint", + "Temperature" ] }, { @@ -34,12 +40,18 @@ "friendlyName": "Water Temperature", "channel": "water_temp_t", "type": "Number", + "unit": "CELCIUS", "refresh": true, "actions": [ { "command": "set_water_temp_t", "parameterType": "NUMBER" } + ], + "category": "temperature", + "tags": [ + "Setpoint", + "Temperature" ] }, { @@ -47,12 +59,18 @@ "friendlyName": "Fan Temperature", "channel": "fan_temp", "type": "Number", + "unit": "CELCIUS", "refresh": true, "actions": [ { "command": "set_fan_temp", "parameterType": "NUMBER" } + ], + "category": "temperature", + "tags": [ + "Setpoint", + "Temperature" ] }, { 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 3bb4391115d8e..69b5b08969cc1 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 @@ -83,11 +83,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "nl_br", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/yunmi.waterpurifier.json b/bundles/org.openhab.binding.miio/src/main/resources/database/yunmi.waterpurifier.json index 628093281cce5..3534873bca19e 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/yunmi.waterpurifier.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/yunmi.waterpurifier.json @@ -45,10 +45,15 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "rinse", 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 79c7522f08ebb..820757adc1b0e 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 @@ -124,7 +124,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "use_time", @@ -136,7 +137,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "motor1_speed", @@ -177,12 +179,17 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "transformation": "/10", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "purify_volume", 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 0bd264c7622e2..04e1305f66b1d 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 @@ -113,7 +113,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "use_time", @@ -125,7 +126,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "motor1_speed", @@ -166,12 +168,17 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "transformation": "/10", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "purify_volume", 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 0fd833c8f766b..a0617549dc0ba 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 @@ -116,7 +116,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "motor1_speed", @@ -166,12 +167,17 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "transformation": "/10", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "child_lock", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.sa1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.sa1.json index 57eafaec00d3d..97ade35906130 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.sa1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.sa1.json @@ -43,7 +43,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "angle", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.v3.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.v3.json index af68489f9bf42..25589f9a8bbef 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.v3.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.v3.json @@ -44,7 +44,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "angle", @@ -169,10 +170,16 @@ "friendlyName": "Temperature", "channel": "temp_dec", "type": "Number", + "unit": "CELCIUS", "refresh": true, "transformation": "/10", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "humidity", 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 07381cc13da23..b9617e9417795 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 @@ -43,7 +43,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "angle", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za1.json index c372f09948f5d..09129b5391b8f 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za1.json @@ -25,14 +25,19 @@ "friendlyName": "Target Temperature", "channel": "target_temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "actions": [ { "command": "set_target_temperature", "parameterType": "NUMBER" } + ], + "category": "temperature", + "tags": [ + "Setpoint", + "Temperature" ] }, { @@ -103,10 +108,15 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "use_time", @@ -117,7 +127,8 @@ "unit": "hours", "refresh": true, "transformation": "SecondsToHours", - "actions": [] + "actions": [], + "category": "time" } ], "experimental": true diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za2-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za2-miot.json index 2a9a0071091ba..695b09e925f79 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za2-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za2-miot.json @@ -48,6 +48,11 @@ "command": "set_properties", "parameterType": "NUMBER" } + ], + "category": "temperature", + "tags": [ + "Setpoint", + "Temperature" ] }, { @@ -104,7 +109,12 @@ "type": "Number:Temperature", "unit": "CELCIUS", "refresh": true, - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "brightness", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.zb1-miot.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.zb1-miot.json index 7d37d20a22899..d4cf7352d0531 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.zb1-miot.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.zb1-miot.json @@ -48,6 +48,11 @@ "command": "set_properties", "parameterType": "NUMBER" } + ], + "category": "temperature", + "tags": [ + "Setpoint", + "Temperature" ] }, { @@ -104,7 +109,12 @@ "type": "Number:Temperature", "unit": "CELCIUS", "refresh": true, - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "brightness", @@ -158,6 +168,51 @@ "channel": "country-code", "channelType": "ZhimiHeaterZb1_country-code", "type": "Number", + "stateDescription": { + "readOnly": true, + "options": [ + { + "value": "0", + "label": "Unknown" + }, + { + "value": "1", + "label": "US" + }, + { + "value": "82", + "label": "KR" + }, + { + "value": "44", + "label": "EU" + }, + { + "value": "81", + "label": "JP" + }, + { + "value": "7", + "label": "RU" + }, + { + "value": "86", + "label": "CN" + }, + { + "value": "852", + "label": "HK" + }, + { + "value": "886", + "label": "TW" + }, + { + "value": "33", + "label": "FR" + } + ] + }, "refresh": true, "actions": [ { @@ -165,48 +220,6 @@ "parameterType": "NUMBER" } ], - "value-list": [ - { - "value": 0, - "description": "Unknown" - }, - { - "value": 1, - "description": "US" - }, - { - "value": 82, - "description": "KR" - }, - { - "value": 44, - "description": "EU" - }, - { - "value": 81, - "description": "JP" - }, - { - "value": 7, - "description": "RU" - }, - { - "value": 86, - "description": "CN" - }, - { - "value": 852, - "description": "HK" - }, - { - "value": 886, - "description": "TW" - }, - { - "value": 33, - "description": "FR" - } - ], "readmeComment": "Value mapping [0\u003d\"Unknown\",1\u003d\"US\",82\u003d\"KR\",44\u003d\"EU\",81\u003d\"JP\",7\u003d\"RU\",86\u003d\"CN\",852\u003d\"HK\",886\u003d\"TW\",33\u003d\"FR\"]" } ], diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.ca4.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.ca4.json index 5032a80b98ccb..bf5a291ff5231 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.ca4.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.ca4.json @@ -88,8 +88,8 @@ "channelType": "waterlevel", "type": "Number", "refresh": true, - "ChannelGroup": "Status", "transformation": "tankLevel", + "ChannelGroup": "Status", "actions": [] }, { @@ -155,7 +155,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "power_time", @@ -165,11 +166,12 @@ "channel": "powerhours", "channelType": "powerhours", "type": "Number:Time", + "unit": "hours", "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "unit": "hours", - "actions": [] + "actions": [], + "category": "time" }, { "property": "speed_level", @@ -202,11 +204,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "child_lock", diff --git a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.cb1.json b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.cb1.json index f7b54c51ddddb..95b34cdd98ee6 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.cb1.json +++ b/bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.cb1.json @@ -122,7 +122,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "speed", @@ -139,11 +140,16 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "child_lock", 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 0efa145670d6c..001815ea04e8b 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 @@ -143,7 +143,8 @@ "refresh": true, "transformation": "SecondsToHours", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "time" }, { "property": "speed", @@ -160,12 +161,17 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, "transformation": "/10", "ChannelGroup": "Status", - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "child_lock", 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 27ff304b47a23..f6fb815a5d109 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 @@ -73,10 +73,15 @@ "friendlyName": "Temperature", "channel": "temperature", "channelType": "temperatureC", - "unit": "CELCIUS", "type": "Number:Temperature", + "unit": "CELCIUS", "refresh": true, - "actions": [] + "actions": [], + "category": "temperature", + "tags": [ + "Measurement", + "Temperature" + ] }, { "property": "lp_autooff",