[miio] Allow for custom refresh commands (#8796)

* [miio] Allow for custom refresh commands

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>

bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java

@@ -82,7 +82,7 @@ public class MiIoHandlerFactory extends BaseThingHandlerFactory {
             return new MiIoGenericHandler(thing, miIoDatabaseWatchService);
         }
         if (thingTypeUID.equals(THING_TYPE_BASIC)) {
-            return new MiIoBasicHandler(thing, miIoDatabaseWatchService);
+            return new MiIoBasicHandler(thing, miIoDatabaseWatchService, channelTypeRegistry);
         }
         if (thingTypeUID.equals(THING_TYPE_VACUUM)) {
             return new MiIoVacuumHandler(thing, miIoDatabaseWatchService, cloudConnector, channelTypeRegistry);

bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoSendCommand.java

@@ -15,6 +15,7 @@ package org.openhab.binding.miio.internal;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
@@ -28,17 +29,17 @@ public class MiIoSendCommand {
 
     private final int id;
     private final MiIoCommand command;
-    private final String commandString;
+    private final JsonObject commandJson;
     private @Nullable JsonObject response;
 
     public void setResponse(JsonObject response) {
         this.response = response;
     }
 
-    public MiIoSendCommand(int id, MiIoCommand command, String commandString) {
+    public MiIoSendCommand(int id, MiIoCommand command, JsonObject fullCommand) {
         this.id = id;
         this.command = command;
-        this.commandString = commandString;
+        this.commandJson = fullCommand;
     }
 
     public int getId() {
@@ -49,8 +50,20 @@ public class MiIoSendCommand {
         return command;
     }
 
+    public JsonObject getCommandJson() {
+        return commandJson;
+    }
+
     public String getCommandString() {
-        return commandString;
+        return commandJson.toString();
+    }
+
+    public String getMethod() {
+        return commandJson.has("method") ? commandJson.get("method").getAsString() : "";
+    }
+
+    public JsonElement getParams() {
+        return commandJson.has("params") ? commandJson.get("params").getAsJsonArray() : new JsonArray();
     }
 
     public JsonObject getResponse() {

bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java

@@ -56,6 +56,9 @@ public class MiIoBasicChannel {
     @SerializedName("refresh")
     @Expose
     private @Nullable Boolean refresh;
+    @SerializedName("customRefreshCommand")
+    @Expose
+    private @Nullable String channelCustomRefreshCommand;
     @SerializedName("transformation")
     @Expose
     private @Nullable String transfortmation;
@@ -133,7 +136,7 @@ public class MiIoBasicChannel {
     public String getChannelType() {
         final @Nullable String ct = channelType;
         if (ct == null || ct.isEmpty()) {
-            return BINDING_ID + ":" + getChannel();
+            return "";
         } else {
             return (ct.startsWith("system") ? ct : BINDING_ID + ":" + ct);
         }
@@ -161,6 +164,15 @@ public class MiIoBasicChannel {
         this.refresh = refresh;
     }
 
+    public String getChannelCustomRefreshCommand() {
+        final @Nullable String channelCustomRefreshCommand = this.channelCustomRefreshCommand;
+        return channelCustomRefreshCommand != null ? channelCustomRefreshCommand : "";
+    }
+
+    public void setChannelCustomRefreshCommand(String channelCustomRefreshCommand) {
+        this.channelCustomRefreshCommand = channelCustomRefreshCommand;
+    }
+
     public String getChannelGroup() {
         final @Nullable String channelGroup = this.channelGroup;
         return channelGroup != null ? channelGroup : "";

bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java

@@ -50,6 +50,7 @@ import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.binding.builder.ChannelBuilder;
 import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
 import org.openhab.core.thing.type.ChannelTypeUID;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.RefreshType;
@@ -73,7 +74,6 @@ import com.google.gson.JsonSyntaxException;
  */
 @NonNullByDefault
 public class MiIoBasicHandler extends MiIoAbstractHandler {
-
     private final Logger logger = LoggerFactory.getLogger(MiIoBasicHandler.class);
     private boolean hasChannelStructure;
 
@@ -83,12 +83,16 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
     });
 
     List<MiIoBasicChannel> refreshList = new ArrayList<>();
+    private Map<String, MiIoBasicChannel> refreshListCustomCommands = new HashMap<>();
 
     private @Nullable MiIoBasicDevice miioDevice;
     private Map<ChannelUID, MiIoBasicChannel> actions = new HashMap<>();
+    private ChannelTypeRegistry channelTypeRegistry;
 
-    public MiIoBasicHandler(Thing thing, MiIoDatabaseWatchService miIoDatabaseWatchService) {
+    public MiIoBasicHandler(Thing thing, MiIoDatabaseWatchService miIoDatabaseWatchService,
+            ChannelTypeRegistry channelTypeRegistry) {
         super(thing, miIoDatabaseWatchService);
+        this.channelTypeRegistry = channelTypeRegistry;
     }
 
     @Override
@@ -97,6 +101,7 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
         hasChannelStructure = false;
         isIdentified = false;
         refreshList = new ArrayList<>();
+        refreshListCustomCommands = new HashMap<>();
     }
 
     @Override
@@ -259,6 +264,7 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
             final MiIoBasicDevice midevice = miioDevice;
             if (midevice != null) {
                 refreshProperties(midevice);
+                refreshCustomProperties(midevice);
                 refreshNetwork();
             }
         } catch (Exception e) {
@@ -266,6 +272,12 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
         }
     }
 
+    private void refreshCustomProperties(MiIoBasicDevice midevice) {
+        for (MiIoBasicChannel miChannel : refreshListCustomCommands.values()) {
+            sendCommand(miChannel.getChannelCustomRefreshCommand());
+        }
+    }
+
     private boolean refreshProperties(MiIoBasicDevice device) {
         MiIoCommand command = MiIoCommand.getCommand(device.getDevice().getPropertyMethod());
         int maxProperties = device.getDevice().getMaxProperties();
@@ -326,7 +338,12 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
             if (miioDevice != null) {
                 for (MiIoBasicChannel miChannel : miioDevice.getDevice().getChannels()) {
                     if (miChannel.getRefresh()) {
+                        if (miChannel.getChannelCustomRefreshCommand().isBlank()) {
                             refreshList.add(miChannel);
+                        } else {
+                            String i = miChannel.getChannelCustomRefreshCommand().split("\\[")[0];
+                            refreshListCustomCommands.put(i.trim(), miChannel);
+                        }
                     }
                 }
             }
@@ -398,7 +415,6 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
             return null;
         }
         ChannelUID channelUID = new ChannelUID(getThing().getUID(), channel);
-        ChannelTypeUID channelTypeUID = new ChannelTypeUID(channelType);
 
         // TODO: Need to understand if this harms anything. If yes, channel only to be added when not there already.
         // current way allows to have no issues when channels are changing.
@@ -406,9 +422,17 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
             logger.info("Channel '{}' for thing {} already exist... removing", channel, getThing().getUID());
             thingBuilder.withoutChannel(new ChannelUID(getThing().getUID(), channel));
         }
-        Channel newChannel = ChannelBuilder.create(channelUID, datatype).withType(channelTypeUID)
+        ChannelBuilder newChannel = ChannelBuilder.create(channelUID, datatype).withLabel(friendlyName);
-                .withLabel(friendlyName).build();
+        if (!channelType.isBlank()) {
-        thingBuilder.withChannel(newChannel);
+            ChannelTypeUID channelTypeUID = new ChannelTypeUID(channelType);
+            if (channelTypeRegistry.getChannelType(channelTypeUID) != null) {
+                newChannel = newChannel.withType(channelTypeUID);
+            } else {
+                logger.debug("ChannelType '{}' is not available. Check the Json file for {}", channelTypeUID,
+                        getThing().getUID());
+            }
+        }
+        thingBuilder.withChannel(newChannel.build());
         return channelUID;
     }
 
@@ -528,6 +552,23 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
                     }
                     break;
                 default:
+                    if (refreshListCustomCommands.containsKey(response.getMethod())) {
+                        logger.debug("Processing custom refresh command response for !{}", response.getMethod());
+                        MiIoBasicChannel ch = refreshListCustomCommands.get(response.getMethod());
+                        if (response.getResult().isJsonArray()) {
+                            JsonArray cmdResponse = response.getResult().getAsJsonArray();
+                            final String transformation = ch.getTransfortmation();
+                            if (transformation == null || transformation.isBlank()) {
+                                updateChannel(ch, ch.getChannel(),
+                                        cmdResponse.get(0).isJsonPrimitive() ? cmdResponse.get(0)
+                                                : new JsonPrimitive(cmdResponse.get(0).toString()));
+                            } else {
+                                updateChannel(ch, ch.getChannel(), cmdResponse);
+                            }
+                        } else {
+                            updateChannel(ch, ch.getChannel(), new JsonPrimitive(response.getResult().toString()));
+                        }
+                    }
                     break;
             }
         } catch (Exception e) {

bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoUnsupportedHandler.java

@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.miio.internal.MiIoBindingConfiguration;
 import org.openhab.binding.miio.internal.MiIoCommand;
 import org.openhab.binding.miio.internal.MiIoDevices;
@@ -170,7 +171,9 @@ public class MiIoUnsupportedHandler extends MiIoAbstractHandler {
         sb.append("Properties: ");
         int lastCommand = -1;
         for (String c : channelList.keySet()) {
-            String cmd = "get_prop[" + c + "]";
+            MiIoBasicChannel ch = channelList.get(c);
+            String cmd = ch.getChannelCustomRefreshCommand().isBlank() ? ("get_prop[" + c + "]")
+                    : ch.getChannelCustomRefreshCommand();
             sb.append(c);
             sb.append(" -> ");
             lastCommand = sendCommand(cmd);
@@ -183,10 +186,13 @@ public class MiIoUnsupportedHandler extends MiIoAbstractHandler {
         logger.info("{}", sb.toString());
     }
 
-    private LinkedHashMap<String, MiIoBasicChannel> collectProperties(String model) {
+    private LinkedHashMap<String, MiIoBasicChannel> collectProperties(@Nullable String model) {
         LinkedHashMap<String, MiIoBasicChannel> testChannelsList = new LinkedHashMap<>();
         LinkedHashSet<MiIoDevices> testDeviceList = new LinkedHashSet<>();
-
+        if (model == null || model.length() < 2) {
+            logger.info("Wait until the model is determined, than try again");
+            return testChannelsList;
+        }
         // first add similar devices to test those channels first, then test all others
         int[] subset = { model.length() - 1, model.lastIndexOf("."), model.indexOf("."), 0 };
         for (int i : subset) {
@@ -203,9 +209,16 @@ public class MiIoUnsupportedHandler extends MiIoAbstractHandler {
         }
         for (MiIoDevices dev : testDeviceList) {
             for (MiIoBasicChannel ch : getBasicChannels(dev.getModel())) {
-                if (!ch.isMiOt() && !ch.getProperty().isBlank() && !testChannelsList.containsKey(ch.getProperty())) {
+                // Add all (unique) properties
+                if (!ch.isMiOt() && !ch.getProperty().isBlank() && ch.getChannelCustomRefreshCommand().isBlank()
+                        && !testChannelsList.containsKey(ch.getProperty())) {
                     testChannelsList.put(ch.getProperty(), ch);
                 }
+                // Add all (unique) custom refresh commands
+                if (!ch.isMiOt() && !ch.getChannelCustomRefreshCommand().isBlank()
+                        && !testChannelsList.containsKey(ch.getChannelCustomRefreshCommand())) {
+                    testChannelsList.put(ch.getChannelCustomRefreshCommand(), ch);
+                }
             }
         }
         return testChannelsList;

bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/transport/MiIoAsyncCommunication.java

@@ -143,8 +143,7 @@ public class MiIoAsyncCommunication {
             fullCommand.addProperty("id", cmdId);
             fullCommand.addProperty("method", command);
             fullCommand.add("params", parser.parse(params));
-            MiIoSendCommand sendCmd = new MiIoSendCommand(cmdId, MiIoCommand.getCommand(command),
+            MiIoSendCommand sendCmd = new MiIoSendCommand(cmdId, MiIoCommand.getCommand(command), fullCommand);
-                    fullCommand.toString());
             concurrentLinkedQueue.add(sendCmd);
             if (logger.isDebugEnabled()) {
                 // Obfuscate part of the token to allow sharing of the logfiles

bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.b1.json

@@ -20,6 +20,7 @@
 				"property": "pm25",
 				"friendlyName": "PM2.5",
 				"channel": "pm25",
+				"channelType": "pm25",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -29,6 +30,7 @@
 				"property": "co2e",
 				"friendlyName": "CO2e",
 				"channel": "co2",
+				"channelType": "co2",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -38,6 +40,7 @@
 				"property": "tvoc",
 				"friendlyName": "tVOC",
 				"channel": "tvoc",
+				"channelType": "tvoc",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -47,6 +50,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -56,6 +60,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/cgllc.airmonitor.s1.json

@@ -20,6 +20,7 @@
 				"property": "pm25",
 				"friendlyName": "PM2.5",
 				"channel": "pm25",
+				"channelType": "pm25",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -29,6 +30,7 @@
 				"property": "co2",
 				"friendlyName": "CO2",
 				"channel": "co2",
+				"channelType": "co2",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -38,6 +40,7 @@
 				"property": "tvoc",
 				"friendlyName": "tVOC",
 				"channel": "tvoc",
+				"channelType": "tvoc",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -47,6 +50,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -56,6 +60,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.m1.json

@@ -10,6 +10,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -24,6 +25,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -33,6 +35,7 @@
 				"property": "wifi_led",
 				"friendlyName": "Indicator light",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",

bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v1.json

@@ -8,6 +8,7 @@
 				"property": "on",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "usb_on",
 				"friendlyName": "USB",
 				"channel": "usb",
+				"channelType": "usb",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v2.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -22,6 +23,7 @@
 				"property": "usb_on",
 				"friendlyName": "USB",
 				"channel": "usb",
+				"channelType": "usb",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "usb_on",
 				"friendlyName": "USB",
 				"channel": "usb",
+				"channelType": "usb",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -35,6 +37,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -44,6 +47,7 @@
 				"property": "wifi_led",
 				"friendlyName": "Wifi LED",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/chuangmi.plug.v3fw.json

@@ -11,21 +11,23 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
-				"readmeComment": "If this channel does not respond to on/off replace the model with chuangmi.plug.v3old in the config or upgrade firmware",
 				"actions": [
 					{
 						"command": "set_power",
 						"parameterType": "ONOFF"
 					}
-				]
+				],
+				"readmeComment": "If this channel does not respond to on/off replace the model with chuangmi.plug.v3old in the config or upgrade firmware"
 			},
 			{
 				"property": "usb_on",
 				"friendlyName": "USB",
 				"channel": "usb",
+				"channelType": "usb",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -40,6 +42,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -49,6 +52,7 @@
 				"property": "wifi_led",
 				"friendlyName": "Wifi LED",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.a1.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "airFreshMode",
+				"channelType": "airFreshMode",
 				"type": "String",
 				"refresh": true,
 				"actions": [
@@ -34,6 +36,7 @@
 				"property": "ptc_on",
 				"friendlyName": "PTC",
 				"channel": "airFreshPTCPower",
+				"channelType": "airFreshPTCPower",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -47,6 +50,7 @@
 				"property": "ptc_status",
 				"friendlyName": "PTC Status",
 				"channel": "airFreshPTCStatus",
+				"channelType": "airFreshPTCStatus",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -56,6 +60,7 @@
 				"property": "display",
 				"friendlyName": "Display",
 				"channel": "airFreshDisplay",
+				"channelType": "airFreshDisplay",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -69,6 +74,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "airFreshChildLock",
+				"channelType": "airFreshChildLock",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -82,6 +88,7 @@
 				"property": "sound",
 				"friendlyName": "Sound",
 				"channel": "airFreshSound",
+				"channelType": "airFreshSound",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -95,6 +102,7 @@
 				"property": "pm25",
 				"friendlyName": "PM2.5",
 				"channel": "airFreshPM25",
+				"channelType": "airFreshPM25",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -104,6 +112,7 @@
 				"property": "co2",
 				"friendlyName": "CO2",
 				"channel": "airFreshCO2",
+				"channelType": "airFreshCO2",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -113,6 +122,7 @@
 				"property": "control_speed",
 				"friendlyName": "Current Speed",
 				"channel": "airFreshCurrentSpeed",
+				"channelType": "airFreshCurrentSpeed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -122,6 +132,7 @@
 				"property": "favourite_speed",
 				"friendlyName": "Favorite Speed",
 				"channel": "airFreshFavoriteSpeed",
+				"channelType": "airFreshFavoriteSpeed",
 				"type": "Number",
 				"refresh": true,
 				"actions": [
@@ -135,6 +146,7 @@
 				"property": "temperature_outside",
 				"friendlyName": "Temperature Outside",
 				"channel": "airFreshTemperature",
+				"channelType": "airFreshTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -144,6 +156,7 @@
 				"property": "filter_rate",
 				"friendlyName": "Filter Percents Remaining",
 				"channel": "airFreshFilterPercents",
+				"channelType": "airFreshFilterPercents",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -153,6 +166,7 @@
 				"property": "filter_day",
 				"friendlyName": "Filter Days Remaining",
 				"channel": "airFreshFilterDays",
+				"channelType": "airFreshFilterDays",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -162,6 +176,7 @@
 				"property": "",
 				"friendlyName": "Reset Filter",
 				"channel": "airFreshResetFilterA1",
+				"channelType": "airFreshResetFilterA1",
 				"type": "String",
 				"refresh": false,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.airfresh.t2017.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "airFreshMode",
+				"channelType": "airFreshMode",
 				"type": "String",
 				"refresh": true,
 				"actions": [
@@ -34,6 +36,7 @@
 				"property": "ptc_on",
 				"friendlyName": "PTC",
 				"channel": "airFreshPTCPower",
+				"channelType": "airFreshPTCPower",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -47,6 +50,7 @@
 				"property": "ptc_level",
 				"friendlyName": "PTC Level",
 				"channel": "airFreshPtcLevel",
+				"channelType": "airFreshPtcLevel",
 				"type": "String",
 				"refresh": true,
 				"actions": [
@@ -60,6 +64,7 @@
 				"property": "ptc_status",
 				"friendlyName": "PTC Status",
 				"channel": "airFreshPTCStatus",
+				"channelType": "airFreshPTCStatus",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -69,6 +74,7 @@
 				"property": "screen_direction",
 				"friendlyName": "Screen direction",
 				"channel": "airFreshDisplayDirection",
+				"channelType": "airFreshDisplayDirection",
 				"type": "String",
 				"refresh": true,
 				"actions": [
@@ -82,6 +88,7 @@
 				"property": "display",
 				"friendlyName": "Display",
 				"channel": "airFreshDisplay",
+				"channelType": "airFreshDisplay",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -95,6 +102,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "airFreshChildLock",
+				"channelType": "airFreshChildLock",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -108,6 +116,7 @@
 				"property": "sound",
 				"friendlyName": "Sound",
 				"channel": "airFreshSound",
+				"channelType": "airFreshSound",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -121,6 +130,7 @@
 				"property": "pm25",
 				"friendlyName": "PM2.5",
 				"channel": "airFreshPM25",
+				"channelType": "airFreshPM25",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -130,6 +140,7 @@
 				"property": "co2",
 				"friendlyName": "CO2",
 				"channel": "airFreshCO2",
+				"channelType": "airFreshCO2",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -139,6 +150,7 @@
 				"property": "control_speed",
 				"friendlyName": "Current Speed",
 				"channel": "airFreshCurrentSpeed",
+				"channelType": "airFreshCurrentSpeed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -148,6 +160,7 @@
 				"property": "favourite_speed",
 				"friendlyName": "Favorite Speed",
 				"channel": "airFreshFavoriteSpeed",
+				"channelType": "airFreshFavoriteSpeed",
 				"type": "Number",
 				"refresh": true,
 				"actions": [
@@ -161,6 +174,7 @@
 				"property": "temperature_outside",
 				"friendlyName": "Temperature Outside",
 				"channel": "airFreshTemperature",
+				"channelType": "airFreshTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -170,6 +184,7 @@
 				"property": "filter_intermediate",
 				"friendlyName": "Filter Percents Remaining",
 				"channel": "airFreshFilterPercents",
+				"channelType": "airFreshFilterPercents",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -179,6 +194,7 @@
 				"property": "filter_inter_day",
 				"friendlyName": "Filter Days Remaining",
 				"channel": "airFreshFilterDays",
+				"channelType": "airFreshFilterDays",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -188,6 +204,7 @@
 				"property": "filter_efficient",
 				"friendlyName": "Filter Pro Percents Remaining",
 				"channel": "airFreshFilterProPercents",
+				"channelType": "airFreshFilterProPercents",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -197,6 +214,7 @@
 				"property": "filter_effi_day",
 				"friendlyName": "Filter Pro Days Remaining",
 				"channel": "airFreshFilterProDays",
+				"channelType": "airFreshFilterProDays",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -206,6 +224,7 @@
 				"property": "",
 				"friendlyName": "Reset Filter",
 				"channel": "airFreshResetFilter",
+				"channelType": "airFreshResetFilter",
 				"type": "String",
 				"refresh": false,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.fan.p5.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -34,6 +35,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -48,6 +50,7 @@
 				"property": "roll_angle",
 				"friendlyName": "Angle",
 				"channel": "angle",
+				"channelType": "angle",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -118,6 +121,7 @@
 				"property": "speed",
 				"friendlyName": "Speed",
 				"channel": "speed",
+				"channelType": "speed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.fan.p8-miot.json

@@ -16,8 +16,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "model",
@@ -28,8 +27,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "serial-number",
@@ -40,8 +38,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "firmware-revision",
@@ -52,8 +49,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "on",

bundles/org.openhab.binding.miio/src/main/resources/database/dmaker.fan.p9-miot.json

@@ -16,8 +16,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "model",
@@ -28,8 +27,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "serial-number",
@@ -40,8 +38,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "firmware-revision",
@@ -52,8 +49,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "on",

bundles/org.openhab.binding.miio/src/main/resources/database/dreame.vacuum.mc1808-miot.json

@@ -110,8 +110,7 @@
 				"channelType": "miot_uint8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "charging-state",
@@ -122,8 +121,7 @@
 				"channelType": "miot_uint8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "fault",
@@ -134,8 +132,7 @@
 				"channelType": "miot_uint8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "status",
@@ -146,8 +143,7 @@
 				"channelType": "miot_int8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "brush-left-time",
@@ -158,8 +154,7 @@
 				"channelType": "miot_uint16",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "brush-life-level",
@@ -170,8 +165,7 @@
 				"channelType": "miot_uint8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "filter-life-level",
@@ -182,8 +176,7 @@
 				"channelType": "miot_uint8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "filter-left-time",
@@ -194,8 +187,7 @@
 				"channelType": "miot_uint16",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "brush-left-time1",
@@ -206,8 +198,7 @@
 				"channelType": "miot_uint16",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "brush-life-level1",
@@ -218,8 +209,7 @@
 				"channelType": "miot_uint8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "work-mode",
@@ -230,8 +220,7 @@
 				"channelType": "miot_int32",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "area",
@@ -290,8 +279,7 @@
 				"channelType": "miot_uint32",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "total-clean-times",
@@ -302,8 +290,7 @@
 				"channelType": "miot_uint32",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "total-clean-area",
@@ -314,8 +301,7 @@
 				"channelType": "miot_uint32",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "clean-log-start-time",
@@ -326,8 +312,7 @@
 				"channelType": "miot_uint32",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "button-led",
@@ -338,8 +323,7 @@
 				"channelType": "miot_uint16",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "task-done",
@@ -350,8 +334,7 @@
 				"channelType": "miot_uint8",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "life-sieve",
@@ -458,8 +441,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "volume",
@@ -502,8 +484,7 @@
 				"channelType": "miot_string",
 				"type": "String",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			}
 		]
 	}

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bceiling1.json

@@ -13,6 +13,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -26,6 +27,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"actions": [
@@ -49,6 +51,7 @@
 				"property": "cct",
 				"friendlyName": "Correlated Color Temperature",
 				"channel": "cct",
+				"channelType": "cct",
 				"type": "Dimmer",
 				"refresh": true,
 				"actions": [
@@ -62,6 +65,7 @@
 				"property": "snm",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"actions": [
@@ -75,6 +79,7 @@
 				"property": "dv",
 				"friendlyName": "DV",
 				"channel": "dv",
+				"channelType": "dv",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -136,6 +141,7 @@
 				"property": "",
 				"friendlyName": "Delay Off",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Switch",
 				"refresh": false,
 				"ChannelGroup": "actions",
@@ -160,6 +166,6 @@
 				]
 			}
 		],
-		"experimental":true
+		"experimental": true
 	}
 }

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.bulb.json

@@ -13,6 +13,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -27,6 +28,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -51,6 +53,7 @@
 				"property": "cct",
 				"friendlyName": "Correlated Color Temperature",
 				"channel": "cct",
+				"channelType": "cct",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -65,6 +68,7 @@
 				"property": "snm",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -79,6 +83,7 @@
 				"property": "dv",
 				"friendlyName": "DV",
 				"channel": "dv",
+				"channelType": "dv",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -106,6 +111,7 @@
 				"property": "",
 				"friendlyName": "Delay Off",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Switch",
 				"refresh": false,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.candle.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -23,6 +24,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -47,6 +49,7 @@
 				"property": "cct",
 				"friendlyName": "Correlated Color Temperature",
 				"channel": "cct",
+				"channelType": "cct",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -61,6 +64,7 @@
 				"property": "snm",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -75,6 +79,7 @@
 				"property": "",
 				"friendlyName": "Delay Off",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Switch",
 				"refresh": false,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.cbulb.json

@@ -10,6 +10,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -24,6 +25,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -48,6 +50,7 @@
 				"property": "cct",
 				"friendlyName": "Correlated Color Temperature",
 				"channel": "cct",
+				"channelType": "cct",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -62,6 +65,7 @@
 				"property": "snm",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -118,6 +122,7 @@
 				"property": "",
 				"friendlyName": "Delay Off",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Switch",
 				"refresh": false,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.ceiling.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -23,6 +24,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -47,6 +49,7 @@
 				"property": "cct",
 				"friendlyName": "Correlated Color Temperature",
 				"channel": "cct",
+				"channelType": "cct",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -61,6 +64,7 @@
 				"property": "snm",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.mono.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -22,6 +23,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -46,6 +48,7 @@
 				"property": "scene_num",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.moonlight.json

@@ -8,6 +8,7 @@
 				"property": "pow",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -22,6 +23,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -46,6 +48,7 @@
 				"property": "cct",
 				"friendlyName": "Correlated Color Temperature",
 				"channel": "cct",
+				"channelType": "cct",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -60,6 +63,7 @@
 				"property": "snm",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -74,6 +78,7 @@
 				"property": "dv",
 				"friendlyName": "DV",
 				"channel": "dv",
+				"channelType": "dv",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -87,6 +92,7 @@
 				"property": "",
 				"friendlyName": "Go Night",
 				"channel": "gonight",
+				"channelType": "gonight",
 				"type": "Switch",
 				"refresh": false,
 				"ChannelGroup": "actions",
@@ -101,6 +107,7 @@
 				"property": "",
 				"friendlyName": "Delay Off",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Switch",
 				"refresh": false,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.rwread.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -22,6 +23,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -46,6 +48,7 @@
 				"property": "snm",
 				"friendlyName": "Scene",
 				"channel": "scene",
+				"channelType": "scene",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -73,6 +76,7 @@
 				"property": "dv",
 				"friendlyName": "DV",
 				"channel": "dv",
+				"channelType": "dv",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/philips.light.sread1.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -23,6 +24,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -47,6 +49,7 @@
 				"property": "ambstatus",
 				"friendlyName": "Ambient Power",
 				"channel": "ambientPower",
+				"channelType": "ambientPower",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -61,6 +64,7 @@
 				"property": "ambvalue",
 				"friendlyName": "Ambient Brightness",
 				"channel": "ambientBrightness",
+				"channelType": "ambientBrightness",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -75,6 +79,7 @@
 				"property": "dvalue",
 				"friendlyName": "Ambient Illumination",
 				"channel": "illumination",
+				"channelType": "illumination",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -84,6 +89,7 @@
 				"property": "eyecare",
 				"friendlyName": "Eyecare",
 				"channel": "eyecare",
+				"channelType": "eyecare",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/viomi.vacuum.v8.json

@@ -29,15 +29,16 @@
 				"property": "run_state",
 				"friendlyName": "State",
 				"channel": "state",
+				"channelType": "state",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "Number",
 				"refresh": true,
 				"actions": [
@@ -53,8 +54,7 @@
 				"channel": "err_state",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "battery_life",
@@ -62,8 +62,7 @@
 				"channel": "battery_life",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "box_type",
@@ -73,6 +72,7 @@
 				"refresh": true,
 				"actions": [
 					{
+						"parameterType": "EMPTY"
 					}
 				]
 			},
@@ -147,8 +147,7 @@
 				"channel": "remember_map",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "has_map",
@@ -156,8 +155,7 @@
 				"channel": "has_map",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "is_mop",
@@ -165,8 +163,7 @@
 				"channel": "is_mop",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			},
 			{
 				"property": "has_newmap",
@@ -174,8 +171,7 @@
 				"channel": "has_newmap",
 				"type": "Number",
 				"refresh": true,
-                "actions": [
+				"actions": []
-                ]
 			}
 		]
 	}

bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.bhf1.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -37,6 +38,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -61,6 +63,7 @@
 				"property": "delayoff",
 				"friendlyName": "Shutdown Timer",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -79,6 +82,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -88,6 +92,7 @@
 				"property": "nl_br",
 				"friendlyName": "Nightlight Brightness",
 				"channel": "nightlightBrightness",
+				"channelType": "nightlightBrightness",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",

bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling.json

@@ -34,6 +34,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -48,6 +49,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -72,6 +74,7 @@
 				"property": "delayoff",
 				"friendlyName": "Shutdown Timer",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -90,6 +93,7 @@
 				"property": "ct",
 				"friendlyName": "Color Temperature",
 				"channel": "colorTemperature",
+				"channelType": "colorTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -109,6 +113,7 @@
 				"property": "color_mode",
 				"friendlyName": "Color Mode",
 				"channel": "colorMode",
+				"channelType": "colorMode",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -132,6 +137,7 @@
 				"property": "",
 				"friendlyName": "Set Scene",
 				"channel": "customScene",
+				"channelType": "customScene",
 				"type": "String",
 				"refresh": false,
 				"ChannelGroup": "actions",
@@ -146,6 +152,7 @@
 				"property": "nl_br",
 				"friendlyName": "Nightlight Brightness",
 				"channel": "nightlightBrightness",
+				"channelType": "nightlightBrightness",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",

bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling2.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -23,6 +24,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -47,6 +49,7 @@
 				"property": "delayoff",
 				"friendlyName": "Shutdown Timer",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -65,6 +68,7 @@
 				"property": "ct",
 				"friendlyName": "Color Temperature",
 				"channel": "colorTemperature",
+				"channelType": "colorTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -84,6 +88,7 @@
 				"property": "color_mode",
 				"friendlyName": "Color Mode",
 				"channel": "colorMode",
+				"channelType": "colorMode",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -107,6 +112,7 @@
 				"property": "",
 				"friendlyName": "Set Scene",
 				"channel": "customScene",
+				"channelType": "customScene",
 				"type": "String",
 				"refresh": false,
 				"ChannelGroup": "actions",
@@ -121,6 +127,7 @@
 				"property": "nl_br",
 				"friendlyName": "Nightlight Brightness",
 				"channel": "nightlightBrightness",
+				"channelType": "nightlightBrightness",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",

bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.ceiling4.json

@@ -10,6 +10,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -24,6 +25,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -48,6 +50,7 @@
 				"property": "bg_bright",
 				"friendlyName": "Ambient Brightness",
 				"channel": "ambientBrightness",
+				"channelType": "ambientBrightness",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -62,6 +65,7 @@
 				"property": "delayoff",
 				"friendlyName": "Shutdown Timer",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -80,6 +84,7 @@
 				"property": "ct",
 				"friendlyName": "Color Temperature",
 				"channel": "colorTemperature",
+				"channelType": "colorTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -99,6 +104,7 @@
 				"property": "color_mode",
 				"friendlyName": "Color Mode",
 				"channel": "colorMode",
+				"channelType": "colorMode",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -122,6 +128,7 @@
 				"property": "bg_power",
 				"friendlyName": "Ambient Power",
 				"channel": "ambientPower",
+				"channelType": "ambientPower",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -136,6 +143,7 @@
 				"property": "bg_rgb",
 				"friendlyName": "Ambient Color",
 				"channel": "ambientColor",
+				"channelType": "ambientColor",
 				"type": "Color",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -150,6 +158,7 @@
 				"property": "bg_ct",
 				"friendlyName": "Ambient Color Temperature",
 				"channel": "ambientColorTemperature",
+				"channelType": "ambientColorTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -157,8 +166,6 @@
 					{
 						"command": "bg_set_ct_abx",
 						"parameterType": "NUMBER",
-						"parameter1": "\"smooth\"",
-						"parameter2": "500",
 						"parameters": [
 							"$value$",
 							"smooth",
@@ -171,6 +178,7 @@
 				"property": "",
 				"friendlyName": "Set Scene",
 				"channel": "customScene",
+				"channelType": "customScene",
 				"type": "String",
 				"refresh": false,
 				"ChannelGroup": "actions",
@@ -185,6 +193,7 @@
 				"property": "bg_lmode",
 				"friendlyName": "Ambient Color Mode",
 				"channel": "ambientColorMode",
+				"channelType": "ambientColorMode",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -194,6 +203,7 @@
 				"property": "nl_br",
 				"friendlyName": "Nightlight Brightness",
 				"channel": "nightlightBrightness",
+				"channelType": "nightlightBrightness",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",

bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.color1.json

@@ -17,6 +17,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -31,6 +32,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -55,6 +57,7 @@
 				"property": "delayoff",
 				"friendlyName": "Shutdown Timer",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -73,6 +76,7 @@
 				"property": "ct",
 				"friendlyName": "Color Temperature",
 				"channel": "colorTemperature",
+				"channelType": "colorTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -92,6 +96,7 @@
 				"property": "color_mode",
 				"friendlyName": "Color Mode",
 				"channel": "colorMode",
+				"channelType": "colorMode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -122,14 +127,14 @@
 					{
 						"command": "set_rgb",
 						"parameterType": "COLOR",
-						"condition": {
-							"name": "HSBOnly"
-						},
 						"parameters": [
 							"$value$",
 							"smooth",
 							500
-						]
+						],
+						"condition": {
+							"name": "HSBOnly"
+						}
 					},
 					{
 						"command": "set_bright",

bundles/org.openhab.binding.miio/src/main/resources/database/yeelink.light.lamp1.json

@@ -22,6 +22,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -36,6 +37,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Dimmer",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -60,6 +62,7 @@
 				"property": "delayoff",
 				"friendlyName": "Shutdown Timer",
 				"channel": "delayoff",
+				"channelType": "delayoff",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -78,6 +81,7 @@
 				"property": "ct",
 				"friendlyName": "Color Temperature",
 				"channel": "colorTemperature",
+				"channelType": "colorTemperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -97,6 +101,7 @@
 				"property": "color_mode",
 				"friendlyName": "Color Mode",
 				"channel": "colorMode",
+				"channelType": "colorMode",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/yunmi.waterpurifier.json

@@ -22,6 +22,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -43,6 +44,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"actions": []

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airmonitor.v1.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -22,6 +23,7 @@
 				"property": "aqi",
 				"friendlyName": "Air Quality Index",
 				"channel": "aqi",
+				"channelType": "aqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.m1.json

@@ -19,6 +19,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -32,6 +33,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -46,6 +48,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -55,6 +58,7 @@
 				"property": "aqi",
 				"friendlyName": "Air Quality Index",
 				"channel": "aqi",
+				"channelType": "aqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -64,6 +68,7 @@
 				"property": "average_aqi",
 				"friendlyName": "Average Air Quality Index",
 				"channel": "averageaqi",
+				"channelType": "averageaqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -73,6 +78,7 @@
 				"property": "led",
 				"friendlyName": "LED Status",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -87,6 +93,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer Status",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -101,6 +108,7 @@
 				"property": "f1_hour",
 				"friendlyName": "Filter Max Life",
 				"channel": "filtermaxlife",
+				"channelType": "filtermaxlife",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -110,6 +118,7 @@
 				"property": "f1_hour_used",
 				"friendlyName": "Filter Hours used",
 				"channel": "filterhours",
+				"channelType": "filterhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -120,6 +129,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -130,6 +140,7 @@
 				"property": "motor1_speed",
 				"friendlyName": "Motor Speed",
 				"channel": "motorspeed",
+				"channelType": "motorspeed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -148,6 +159,7 @@
 				"property": "favorite_level",
 				"friendlyName": "Favorite Level",
 				"channel": "favoritelevel",
+				"channelType": "favoritelevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -162,6 +174,7 @@
 				"property": "temp_dec",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "/10",
@@ -172,6 +185,7 @@
 				"property": "purify_volume",
 				"friendlyName": "Purivied Volume",
 				"channel": "purifyvolume",
+				"channelType": "purifyvolume",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -181,6 +195,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "childlock",
+				"channelType": "childlock",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v1.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -35,6 +37,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -44,6 +47,7 @@
 				"property": "aqi",
 				"friendlyName": "Air Quality Index",
 				"channel": "aqi",
+				"channelType": "aqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -53,6 +57,7 @@
 				"property": "bright",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -67,6 +72,7 @@
 				"property": "led",
 				"friendlyName": "LED Status",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -81,6 +87,7 @@
 				"property": "act_det",
 				"friendlyName": "Air AutoDetect",
 				"channel": "act_det",
+				"channelType": "act_det",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -90,6 +97,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer Status",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -104,6 +112,7 @@
 				"property": "f1_hour",
 				"friendlyName": "Filter Max Life",
 				"channel": "filtermaxlife",
+				"channelType": "filtermaxlife",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -113,6 +122,7 @@
 				"property": "filter1_life",
 				"friendlyName": "Filter Life",
 				"channel": "filterlive",
+				"channelType": "filterlive",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v6.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -22,6 +23,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -36,6 +38,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -45,6 +48,7 @@
 				"property": "aqi",
 				"friendlyName": "Air Quality Index",
 				"channel": "aqi",
+				"channelType": "aqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -54,6 +58,7 @@
 				"property": "average_aqi",
 				"friendlyName": "Average Air Quality Index",
 				"channel": "averageaqi",
+				"channelType": "averageaqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -63,6 +68,7 @@
 				"property": "led",
 				"friendlyName": "LED Status",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -91,6 +97,7 @@
 				"property": "f1_hour",
 				"friendlyName": "Filter Max Life",
 				"channel": "filtermaxlife",
+				"channelType": "filtermaxlife",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -100,6 +107,7 @@
 				"property": "f1_hour_used",
 				"friendlyName": "Filter Hours used",
 				"channel": "filterhours",
+				"channelType": "filterhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -110,6 +118,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -120,6 +129,7 @@
 				"property": "motor1_speed",
 				"friendlyName": "Motor Speed",
 				"channel": "motorspeed",
+				"channelType": "motorspeed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -138,6 +148,7 @@
 				"property": "favorite_level",
 				"friendlyName": "Favorite Level",
 				"channel": "favoritelevel",
+				"channelType": "favoritelevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -152,6 +163,7 @@
 				"property": "temp_dec",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "/10",
@@ -162,6 +174,7 @@
 				"property": "purify_volume",
 				"friendlyName": "Purivied Volume",
 				"channel": "purifyvolume",
+				"channelType": "purifyvolume",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -171,6 +184,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "childlock",
+				"channelType": "childlock",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.airpurifier.v7.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -35,6 +37,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -44,6 +47,7 @@
 				"property": "aqi",
 				"friendlyName": "Air Quality Index",
 				"channel": "aqi",
+				"channelType": "aqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -53,6 +57,7 @@
 				"property": "average_aqi",
 				"friendlyName": "Average Air Quality Index",
 				"channel": "averageaqi",
+				"channelType": "averageaqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -71,6 +76,7 @@
 				"property": "led",
 				"friendlyName": "LED Status",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -94,6 +100,7 @@
 				"property": "f1_hour",
 				"friendlyName": "Filter Max Life",
 				"channel": "filtermaxlife",
+				"channelType": "filtermaxlife",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -103,6 +110,7 @@
 				"property": "f1_hour_used",
 				"friendlyName": "Filter Hours used",
 				"channel": "filterhours",
+				"channelType": "filterhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -113,6 +121,7 @@
 				"property": "motor1_speed",
 				"friendlyName": "Motor Speed",
 				"channel": "motorspeed",
+				"channelType": "motorspeed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -140,6 +149,7 @@
 				"property": "favorite_level",
 				"friendlyName": "Favorite Level",
 				"channel": "favoritelevel",
+				"channelType": "favoritelevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -154,6 +164,7 @@
 				"property": "temp_dec",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "/10",
@@ -164,6 +175,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "childlock",
+				"channelType": "childlock",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.sa1.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -22,6 +23,7 @@
 				"property": "angle_enable",
 				"friendlyName": "Rotation",
 				"channel": "angleEnable",
+				"channelType": "angleEnable",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -35,6 +37,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -45,6 +48,7 @@
 				"property": "angle",
 				"friendlyName": "Angle",
 				"channel": "angle",
+				"channelType": "angle",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -59,6 +63,7 @@
 				"property": "poweroff_time",
 				"friendlyName": "Timer",
 				"channel": "poweroffTime",
+				"channelType": "poweroffTime",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -73,6 +78,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -115,6 +121,7 @@
 				"property": "speed_level",
 				"friendlyName": "Speed Level",
 				"channel": "speedLevel",
+				"channelType": "speedLevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -129,6 +136,7 @@
 				"property": "speed",
 				"friendlyName": "Speed",
 				"channel": "speed",
+				"channelType": "speed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -143,6 +151,7 @@
 				"property": "natural_level",
 				"friendlyName": "Natural Level",
 				"channel": "naturalLevel",
+				"channelType": "naturalLevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -157,6 +166,7 @@
 				"property": "ac_power",
 				"friendlyName": "AC Power",
 				"channel": "acPower",
+				"channelType": "acPower",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -166,6 +176,7 @@
 				"property": "",
 				"friendlyName": "Move Direction",
 				"channel": "move",
+				"channelType": "move",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.v3.json

@@ -10,6 +10,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -23,6 +24,7 @@
 				"property": "angle_enable",
 				"friendlyName": "Rotation",
 				"channel": "angleEnable",
+				"channelType": "angleEnable",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -36,6 +38,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -46,6 +49,7 @@
 				"property": "angle",
 				"friendlyName": "Angle",
 				"channel": "angle",
+				"channelType": "angle",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -60,6 +64,7 @@
 				"property": "poweroff_time",
 				"friendlyName": "Timer",
 				"channel": "poweroffTime",
+				"channelType": "poweroffTime",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -74,6 +79,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -116,6 +122,7 @@
 				"property": "speed_level",
 				"friendlyName": "Speed Level",
 				"channel": "speedLevel",
+				"channelType": "speedLevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -130,6 +137,7 @@
 				"property": "speed",
 				"friendlyName": "Speed",
 				"channel": "speed",
+				"channelType": "speed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -144,6 +152,7 @@
 				"property": "natural_level",
 				"friendlyName": "Natural Level",
 				"channel": "naturalLevel",
+				"channelType": "naturalLevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -168,6 +177,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -177,6 +187,7 @@
 				"property": "ac_power",
 				"friendlyName": "AC Power",
 				"channel": "acPower",
+				"channelType": "acPower",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -186,6 +197,7 @@
 				"property": "bat_charge",
 				"friendlyName": "Battery Charge",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -205,6 +217,7 @@
 				"property": "",
 				"friendlyName": "Move Direction",
 				"channel": "move",
+				"channelType": "move",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.fan.za4.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "angle_enable",
 				"friendlyName": "Rotation",
 				"channel": "angleEnable",
+				"channelType": "angleEnable",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -34,6 +36,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -44,6 +47,7 @@
 				"property": "angle",
 				"friendlyName": "Angle",
 				"channel": "angle",
+				"channelType": "angle",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -58,6 +62,7 @@
 				"property": "poweroff_time",
 				"friendlyName": "Timer",
 				"channel": "poweroffTime",
+				"channelType": "poweroffTime",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -72,6 +77,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -114,6 +120,7 @@
 				"property": "speed_level",
 				"friendlyName": "Speed Level",
 				"channel": "speedLevel",
+				"channelType": "speedLevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -128,6 +135,7 @@
 				"property": "speed",
 				"friendlyName": "Speed",
 				"channel": "speed",
+				"channelType": "speed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -142,6 +150,7 @@
 				"property": "natural_level",
 				"friendlyName": "Natural Level",
 				"channel": "naturalLevel",
+				"channelType": "naturalLevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -156,6 +165,7 @@
 				"property": "",
 				"friendlyName": "Move Direction",
 				"channel": "move",
+				"channelType": "move",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.heater.za1.json

@@ -10,6 +10,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -36,6 +37,7 @@
 				"property": "brightness",
 				"friendlyName": "Brightness",
 				"channel": "brightness",
+				"channelType": "brightness",
 				"type": "Number",
 				"refresh": true,
 				"actions": [
@@ -49,6 +51,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer Status",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -70,6 +73,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "childlock",
+				"channelType": "childlock",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -96,6 +100,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"actions": []
@@ -104,6 +109,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.cb1.json

@@ -8,6 +8,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -21,6 +22,7 @@
 				"property": "mode",
 				"friendlyName": "Humidifier Mode",
 				"channel": "humidifierMode",
+				"channelType": "humidifierMode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -35,6 +37,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -44,6 +47,7 @@
 				"property": "limit_hum",
 				"friendlyName": "Humidity Set",
 				"channel": "setHumidity",
+				"channelType": "setHumidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -72,6 +76,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer Status",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -86,6 +91,7 @@
 				"property": "depth",
 				"friendlyName": "Depth",
 				"channel": "depth",
+				"channelType": "depth",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -95,6 +101,7 @@
 				"property": "dry",
 				"friendlyName": "Dry",
 				"channel": "dry",
+				"channelType": "dry",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -109,6 +116,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -119,6 +127,7 @@
 				"property": "speed",
 				"friendlyName": "Motor Speed",
 				"channel": "motorspeed",
+				"channelType": "motorspeed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -128,6 +137,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -137,6 +147,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "childlock",
+				"channelType": "childlock",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/zhimi.humidifier.v1.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"actions": [
@@ -22,6 +23,7 @@
 				"property": "mode",
 				"friendlyName": "Mode",
 				"channel": "mode",
+				"channelType": "mode",
 				"type": "String",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -36,6 +38,7 @@
 				"property": "humidity",
 				"friendlyName": "Humidity",
 				"channel": "humidity",
+				"channelType": "humidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -45,6 +48,7 @@
 				"property": "limit_hum",
 				"friendlyName": "Humidity Set",
 				"channel": "setHumidity",
+				"channelType": "setHumidity",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -59,6 +63,7 @@
 				"property": "aqi",
 				"friendlyName": "Air Quality Index",
 				"channel": "aqi",
+				"channelType": "aqi",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -68,6 +73,7 @@
 				"property": "trans_level",
 				"friendlyName": "Trans_level",
 				"channel": "translevel",
+				"channelType": "translevel",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -91,6 +97,7 @@
 				"property": "buzzer",
 				"friendlyName": "Buzzer Status",
 				"channel": "buzzer",
+				"channelType": "buzzer",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "actions",
@@ -105,6 +112,7 @@
 				"property": "depth",
 				"friendlyName": "Depth",
 				"channel": "depth",
+				"channelType": "depth",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -114,6 +122,7 @@
 				"property": "dry",
 				"friendlyName": "Dry",
 				"channel": "dry",
+				"channelType": "dry",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -128,6 +137,7 @@
 				"property": "use_time",
 				"friendlyName": "Run Time",
 				"channel": "usedhours",
+				"channelType": "usedhours",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "SecondsToHours",
@@ -138,6 +148,7 @@
 				"property": "speed",
 				"friendlyName": "Motor Speed",
 				"channel": "motorspeed",
+				"channelType": "motorspeed",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",
@@ -147,6 +158,7 @@
 				"property": "temp_dec",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"transformation": "/10",
@@ -157,6 +169,7 @@
 				"property": "child_lock",
 				"friendlyName": "Child Lock",
 				"channel": "childlock",
+				"channelType": "childlock",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "Status",

bundles/org.openhab.binding.miio/src/main/resources/database/zimi.powerstrip.v2.json

@@ -9,6 +9,7 @@
 				"property": "power",
 				"friendlyName": "Power",
 				"channel": "power",
+				"channelType": "power",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -23,6 +24,7 @@
 				"property": "power_consume_rate",
 				"friendlyName": "Power Consumption",
 				"channel": "powerUsage",
+				"channelType": "powerUsage",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -36,6 +38,7 @@
 				"property": "wifi_led",
 				"friendlyName": "wifi LED",
 				"channel": "led",
+				"channelType": "led",
 				"type": "Switch",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -64,6 +67,7 @@
 				"property": "current",
 				"friendlyName": "Current",
 				"channel": "current",
+				"channelType": "current",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",
@@ -73,6 +77,7 @@
 				"property": "temperature",
 				"friendlyName": "Temperature",
 				"channel": "temperature",
+				"channelType": "temperature",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "",