[miio] powerplug & db fixes

Signed-off-by: Marcel Verpaalen <[email protected]>
aduffeck · May 29, 2018 · 860e7cd · 860e7cd
1 parent 49b0a84
commit 860e7cd
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 9 deletions.
diff --git a/addons/binding/org.openhab.binding.miio/ESH-INF/thing/CommonChannels.xml b/addons/binding/org.openhab.binding.miio/ESH-INF/thing/CommonChannels.xml
@@ -198,8 +198,8 @@
         <item-type>Switch</item-type>
         <label>Dry</label>
     </channel-type>
-	<channel-type id="dept">
+	<channel-type id="depth">
 		<item-type>Number</item-type>
-		<label>Dept</label>
+		<label>Depth</label>
 	</channel-type>
 </thing:thing-descriptions>
diff --git a/addons/binding/org.openhab.binding.miio/database/chuangmi.plug.v1.json b/addons/binding/org.openhab.binding.miio/database/chuangmi.plug.v1.json
@@ -1,14 +1,15 @@
 {
 	"deviceMapping": {
 		"id": [
-			"chuangmi.plug.v1"
+			"chuangmi.plug.v1",
+			"chuangmi.plug.v2"
 		],
 		"channels": [
 			{
 				"property": "on",
 				"friendlyName": "Power",
 				"channel": "power",
-                "type": "Switch",
+				"type": "Switch",
 				"refresh": true,
 				"channelGroup": "actions",
 				"actions": [

diff --git a/addons/binding/org.openhab.binding.miio/database/chuangmi.plug.v3.json b/addons/binding/org.openhab.binding.miio/database/chuangmi.plug.v3.json
@@ -0,0 +1,56 @@
+{
+	"deviceMapping": {
+		"id": [
+			"chuangmi.plug.v3"
+		],
+		"channels": [
+			{
+				"property": "on",
+				"friendlyName": "Power",
+				"channel": "power",
+				"type": "Switch",
+				"refresh": true,
+				"channelGroup": "actions",
+				"actions": [
+					{
+						"command": "set_*",
+						"parameterType": "ONOFFPARA"
+					}
+				]
+			},
+			{
+				"property": "usb_on",
+				"friendlyName": "USB",
+				"channel": "usb",
+				"type": "OnOffType",
+				"refresh": true,
+				"ChannelGroup": "actions",
+				"actions": [
+					{
+						"command": "set_usb_*",
+						"parameterType": "ONOFFPARA"
+					}
+				]
+			},
+			{
+				"property": "temperature",
+				"friendlyName": "Temperature",
+				"channel": "temperature",
+				"type": "Number",
+				"refresh": true,
+				"ChannelGroup": "",
+				"actions": []
+			},
+			{
+				"property": "wifi_led",
+				"friendlyName": "Wifi led",
+				"channel": "led",
+				"type": "Switch",
+				"refresh": true,
+				"ChannelGroup": "actions",
+				"actions": []
+			}
+		]
+	}
+}
+
diff --git a/addons/binding/org.openhab.binding.miio/database/zhimi.humidifier.v1.json b/addons/binding/org.openhab.binding.miio/database/zhimi.humidifier.v1.json
@@ -102,9 +102,9 @@
 				]
 			},
 			{
-				"property": "dept",
-				"friendlyName": "Dept",
-				"channel": "dept",
+				"property": "depth",
+				"friendlyName": "Depth",
+				"channel": "depth",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",

diff --git a/...org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java b/...org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoDevices.java
@@ -53,8 +53,9 @@ public enum MiIoDevices {
     PHILIPS_C2("philips.light.zyceiling", "Xiaomi Philips LED Ceiling Lamp", MiIoBindingConstants.THING_TYPE_BASIC),
     PHILIPS_BULB("philips.light.bulb", "Xiaomi Philips Bulb", MiIoBindingConstants.THING_TYPE_BASIC),
     POWERPLUG("chuangmi.plug.m1", "Mi Power-plug", MiIoBindingConstants.THING_TYPE_BASIC),
-    POWERPLUG1("chuangmi.plug.v1", "Mi Power-plug v1", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
-    POWERPLUG2("chuangmi.plug.v2", "Mi Power-plug v2", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
+    POWERPLUG1("chuangmi.plug.v1", "Mi Power-plug v1", MiIoBindingConstants.THING_TYPE_BASIC),
+    POWERPLUG2("chuangmi.plug.v2", "Mi Power-plug v2", MiIoBindingConstants.THING_TYPE_BASIC),
+    POWERPLUG3("chuangmi.plug.v3", "Mi Power-plug v3", MiIoBindingConstants.THING_TYPE_BASIC),
     POWERSTRIP("qmi.powerstrip.v1", "Mi Power-strip v1", MiIoBindingConstants.THING_TYPE_BASIC),
     POWERSTRIP2("zimi.powerstrip.v2", "Mi Power-strip v2", MiIoBindingConstants.THING_TYPE_BASIC),
     TOOTHBRUSH("soocare.toothbrush.x3", "Mi Toothbrush", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),