zigbee-herdsman-converters 25.47.0 → 25.49.0

package/dist/devices/ubisys.js

@@ -378,7 +378,7 @@ const ubisys = {
                 }
                 if (value.input_action_templates != null) {
                     const templateTypes = {
-                        // source: "ZigBee Device Physical Input Configurations Integrator’s Guide"
+                        // source: "Zigbee Device Physical Input Configurations Integrator’s Guide"
                         // (can be obtained directly from ubisys upon request)
                         toggle: {
                             getInputActions: (input, endpoint) => [[input, 0x0d, endpoint, 0x06, 0x00, 0x02]],

package/dist/devices/vbled.js

@@ -40,7 +40,7 @@ exports.definitions = [
         zigbeeModel: ["43023"],
         model: "43023",
         vendor: "VBLED",
-        description: "ZigBee AC phase-cut dimmer",
+        description: "Zigbee AC phase-cut dimmer",
         extend: [m.light({ configureReporting: true })],
     },
 ];

package/dist/devices/yokis.js

@@ -100,7 +100,7 @@ const YokisClustersDefinition = {
                 response: 0,
                 parameters: [],
             },
-            // Open ZigBee network
+            // Open Zigbee network
             openNetwork: {
                 ID: 0x12,
                 response: 0,
@@ -897,7 +897,7 @@ const yokisCommandsExtend = {
     openNetwork: () => {
         const exposes = e
             .composite("open_network_command", "open_network_prop", ea.SET)
-            .withDescription("Open ZigBee network")
+            .withDescription("Open Zigbee network")
             .withFeature(e
             .numeric("opening_time", ea.SET) //uc_OpeningTime
             .withValueMin(0)

package/dist/lib/bosch.d.ts

@@ -48,7 +48,10 @@ export declare const boschGeneralSensorDeviceExtend: {
     customIasZoneCluster: () => ModernExtend;
     testMode: (args: {
         testModeDescription: string;
-        supportTimeout?: boolean;
+        sensitivityLevelToUse: number;
+        variableTimeoutSupported?: boolean;
+        defaultTimeout?: number;
+        zoneStatusBit?: number;
     }) => ModernExtend;
 };
 export interface BoschBmctCluster extends BoschGeneralEnergyDeviceCluster {
@@ -230,6 +233,22 @@ export declare const boschWaterAlarmExtend: {
     alarmOnMotion: () => ModernExtend;
     testMode: () => ModernExtend;
 };
+export declare const boschSmokeAlarmExtend: {
+    /** In previous implementations, the user was able to change the
+     * sensitivity level of the smoke detector. That is not supported
+     * when using the Bosch Smart Home Controller II. As the previous
+     * creator assumed that Bosch follows the ZCL specification for
+     * the sensitivity level (which isn't the case), this may result
+     * in an unintentionally lowered sensitivity level. Therefore,
+     * we set the manufacturer's default value here once to reverse
+     * any previous modifications for safety reasons, as we talk
+     * about a device that should save lives... */
+    enforceDefaultSensitivityLevel: () => ModernExtend;
+    smokeAlarmAndButtonPushes: () => ModernExtend;
+    alarmControl: () => ModernExtend;
+    testMode: () => ModernExtend;
+    battery: () => ModernExtend;
+};
 export declare const boschSmartPlugExtend: {
     smartPlugCluster: () => ModernExtend;
     onOff: () => ModernExtend;

package/dist/lib/bosch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bosch.d.ts","sourceRoot":"","sources":["../../src/lib/bosch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bosch.d.ts","sourceRoot":"","sources":["../../src/lib/bosch.ts"],"names":[],"mappings":"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"}

package/dist/lib/bosch.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.boschThermostatExtend = exports.boschSmartPlugExtend = exports.boschWaterAlarmExtend = exports.boschBsenExtend = exports.boschDoorWindowContactExtend = exports.boschBsirExtend = exports.boschBmctExtend = exports.boschGeneralSensorDeviceExtend = exports.boschGeneralEnergyDeviceExtend = exports.boschGeneralExtend = exports.manufacturerOptions = void 0;
+exports.boschThermostatExtend = exports.boschSmartPlugExtend = exports.boschSmokeAlarmExtend = exports.boschWaterAlarmExtend = exports.boschBsenExtend = exports.boschDoorWindowContactExtend = exports.boschBsirExtend = exports.boschBmctExtend = exports.boschGeneralSensorDeviceExtend = exports.boschGeneralEnergyDeviceExtend = exports.boschGeneralExtend = exports.manufacturerOptions = void 0;
 const zigbee_herdsman_1 = require("zigbee-herdsman");
 const fz = __importStar(require("../converters/fromZigbee"));
 const tz = __importStar(require("../converters/toZigbee"));
@@ -42,6 +42,7 @@ const m = __importStar(require("../lib/modernExtend"));
 const constants_1 = require("./constants");
 const logger_1 = require("./logger");
 const reporting_1 = require("./reporting");
+const globalStore = __importStar(require("./store"));
 const utils = __importStar(require("./utils"));
 const utils_1 = require("./utils");
 const e = exposes.presets;
@@ -278,29 +279,38 @@ exports.boschGeneralEnergyDeviceExtend = {
 exports.boschGeneralSensorDeviceExtend = {
     customIasZoneCluster: () => m.deviceAddCustomCluster("ssIasZone", {
         ID: zigbee_herdsman_1.Zcl.Clusters.ssIasZone.ID,
-        attributes: {},
+        attributes: {
+            unknownAttribute1: { ID: 0x8f01, type: zigbee_herdsman_1.Zcl.DataType.UINT8, manufacturerCode: exports.manufacturerOptions.manufacturerCode },
+            unknownAttribute2: { ID: 0x8f06, type: zigbee_herdsman_1.Zcl.DataType.UINT8, manufacturerCode: exports.manufacturerOptions.manufacturerCode },
+        },
         commands: {
-            initCustomTestMode: {
+            initiateTestMode: {
                 ID: 0x02,
                 parameters: [
-                    { name: "timeoutInSeconds", type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
-                    { name: "reportTestInZoneStatus", type: zigbee_herdsman_1.Zcl.DataType.ENUM8 },
+                    { name: "testModeDuration", type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
+                    { name: "currentZoneSensitivityLevel", type: zigbee_herdsman_1.Zcl.DataType.ENUM8 },
+                ],
+            },
+            alarmControl: {
+                ID: 0x80,
+                parameters: [
+                    { name: "alarmMode", type: zigbee_herdsman_1.Zcl.DataType.ENUM8 },
+                    { name: "alarmTimeout", type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
                 ],
             },
         },
         commandsResponse: {},
     }),
     testMode: (args) => {
-        const { testModeDescription, supportTimeout = false } = args;
+        const { testModeDescription, sensitivityLevelToUse, variableTimeoutSupported = false, defaultTimeout = 0, zoneStatusBit = 8 } = args;
         const testModeLookup = {
             ON: true,
             OFF: false,
         };
-        const defaultTimeout = 3;
-        const enableTestMode = async (endpoint, timeout) => {
-            await endpoint.command("ssIasZone", "initCustomTestMode", {
-                timeoutInSeconds: timeout,
-                reportTestInZoneStatus: 0x80,
+        const enableTestMode = async (endpoint, sensitivityLevelToUse, timeoutInSeconds) => {
+            await endpoint.command("ssIasZone", "initiateTestMode", {
+                testModeDuration: timeoutInSeconds,
+                currentZoneSensitivityLevel: sensitivityLevelToUse,
             });
         };
         const disableTestMode = async (endpoint) => {
@@ -312,7 +322,7 @@ exports.boschGeneralSensorDeviceExtend = {
                 .withDescription(testModeDescription)
                 .withCategory("config"),
         ];
-        if (supportTimeout) {
+        if (variableTimeoutSupported) {
             exposes.push(e
                 .numeric("test_mode_timeout", ea.ALL)
                 .withDescription(`Determines how long the test mode should be activated. The default length is ${defaultTimeout} seconds.`)
@@ -331,7 +341,7 @@ exports.boschGeneralSensorDeviceExtend = {
                         return;
                     }
                     const result = {};
-                    const testModeEnabled = (zoneStatus & (1 << 8)) > 0;
+                    const testModeEnabled = (zoneStatus & (1 << zoneStatusBit)) > 0;
                     result.test_mode = utils.getFromLookupByValue(testModeEnabled, testModeLookup);
                     return result;
                 },
@@ -343,21 +353,16 @@ exports.boschGeneralSensorDeviceExtend = {
                 convertSet: async (entity, key, value, meta) => {
                     if (key === "test_mode") {
                         if (value === utils.getFromLookupByValue(true, testModeLookup)) {
-                            let timeout;
-                            if (supportTimeout) {
-                                const currentTimeout = meta.state.test_mode_timeout;
-                                if (currentTimeout == null) {
-                                    timeout = defaultTimeout;
-                                    meta.publish({ test_mode_timeout: timeout });
-                                }
-                                else {
-                                    timeout = utils.toNumber(currentTimeout);
-                                }
+                            let timeoutInSeconds;
+                            const currentTimeout = meta.state.test_mode_timeout;
+                            if (currentTimeout == null) {
+                                timeoutInSeconds = defaultTimeout;
+                                meta.publish({ test_mode_timeout: timeoutInSeconds });
                             }
                             else {
-                                timeout = 0;
+                                timeoutInSeconds = utils.toNumber(currentTimeout);
                             }
-                            await enableTestMode(entity, timeout);
+                            await enableTestMode(entity, sensitivityLevelToUse, timeoutInSeconds);
                         }
                         else {
                             await disableTestMode(entity);
@@ -372,7 +377,7 @@ exports.boschGeneralSensorDeviceExtend = {
                         await entity.read("ssIasZone", ["zoneStatus"]);
                     }
                     if (key === "test_mode_timeout" && meta.state.test_mode_timeout == null) {
-                        meta.publish({ test_mode_timeout: supportTimeout ? defaultTimeout : 0 });
+                        meta.publish({ test_mode_timeout: defaultTimeout });
                     }
                 },
             },
@@ -1825,6 +1830,7 @@ exports.boschBsenExtend = {
         testModeDescription: "Activates the test mode. In this mode, the device blinks on every detected motion " +
             "without any wait time in between to verify the installation. Please keep in mind " +
             "that it can take up to 45 seconds for the test mode to be activated.",
+        sensitivityLevelToUse: 0x80,
     }),
     illuminance: () => m.illuminance({ reporting: { min: "1_SECOND", max: 600, change: 3522 } }),
     // The temperature sensor isn't used at all by Bosch on the BSEN-M.
@@ -2111,8 +2117,182 @@ exports.boschWaterAlarmExtend = {
         testModeDescription: "Activates the test mode. In this mode, the device acts like it would when " +
             "detecting any water to verify the installation. Please keep in mind " +
             "that it can take up to 10 seconds for the test mode to be activated.",
-        supportTimeout: true,
+        sensitivityLevelToUse: 0x00,
+        variableTimeoutSupported: true,
+        defaultTimeout: 3,
+    }),
+};
+//endregion
+//region Bosch BSD-2 (Smoke alarm II)
+exports.boschSmokeAlarmExtend = {
+    /** In previous implementations, the user was able to change the
+     * sensitivity level of the smoke detector. That is not supported
+     * when using the Bosch Smart Home Controller II. As the previous
+     * creator assumed that Bosch follows the ZCL specification for
+     * the sensitivity level (which isn't the case), this may result
+     * in an unintentionally lowered sensitivity level. Therefore,
+     * we set the manufacturer's default value here once to reverse
+     * any previous modifications for safety reasons, as we talk
+     * about a device that should save lives... */
+    enforceDefaultSensitivityLevel: () => {
+        const onEvent = [
+            async (event) => {
+                if (event.type !== "start") {
+                    return;
+                }
+                const device = event.data.device;
+                if (device.meta.enforceDefaultSensitivityLevelApplied !== true) {
+                    const endpoint = device.getEndpoint(1);
+                    await endpoint.write("ssIasZone", { currentZoneSensitivityLevel: 0x00 });
+                    device.meta.enforceDefaultSensitivityLevelApplied = true;
+                }
+            },
+        ];
+        return {
+            onEvent,
+            isModernExtend: true,
+        };
+    },
+    smokeAlarmAndButtonPushes: () => m.iasZoneAlarm({
+        zoneType: "smoke",
+        zoneAttributes: ["alarm_1"],
+        manufacturerZoneAttributes: [
+            {
+                bit: 11,
+                name: "smoke_alarm_silenced",
+                valueOn: true,
+                valueOff: false,
+                description: "Indicates whether an smoke alarm was silenced on the device itself for 10 minutes. " +
+                    "Please keep in mind that the smoke detection is being disabled during that " +
+                    "time period as well.",
+                entityCategory: "diagnostic",
+            },
+            {
+                bit: 8,
+                name: "button_pushed",
+                valueOn: true,
+                valueOff: false,
+                description: "Indicates whether the button on the device is being pushed for at least " +
+                    "3 seconds (e.g., to trigger a test alarm or silence a smoke alarm)",
+                entityCategory: "diagnostic",
+            },
+        ],
+    }),
+    alarmControl: () => {
+        const alarmModeLookup = {
+            manual_smoke_alarm: 0x00,
+            manual_burglar_alarm: 0x01,
+        };
+        const onOffLookup = {
+            OFF: false,
+            ON: true,
+        };
+        const defaultBroadcastAlarms = true;
+        function setDefaultBroadcastAlarms(meta) {
+            const newBroadcastStatus = utils.getFromLookupByValue(defaultBroadcastAlarms, onOffLookup);
+            meta.publish({ broadcast_alarms: newBroadcastStatus });
+        }
+        async function sendAlarmControlMessage(endpoint, broadcastAlarm, alarmMode, timeoutInSeconds) {
+            if (broadcastAlarm === true) {
+                // Bosch sends broadcast messages two times with 4 seconds in between to
+                // ensure all sleepy devices receive them. We mimic the same pattern here.
+                for (let index = 0; index < 2; index++) {
+                    await endpoint.zclCommandBroadcast(255, zigbee_herdsman_1.ZSpec.BroadcastAddress.SLEEPY, "ssIasZone", "alarmControl", { alarmMode: alarmMode, alarmTimeout: timeoutInSeconds }, exports.manufacturerOptions);
+                    await (0, utils_1.sleep)(4000);
+                }
+            }
+            else {
+                await endpoint.command("ssIasZone", "alarmControl", { alarmMode: alarmMode, alarmTimeout: timeoutInSeconds }, exports.manufacturerOptions);
+            }
+        }
+        const exposes = [
+            e
+                .binary("manual_smoke_alarm", ea.ALL, utils.getFromLookupByValue(true, onOffLookup), utils.getFromLookupByValue(false, onOffLookup))
+                .withDescription("Indicates whether the smoke alarm siren is being manually activated on the device"),
+            e
+                .binary("manual_burglar_alarm", ea.ALL, utils.getFromLookupByValue(true, onOffLookup), utils.getFromLookupByValue(false, onOffLookup))
+                .withDescription("Indicates whether the burglar alarm siren is being manually activated on the device"),
+            e
+                .binary("broadcast_alarms", ea.ALL, utils.getFromLookupByValue(true, onOffLookup), utils.getFromLookupByValue(false, onOffLookup))
+                .withLabel("Broadcast alarms")
+                .withDescription("Broadcast manual alarm state changes to all BSD-2 devices on the network. Please keep in mind " +
+                "that a detected smoke alarm is not being transmitted automatically to other devices. " +
+                "To achieve that, you must set up an automation, e.g., in Home Assistant.")
+                .withCategory("config"),
+        ];
+        const fromZigbee = [
+            {
+                cluster: "ssIasZone",
+                type: ["commandStatusChangeNotification", "attributeReport", "readResponse"],
+                convert: (model, msg, publish, options, meta) => {
+                    const zoneStatus = "zonestatus" in msg.data ? msg.data.zonestatus : msg.data.zoneStatus;
+                    if (zoneStatus === undefined) {
+                        return;
+                    }
+                    const result = {};
+                    const smokeAlarmEnabled = (zoneStatus & (1 << 1)) > 0;
+                    result.manual_smoke_alarm = utils.getFromLookupByValue(smokeAlarmEnabled, onOffLookup);
+                    const burglarAlarmEnabled = (zoneStatus & (1 << 7)) > 0;
+                    result.manual_burglar_alarm = utils.getFromLookupByValue(burglarAlarmEnabled, onOffLookup);
+                    return result;
+                },
+            },
+        ];
+        const toZigbee = [
+            {
+                key: ["manual_smoke_alarm", "manual_burglar_alarm", "broadcast_alarms"],
+                convertSet: async (entity, key, value, meta) => {
+                    if (key === "manual_smoke_alarm" || key === "manual_burglar_alarm") {
+                        let broadcastAlarm;
+                        try {
+                            broadcastAlarm = utils.getFromLookup(meta.state.broadcast_alarms, onOffLookup);
+                        }
+                        catch {
+                            setDefaultBroadcastAlarms(meta);
+                            broadcastAlarm = defaultBroadcastAlarms;
+                        }
+                        const alarmMode = utils.getFromLookup(key, alarmModeLookup);
+                        const enableAlarm = utils.getFromLookup(value, onOffLookup);
+                        const timeoutInSeconds = enableAlarm ? 0xf0 : 0;
+                        utils.assertEndpoint(entity);
+                        await sendAlarmControlMessage(entity, broadcastAlarm, alarmMode, timeoutInSeconds);
+                        clearTimeout(globalStore.getValue("boschSmokeAlarm", "alarmTimer"));
+                        if (enableAlarm) {
+                            const alarmTimer = setTimeout(async () => await sendAlarmControlMessage(entity, broadcastAlarm, alarmMode, timeoutInSeconds), (timeoutInSeconds - 60) * 1000);
+                            globalStore.putValue("boschSmokeAlarm", "alarmTimer", alarmTimer);
+                        }
+                    }
+                    if (key === "broadcast_alarms") {
+                        return { state: { broadcast_alarms: value } };
+                    }
+                },
+                convertGet: async (entity, key, meta) => {
+                    if (key === "manual_smoke_alarm" || key === "manual_burglar_alarm") {
+                        await entity.read("ssIasZone", ["zoneStatus"]);
+                    }
+                    if (key === "broadcast_alarms" && meta.state[key] === undefined) {
+                        setDefaultBroadcastAlarms(meta);
+                    }
+                },
+            },
+        ];
+        return {
+            exposes,
+            fromZigbee,
+            toZigbee,
+            isModernExtend: true,
+        };
+    },
+    testMode: () => exports.boschGeneralSensorDeviceExtend.testMode({
+        testModeDescription: "Check the function of the smoke alarm. Pay attention to the alarm sound " +
+            "and the flashing of the alarm LED. Please keep in mind that it can take " +
+            "up to 10 seconds for the test mode to be activated.",
+        sensitivityLevelToUse: 0x00,
+        variableTimeoutSupported: true,
+        defaultTimeout: 5,
+        zoneStatusBit: 10,
     }),
+    battery: () => exports.boschGeneralExtend.batteryWithPercentageAndLowStatus({ percentageReportingConfig: { min: "MIN", max: "MAX", change: 1 } }),
 };
 exports.boschSmartPlugExtend = {
     smartPlugCluster: () => m.deviceAddCustomCluster("boschEnergyDevice", {