hoffmation-base 3.0.0-alpha.8 → 3.0.0-alpha.81

package/lib/server/devices/zigbee/zigbeeAqaraOpple3Switch.js

@@ -8,15 +8,30 @@ const models_1 = require("../../../models");
 class ZigbeeAqaraOpple3Switch extends BaseDevices_1.ZigbeeSwitch {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAqaraOpple3Switch);
+        /** @inheritDoc */
         this.buttonTopLeft = new button_1.Button('TopLeft', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        /** @inheritDoc */
         this.buttonMidLeft = new button_1.Button('MidLeft', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        /** @inheritDoc */
         this.buttonBotLeft = new button_1.Button('BotLeft', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        /** @inheritDoc */
         this.buttonTopRight = new button_1.Button('TopRight', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        /** @inheritDoc */
         this.buttonMidRight = new button_1.Button('MidRight', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        /** @inheritDoc */
         this.buttonBotRight = new button_1.Button('BotRight', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        /**
+         * Not present for {@link DeviceType.ZigbeeAqaraOpple3Switch}
+         * @inheritDoc
+         */
         this.buttonBot = undefined;
+        /**
+         * Not present for {@link DeviceType.ZigbeeAqaraOpple3Switch}
+         * @inheritDoc
+         */
         this.buttonTop = undefined;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Magnet Contact Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
@@ -25,6 +40,7 @@ class ZigbeeAqaraOpple3Switch extends BaseDevices_1.ZigbeeSwitch {
             this.updateButton(name, state.val);
         }
     }
+    /** @inheritDoc */
     getButtonAssignment() {
         const result = [`Button: ${this.info.customName}`];
         for (const taste of [

package/lib/server/devices/zigbee/zigbeeAquaraMotion.d.ts

@@ -6,9 +6,15 @@ export declare class ZigbeeAquaraMotion extends ZigbeeMotionSensor implements iI
     private occupancyTimeoutID;
     constructor(pInfo: IoBrokerDeviceInfo);
     private _motionTimeout;
+    /**
+     * Time after the last trigger until a motion event gets triggered again
+     * @returns The time in ??? unit TODO: RF
+     */
     get motionTimeout(): number;
     set motionTimeout(value: number);
+    /** @inheritDoc */
     get currentIllumination(): number;
     private set currentIllumination(value);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
 }

package/lib/server/devices/zigbee/zigbeeAquaraMotion.js

@@ -10,12 +10,15 @@ class ZigbeeAquaraMotion extends BaseDevices_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraMotion);
         this._illuminance = 0;
-        this.occupancyTimeoutID = `occupancy_timeout`;
+        this.occupancyTimeoutID = 'occupancy_timeout';
         this._motionTimeout = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
         this.occupancyTimeoutID = `${this.info.fullID}.${this.occupancyTimeoutID}`;
     }
-    // Time after the last trigger until a motion event gets triggered again
+    /**
+     * Time after the last trigger until a motion event gets triggered again
+     * @returns The time in ??? unit TODO: RF
+     */
     get motionTimeout() {
         return this._motionTimeout;
     }
@@ -26,7 +29,7 @@ class ZigbeeAquaraMotion extends BaseDevices_1.ZigbeeMotionSensor {
             console.log(`Error occurred while setting motion timeout: ${err}`);
         });
     }
-    // Currently measured brightness in lux
+    /** @inheritDoc */
     get currentIllumination() {
         return this._illuminance;
     }
@@ -35,6 +38,7 @@ class ZigbeeAquaraMotion extends BaseDevices_1.ZigbeeMotionSensor {
         this._illuminance = value;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistIlluminationSensor(this);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);

package/lib/server/devices/zigbee/zigbeeAquaraVibra.d.ts

@@ -1,33 +1,80 @@
+import { BatteryLevelChangeAction } from '../../../models';
 import { iBatteryDevice, iVibrationSensor } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor, iBatteryDevice {
-    private _battery;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
-    get battery(): number;
+    /**
+     * The sensitivity of the vibration sensor
+     */
     sensitivity: string;
+    /**
+     * The detected tilt angle of the vibration sensor
+     */
     tiltAngle: number;
+    /**
+     * The detected tilt angle on the x-axis of the vibration sensor
+     */
     tiltAngleX: number;
+    /**
+     * The detected tilt angle on the x-axis of the vibration sensor
+     */
     tiltAngleXAbs: number;
+    /**
+     * The detected tilt angle on the y-axis of the vibration sensor
+     */
     tiltAngleY: number;
+    /**
+     * The detected tilt angle on the y-axis in absolute values of the vibration sensor
+     */
     tiltAngleYAbs: number;
+    /**
+     * The detected tilt angle on the z-axis of the vibration sensor
+     */
     tiltAngleZ: number;
+    /**
+     * Whether the vibration sensor is tilted
+     */
     tilt: boolean;
-    vibration: boolean;
-    vibrationBlockedByGriffTimeStamp: number;
-    vibrationBlockedByMotionTimeStamp: number;
+    private _battery;
+    private _lastBatteryPersist;
+    private _vibration;
+    private _vibrationBlockedByHandleTimeStamp;
+    private _vibrationBlockedByMotionTimeStamp;
     private _idSensitivity;
     private _alarmMessage;
-    constructor(pInfo: IoBrokerDeviceInfo);
     private _vibrationBlockedByGriff;
-    get vibrationBlockedByGriff(): boolean;
-    set vibrationBlockedByGriff(pVal: boolean);
     private _vibrationBlockedByMotion;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    get vibration(): boolean;
+    /** @inheritDoc */
+    get vibrationBlockedByMotionTimeStamp(): number;
+    /** @inheritDoc */
+    get vibrationBlockedByHandleTimeStamp(): number;
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
+    get vibrationBlockedByHandle(): boolean;
+    /** @inheritDoc */
+    set vibrationBlockedByHandle(pVal: boolean);
+    /** @inheritDoc */
     get vibrationBlockedByMotion(): boolean;
+    /** @inheritDoc */
     set vibrationBlockedByMotion(pVal: boolean);
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setSensitivity(pVal: number): void;
-    alarmCheck(): void;
+    /** @inheritDoc */
     persistBatteryDevice(): void;
+    private alarmCheck;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/zigbeeAquaraVibra.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraVibra = void 0;
 const deviceType_1 = require("../deviceType");
@@ -6,67 +29,118 @@ const services_1 = require("../../services");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
 const DeviceCapability_1 = require("../DeviceCapability");
+const console = __importStar(require("console"));
 class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
+        /**
+         * The sensitivity of the vibration sensor
+         */
         this.sensitivity = '';
+        /**
+         * The detected tilt angle of the vibration sensor
+         */
         this.tiltAngle = 0;
+        /**
+         * The detected tilt angle on the x-axis of the vibration sensor
+         */
         this.tiltAngleX = 0;
+        /**
+         * The detected tilt angle on the x-axis of the vibration sensor
+         */
         this.tiltAngleXAbs = 0;
+        /**
+         * The detected tilt angle on the y-axis of the vibration sensor
+         */
         this.tiltAngleY = 0;
+        /**
+         * The detected tilt angle on the y-axis in absolute values of the vibration sensor
+         */
         this.tiltAngleYAbs = 0;
+        /**
+         * The detected tilt angle on the z-axis of the vibration sensor
+         */
         this.tiltAngleZ = 0;
+        /**
+         * Whether the vibration sensor is tilted
+         */
         this.tilt = false;
-        this.vibration = false;
-        this.vibrationBlockedByGriffTimeStamp = 0;
-        this.vibrationBlockedByMotionTimeStamp = 0;
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
+        this._vibration = false;
+        this._vibrationBlockedByHandleTimeStamp = 0;
+        this._vibrationBlockedByMotionTimeStamp = 0;
         this._idSensitivity = '';
-        // TODO Set Sensitivity
         this._vibrationBlockedByGriff = false;
         this._vibrationBlockedByMotion = false;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.vibrationSensor);
         this._alarmMessage = services_1.Res.vibrationAlarm(this.info.customName);
         services_1.PollyService.preloadTTS(this._alarmMessage);
         this._idSensitivity = `${this.info.fullID}.sensitivity`;
     }
-    get vibrationBlockedByGriff() {
+    /** @inheritDoc */
+    get vibration() {
+        return this._vibration;
+    }
+    /** @inheritDoc */
+    get vibrationBlockedByMotionTimeStamp() {
+        return this._vibrationBlockedByMotionTimeStamp;
+    }
+    /** @inheritDoc */
+    get vibrationBlockedByHandleTimeStamp() {
+        return this._vibrationBlockedByHandleTimeStamp;
+    }
+    // TODO Set Sensitivity
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
+    get vibrationBlockedByHandle() {
         return this._vibrationBlockedByGriff;
     }
-    set vibrationBlockedByGriff(pVal) {
+    /** @inheritDoc */
+    set vibrationBlockedByHandle(pVal) {
         this.log(models_1.LogLevel.Debug, `${pVal ? 'disa' : 'a'}rming vibration alarm for ${this.info.customName} due to handle`);
         if (pVal) {
-            this.vibrationBlockedByGriffTimeStamp = new Date().getTime();
+            this._vibrationBlockedByHandleTimeStamp = new Date().getTime();
         }
         this._vibrationBlockedByGriff = pVal;
     }
+    /** @inheritDoc */
     get vibrationBlockedByMotion() {
         return this._vibrationBlockedByMotion;
     }
+    /** @inheritDoc */
     set vibrationBlockedByMotion(pVal) {
         this.log(models_1.LogLevel.Debug, `${pVal ? 'Dea' : 'A'}ktiviere Vibrationsalarm für ${this.info.customName} in Bezug auf Bewegung`);
         if (pVal) {
-            this.vibrationBlockedByMotionTimeStamp = services_1.Utils.nowMS();
+            this._vibrationBlockedByMotionTimeStamp = services_1.Utils.nowMS();
         }
         this._vibrationBlockedByMotion = pVal;
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
-                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                    this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
             case 'sensitivity':
@@ -87,8 +161,8 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
                 break;
             case 'vibration':
                 this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Vibration erkannt: ${state.val}`);
-                this.vibration = state.val;
-                if (this.vibration) {
+                this._vibration = state.val;
+                if (this._vibration) {
                     services_1.Utils.guardedTimeout(() => {
                         this.alarmCheck();
                     }, 8500, this);
@@ -123,7 +197,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
                 break;
         }
         if (this._idSensitivity === '') {
-            this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
+            this.log(models_1.LogLevel.Error, 'Keine Switch ID bekannt.');
             return;
         }
         this.log(models_1.LogLevel.Debug, `Vibration Sensitivität schalten Wert: ${result}`);
@@ -131,10 +205,20 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
             console.log(`Stecker schalten ergab Fehler: ${err}`);
         });
     }
+    /** @inheritDoc */
+    persistBatteryDevice() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
+    }
     alarmCheck() {
         this.log(models_1.LogLevel.Debug, `Alarmcheck für ${this.info.customName} Alarmblock Wert: ${this._vibrationBlockedByGriff}`);
         if (this._vibrationBlockedByGriff) {
-            this.log(models_1.LogLevel.Debug, `Window is open; ignoring vibration alarm.`);
+            this.log(models_1.LogLevel.Debug, 'Window is open; ignoring vibration alarm.');
             return;
         }
         if (this._vibrationBlockedByMotion) {
@@ -145,14 +229,18 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         services_1.SonosService.speakOnAll(message);
         this.log(models_1.LogLevel.Alert, message);
     }
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeAquaraVibra = ZigbeeAquaraVibra;

package/lib/server/devices/zigbee/zigbeeAquaraWater.d.ts

@@ -1,25 +1,44 @@
-/// <reference types="node" />
 import { ZigbeeDevice } from './BaseDevices';
+import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeAquaraWater extends ZigbeeDevice implements iBatteryDevice {
-    private _battery;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
-    get battery(): number;
+    /**
+     * Whether water is detected
+     */
     water: boolean;
+    /**
+     * The timeout for the alarm
+     * @default undefined (no alarm active)
+     */
     iAlarmTimeout: NodeJS.Timeout | undefined;
+    private _battery;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     private _messageAlarmFirst;
     private _messageAlarm;
     private _messageAlarmEnd;
     private _supressAlarmTimeStamp;
-    constructor(pInfo: IoBrokerDeviceInfo);
     private _roomName;
-    set roomName(val: string);
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     stopAlarm(quiet?: boolean, timeout?: number): void;
-    private startAlarm;
-    private alarm;
+    /** @inheritDoc */
     persistBatteryDevice(): void;
+    /** @inheritDoc */
     dispose(): void;
+    private startAlarm;
+    private alarm;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/zigbeeAquaraWater.js

@@ -6,19 +6,23 @@ const services_1 = require("../../services");
 const BaseDevices_1 = require("./BaseDevices");
 const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
+// TODO: Add iWaterSensor
 class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
+        /**
+         * Whether water is detected
+         */
         this.water = false;
+        /**
+         * The timeout for the alarm
+         * @default undefined (no alarm active)
+         */
         this.iAlarmTimeout = undefined;
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
@@ -29,24 +33,29 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarm = services_1.Res.waterAlarmRepeat(this.info.customName, this._roomName);
         this._messageAlarmEnd = services_1.Res.waterAlarmEnd(this._roomName);
     }
-    set roomName(val) {
-        this._roomName = val;
-        this._messageAlarmFirst = services_1.Res.waterAlarmStart(this.info.customName, this._roomName);
-        this._messageAlarm = services_1.Res.waterAlarmRepeat(this.info.customName, this._roomName);
-        this._messageAlarmEnd = services_1.Res.waterAlarmEnd(this._roomName);
-        services_1.PollyService.preloadTTS(this._messageAlarmFirst);
-        services_1.PollyService.preloadTTS(this._messageAlarm);
-        services_1.PollyService.preloadTTS(this._messageAlarmEnd);
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Water Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
-                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                    this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
             case 'detected':
@@ -80,9 +89,27 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
             services_1.SonosService.speakOnAll(message);
         });
     }
+    /** @inheritDoc */
+    persistBatteryDevice() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
+    }
+    /** @inheritDoc */
+    dispose() {
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
+            this.iAlarmTimeout = undefined;
+        }
+        super.dispose();
+    }
     startAlarm() {
         if (services_1.Utils.nowMS() < this._supressAlarmTimeStamp) {
-            this.log(models_1.LogLevel.Warn, `Would start alarm, but we are supressed.`);
+            this.log(models_1.LogLevel.Warn, 'Would start alarm, but we are supressed.');
             return;
         }
         if (this.iAlarmTimeout !== undefined) {
@@ -102,21 +129,18 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
             services_1.SonosService.speakOnAll(message, 80);
         });
     }
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    dispose() {
-        if (this.iAlarmTimeout) {
-            clearInterval(this.iAlarmTimeout);
-            this.iAlarmTimeout = undefined;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
         }
-        super.dispose();
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeAquaraWater = ZigbeeAquaraWater;

package/lib/server/devices/zigbee/zigbeeBlitzShp.d.ts

@@ -4,24 +4,34 @@ import { iExcessEnergyConsumer } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
 export declare class ZigbeeBlitzShp extends ZigbeeActuator implements iExcessEnergyConsumer, iLoadMeter {
+    /** @inheritDoc */
+    settings: ActuatorSettings;
+    protected readonly _actuatorOnStateIdState: string;
     private _steckerOn;
-    get steckerOn(): boolean;
     private _current;
-    get current(): number;
     private _energy;
-    get energy(): number;
     private _loadPower;
-    get loadPower(): number;
-    settings: ActuatorSettings;
     private readonly _availableForExcessEnergy;
     private _activatedByExcessEnergy;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get current(): number;
+    get energy(): number;
+    /** @inheritDoc */
+    get loadPower(): number;
+    /** @inheritDoc */
     get energySettings(): ExcessEnergyConsumerSettings;
+    /** @inheritDoc */
     get currentConsumption(): number;
+    /** @inheritDoc */
     get on(): boolean;
+    /** @inheritDoc */
     isAvailableForExcessEnergy(): boolean;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    /** @inheritDoc */
     turnOnForExcessEnergy(): void;
+    /** @inheritDoc */
     turnOffDueToMissingEnergy(): void;
+    /** @inheritDoc */
     wasActivatedByExcessEnergy(): boolean;
 }