Merge pull request #4 from boc-tothefuture/omnilink-binding

Update Zones type and add zone refresh.
digitaldan · May 27, 2017 · 8b3cad9 · 8b3cad9
2 parents 7c8fadf + 589a1a7
commit 8b3cad9
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/...ng.omnilink/src/main/java/org/openhab/binding/omnilink/handler/OmnilinkBridgeHandler.java b/...ng.omnilink/src/main/java/org/openhab/binding/omnilink/handler/OmnilinkBridgeHandler.java
@@ -441,6 +441,27 @@ public UnitStatus apply(ObjectStatus t) {
         }, listeningExecutor);
     }
 
+    public ListenableFuture<ZoneStatus> getZoneStatus(final int address) {
+
+        ListenableFuture<ObjectStatus> omniCall = listeningExecutor.submit(new Callable<ObjectStatus>() {
+
+            @Override
+            public ObjectStatus call() throws Exception {
+                if (omniConnection == null) {
+                    Thread.sleep(100);
+                }
+                return omniConnection.reqObjectStatus(Message.OBJ_TYPE_ZONE, address, address);
+            }
+        });
+        return Futures.transform(omniCall, new Function<ObjectStatus, ZoneStatus>() {
+
+            @Override
+            public ZoneStatus apply(ObjectStatus t) {
+                return (ZoneStatus) t.getStatuses()[0];
+            }
+        }, listeningExecutor);
+    }
+
     public ListenableFuture<AreaStatus> getAreaStatus(final int address) {
 
         ListenableFuture<ObjectStatus> omniCall = listeningExecutor.submit(new Callable<ObjectStatus>() {

diff --git a/...nhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/ZoneHandler.java b/...nhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/ZoneHandler.java
@@ -1,16 +1,21 @@
 package org.openhab.binding.omnilink.handler;
 
-import org.eclipse.smarthome.core.library.types.OnOffType;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import org.eclipse.smarthome.core.library.types.OpenClosedType;
 import org.eclipse.smarthome.core.thing.ChannelUID;
 import org.eclipse.smarthome.core.thing.Thing;
+import org.eclipse.smarthome.core.thing.UID;
 import org.eclipse.smarthome.core.types.Command;
 import org.eclipse.smarthome.core.types.State;
 import org.openhab.binding.omnilink.OmnilinkBindingConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.eclipse.smarthome.core.types.RefreshType;
 
 import com.digitaldan.jomnilinkII.MessageTypes.statuses.ZoneStatus;
 
+
 public class ZoneHandler extends AbstractOmnilinkHandler {
     private Logger logger = LoggerFactory.getLogger(ZoneHandler.class);
 
@@ -21,10 +26,26 @@ public ZoneHandler(Thing thing) {
     @Override
     public void handleCommand(ChannelUID channelUID, Command command) {
         logger.debug("must handle command");
+        if (command instanceof RefreshType) {
+          String[] channelParts = channelUID.getAsString().split(UID.SEPARATOR);
+          logger.debug("Zone '{}' got REFRESH command", thing.getLabel());
+            Futures.addCallback(getOmnilinkBridgeHander().getZoneStatus(Integer.parseInt(channelParts[2])),
+                    new FutureCallback<ZoneStatus>() {
+                        @Override
+                        public void onFailure(Throwable arg0) {
+                            logger.error("Error refreshing unit status", arg0);
+                        }
+
+                        @Override
+                        public void onSuccess(ZoneStatus status) {
+                            handleZoneStatus(status);
+                        }
+                    });
+        }
     }
 
     public void handleZoneStatus(ZoneStatus status) {
-        State newState = status.getStatus() == 1 ? OnOffType.ON : OnOffType.OFF;
+        State newState = status.getStatus() == 1 ? OpenClosedType.OPEN : OpenClosedType.CLOSED;
         logger.debug("handle Zone Status Change to: " + newState);
         updateState(OmnilinkBindingConstants.CHANNEL_CONTACTSENSOR, newState);