[miio] Fix issue battery channel (openhab#4752)

* Fix issue battery channel - Fix error for devices with battery channel - Add chungmi plug m3 - minor edits Signed-off-by: Marcel Verpaalen <[email protected]>
hreichert · Jan 30, 2019 · b1c45ae · b1c45ae
1 parent 8f80805
commit b1c45ae
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/addons/binding/org.openhab.binding.miio/database/chuangmi.plug.m1.json b/addons/binding/org.openhab.binding.miio/database/chuangmi.plug.m1.json
@@ -2,6 +2,7 @@
 	"deviceMapping": {
 		"id": [
 			"chuangmi.plug.m1",
+			"chuangmi.plug.m3",
 			"chuangmi.plug.hmi205"
 		],
 		"channels": [

diff --git a/addons/binding/org.openhab.binding.miio/database/zhimi.airmonitor.v1.json b/addons/binding/org.openhab.binding.miio/database/zhimi.airmonitor.v1.json
@@ -32,7 +32,7 @@
 				"property": "battery",
 				"friendlyName": "Battery",
 				"channel": "battery",
-				"channelType":"system.battery-level",
+				"channelType":"system:battery-level",
 				"type": "Number",
 				"refresh": true,
 				"ChannelGroup": "Status",

diff --git a/addons/binding/org.openhab.binding.miio/database/zhimi.fan.v3.json b/addons/binding/org.openhab.binding.miio/database/zhimi.fan.v3.json
@@ -197,7 +197,7 @@
 				"property": "battery",
 				"friendlyName": "Battery",
 				"channel": "battery",
-				"channelType": "system.battery-level",
+				"channelType": "system:battery-level",
 				"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
@@ -82,6 +82,7 @@ public enum MiIoDevices {
     POWERPLUG1("chuangmi.plug.v1", "Mi Power-plug v1", THING_TYPE_BASIC),
     POWERPLUG2("chuangmi.plug.v2", "Mi Power-plug v2", THING_TYPE_BASIC),
     POWERPLUG3("chuangmi.plug.v3", "Mi Power-plug v3", THING_TYPE_BASIC),
+    POWERPLUGM3("chuangmi.plug.m3", "Mi Power-plug", THING_TYPE_BASIC),
     POWERPLUG_HMI205("chuangmi.plug.hmi205", "Mi Smart Plug", THING_TYPE_BASIC),
     POWERSTRIP("qmi.powerstrip.v1", "Qing Mi Smart Power Strip v1", THING_TYPE_BASIC),
     POWERSTRIP2("zimi.powerstrip.v2", "Mi Power-strip v2", THING_TYPE_BASIC),

diff --git a/....binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java b/....binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java
@@ -12,6 +12,8 @@
  */
 package org.openhab.binding.miio.internal.basic;
 
+import static org.openhab.binding.miio.internal.MiIoBindingConstants.BINDING_ID;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -78,7 +80,8 @@ public void setChannel(String channel) {
     }
 
     public String getChannelType() {
-        return channelType == null || channelType.isEmpty() ? channel : channelType;
+        return channelType == null || channelType.isEmpty() ? BINDING_ID + ":" + channel
+                : (channelType.startsWith("system") ? channelType : BINDING_ID + ":" + channelType);
     }
 
     public void setChannelType(String channelType) {

diff --git a/...inding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java b/...inding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java
@@ -360,7 +360,7 @@ private boolean addChannel(ThingBuilder thingBuilder, String channel, String cha
             return false;
         }
         ChannelUID channelUID = new ChannelUID(getThing().getUID(), channel);
-        ChannelTypeUID channelTypeUID = new ChannelTypeUID(MiIoBindingConstants.BINDING_ID, channelType);
+        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.

diff --git a/...penhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/StatusType.java b/...penhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/StatusType.java
@@ -35,6 +35,7 @@ public enum StatusType {
     SHUTTING_DOWN(13, "Shutting Down"),
     UPDATING(14, "Updating"),
     DOCKING(15, "Docking"),
+    GOTO(16, "Go To"),
     ZONE(17, "Zone Clean"),
     FULL(100, "Full");
 

diff --git a/...iio/src/main/java/org/openhab/binding/miio/internal/transport/MiIoAsyncCommunication.java b/...iio/src/main/java/org/openhab/binding/miio/internal/transport/MiIoAsyncCommunication.java
@@ -74,7 +74,7 @@ public class MiIoAsyncCommunication {
     private int timeout;
     private boolean needPing = true;
     private static final int MAX_ERRORS = 3;
-    private static final int MAX_ID = 1000;
+    private static final int MAX_ID = 15000;
 
     private ConcurrentLinkedQueue<MiIoSendCommand> concurrentLinkedQueue = new ConcurrentLinkedQueue<MiIoSendCommand>();