Re-enable window covering with the upstream hap fix

Author: timcharper

addons/io/org.openhab.io.homekit/README.md

@@ -77,6 +77,7 @@ A full list of supported accessory types can be found in the table below.
 | LeakSensor            |                               | Switch, ContactSensor     | Leak sensor. ON / OPEN state means flood detected. |
 | MotionSensor          |                               | Switch, ContactSensor     | Motion sensor. ON / OPEN state means motion detected. |
 | Valve                 |                               | Switch                    | Simple open/close valve. Assumes liquid is flowing when valve is open. |
+| WindowCovering        |                               | Rollershutter             | Simple window covering with support for setting target position / current position support. |
 
 
 See the sample below for example items:
@@ -93,6 +94,7 @@ String DownstairsThermostatHeatingCoolingMode "Downstairs Thermostat Heating/Coo
 Switch Hallway_MotionSensor "Hallway Motion Sensor" [ "MotionSensor" ]
 Switch MasterBath_Toilet_LeakSensor "Master Bath Toilet Flood" ["LeakSensor"]
 Switch WaterMain_Valve "Water Main Valve" ["Valve"]
+Rollershutter MasterWindow_Blinds "Master Window Blinds" [ "WindowCovering" ]
 ```
 
 ## Battery Level

addons/io/org.openhab.io.homekit/lib/hap-1.1.5-SNAPSHOT-sources.jar

@@ -30,7 +30,10 @@ public enum HomekitAccessoryType {
     LEAK_SENSOR("LeakSensor"),
     MOTION_SENSOR("MotionSensor"),
     OCCUPANCY_SENSOR("OccupancySensor"),
-    CONTACT_SENSOR("ContactSensor");
+    CONTACT_SENSOR("ContactSensor"),
+    WINDOW_COVERING("WindowCovering"),
+    @Deprecated()
+    BLINDS("Blinds");
 
     private static final Map<String, HomekitAccessoryType> tagMap = new HashMap<>();
 

addons/io/org.openhab.io.homekit/lib/hap-1.1.5-SNAPSHOT.jar

@@ -11,6 +11,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.eclipse.smarthome.core.items.GroupItem;
 import org.eclipse.smarthome.core.items.Item;
@@ -105,6 +106,9 @@ public static HomekitAccessory create(HomekitTaggedItem taggedItem, ItemRegistry
 
             case HUMIDITY_SENSOR:
                 return new HomekitHumiditySensorImpl(taggedItem, itemRegistry, updater);
+            case BLINDS:
+            case WINDOW_COVERING:
+                return new HomekitWindowCoveringImpl(taggedItem, itemRegistry, updater);
         }
 
         throw new Exception("Unknown homekit type: " + taggedItem.getAccessoryType());

addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAccessoryType.java

@@ -0,0 +1,96 @@
+package org.openhab.io.homekit.internal.accessories;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.eclipse.smarthome.core.items.ItemRegistry;
+import org.eclipse.smarthome.core.library.items.RollershutterItem;
+import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.io.homekit.internal.HomekitAccessoryUpdater;
+import org.openhab.io.homekit.internal.HomekitTaggedItem;
+
+import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
+import com.beowulfe.hap.accessories.WindowCovering;
+import com.beowulfe.hap.accessories.properties.WindowCoveringPositionState;
+
+public class HomekitWindowCoveringImpl extends AbstractHomekitAccessoryImpl<RollershutterItem> implements WindowCovering {
+
+    public HomekitWindowCoveringImpl(HomekitTaggedItem taggedItem, ItemRegistry itemRegistry, HomekitAccessoryUpdater updater) {
+        super(taggedItem, itemRegistry, updater, RollershutterItem.class);
+    }
+
+    @Override
+    public CompletableFuture<Integer> getCurrentPosition() {
+        PercentType value = getItem().getStateAs(PercentType.class);
+        if (value == null) {
+            return CompletableFuture.completedFuture(null);
+        }
+        return CompletableFuture.completedFuture(100 - value.intValue());
+    }
+
+    @Override
+    public CompletableFuture<Boolean> getObstructionDetected() {
+        return CompletableFuture.completedFuture(false);
+    }
+
+    @Override
+    public CompletableFuture<WindowCoveringPositionState> getPositionState() {
+        return CompletableFuture.completedFuture(WindowCoveringPositionState.STOPPED);
+    }
+
+    @Override
+    public CompletableFuture<Integer> getTargetPosition() {
+        return getCurrentPosition();
+    }
+
+    @Override
+    public CompletableFuture<Void> setHoldPosition(boolean value) throws Exception {
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public CompletableFuture<Void> setTargetPosition(int value) throws Exception {
+        ((RollershutterItem) getItem()).send(new PercentType(100 - value));
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public void subscribeCurrentPosition(HomekitCharacteristicChangeCallback callback) {
+        getUpdater().subscribe(getItem(), callback);
+    }
+
+    @Override
+    public void subscribeObstructionDetected(HomekitCharacteristicChangeCallback callback) {
+        // Not implemented
+    }
+
+    @Override
+    public void subscribePositionState(HomekitCharacteristicChangeCallback callback) {
+        // Not implemented
+    }
+
+    @Override
+    public void subscribeTargetPosition(HomekitCharacteristicChangeCallback callback) {
+        getUpdater().subscribe(getItem(), "targetPosition", callback);
+    }
+
+    @Override
+    public void unsubscribeCurrentPosition() {
+        getUpdater().unsubscribe(getItem());
+    }
+
+    @Override
+    public void unsubscribeObstructionDetected() {
+        // Not implemented
+    }
+
+    @Override
+    public void unsubscribePositionState() {
+        // Not implemented
+    }
+
+    @Override
+    public void unsubscribeTargetPosition() {
+        getUpdater().unsubscribe(getItem(), "targetPosition");
+    }
+
+}