Make Shelly 2PM cover tilt opt-in

Author: MaxRink

src/devices/shelly.ts

@@ -18,6 +18,14 @@ const NS = "zhc:shelly";
 const HA_ELECTRICAL_MEASUREMENT_CLUSTER_ID = 0x0b04;
 const HA_ELECTRICAL_MEASUREMENT_POWER_FACTOR_ATTR_ID = 0x0510;
 
+const checkOption = (device: Zh.Device | DummyDevice, options: KeyValue, key: string, defaultValue = false): boolean => {
+    if (options?.[key] === "true") return true;
+    if (options?.[key] === "false") return false;
+    if (!utils.isDummyDevice(device) && device.meta[key] !== undefined) return !!device.meta[key];
+
+    return defaultValue;
+};
+
 interface ShellyRPC {
     attributes: {
         data: string;
@@ -371,6 +379,25 @@ const shellyModernExtend = {
             }),
         ];
     },
+    shellyWindowCovering(): ModernExtend {
+        const result = m.windowCovering({controls: ["lift", "tilt"]});
+        const tiltOption = e
+            .enum("cover_tilt_enabled", ea.SET, ["auto", "true", "false"])
+            .withDescription("Expose tilt/slat controls for covers with Shelly slat control enabled");
+        const exposesFn: DefinitionExposesFunction = (device, options) => {
+            const cover = e.cover().withPosition();
+            if (checkOption(device, options, "cover_tilt_enabled")) {
+                cover.withTilt();
+            }
+
+            return [cover];
+        };
+
+        result.exposes = [exposesFn];
+        result.options = [...(result.options ?? []), tiltOption];
+
+        return result;
+    },
     shellyRPCSetup(features: string[] = []): ModernExtend {
         // Set helper variables
         const shellyRPCBugFixed = false; // For firmware 20250819-150402/ga0def2d
@@ -1501,7 +1528,7 @@ export const definitions: DefinitionWithExtend[] = [
         ],
         extend: [
             m.deviceEndpoints({endpoints: {sw1: 2, sw2: 3}}),
-            m.windowCovering({controls: ["lift", "tilt"]}),
+            shellyModernExtend.shellyWindowCovering(),
             ...shellyModernExtend.shellyCustomClusters(),
             shellyModernExtend.shellyRPCSetup(["2PMInputMode"]),
             shellyModernExtend.shellyWiFiSetup(),

test/shelly.test.ts

@@ -0,0 +1,38 @@
+import assert from "node:assert";
+import {describe, expect, it} from "vitest";
+import {findByDevice} from "../src/index";
+import type {DefinitionExposesFunction, Expose} from "../src/lib/types";
+import {mockDevice} from "./utils";
+
+const getFeatureNames = (expose: Expose): string[] => {
+    return "features" in expose ? expose.features.map((feature) => feature.name) : [];
+};
+
+describe("Shelly 2PM Gen4 cover mode", () => {
+    it("exposes lift-only covers by default and opt-in tilt controls", async () => {
+        const device = mockDevice({
+            modelID: "2PM",
+            manufacturerName: "Shelly",
+            endpoints: [
+                {ID: 1, profileID: 260, deviceID: 514, inputClusterIDs: [0, 3, 4, 5, 258], outputClusterIDs: []},
+                {ID: 239, profileID: 49153, deviceID: 8193, inputClusterIDs: [64513, 64514], outputClusterIDs: []},
+                {ID: 242, profileID: 41440, deviceID: 97, inputClusterIDs: [], outputClusterIDs: [33]},
+            ],
+        });
+        const definition = await findByDevice(device);
+        expect(definition.model).toBe("S4SW-002P16EU-COVER");
+        expect(typeof definition.exposes).toBe("function");
+        const exposes = definition.exposes as DefinitionExposesFunction;
+
+        const defaultCover = exposes(device, {}).find((expose) => expose.type === "cover");
+        const tiltCover = exposes(device, {cover_tilt_enabled: "true"}).find((expose) => expose.type === "cover");
+        assert(defaultCover);
+        assert(tiltCover);
+
+        expect(getFeatureNames(defaultCover)).toContain("position");
+        expect(getFeatureNames(defaultCover)).not.toContain("tilt");
+        expect(getFeatureNames(tiltCover)).toContain("position");
+        expect(getFeatureNames(tiltCover)).toContain("tilt");
+        expect(definition.options?.some((option) => option.name === "cover_tilt_enabled")).toBe(true);
+    });
+});